Commit Graph

2178 Commits

Author SHA1 Message Date
matildepark
1b96410b94
Merge pull request #4197 from tylershuster/hark-title
interface: document title
2021-01-06 16:10:37 -05:00
Tyler Brown Cifu Shuster
207c9accde interface: document title 2021-01-06 12:54:52 -08:00
Tyler Brown Cifu Shuster
1bc5d22412 interface: add fallback fonts 2021-01-05 22:05:36 -08:00
Matilde Park
822a378fb4 Merge branch 'release/next-js' into release/next-userspace 2021-01-05 20:06:37 -05:00
Liam Fitzgerald
44ac3130f8
graph-store: use +bap for update-log listification 2021-01-05 08:23:12 +10:00
Liam Fitzgerald
3e1207283b
Merge remote-tracking branch 'origin/master' into lf/update-log-order 2021-01-05 08:18:12 +10:00
matildepark
584755de2d
Merge pull request #4121 from tylershuster/serve-woff
landscape: add woff2 support, serve Inter & Source Code Pro
2021-01-04 11:31:02 -05:00
Philip Monk
598a46d1f7
Merge remote-tracking branch 'origin/la/spider-fix' into philip/gall-vega 2020-12-18 17:04:02 -08:00
janeway
327a542952
glob: update to 0v5.hvt1e.ie7it.b7i7l.1r7jj.dn9ib 2020-12-18 13:06:18 -08:00
Liam Fitzgerald
2d6913794f
glob: update to 0v7.p2egb.1l8lk.11asn.n1bkb.71bkt 2020-12-18 14:09:25 +10:00
Liam Fitzgerald
a66d0fc2ba
Merge remote-tracking branch 'origin/release/next-userspace' 2020-12-18 14:04:08 +10:00
Liam Fitzgerald
128356dd47
Merge pull request #4156 from urbit/lf/last-updated
hark-graph-hook, hark-store: set last-updated on self posts
2020-12-18 13:56:16 +10:00
Logan Allen
be8c0940e7 hark-graph-hook: reduce extraneous %no-metadata printfs 2020-12-17 19:45:05 +00:00
Liam Fitzgerald
6b6e9a7be2
hark: cleanup notifications on leave 2020-12-17 16:10:26 +10:00
Liam Fitzgerald
69c555c4b5
hark: lazier notifications, update in add-graph 2020-12-17 11:59:35 +10:00
fang
744cce098f
Merge pull request #4163 from jfranklin9000/release/next-userspace
dbug: make eyre Channels header match the table
2020-12-16 15:53:31 +01:00
Liam Fitzgerald
7ae79cfb1a
glob: update to 0v2.4fgj3.q9463.10ksb.jmhse.00031 2020-12-16 17:52:08 +10:00
Liam Fitzgerald
169955b45a
hark: rework unread tracking, pt.3 2020-12-16 17:46:35 +10:00
Liam Fitzgerald
610a8730b7
wip 2020-12-16 14:22:23 +10:00
Liam Fitzgerald
0ab9af0679
glob: update to 0v1.pr789.2ugh8.chgtm.dlmfn.cc9pr 2020-12-16 10:11:05 +10:00
Liam Fitzgerald
fa7c347870
graph-store: add TODO comment for backwards tap 2020-12-16 09:42:01 +10:00
Liam Fitzgerald
2c915af179
graph-store: run update log in correct order
tapping an ordered map returns a list with the smallest keys first.
However, graph-store's update-log is defined backwards, such that the
list will have the most recent updates in the front of the list. We
therefore flop the update log before iterating over it, in order to
process the updates in the order they occurred
2020-12-15 21:37:50 +10:00
Liam Fitzgerald
4461b42d6a
glob: update to 0v3t3u8.g4h6p.ckag1.tpdjo.785v5 2020-12-15 15:53:24 +10:00
Liam Fitzgerald
d9b8fd77c1
Merge branch 'release/next-u' into lf/last-updated 2020-12-15 15:49:39 +10:00
Liam Fitzgerald
5fdfca10e2
hark-store: send update counts separately 2020-12-15 15:38:56 +10:00
Liam Fitzgerald
6499eb5fe0
glob: update to 0v5.bo337.25di9.mg5d5.i9vun.5qaqe 2020-12-15 10:09:22 +10:00
John Franklin
00b5734b41 dbug: make eyre Channels header match the table 2020-12-14 17:20:31 -06:00
Liam Fitzgerald
66fe59819e
hark-store: allow setting last-updated independently of unread counts 2020-12-14 13:33:31 +10:00
Liam Fitzgerald
503aaa899a
hark-graph-hook: refactor to ensure facts are given correctly 2020-12-14 13:14:56 +10:00
Logan Allen
504e02a6c8 graph-store: turn back on noisy duplicates 2020-12-12 18:06:44 -06:00
Logan Allen
8b83df00bd Merge remote-tracking branch 'origin/master' into release/next-userspace 2020-12-12 18:05:49 -06:00
Logan Allen
35c2ccd54c graph-store: silence duplicate message assertion temporarily 2020-12-12 14:46:59 -06:00
Matilde Park
2a62b40b62 Merge branch 'la/silence' (#4142)
* origin/la/silence:
  graph-pull-hook: silence issues temporarily

Signed-off-by: Matilde Park <matilde.park@gmail.com>
2020-12-11 20:09:07 -05:00
Logan Allen
97ff374e19 graph-pull-hook: silence issues temporarily 2020-12-12 01:01:17 +00:00
Matilde Park
bad8eb1478 Merge branch 'la/mitigate-notification-madness' (#4137)
* origin/la/mitigate-notification-madness:
  graph-store: no need to iterate through whole list if we find a single duplicate
  graph-store: address ted and mark's comments
  graph-store: no-op if we already have *any* of the indexes in an %add-nodes event

Signed-off-by: Matilde Park <matilde.park@gmail.com>
2020-12-11 19:27:03 -05:00
Logan Allen
386997475b graph-store: no need to iterate through whole list if we find a single duplicate 2020-12-11 18:13:47 -06:00
fang
76de5dec47
Merge pull request #4138 from urbit/m/debug-quacks
debug: render queued ames acks correctly
2020-12-12 01:10:56 +01:00
Logan Allen
78cf4443c2 graph-store: address ted and mark's comments 2020-12-11 18:10:10 -06:00
fang
ed73326cc3
debug: render queued ames acks correctly
Wrap the items in a SearchableList instead of throwing the objects into
the DOM directly.
2020-12-12 00:44:59 +01:00
Logan Allen
e845860e5e graph-store: no-op if we already have *any* of the indexes in an %add-nodes event 2020-12-11 23:05:54 +00:00
Matilde Park
03eb12698a glob: update to 0vada5t.b1gqn.oo4ga.6o12h.ek1ot 2020-12-11 16:16:50 -05:00
Logan Allen
26b9c5a66f graph-store: remove unnecessary clay write upon clobber 2020-12-11 14:53:02 -06:00
Liam Fitzgerald
82851feaea
glob: update to 0v3.e7ep6.1ki6b.qpuiq.22qs6.qcbi7 2020-12-11 16:28:28 +10:00
Liam Fitzgerald
bce1b3e65e
group-pull-hook: remove group on nack 2020-12-11 14:57:20 +10:00
Liam Fitzgerald
191b623d47
hark-store: correctly send reads on %read-index 2020-12-11 14:22:12 +10:00
Logan Allen
34751e1bf8 chat-*: remove unused logic 2020-12-10 21:50:20 -06:00
Liam Fitzgerald
82b668cf3a
graph-store: %node-siblings fixed 2020-12-11 13:05:40 +10:00
Liam Fitzgerald
2b95b308b8
graph-store: simplify node-siblings scries 2020-12-11 12:21:47 +10:00
Liam Fitzgerald
f8452af94e
Merge remote-tracking branch 'origin/release/next-userspace' into lf/chat-graph 2020-12-11 11:50:18 +10:00
Liam Fitzgerald
37bb4e9bfe
graph-store: backup overwritten graphs to clay 2020-12-11 11:38:12 +10:00
Liam Fitzgerald
95cf71c1e6
chat-cli: actually run migration 2020-12-11 11:05:13 +10:00
Liam Fitzgerald
34dee40e74
metadata-store: migrate in poke-import case 2020-12-11 10:56:41 +10:00
Tyler Brown Cifu Shuster
263f046cc2 addressed feedback 2020-12-10 15:42:35 -08:00
Tyler Brown Cifu Shuster
308da85851 landscape: add woff2 support, serve Inter & Source Code Pro
Fixes urbit/landscape#92
2020-12-10 13:55:15 -08:00
Logan Allen
fe728fea35 observe-hook: add %group-on-leave back to observers 2020-12-10 13:55:14 -06:00
Logan Allen
fbfe5f46f0 spider: verbose 2020-12-10 13:46:42 -06:00
Logan Allen
f3e5ee88cc observe-hook: add spacing 2020-12-10 13:27:40 -06:00
Logan Allen
45351e1efa observe-hook: spider wasn't always issuing thread-results, so we got %watch-not-unique. we now make unique wires, but spider's issue remains 2020-12-10 13:20:13 -06:00
Matilde Park
cf88b8525e glob: update to 0v7.0p8us.ekd7r.qtve8.hthik.65552 2020-12-10 10:49:51 -05:00
Liam Fitzgerald
c3e4a1632f
hark: migrate and drop chat notifications 2020-12-10 15:19:46 +10:00
Liam Fitzgerald
c29b3d8167
chat: address migration of missing owner in unmanaged groups 2020-12-10 13:52:25 +10:00
Liam Fitzgerald
1aace5cc07
glob: update to 0v3.fbu1a.5lre3.sfu4r.113f6.2ro2c 2020-12-10 13:23:53 +10:00
Liam Fitzgerald
fc189a7c13
graph-store: on overwrite, archive existing graph 2020-12-10 12:36:59 +10:00
Liam Fitzgerald
bf9d6cfe44
chat: refine archival logic 2020-12-10 12:36:26 +10:00
Logan Allen
144e30a90e chat-hook, store, and hark-chat-hook: fixed merge issues 2020-12-09 16:00:13 -06:00
Logan Allen
7802a7f8d9 Merge branch 'release/next-userspace' into lf/chat-graph 2020-12-09 15:45:26 -06:00
Isaac Visintainer
c5ccc1171a chat-hook: send right amount of backlog 2020-12-08 19:51:28 -08:00
Philip Monk
530d0f8a40
glob: update to 0v2.u8gnq.ipqi1.eksfl.qtd8n.0d56e 2020-12-08 09:56:37 -08:00
Jake Miller
7b19f7a6a3 lens: clear state on %cancel
if you use herb to send a dojo command that doesn't compile,
the lens state doesn't clear and herb no longer works.
this just adds a simple way to clear that state.
2020-12-08 02:45:41 -08:00
Joe Bryan
fd707761f8 zuse: moves lib/base64 2020-12-08 02:36:11 -08:00
Joe Bryan
65fa2ea1af Merge branch 'na-release/candidate' into jb/motion
* na-release/candidate:
  vere: to 1.0
  gaze: update for eth-watcher batch resuls
  vere: replaces obsolete references to u3v_numb and u3A->sen
  u3: adds comments to explain unusual u3v_arvo/u3v_home requirements
  u3: fixes checkpoint version enforcement, refactors u3m_pave() et al
  king: port the new lmdb event log changes.
  u3: WIP adds a version to the checkpoint / persistent state
  u3: revises "rock" format, tags jet registrations
  u3: adds version number to checkpoint patch files
  u3: removes obsolete members from u3_arvo
  vere: removes u3A->sen references from i/o drivers
  vere: implements lmdb event log format
  vere: adds version to lmdb meta table, removes unnecessary jam
2020-12-08 00:37:31 -08:00
Joe Bryan
4420aabfa1 chat-hook: fixes typo in $sign migration 2020-12-07 20:41:49 -08:00
Liam Fitzgerald
8c4b453ed4
Merge remote-tracking branch 'origin/release/next-userspace' into lf/app-sane 2020-12-08 13:14:26 +10:00
Joe Bryan
aaf506ce8a Merge branch 'jb/motion' into jb/motion-merge
* jb/motion:
  pill: solid
  zuse: remove %crud from vane-task
  arvo: full vane names in $sign
  aqua: build again (still broken)
  arvo: reform of the scry reform
2020-12-07 18:52:51 -08:00
Liam Fitzgerald
1895e807fd
hark-graph-hook: give %listen update on autoadd 2020-12-08 12:25:51 +10:00
Philip Monk
56bf97b256
gaze: update for eth-watcher batch resuls 2020-12-07 18:23:50 -08:00
fang
d98c59e73a
zuse: lift moves out of +able 2020-12-08 01:47:06 +01:00
Joe Bryan
17736990ed arvo: full vane names in $sign 2020-12-07 16:30:22 -08:00
Joe Bryan
83dd7384c6 aqua: build again (still broken) 2020-12-07 16:23:13 -08:00
fang
eab88170e2
Merge branch 'jb/motion' into m/de-thereum 2020-12-07 13:42:00 +01:00
Joe Bryan
5a82f1d4c0 Merge branch 'na-release/candidate' into jb/motion
* na-release/candidate: (36 commits)
  ames: don't crash on forward-lane scry
  jael: cleanup per review
  jael: don't signal breach if first hearing of ship
  pill: update
  vere: compile
  lens: don't de-base64
  vere: make import flow not use base64 encoding
  version: strip trailing newline
  pill: mainnet
  Revert "zuse: change to ropsten"
  chat-hook: fix another poke-import issue
  chat-hook: fix poke-import issue
  apps: reorder maps, sets, and jugs
  apps: reorder maps, sets, and jugs
  kiln: add base-hash and our scries
  lens: fix change lost in merge
  graph-store: leave try-rejoin wire when subscription succeeds
  graphs: import-export
  chat: import/export
  invites: import/export
  ...
2020-12-07 00:27:58 -08:00
Liam Fitzgerald
12bfae630b
hark-graph-hook: do not autowatch leaf nodes 2020-12-07 15:06:19 +10:00
Liam Fitzgerald
f4c2dedba2
hark-graph-hook: autowatch unmanaged graphs 2020-12-07 13:55:55 +10:00
fang
25a55c0f63
various: ethereum, azimuth, json-rpc out of zuse
Moves them into files in /lib, and updates dependents accordingly.
2020-12-06 17:26:52 +01:00
Joe Bryan
205c9a8620 zuse: removes en/de-beam (now in arvo) 2020-12-06 03:33:43 -08:00
Joe Bryan
958bb5acf7 arvo: removes +is and all references to it 2020-12-05 00:51:49 -08:00
Joe Bryan
0f0c2a6ffb zuse: moves |dawn to lib/vere, rewrites +ivory 2020-12-05 00:51:49 -08:00
Philip Monk
b9fe6af976
jael: don't signal breach if first hearing of ship
When you first boot, if you try talk to someone before your azimuth is
up-to-date (for example by import), then if they've ever breached
(twice) then you'll get breach notification, cancelling your message.

This changes is it so that if we haven't heard anything about this ship,
we don't signal a breach.

The implementation complexity is primarily because we need
eth-watcher/azimuth-tracker to produce an update of a list instead of a
list of updates.  This way, Jael can keep a "state as of the beginning
of this move" variable to check when deciding whether to signal a
breach.
2020-12-04 23:08:47 -08:00
Philip Monk
0de3e76055
glob: update to 0v6.cmrce.5ass7.5gfqi.7c8cg.mdo7n 2020-12-04 17:59:15 -08:00
Matilde Park
1c6f92abef Merge branch 'release/next-userspace' into lf/chat-graph 2020-12-04 15:10:05 -05:00
Logan Allen
fc28fbd1c5 Merge branch 'lf/chat-graph' into la/merge-graph 2020-12-04 12:49:21 -06:00
Joe Bryan
bbaeafe751
Merge pull request #4036 from urbit/m/listless-generators
various: start threads with unit of tuple args
2020-12-04 00:21:00 -08:00
Philip Monk
8329b90efa
lens: don't de-base64 2020-12-03 22:50:45 -08:00
matildepark
9532a2e2a2
Merge pull request #4000 from urbit/m/chat-cli-graph
chat-cli: mvp graph-store migration
2020-12-03 23:52:48 -05:00
Liam Fitzgerald
0fb8f98a44
chat-cli: print messages only if chat is viewed 2020-12-04 13:05:38 +10:00
Liam Fitzgerald
56b57a6af7
chat-cli: render mentions, urls inline 2020-12-04 13:05:20 +10:00
Liam Fitzgerald
62e535196e
chat-cli: set default width 2020-12-04 13:04:48 +10:00
Matilde Park
78c22ae5c4 Merge branch 'na-release/candidate' into release/next-userspace 2020-12-03 20:55:16 -05:00
Philip Monk
1213e298db
Merge remote-tracking branch 'origin/na-release/candidate' into philip/testnet 2020-12-03 17:16:02 -08:00
Joe Bryan
4a825df15b Merge branch 'na-release/candidate' into jb/atom-gates
* na-release/candidate:
  kh: use Word8 for Tint true color values
  arvo: remove unused app files, libraries, and imports
  webterm: improve line-spacing in certain browsers
  vere: avoid +scot call for color value rendering
  kh: support 24-bit %klr colors
  vere: support 24-bit %klr colors
  webterm: update mar and js to support 24-bit color
  tests: fix ames tests
  pill: update ivory pill
  dojo: correct mark conversion scry path
  pill: solid
  aqua/ph: fix comet test
  ames: flat packet format
  hoon, dill: Add 24-bit true color
2020-12-03 14:17:23 -08:00
Logan Allen
275144c72a observe-hook: add %group-on-remove-member thread 2020-12-03 13:32:06 -06:00
Matilde Park
03dea8b1ad Merge branch 'release/next-userspace' into lf/chat-graph 2020-12-03 13:19:03 -05:00
Logan Allen
4268235581 chat-hook: no longer make unnecessary subscriptions on init 2020-12-03 12:02:02 -06:00
Isaac Visintainer
2f1e48b3c1 Merge branch 'ixv/data-migration' into philip/testnet 2020-12-02 22:49:48 -08:00
Isaac Visintainer
79308eb4ed chat-hook: fix another poke-import issue 2020-12-02 22:48:33 -08:00
Liam Fitzgerald
2caf1dac24
group-push-hook: kick members who are not subscribed
If a ship breaches, it may no longer be subscribed to the group, but
still be in it. This causes DM breakage amongst other things. To fix it,
we loop over the incoming subscriptions and kick everyone who is a part
of a group, but not subscribed to it.
2020-12-03 16:00:57 +10:00
Liam Fitzgerald
0a2839a152
glob: update to 0v3.p45m3.me2if.4nrp4.1u4ve.luhf2 2020-12-03 15:18:18 +10:00
Liam Fitzgerald
b15a5390ec
chat-hook: exponential backoff 2020-12-03 15:14:27 +10:00
Isaac Visintainer
2cf6af586d Merge branch 'na-release/candidate' into philip/testnet 2020-12-02 21:10:15 -08:00
Liam Fitzgerald
5b318ad873
chat, metadata: OTA migration 2020-12-03 14:53:48 +10:00
Liam Fitzgerald
ea01e8515d
chat-store: OTA migration 2020-12-03 14:30:18 +10:00
Matilde Park
5c4cf4d999 Merge branch 'release/next-userspace' into lf/eyre-perf-improvment 2020-12-02 17:51:27 -05:00
Logan Allen
1913cdf4f1 arvo: remove unused app files, libraries, and imports 2020-12-02 14:05:04 -06:00
Isaac Visintainer
93abae77a4 Merge branch 'ixv/data-migration' into philip/testnet 2020-12-02 01:33:14 -08:00
Isaac Visintainer
13f49d42e1 chat-hook: fix poke-import issue 2020-12-02 01:32:25 -08:00
Joe Bryan
b5ec0c30f0 hoon: renames +new-end, +new-lsh, +new-rsh 2020-12-02 01:00:09 -08:00
Isaac Visintainer
e672c7348b Merge branch 'ixv/data-migration' into philip/testnet 2020-12-02 00:29:14 -08:00
Isaac Visintainer
a6276c70b2 Merge branch 'ixv/data-migration-with-lens' into ixv/data-migration 2020-12-02 00:21:55 -08:00
Joe Bryan
bec63413b0 hoon: adds +new-rsh, switches all +rsh call sites 2020-12-02 00:21:51 -08:00
Joe Bryan
4f9cba2baf hoon: adds +new-end, switches all +end call sites 2020-12-02 00:21:12 -08:00
Isaac Visintainer
1d6a460345 apps: reorder maps, sets, and jugs 2020-12-02 00:20:37 -08:00
Isaac Visintainer
0c3edb1ca9 apps: reorder maps, sets, and jugs 2020-12-02 00:00:03 -08:00
Liam Fitzgerald
85508337e0
publish, links: better unread handling 2020-12-02 15:32:22 +10:00
Liam Fitzgerald
3d21dcd19f
Merge branch 'release/next-userspace' into lf/chat-graph 2020-12-02 13:42:02 +10:00
Philip Monk
b4e3b5c4ba
Merge remote-tracking branch 'origin/philip/testnet-master' into philip/testnet 2020-12-01 18:24:53 -08:00
Philip Monk
390e071548
lens: fix change lost in merge 2020-12-01 18:22:03 -08:00
Liam Fitzgerald
4e9c13834c
channel.js: address L review 2020-12-02 12:09:26 +10:00
Isaac Visintainer
9ea43121a5 graph-store: leave try-rejoin wire when subscription succeeds 2020-12-01 17:52:24 -08:00
Isaac Visintainer
2f53524e2f graphs: import-export 2020-12-01 17:38:51 -08:00
Isaac Visintainer
feab60f8a9 chat: import/export 2020-12-01 17:38:51 -08:00
Isaac Visintainer
398fb5de50 invites: import/export 2020-12-01 17:38:51 -08:00
Isaac Visintainer
4f0e599cb1 contacts: import/export 2020-12-01 17:38:51 -08:00
Isaac Visintainer
9ea14aa558 metadata: import/export 2020-12-01 17:38:51 -08:00
Isaac Visintainer
4668ddf84d groups: import/export 2020-12-01 17:38:51 -08:00
Logan Allen
0007c5c097 Merge branch 'release/next-userspace' into la/archive-graph-on-leave 2020-12-01 16:41:26 -06:00
Philip Monk
dc6dddac49
glob: update to 0v5.u5b0i.2ks0m.6ipcp.djea4.16n1h 2020-12-01 14:40:41 -08:00
fang
03fd56e8cc
various: start threads with unit of tuple args
Instead of a list of arguments, with trailing ~.
2020-12-01 23:38:02 +01:00
Philip Monk
e69804a5ae
Merge remote-tracking branch 'origin/na-release/candidate' into m/flagday-keyfile 2020-12-01 14:02:37 -08:00
Logan Allen
2760f79f66 group-on-leave thread: clean up contacts as well as everything else 2020-12-01 15:20:45 -06:00
Philip Monk
257b17bdfc
Merge remote-tracking branch 'origin/ixv/data-migration-with-lens' into m/flagday-keyfile 2020-12-01 13:16:53 -08:00
fang
9545e8727e
dojo: correct mark conversion scry path
Fixes an instance that hadn't accounted for #3994 yet.
2020-12-01 16:55:19 +01:00
Isaac Visintainer
a779ca4d7e herb: expect * rather than @ 2020-12-01 00:15:05 -08:00
Isaac Visintainer
81cf813128 herb/lens: add utilites for import/export 2020-12-01 00:00:49 -08:00
Isaac Visintainer
94f7ca5b9d graphs: import-export 2020-11-30 23:12:26 -08:00
Isaac Visintainer
edcd29c4da chat: import/export 2020-11-30 23:05:46 -08:00
Isaac Visintainer
0c0efae1e9 invites: import/export 2020-11-30 23:05:46 -08:00
Isaac Visintainer
295340b422 contacts: import/export 2020-11-30 23:05:46 -08:00
Isaac Visintainer
c2d09c58e3 metadata: import/export 2020-11-30 23:05:46 -08:00
Isaac Visintainer
50ca536a27 groups: import/export 2020-11-30 23:05:39 -08:00
Liam Fitzgerald
9ee62a2e55
hark: rework unread tracking, again 2020-12-01 15:46:28 +10:00
ixv
29850cdfa0
Merge pull request #4042 from urbit/ixv/aqua-azimuth
aqua: rework how it uses azimuth
2020-11-30 16:54:04 -08:00
Logan Allen
1b0e19eb51 observe-hook: state-2 typo 2020-11-30 16:32:53 -06:00
Logan Allen
41e3af25b3 threads: collapse them into a single %group-on-leave thread 2020-11-30 16:30:20 -06:00
Logan Allen
6c26a01655 contact-view: remove (now) unnecessary metadata removal 2020-11-30 16:22:20 -06:00
Logan Allen
a6bf3ca924 observe-hook + thread: remove metadata when leaving a group 2020-11-30 16:20:26 -06:00
Isaac Visintainer
94bb140448 aqua: manage azimuth state within aqua itself rather than using a thread 2020-11-30 13:15:59 -08:00
Logan Allen
f2e20efcf0 observe-hook: compiles 2020-11-30 13:20:27 -06:00
Liam Fitzgerald
3d51d6827f
sane: refactor to automatically fix issues 2020-11-30 13:36:03 +10:00
Liam Fitzgerald
8145e66078
chat-hook: add /x/synced scry 2020-11-30 13:35:26 +10:00
fang
732addadd3
various: touch up improperly rewritten comments
Also patches /mar/snip to be more correct, but a &snip [~ ~] in dojo
still does not work.
2020-11-27 13:25:40 +01:00
fang
a539d986a7
various: move away from {type} syntax
In favor of [type] syntax.
Turns a bunch of ++ into +$ along the way.
2020-11-26 17:43:26 +01:00
fang
44fb0cc19d
various: move away from face/type syntax
In favor of face=type.
2020-11-26 17:38:00 +01:00
fang
a6e7af38d5
various: move away from $constant type syntax 2020-11-26 17:31:06 +01:00
Matilde Park
959b585b38 glob: update to 0v5.0umdn.af5hq.bp84b.66eao.q0b98 2020-11-25 20:19:24 -05:00
Matilde Park
531f406222 glob: update to 0v2.qmtv4.6j75q.g4ph5.5agd1.02hsd 2020-11-25 20:11:34 -05:00
Liam Fitzgerald
507bcfc9cb
glob: update to 0v5.c8agf.rjdcu.6p4ea.umc9e.5olmv 2020-11-25 16:42:09 +10:00
Liam Fitzgerald
7addb558b2
channel.js: debounce subscribes 2020-11-25 16:38:16 +10:00
Liam Fitzgerald
d4d655528e
channel.js: queue interactions 2020-11-25 16:38:16 +10:00
matildepark
3415435399
Merge pull request #4016 from urbit/lf/read-index-fix
hark-store: fix caching of merged notifications
2020-11-25 00:25:27 -05:00
matildepark
91df3ca710
Merge pull request #4019 from urbit/lf/safe-update-log-peek
graph-store: safely peek update-log
2020-11-25 00:24:38 -05:00
Liam Fitzgerald
88adb0033a
graph-store: safely peek update-log
Safely returns a null when either the update-log does not exists, or it
is empty

Fixes #3976
2020-11-25 14:41:19 +10:00
Liam Fitzgerald
8a299eadc0
hark-store: fix caching of merged notifications
If a notification came in that merged with a notification that had
already been read, then it would not be added to the cache properly and
therefore would not correctly send %read updates when %read-index was
called.

Fixes #3977
2020-11-25 10:53:45 +10:00
fang
27d6fc7597
zuse, clay, various: unflop the spur in beams
Unflops the spur in +en-beam, +de-beam, and everything that calls either
of those, or works with the consequences of their output.

This includes clay's interface for mounting and unmounting, which now
no longer expects the arguments to contain an old-style spur.
2020-11-24 15:44:25 +01:00
Liam Fitzgerald
b7b4000986
hark: separate unread tracking from notifications 2020-11-24 15:40:03 +10:00
Liam Fitzgerald
360d24e11c
hark: add scries for chat 2020-11-24 15:39:53 +10:00
fang
de13468f86
chat-cli: support multiple sole sessions 2020-11-23 16:10:04 +01:00
fang
6fd942e5fd
chat-cli: mvp graph-store migration
Makes chat-cli listen to graph-store rather than chat-store.

Along the way, cuts some features. No longer supports channel creation,
deletion, permission management or inviting. No longer lets you send
messages to multiple targets at once.

No longer displays messages from all joined chats, and no longer lets
you join or leave chats. Instead, chat-cli solely concerns itself with
viewing chat content you're already subscribed to (through use of
Landscape or other rich clients). ;view ~host/chat to start printing
messages for that chat when they come in, ;flee to toggle off. ;view to
see what chats are enabled, ;chats to see all available chats.

The removal of features acknowledges chat-cli's lack of real support for
the modern, group-centric state of userspace.
The intent of ;view ux is to prepare chat-cli for a multi-session
terminal world.
2020-11-23 01:39:03 +01:00
Logan Allen
cfbfa59100 spider: make handle-stop-thread into a get by instead of a got by to fix failing +on-load 2020-11-20 16:22:49 -06:00
Joe Bryan
7723ba2da8 Merge branch 'master' into release/next-vere
* master: (390 commits)
  glob: update to 0v4.fpa4r.s6dtc.h8tps.62jv0.qn0fj
  notifications: prevent safari shrinkage
  glob: update to 0v5.91i1u.1g535.t3de3.6c3ih.fanmv
  Sidebar: loosen property access
  launch: loosen property access in unread count
  notifications: fix scroll to load
  glob: update to 0v1.pak02.pfla3.gh56f.qhc6h.3h881
  inbox: fix graph resource redirects
  inbox: fix link routing and rendering
  glob: update to 0v4.3fbh4.p7j6i.2pi9g.d1ltq.5u7uu
  hark-fe: fix crash
  hark: update graph marks for editable comments
  graph-store: change atom to %1 for all migrated comments
  glob: update to 0v5.67obv.15auf.c2rc7.jpcu2.iain3
  inbox: correct notification order
  inbox: redirect invites correctly
  publish: Restore basic 'add writers' form
  interface: show currently editing comment as pending
  landscape: preclude dropdown duplicates on exact match
  interface: links and publish comments both work
  ...
2020-11-20 13:16:53 -08:00
Tyler Brown Cifu Shuster
1a22a917c4 weather: changing API
added new colors

allow arbitrary location

Fixes #2634
2020-11-20 11:38:54 -08:00
Logan Allen
837abacb9c observe-hook: add new thread to leave graphs upon removing a group 2020-11-20 11:01:24 -06:00
Joe Bryan
1c83ad35e9 Merge branch 'release/next-vere' into na-release/runes
* release/next-vere:
  build: update gcloud to use non-deprecated action
  vere: manage memory properly in _fore_import
  build: update GoogleCloudPlatform/github-actions/setup-gcloud to 0.2.0
  king: try undoing warnings in eventlog-lmdb
  king: diswarn tests
  king: more warnery
  king: fix warnings; more consistent warn policy
  vere: add -i and -o options for import and export
  herb/lens: add utilites for import/export
  vere: refactors pier initialization to fix -X
  king: fix test (daaad)
  king: fix warnings in Tree (thanks dad)
  king: this is a holdup!
2020-11-20 00:00:27 -08:00
Joe Bryan
e1186950bc Merge branch 'na-release/next-vere' into na-release/runes
* na-release/next-vere: (943 commits)
  pill: solid
  glob: update to 0v4.fpa4r.s6dtc.h8tps.62jv0.qn0fj
  notifications: prevent safari shrinkage
  glob: update to 0v5.91i1u.1g535.t3de3.6c3ih.fanmv
  Sidebar: loosen property access
  launch: loosen property access in unread count
  notifications: fix scroll to load
  glob: update to 0v1.pak02.pfla3.gh56f.qhc6h.3h881
  inbox: fix graph resource redirects
  inbox: fix link routing and rendering
  glob: update to 0v4.3fbh4.p7j6i.2pi9g.d1ltq.5u7uu
  hark-fe: fix crash
  hark: update graph marks for editable comments
  graph-store: change atom to %1 for all migrated comments
  glob: update to 0v5.67obv.15auf.c2rc7.jpcu2.iain3
  inbox: correct notification order
  inbox: redirect invites correctly
  publish: Restore basic 'add writers' form
  interface: show currently editing comment as pending
  landscape: preclude dropdown duplicates on exact match
  ...
2020-11-19 14:22:00 -08:00
Logan Allen
b11b343280 Merge branch 'release/next-userspace' into lf/app-sane 2020-11-19 11:39:48 -06:00
Liam Fitzgerald
a9d6811299
glob: update to 0v4.fpa4r.s6dtc.h8tps.62jv0.qn0fj 2020-11-19 16:44:33 +10:00
Liam Fitzgerald
217da2acf4
glob: update to 0v5.91i1u.1g535.t3de3.6c3ih.fanmv 2020-11-19 15:20:35 +10:00
Liam Fitzgerald
90faac16c9
glob: update to 0v1.pak02.pfla3.gh56f.qhc6h.3h881 2020-11-19 13:40:32 +10:00
Liam Fitzgerald
99faa900a4
glob: update to 0v4.3fbh4.p7j6i.2pi9g.d1ltq.5u7uu 2020-11-19 12:51:52 +10:00
Logan Allen
e7b0ff2c66 graph-store: change atom to %1 for all migrated comments 2020-11-18 20:02:42 -06:00
Matilde Park
195cd23ad4 glob: update to 0v5.67obv.15auf.c2rc7.jpcu2.iain3 2020-11-18 20:38:37 -05:00
Liam Fitzgerald
474e769839
Merge remote-tracking branch 'origin/master' into release/next-userspace 2020-11-19 10:46:20 +10:00
L
c3c9218083
Merge pull request #3927 from urbit/la/revisions
graph-store: amend %publish and %link validators to allow editing comments
2020-11-18 18:01:13 -06:00
Philip Monk
0d034f3267
glob: update to 0v2.7r49j.ca15d.c9dtr.avfbh.l20d0 2020-11-17 22:03:01 -08:00
Philip Monk
eadc63938c
Merge remote-tracking branch 'origin/release/next-dill' into release/next-sys 2020-11-17 21:54:50 -08:00
Philip Monk
cd87c786ca
Merge remote-tracking branch 'origin/master' into HEAD 2020-11-17 21:10:20 -08:00
Liam Fitzgerald
f8865b479c
hark-chat-hook: restart possibly killed subscription
Issue #3946 may have caused the subscription to be killed by way of a
crashed %fact handling. If so, restart the subscription.
2020-11-18 14:25:31 +10:00
Liam Fitzgerald
7a1ff3ce2a
chat-view: join chat after acquiring metadata
hark-chat-hook scries for the group in order to determine whether the
chat should be automatically watched for notifications. Therefore, if we
are joining a chat, we should acquire the metadata before joining the
chat. This is to ensure that the scry works correctly.

Fixes #3946
2020-11-18 14:12:13 +10:00
Liam Fitzgerald
65e4a06a64
Merge branch 'release/next-userspace' into lf/hark-caching 2020-11-18 11:00:34 +10:00
Liam Fitzgerald
5615c10c2b
graph-store: correctly subset in scries 2020-11-17 18:00:29 +10:00
John Franklin
11f8ba23d7 hoon: bscl to bccl, etc 2020-11-17 01:05:17 -06:00
Isaac Visintainer
41ce22d6ae herb/lens: add utilites for import/export 2020-11-16 15:57:35 -08:00
Liam Fitzgerald
6ec8037be8
hark-store: allow scrying for archive 2020-11-16 13:53:18 +10:00
Liam Fitzgerald
5c148e9c56
hark-store: reverse map ordering 2020-11-16 13:52:45 +10:00
Liam Fitzgerald
ec580cf8c1
hark-store: rework caching 2020-11-16 12:22:42 +10:00
John Franklin
756c94aeb6 hoon: update glyph names (continued) 2020-11-14 23:08:52 -06:00
Logan Allen
4f7ca0a0dc graph-store: add overwrite field to %add-graph 2020-11-12 20:40:12 +00:00
Logan Allen
cb990242e8 graph-store: added debugging tool to %validate-graph 2020-11-12 20:19:36 +00:00
Logan Allen
9c9e1160ad graph-store: update %publish and %link schemas, wipe update-logs 2020-11-12 13:47:42 -06:00
Matilde Park
0d4aeb097a glob: update to 0ve8ukb.s45qi.3h6k8.hmh4p.h6p9m 2020-11-12 10:48:15 -05:00
Matilde Park
d527b42058 glob: update to 0vvse4p.hsbcu.1hjo3.dhct1.t7jqn 2020-11-12 00:09:58 -05:00
Matilde Park
51fd47e886 glob: update to 0v2.05ddv.3pde4.12728.vv799.onc9n 2020-11-11 23:10:44 -05:00
Liam Fitzgerald
45f273a984
hark-chat-hook: automatically watch DMs for notifications 2020-11-12 13:55:58 +10:00
Liam Fitzgerald
698dc68b64
chat-view: create group and metadata first 2020-11-12 13:55:30 +10:00
Liam Fitzgerald
437c107c83
hark-store: cache graph-unreads 2020-11-12 11:31:33 +10:00
Liam Fitzgerald
f07b231e36
hark-store: default to DND being off 2020-11-12 10:34:51 +10:00
Liam Fitzgerald
b4ce2fccda
Merge branch 'release/next-userspace' into lf/hark-qa-fixes 2020-11-12 10:33:26 +10:00
Liam Fitzgerald
fa9a7dc0f0
hark-store: do not give all notifications in +on-watch 2020-11-12 10:26:24 +10:00
Liam Fitzgerald
3b55404dee
hark-group-hook: fix path in +on-watch 2020-11-12 10:26:02 +10:00
Matilde Park
2ba78348fb glob: update to 0v3.h5gg6.t76qc.9on82.im1ti.i4vuu 2020-11-11 00:19:44 -05:00
matildepark
565fc46660
Merge pull request #3910 from urbit/lf/graph-cleanup
graph-store: run-updates no longer pokes itself
2020-11-10 23:24:24 -05:00
Liam Fitzgerald
e71ba741f4
Merge pull request #3908 from urbit/lf/hark-graph-indices
hark: follow individual indices
2020-11-11 10:37:19 +10:00
Liam Fitzgerald
a07f55b832
hark-graph-hook: fix conflict in merge 2020-11-11 10:36:32 +10:00
Matilde Park
e986298ee9 Merge branch 'release/next-userspace' into lf/hark-redux 2020-11-10 15:04:16 -05:00
fang
9ccfeb9e8d
soto: tombstone 2020-11-10 20:47:01 +01:00
Matilde Park
35103ab394 hark-graph-hook: remove ~& 2020-11-10 14:24:47 -05:00
Matilde Park
fdcb2c32db Merge branch 'lf/hark-redux' into lf/hark-graph-indices 2020-11-10 14:21:51 -05:00
fang
9cd9448bcd
dill: remove ducts from %view and %flee interface
This was a little bit too crummy. Instead, we put in a placeholder of ~,
which should be forwards-compatible with atomic session identifiers,
where ~ identifies the default session.

Additionally touches up the herm wires/paths to stick to the above more
closely.
2020-11-10 19:33:11 +01:00
Liam Fitzgerald
5354aae5fa
graph-store: run-updates no longer pokes itself 2020-11-10 15:43:35 +10:00
Liam Fitzgerald
7e5bf37184
hark: address L review 2020-11-10 13:32:48 +10:00
Liam Fitzgerald
9eec477e0e
hark-graph-hook: watch individual indices 2020-11-10 12:14:06 +10:00
Matilde Park
54d08e393f arvo/landscape: remove unused pngs 2020-11-09 21:14:00 -05:00
fang
fbda1de612
webterm: dojo -> term
Includes updating the tile data in launch.
2020-11-09 20:29:36 +01:00
L
9cbed7a4a9
Merge pull request #3832 from urbit/la/thread-watcher
observe-hook: spin up a thread upon receiving a %fact from a subscription
2020-11-09 12:37:13 -06:00
fang
f62129d095
herm: keep blit & belt marks in cache
Perhaps there should be a general-purpose mechanism for this, but for
now this will suffice.
2020-11-06 22:30:24 +01:00
Logan Allen
f714fa602e observe-hook: switch from time to serial, and reorganize on-agent 2020-11-06 15:29:15 -06:00
Logan Allen
4b7f0e8025 thread-watch: change name to observe-hook 2020-11-06 14:55:32 -06:00
Matilde Park
5eb1aa4327 Merge branch 'release/next-userspace' into lf/hark-redux 2020-11-06 08:59:53 -05:00
Liam Fitzgerald
fa3fe2b17d
hark-store, hark-chat-hook: support mentions in chat 2020-11-06 14:19:58 +10:00
Matilde Park
00860ca465 glob: update to 0v3.29n7b.04srk.3pcv0.1ld5v.vl1io 2020-11-05 22:13:06 -05:00
Matilde Park
f8e41dc949 glob: update to 0v5.8huh4.vt7qh.kd39s.hdqmd.vb91t 2020-11-05 20:56:52 -05:00
matildepark
e29e1bb1bb
Merge pull request #3871 from urbit/lf/graph-pull-cleanup
graph-pull-hook: only archive if we have graph
2020-11-05 20:04:07 -05:00
Matilde Park
adce7e05d0 glob: update to 0v4.qe6t9.dnecd.ajaa9.jftp5.vtk3s 2020-11-05 19:57:58 -05:00
Liam Fitzgerald
58e9024ab6
graph-pull-hook: fix scry helper 2020-11-06 08:53:36 +10:00
fang
7a40b1137e
herm: send prompt & cursor on-connect 2020-11-05 20:13:36 +01:00
fang
185b553c99
herm: userspace dill proxy
Listens to the default dill session and passes its %blits on to
subscribers. Passes any %belt pokes it gets into dill.

Updates webdojo to make use of it, which is the primary motivation for
herm's existence.
2020-11-05 19:39:08 +01:00
Liam Fitzgerald
62409ca94d
glob: update to 0v6.9vk2h.hr87m.nn63p.8kmo5.k4ljt 2020-11-05 17:36:58 +10:00
Liam Fitzgerald
9d919407a0
glob: update glob to 0v4.0lvsj.gc55k.nsl3q.mf2h2.pv1bk 2020-11-05 16:48:40 +10:00
Liam Fitzgerald
caa12c1e09
hark: fix JSON conversions 2020-11-05 15:33:52 +10:00
Liam Fitzgerald
974a02e63a
hark-chat-hook: poke hark-store for watching channels 2020-11-05 12:51:46 +10:00
Liam Fitzgerald
cd11d994a4
hark-store: add %chat types 2020-11-05 12:50:56 +10:00
Liam Fitzgerald
b705b91577
hark-chat-hook: add first sketch 2020-11-05 12:27:45 +10:00
Logan Allen
63a0bb00c0 thread-watch-hook: edge cases tested and fixed 2020-11-04 18:42:52 -06:00
Logan Allen
ed81e2304d thread-watch-hook: compiles 2020-11-04 15:14:18 -06:00
Logan Allen
06062757db thread-watch-hook: add +on-init to watch graph invitatory, and remove ~& 2020-11-04 14:55:46 -06:00
Logan Allen
65291863a0 thread-watch-hook: successfully sends facts to %invite-accepted-graph
thread
2020-11-04 12:12:24 -06:00
Matilde Park
f7d59985d2 glob: update to 0v4.cf9m1.t0ofg.dtig4.av3jh.2f2db 2020-11-03 16:04:41 -05:00
Liam Fitzgerald
ebb15a4fc3 lib/graph: address L review 2020-11-04 04:10:57 +10:00
Matilde Park
b107bf16e9 glob: update to 0v2.76bkn.nvb2c.j2704.jqhct.la06e 2020-11-03 12:34:17 -05:00
Liam Fitzgerald
e04d9f2dba graph-pull-hook: only archive graph if we already have it 2020-11-03 17:20:46 +10:00
Liam Fitzgerald
6c150279ac hark-graph-hook: use %mention type for +is-mention 2020-11-03 15:03:02 +10:00
Liam Fitzgerald
13fe6c3ad1 hark: address L review 2020-11-03 14:55:01 +10:00
Liam Fitzgerald
e9d9bb839f Merge branch 'release/next-userspace' into lf/hark-redux 2020-11-03 10:58:52 +10:00
Liam Fitzgerald
515a9a1f54 hark-store, hark-graph-hook: address L review comments 2020-11-03 10:36:00 +10:00
Liam Fitzgerald
9702c5a86c graph-push-hook: allow for node removal by post author 2020-11-03 10:22:12 +10:00
Logan Allen
697d23f83a thread-watch-hook: made %invite-accepted-graph thread 2020-11-02 15:22:50 -06:00
Logan Allen
1b8af7d78c hood: start %thread-watch-hook 2020-11-02 15:22:50 -06:00
Logan Allen
353d328340 thread-watch-hook: moved to marks and slopped vases 2020-11-02 15:22:50 -06:00
Logan Allen
ce43ea0765 thread-watch-hook: compiles properly 2020-11-02 15:22:50 -06:00
Logan Allen
1c0777e0a7 thread-watcher: first sketch 2020-11-02 15:22:50 -06:00
Liam Fitzgerald
625dda87fc glob: update to 0vptpd9.7fcod.53cag.tfca7.grfkf 2020-10-30 13:13:47 +10:00
Matilde Park
cc7c96461f glob: update to 0v6.e9uhe.am6af.kd2sf.7qvdc.cilkh 2020-10-29 21:29:47 -04:00
Matilde Park
60fc870ec0 glob: update to 0v5.97qv3.kke6t.jn8tc.oe2fe.78c8n 2020-10-29 20:47:35 -04:00
Liam Fitzgerald
34771ba30f publish: clarify stack trace in +on-agent 2020-10-30 10:41:06 +10:00
Liam Fitzgerald
f4483fdecb graph-store: update indices of leaf posts 2020-10-30 10:23:08 +10:00
Liam Fitzgerald
5f0855d278 graph-store: update indices in post on migrate 2020-10-30 10:20:35 +10:00
Logan Allen
c0bb44175d Merge branch 'lf/graph-publish-fe' of github.com:urbit/urbit into lf/graph-publish-fe 2020-10-30 00:09:10 +00:00
Logan Allen
27cc2c435d graph-store: indentation fix 2020-10-30 00:09:00 +00:00
Liam Fitzgerald
9c8e1bab2d graph-store: prevent infinite loop 2020-10-30 10:05:59 +10:00
Matilde Park
bdaa56d681 glob: update to 0v1.el225.9dbhq.381at.4pfta.bl8da 2020-10-29 19:13:42 -04:00
Liam Fitzgerald
b768cd3dd0 graph-store: normalize @da in indices
As links is the only application currently using graph-store, we migrate
all indices to @da instead of a @da or a unix timestamp. Rolls over
current graphs and update log to rectify this. Additionally, applies the
link validator mark to graphs, as this was missing. Fixes a latent bug
in graph-store where the removal of a graph that triggered a mark build
would prevent the mark from being rebuilt. Fixes mark input and index
formatting from the frontend as well.
2020-10-29 14:11:55 +10:00
Liam Fitzgerald
fbf505c0d9 graph-store: mark unmarked graphs 2020-10-29 13:11:18 +10:00
Liam Fitzgerald
829cd509b4 publish: migrate note body correctly 2020-10-29 12:56:41 +10:00
Liam Fitzgerald
225718b8cf metadata-store: fix path handling in migration 2020-10-29 10:25:16 +10:00
Liam Fitzgerald
d5683fb631 publish: fix time handling in publish 2020-10-29 09:49:05 +10:00
Liam Fitzgerald
aabd890b6d publish: fix backoff 2020-10-29 09:34:15 +10:00
Matilde Park
7e61bb9a6d glob: update to 0v5.d2ut4.t1kqo.2mdr9.mnc4i.vgb53 2020-10-28 19:25:57 -04:00
Logan Allen
358af000ec invite-store: fix %graph %create 2020-10-28 21:54:02 +00:00
Logan Allen
0eb0ef9479 graph-store: if null timestamp, replace with now 2020-10-28 14:37:26 -05:00
Liam Fitzgerald
39d538f9bc Merge branch 'release/next-userspace' into lf/graph-publish-fe 2020-10-28 16:40:02 +10:00
Liam Fitzgerald
2de45c53ef Merge branch 'release/next-userspace' into lf/hark-redux 2020-10-28 16:34:55 +10:00
Liam Fitzgerald
cf4f0f302e hark: final pass for bugs 2020-10-28 15:52:59 +10:00
L
210a9f968c
Merge pull request #3721 from urbit/la/modernize-invites
invite-store/hook: modernize the code style to match other new apps
2020-10-27 19:37:44 -05:00
Logan Allen
ef67bdea8b invite-store: move to de-path-soft 2020-10-27 19:18:56 -05:00
Logan Allen
870a6f635f invites: indentation fixes 2020-10-27 15:45:26 -05:00
Logan Allen
7083979628 invite: initialize state for %graph invites and fix mark 2020-10-27 12:48:50 -05:00
Liam Fitzgerald
8b090400f1 hark-store: add subscriptions, cache unread count 2020-10-27 15:07:13 +10:00
Liam Fitzgerald
136faf581f hark-group-hook: add subscriptions 2020-10-27 15:06:32 +10:00
Liam Fitzgerald
df2755b485 hark-graph-hook: add subscriptions, preferences 2020-10-27 15:05:00 +10:00
Philip Monk
fc15f0d735
Merge branch 'pr' into HEAD 2020-10-22 20:47:53 -07:00
Matilde Park
6a97ebb54f Merge branch 'release/next-userspace' 2020-10-22 22:21:18 -04:00