diff --git a/pkg/landscape/app/chat-cli.hoon b/pkg/landscape/app/chat-cli.hoon index 89e232a8f..4398cc7e8 100644 --- a/pkg/landscape/app/chat-cli.hoon +++ b/pkg/landscape/app/chat-cli.hoon @@ -169,7 +169,7 @@ :: %fact ?+ p.cage.sign ~|([dap.bowl %bad-sub-mark wire p.cage.sign] !!) - %graph-update-2 + %graph-update-3 %- on-graph-update:tc !<(update:graph q.cage.sign) == @@ -763,7 +763,7 @@ ::TODO move creation into lib? %^ act %out-message %graph-push-hook - :- %graph-update-2 + :- %graph-update-3 !> ^- update:graph :- now.bowl :+ %add-nodes audience diff --git a/pkg/landscape/app/chat-hook.hoon b/pkg/landscape/app/chat-hook.hoon index ce44a73ea..f6da35a7d 100644 --- a/pkg/landscape/app/chat-hook.hoon +++ b/pkg/landscape/app/chat-hook.hoon @@ -154,7 +154,7 @@ ++ poke-graph-store |= =update:graph-store ^- card - (poke-our %graph-store %graph-update-2 !>(update)) + (poke-our %graph-store %graph-update-3 !>(update)) :: ++ nobody ^- @p diff --git a/pkg/landscape/app/dm-hook.hoon b/pkg/landscape/app/dm-hook.hoon index 7c32a2991..7e96bb823 100644 --- a/pkg/landscape/app/dm-hook.hoon +++ b/pkg/landscape/app/dm-hook.hoon @@ -134,7 +134,7 @@ == [cards this] :: - %graph-update-2 + %graph-update-3 =+ !<(=update:store vase) ?+ -.q.update !! %add-nodes diff --git a/pkg/landscape/app/graph-pull-hook.hoon b/pkg/landscape/app/graph-pull-hook.hoon index 1f9f9fc0e..234f208ed 100644 --- a/pkg/landscape/app/graph-pull-hook.hoon +++ b/pkg/landscape/app/graph-pull-hook.hoon @@ -9,7 +9,7 @@ update:store %graph-update %graph-push-hook - 2 2 + 3 3 %.n == -- @@ -41,7 +41,7 @@ %- (slog leaf+"nacked {}" tang) :_ this ?. (~(has in get-keys:gra) resource) ~ - =- [%pass /pull-nack %agent [our.bowl %graph-store] %poke %graph-update-2 -]~ + =- [%pass /pull-nack %agent [our.bowl %graph-store] %poke %graph-update-3 -]~ !> ^- update:store [now.bowl [%archive-graph resource]] :: diff --git a/pkg/landscape/app/graph-push-hook.hoon b/pkg/landscape/app/graph-push-hook.hoon index 0327f6236..71b2a8a5d 100644 --- a/pkg/landscape/app/graph-push-hook.hoon +++ b/pkg/landscape/app/graph-push-hook.hoon @@ -12,7 +12,7 @@ update:store %graph-update %graph-pull-hook - 2 2 + 3 3 == :: +$ agent (push-hook:push-hook config) diff --git a/pkg/landscape/app/graph-store.hoon b/pkg/landscape/app/graph-store.hoon index 821ba69ec..0c2fbd907 100644 --- a/pkg/landscape/app/graph-store.hoon +++ b/pkg/landscape/app/graph-store.hoon @@ -16,6 +16,7 @@ +$ state-5 [%5 network:store] ++ orm orm:store ++ orm-log orm-log:store +++ mar %graph-update-3 -- :: =| state-5 @@ -100,7 +101,7 @@ ++ give |= =action:store ^- (list card) - [%give %fact ~ [%graph-update-2 !>(`update:store`[now.bowl action])]]~ + [%give %fact ~ [mar !>(`update:store`[now.bowl action])]]~ -- :: ++ on-poke @@ -111,7 +112,7 @@ ?> (team:title our.bowl src.bowl) =^ cards state ?+ mark (on-poke:def mark vase) - %graph-update-2 (graph-update !<(update:store vase)) + %graph-update-3 (graph-update !<(update:store vase)) %import (poke-import q.vase) == [cards this] @@ -570,7 +571,7 @@ ++ give |= [paths=(list path) update=action:store] ^- (list card) - [%give %fact paths [%graph-update-2 !>(`update:store`[now.bowl update])]]~ + [%give %fact paths [mar !>(`update:store`[now.bowl update])]]~ -- :: ++ validate-graph @@ -619,11 +620,11 @@ [%x %export ~] ``noun+!>(state) :: [%x %keys ~] - :- ~ :- ~ :- %graph-update-2 + :- ~ :- ~ :- mar !>(`update:store`[now.bowl [%keys ~(key by graphs)]]) :: [%x %tag-queries *] - :- ~ :- ~ :- %graph-update-2 + :- ~ :- ~ :- mar !> ^- update:store :- now.bowl ?+ t.t.path (on-peek:def path) @@ -639,7 +640,7 @@ ?~ marked-graph [~ ~] =* graph p.u.marked-graph =* mark q.u.marked-graph - :- ~ :- ~ :- %graph-update-2 + :- ~ :- ~ :- mar !>(`update:store`[now.bowl [%add-graph [ship term] graph mark %.y]]) :: [%x %update-log @ @ *] @@ -679,7 +680,7 @@ =* mark q.u.marked-graph ?+ t.t.t.t.path (on-peek:def path) ~ - :- ~ :- ~ :- %graph-update-2 + :- ~ :- ~ :- mar !>(`update:store`[now.bowl [%add-graph [ship term] graph mark %.y]]) :: [%mark ~] @@ -688,7 +689,7 @@ [%subset ?(%lone %kith) @ @ ~] =/ start=(unit atom) (rush i.t.t.t.t.t.t.path dem:ag) =/ end=(unit atom) (rush i.t.t.t.t.t.t.t.path dem:ag) - :- ~ :- ~ :- %graph-update-2 + :- ~ :- ~ :- mar !> ^- update:store :^ now.bowl %add-nodes [ship term] %- ~(gas by *(map index:store node:store)) @@ -715,7 +716,7 @@ (turn t.t.pax (cury slav %ud)) =/ node (get-node graph index) ?~ node [~ ~] - :- ~ :- ~ :- %graph-update-2 + :- ~ :- ~ :- mar !> ^- update:store :^ now.bowl %add-nodes [ship term] %- ~(gas by *(map index:store node:store)) @@ -739,7 +740,7 @@ ?: ?=(%empty -.children.u.node) ~ p.children.u.node - :- ~ :- ~ :- %graph-update-2 + :- ~ :- ~ :- mar !> ^- update:store :^ now.bowl %add-nodes [ship term] %- ~(gas by *(map index:store node:store)) @@ -763,7 +764,7 @@ ?: ?=(%empty -.children.u.node) ~ p.children.u.node - :- ~ :- ~ :- %graph-update-2 + :- ~ :- ~ :- mar !> ^- update:store :^ now.bowl %add-nodes [ship term] %- ~(gas by *(map index:store node:store)) @@ -825,7 +826,7 @@ |= [=node:store =index:store =(map index:store node:store)] ^- (unit (unit cage)) ?: ?=(%empty -.children.node) - :- ~ :- ~ :- %graph-update-2 + :- ~ :- ~ :- mar !>(`update:store`[now.bowl [%add-nodes [ship term] map]]) =/ item=[k=atom v=node:store] (need (ram:orm p.children.node)) @@ -858,7 +859,7 @@ =/ start=(unit atom) (rush i.t.t.t.t.t.path dem:ag) ?: ?=(~ count) [~ ~] - :- ~ :- ~ :- %graph-update-2 + :- ~ :- ~ :- mar !> ^- update:store :^ now.bowl %add-nodes [ship term] =* a u.count diff --git a/pkg/landscape/app/hark-graph-hook.hoon b/pkg/landscape/app/hark-graph-hook.hoon index a051a20ee..b9863bd70 100644 --- a/pkg/landscape/app/hark-graph-hook.hoon +++ b/pkg/landscape/app/hark-graph-hook.hoon @@ -228,7 +228,7 @@ ~[watch-graph:ha] :: %fact - ?. ?=(%graph-update-2 p.cage.sign) + ?. ?=(%graph-update-3 p.cage.sign) (on-agent:def wire sign) =^ cards state (graph-update !<(update:graph-store q.cage.sign)) diff --git a/pkg/landscape/gen/dm-hook/dm.hoon b/pkg/landscape/gen/dm-hook/dm.hoon index 129205a55..9e71a2c64 100644 --- a/pkg/landscape/gen/dm-hook/dm.hoon +++ b/pkg/landscape/gen/dm-hook/dm.hoon @@ -13,7 +13,7 @@ contents.post contents == :: -:- %graph-update-2 +:- %graph-update-3 ^- update :- now :+ %add-nodes [our %dm-inbox] diff --git a/pkg/landscape/gen/graph-store/add-graph.hoon b/pkg/landscape/gen/graph-store/add-graph.hoon index 2f284f26a..f9f599e24 100644 --- a/pkg/landscape/gen/graph-store/add-graph.hoon +++ b/pkg/landscape/gen/graph-store/add-graph.hoon @@ -5,6 +5,6 @@ |= $: [now=@da eny=@uvJ =beak] [[=resource mark=(unit mark) overwrite=? ~] ~] == -:- %graph-update-2 +:- %graph-update-3 ^- update [now [%add-graph resource (gas:orm ~ ~) mark overwrite]] diff --git a/pkg/landscape/gen/graph-store/add-post.hoon b/pkg/landscape/gen/graph-store/add-post.hoon index 2f68f2af2..34c3f6001 100644 --- a/pkg/landscape/gen/graph-store/add-post.hoon +++ b/pkg/landscape/gen/graph-store/add-post.hoon @@ -12,7 +12,7 @@ contents.post contents == :: -:- %graph-update-2 +:- %graph-update-3 ^- update :- now :+ %add-nodes [our name] diff --git a/pkg/landscape/gen/graph-store/add-signatures.hoon b/pkg/landscape/gen/graph-store/add-signatures.hoon index 570fa97e7..c97da863f 100644 --- a/pkg/landscape/gen/graph-store/add-signatures.hoon +++ b/pkg/landscape/gen/graph-store/add-signatures.hoon @@ -5,6 +5,6 @@ |= $: [now=@da eny=@uvJ =beak] [[[=resource =index] =signatures ~] ~] == -:- %graph-update-2 +:- %graph-update-3 ^- update [now [%add-signatures [resource index] signatures]] diff --git a/pkg/landscape/gen/graph-store/add-tag.hoon b/pkg/landscape/gen/graph-store/add-tag.hoon index 08366364f..1ac07ae77 100644 --- a/pkg/landscape/gen/graph-store/add-tag.hoon +++ b/pkg/landscape/gen/graph-store/add-tag.hoon @@ -5,6 +5,6 @@ |= $: [now=@da eny=@uvJ =beak] [[=term =uid ~] ~] == -:- %graph-update-2 +:- %graph-update-3 ^- update [now [%add-tag term uid]] diff --git a/pkg/landscape/gen/graph-store/archive-graph.hoon b/pkg/landscape/gen/graph-store/archive-graph.hoon index a6f9ae298..ff3219671 100644 --- a/pkg/landscape/gen/graph-store/archive-graph.hoon +++ b/pkg/landscape/gen/graph-store/archive-graph.hoon @@ -5,6 +5,6 @@ |= $: [now=@da eny=@uvJ =beak] [[=resource ~] ~] == -:- %graph-update-2 +:- %graph-update-3 ^- update [now [%archive-graph resource]] diff --git a/pkg/landscape/gen/graph-store/export-graph.hoon b/pkg/landscape/gen/graph-store/export-graph.hoon index 4330d01eb..2b366f40f 100644 --- a/pkg/landscape/gen/graph-store/export-graph.hoon +++ b/pkg/landscape/gen/graph-store/export-graph.hoon @@ -4,7 +4,7 @@ |= $: [now=@da eny=@uvJ bec=beak] [[=ship graph=term ~] ~] == -:- %graph-update-2 +:- %graph-update-3 =/ our (scot %p p.bec) =/ wen (scot %da now) =/ who (scot %p ship) diff --git a/pkg/landscape/gen/graph-store/import-graph.hoon b/pkg/landscape/gen/graph-store/import-graph.hoon index 4d3e03aa0..4b1cd121b 100644 --- a/pkg/landscape/gen/graph-store/import-graph.hoon +++ b/pkg/landscape/gen/graph-store/import-graph.hoon @@ -4,6 +4,6 @@ |= $: [now=@da eny=@uvJ bec=beak] [[graph=term =path ~] ~] == -:- %graph-update-2 +:- %graph-update-3 =- ~& update=- - .^(=update:graph-store %cx path) diff --git a/pkg/landscape/gen/graph-store/remove-graph.hoon b/pkg/landscape/gen/graph-store/remove-graph.hoon index 2bd979faa..e81298c1e 100644 --- a/pkg/landscape/gen/graph-store/remove-graph.hoon +++ b/pkg/landscape/gen/graph-store/remove-graph.hoon @@ -5,6 +5,6 @@ |= $: [now=@da eny=@uvJ =beak] [[=resource ~] ~] == -:- %graph-update-2 +:- %graph-update-3 ^- update [now [%remove-graph resource]] diff --git a/pkg/landscape/gen/graph-store/remove-posts.hoon b/pkg/landscape/gen/graph-store/remove-posts.hoon index 01f2345c3..8a2877430 100644 --- a/pkg/landscape/gen/graph-store/remove-posts.hoon +++ b/pkg/landscape/gen/graph-store/remove-posts.hoon @@ -5,6 +5,6 @@ |= $: [now=@da eny=@uvJ =beak] [[=resource indices=(set index) ~] ~] == -:- %graph-update-2 +:- %graph-update-3 ^- update [now [%remove-posts resource indices]] diff --git a/pkg/landscape/gen/graph-store/remove-signatures.hoon b/pkg/landscape/gen/graph-store/remove-signatures.hoon index 8bd4b8695..e4dd4dd9f 100644 --- a/pkg/landscape/gen/graph-store/remove-signatures.hoon +++ b/pkg/landscape/gen/graph-store/remove-signatures.hoon @@ -6,6 +6,6 @@ |= $: [now=@da eny=@uvJ =beak] [[[=resource =index] =signatures ~] ~] == -:- %graph-update-2 +:- %graph-update-3 ^- update [now [%remove-signatures [resource index] signatures]] diff --git a/pkg/landscape/gen/graph-store/remove-tag.hoon b/pkg/landscape/gen/graph-store/remove-tag.hoon index 1a425a4bb..ed7c93e07 100644 --- a/pkg/landscape/gen/graph-store/remove-tag.hoon +++ b/pkg/landscape/gen/graph-store/remove-tag.hoon @@ -5,6 +5,6 @@ |= $: [now=@da eny=@uvJ =beak] [[=term =uid ~] ~] == -:- %graph-update-2 +:- %graph-update-3 ^- update [now [%remove-tag term uid]] diff --git a/pkg/landscape/gen/graph-store/unarchive-graph.hoon b/pkg/landscape/gen/graph-store/unarchive-graph.hoon index 9402207af..fc0bf03df 100644 --- a/pkg/landscape/gen/graph-store/unarchive-graph.hoon +++ b/pkg/landscape/gen/graph-store/unarchive-graph.hoon @@ -5,6 +5,6 @@ |= $: [now=@da eny=@uvJ =beak] [[=resource ~] ~] == -:- %graph-update-2 +:- %graph-update-3 ^- update [now [%unarchive-graph resource]] diff --git a/pkg/landscape/gen/tally.hoon b/pkg/landscape/gen/tally.hoon index 793540036..095ebc786 100644 --- a/pkg/landscape/gen/tally.hoon +++ b/pkg/landscape/gen/tally.hoon @@ -67,7 +67,7 @@ =/ real=(set resource:re) =/ upd=update:ga %+ scry update:ga - [%x %graph-store /keys/graph-update-2] + [%x %graph-store /keys/graph-update-3] ?> ?=(%keys -.q.upd) resources.q.upd :: count activity per channel diff --git a/pkg/landscape/lib/graph.hoon b/pkg/landscape/lib/graph.hoon index f8a452d29..c562aa880 100644 --- a/pkg/landscape/lib/graph.hoon +++ b/pkg/landscape/lib/graph.hoon @@ -6,7 +6,7 @@ ++ update |= =update:store ^- cage - [%graph-update-2 !>(update)] + [%graph-update-3 !>(update)] -- :: ++ scry-for diff --git a/pkg/landscape/mar/graph/update-2.hoon b/pkg/landscape/mar/graph/update-2.hoon index e6766edb5..890513819 100644 --- a/pkg/landscape/mar/graph/update-2.hoon +++ b/pkg/landscape/mar/graph/update-2.hoon @@ -1,19 +1,15 @@ /+ *graph-store =* as-octs as-octs:mimes:html :: -|_ upd=update +|_ =update:two ++ grad %noun ++ grow |% - ++ noun upd - ++ json (update:enjs upd) - ++ mime [/application/x-urb-graph-update (as-octs (jam upd))] + ++ noun update -- :: ++ grab |% - ++ noun update - ++ json update:dejs - ++ mime |=([* =octs] ;;(update (cue q.octs))) + ++ noun update:two -- -- diff --git a/pkg/landscape/mar/graph/update-3.hoon b/pkg/landscape/mar/graph/update-3.hoon new file mode 100644 index 000000000..e6766edb5 --- /dev/null +++ b/pkg/landscape/mar/graph/update-3.hoon @@ -0,0 +1,19 @@ +/+ *graph-store +=* as-octs as-octs:mimes:html +:: +|_ upd=update +++ grad %noun +++ grow + |% + ++ noun upd + ++ json (update:enjs upd) + ++ mime [/application/x-urb-graph-update (as-octs (jam upd))] + -- +:: +++ grab + |% + ++ noun update + ++ json update:dejs + ++ mime |=([* =octs] ;;(update (cue q.octs))) + -- +-- diff --git a/pkg/landscape/sur/graph-store.hoon b/pkg/landscape/sur/graph-store.hoon index d8323b026..9ee6981fc 100644 --- a/pkg/landscape/sur/graph-store.hoon +++ b/pkg/landscape/sur/graph-store.hoon @@ -69,9 +69,76 @@ +$ permission-level ?(%no %self %yes) :: +:: %graph-store types version 2 +:: +++ two + =< [. post-one] + =, post-one + |% + ++ orm ((on atom node) gth) + ++ orm-log ((on time logged-update) gth) + :: + +$ graph ((mop atom node) gth) + +$ marked-graph [p=graph q=(unit mark)] + :: + +$ node [=post children=internal-graph] + +$ graphs (map resource marked-graph) + :: + +$ tag-queries (jug term resource) + :: + +$ update-log ((mop time logged-update) gth) + +$ update-logs (map resource update-log) + :: + +$ internal-graph + $~ [%empty ~] + $% [%graph p=graph] + [%empty ~] + == + :: + +$ network + $: =graphs + =tag-queries + =update-logs + archive=graphs + validators=(set mark) + == + :: + +$ update [p=time q=action] + :: + +$ logged-update [p=time q=logged-action] + :: + +$ logged-action + $% [%add-graph =resource =graph mark=(unit mark) overwrite=?] + [%add-nodes =resource nodes=(map index node)] + [%remove-nodes =resource indices=(set index)] + [%add-signatures =uid =signatures] + [%remove-signatures =uid =signatures] + == + :: + +$ action + $% logged-action + [%remove-graph =resource] + :: + [%add-tag =term =resource] + [%remove-tag =term =resource] + :: + [%archive-graph =resource] + [%unarchive-graph =resource] + [%run-updates =resource =update-log] + :: + :: NOTE: cannot be sent as pokes + :: + [%keys =resources] + [%tags tags=(set term)] + [%tag-queries =tag-queries] + == + -- +:: :: %graph-store types version 1 :: -++ one +++ one + =< [. post-one] + =, post-one |% ++ orm ((on atom node) gth) ++ orm-log ((on time logged-update) gth) diff --git a/pkg/landscape/sur/post.hoon b/pkg/landscape/sur/post.hoon index ab40e1044..7306bed90 100644 --- a/pkg/landscape/sur/post.hoon +++ b/pkg/landscape/sur/post.hoon @@ -40,6 +40,23 @@ [%reference =reference] == :: +++ post-one + |% + :: + +$ content + $% [%text text=cord] + [%mention =ship] + [%url url=cord] + [%code expression=cord output=(list tank)] + [%reference =reference] + == + :: + +$ reference + $% [%graph group=resource =uid] + [%group group=resource] + == + -- +:: ++ post-zero |% :: diff --git a/pkg/landscape/ted/graph/add-nodes.hoon b/pkg/landscape/ted/graph/add-nodes.hoon index 2359c5efe..812a2fc8e 100644 --- a/pkg/landscape/ted/graph/add-nodes.hoon +++ b/pkg/landscape/ted/graph/add-nodes.hoon @@ -32,7 +32,7 @@ =/ hashes (nodes-to-pending-indices nodes.q.update) ;< ~ bind:m %^ poke-our %graph-push-hook - %graph-update-2 + %graph-update-3 !> ^- update:store update (pure:m !>(`action:graph-view`[%pending-indices hashes])) diff --git a/pkg/landscape/ted/graph/create-group-feed.hoon b/pkg/landscape/ted/graph/create-group-feed.hoon index 1cf6d261e..7f7553991 100644 --- a/pkg/landscape/ted/graph/create-group-feed.hoon +++ b/pkg/landscape/ted/graph/create-group-feed.hoon @@ -39,7 +39,7 @@ == ;< ~ bind:m %+ poke-our %graph-store - :- %graph-update-2 + :- %graph-update-3 !> ^- update:graph [now.bowl %add-graph feed-rid *graph:graph `%graph-validator-post %&] ;< ~ bind:m diff --git a/pkg/landscape/ted/graph/create.hoon b/pkg/landscape/ted/graph/create.hoon index 04ad3664d..c6e1e7d0c 100644 --- a/pkg/landscape/ted/graph/create.hoon +++ b/pkg/landscape/ted/graph/create.hoon @@ -54,7 +54,7 @@ =/ =update:graph [now.bowl %add-graph rid.action *graph:graph mark.action overwrite] ;< ~ bind:m - (poke-our %graph-store graph-update-2+!>(update)) + (poke-our %graph-store graph-update-3+!>(update)) ;< ~ bind:m (poke-our %graph-push-hook %push-hook-action !>([%add rid.action])) :: diff --git a/pkg/landscape/ted/graph/delete.hoon b/pkg/landscape/ted/graph/delete.hoon index e074482df..607977b1f 100644 --- a/pkg/landscape/ted/graph/delete.hoon +++ b/pkg/landscape/ted/graph/delete.hoon @@ -36,7 +36,7 @@ ^- form:m ;< =bowl:spider bind:m get-bowl:strandio ;< ~ bind:m - (poke-our %graph-store %graph-update-2 !>([now.bowl %remove-graph rid])) + (poke-our %graph-store %graph-update-3 !>([now.bowl %remove-graph rid])) ;< ~ bind:m (poke-our %graph-push-hook %push-hook-action !>([%remove rid])) ;< ~ bind:m diff --git a/pkg/landscape/ted/graph/disable-group-feed.hoon b/pkg/landscape/ted/graph/disable-group-feed.hoon index 15b40e2f9..fdc5c7e8b 100644 --- a/pkg/landscape/ted/graph/disable-group-feed.hoon +++ b/pkg/landscape/ted/graph/disable-group-feed.hoon @@ -40,7 +40,7 @@ ?: ?=([~ ^] feed.config.metadatum) ;< ~ bind:m %+ poke-our %graph-store - :- %graph-update-2 + :- %graph-update-3 !> ^- update:graph [now.bowl [%archive-graph resource.u.u.feed.config.metadatum]] (pure:m !>(~)) diff --git a/pkg/landscape/ted/graph/leave.hoon b/pkg/landscape/ted/graph/leave.hoon index 6357476d4..21808d147 100644 --- a/pkg/landscape/ted/graph/leave.hoon +++ b/pkg/landscape/ted/graph/leave.hoon @@ -31,7 +31,7 @@ ;< ~ bind:m (raw-poke-our %graph-pull-hook %pull-hook-action !>([%remove rid])) ;< ~ bind:m - (raw-poke-our %graph-store %graph-update-2 !>([now [%remove-graph rid]])) + (raw-poke-our %graph-store %graph-update-3 !>([now [%remove-graph rid]])) (pure:m ~) -- :: diff --git a/pkg/landscape/ted/graph/restore.hoon b/pkg/landscape/ted/graph/restore.hoon index 3efac9724..d4d0eb2c0 100644 --- a/pkg/landscape/ted/graph/restore.hoon +++ b/pkg/landscape/ted/graph/restore.hoon @@ -17,7 +17,7 @@ ;< =bowl:spider bind:m get-bowl:strandio :: unarchive graph and share it ;< ~ bind:m - (poke-our %graph-store %graph-update-2 !>([now.bowl %unarchive-graph rid])) + (poke-our %graph-store %graph-update-3 !>([now.bowl %unarchive-graph rid])) ;< ~ bind:m (poke-our %graph-push-hook %push-hook-action !>([%add rid])) :: diff --git a/pkg/landscape/ted/group/on-leave.hoon b/pkg/landscape/ted/group/on-leave.hoon index 34b2b6636..3fd9254de 100644 --- a/pkg/landscape/ted/group/on-leave.hoon +++ b/pkg/landscape/ted/group/on-leave.hoon @@ -70,7 +70,7 @@ ;< ~ bind:m %+ raw-poke [our.bowl %graph-store] - :- %graph-update-2 + :- %graph-update-3 !> ^- update:gra [now.bowl [%archive-graph app-resource]] ;< ~ bind:m diff --git a/pkg/landscape/ted/ph/migrate/make-graphs.hoon b/pkg/landscape/ted/ph/migrate/make-graphs.hoon index 00a0333f7..488691048 100644 --- a/pkg/landscape/ted/ph/migrate/make-graphs.hoon +++ b/pkg/landscape/ted/ph/migrate/make-graphs.hoon @@ -14,7 +14,7 @@ =/ =post:post [our index wen [%text body]~ ~ ~] =/ =node:graph-store [[%& post] %empty ~] =/ act=update:graph-store [wen %add-nodes rid (my [index node] ~)] - (poke-app our %graph-push-hook %graph-update-2 act) + (poke-app our %graph-push-hook %graph-update-3 act) -- :: ^- thread:spider diff --git a/pkg/landscape/ted/ph/migrate/post-import-graphs.hoon b/pkg/landscape/ted/ph/migrate/post-import-graphs.hoon index 00b230972..0d8ef7085 100644 --- a/pkg/landscape/ted/ph/migrate/post-import-graphs.hoon +++ b/pkg/landscape/ted/ph/migrate/post-import-graphs.hoon @@ -14,7 +14,7 @@ =/ =post:post [our index wen [%text body]~ ~ ~] =/ =node:graph-store [[%& post] %empty ~] =/ act=update:graph-store [wen %add-nodes rid (my [index node] ~)] - (poke-app our %graph-push-hook %graph-update-2 act) + (poke-app our %graph-push-hook %graph-update-3 act) -- :: ^- thread:spider diff --git a/pkg/npm/api/graph/lib.ts b/pkg/npm/api/graph/lib.ts index 23751491d..553cff51d 100644 --- a/pkg/npm/api/graph/lib.ts +++ b/pkg/npm/api/graph/lib.ts @@ -5,7 +5,7 @@ import { Enc, Path, Patp, PatpNoSig, Poke, Thread } from '../lib/types'; import { Content, GraphChildrenPoke, GraphNode, GraphNodePoke, Post } from './types'; import { patp2dec } from 'urbit-ob'; -export const GRAPH_UPDATE_VERSION = 2; +export const GRAPH_UPDATE_VERSION = 3; export const createBlankNodeWithChildPost = ( ship: PatpNoSig,