diff --git a/pkg/arvo/lib/graph-view.hoon b/pkg/arvo/lib/graph-view.hoon index e5a83018b9..f208accf31 100644 --- a/pkg/arvo/lib/graph-view.hoon +++ b/pkg/arvo/lib/graph-view.hoon @@ -19,6 +19,7 @@ :~ create+create delete+delete join+join + leave+leave ::groupify+groupify ::invite+invite == @@ -31,13 +32,18 @@ app+app associated+associated == + :: ++ app |= jon=json ^- app-name ?> ?=(%s -.jon) - ~! app-name %chat :: + ++ leave + %- ot + :~ resource+dejs:resource + == + :: ++ delete %- ot :~ resource+dejs:resource @@ -51,12 +57,12 @@ :: ++ groupify !! ++ invite !! + :: ++ associated %- of :~ group+dejs:resource policy+policy:dejs:group-store == - -- -- -- diff --git a/pkg/arvo/sur/graph-view.hoon b/pkg/arvo/sur/graph-view.hoon index 1d54897600..d465c48ab8 100644 --- a/pkg/arvo/sur/graph-view.hoon +++ b/pkg/arvo/sur/graph-view.hoon @@ -38,6 +38,7 @@ =associated == [%delete rid=resource] + [%leave rid=resource] [%join rid=resource =ship] ::[%invite rid=resource ships=(set ship)] :: [%groupify rid=resource title=@t description=@t] diff --git a/pkg/arvo/ted/graph/create.hoon b/pkg/arvo/ted/graph/create.hoon index 43fcabc5c3..bb86d14db1 100644 --- a/pkg/arvo/ted/graph/create.hoon +++ b/pkg/arvo/ted/graph/create.hoon @@ -5,6 +5,7 @@ ++ strand strand:spider ++ poke poke:strandio ++ poke-our poke-our:strandio +:: ++ handle-group |= [rid=resource =associated:graph-view] =/ m (strand ,resource) @@ -17,6 +18,7 @@ (poke-our %group-push-hook %push-hook-action !>([%add rid])) (pure:m rid) -- +:: =, strand=strand:spider ^- thread:spider |= arg=vase @@ -54,4 +56,3 @@ ;< ~ bind:m (poke-our %metadata-hook %metadata-hook-action !>([%add-owned group-path])) (pure:m !>(~)) - diff --git a/pkg/arvo/ted/graph/delete.hoon b/pkg/arvo/ted/graph/delete.hoon index 0df982b677..54de93faab 100644 --- a/pkg/arvo/ted/graph/delete.hoon +++ b/pkg/arvo/ted/graph/delete.hoon @@ -5,6 +5,7 @@ ++ strand strand:spider ++ poke poke:strandio ++ poke-our poke-our:strandio +:: ++ scry-metadata |= rid=resource =/ m (strand ,(unit resource)) @@ -16,6 +17,7 @@ /noun == (pure:m (bind pax de-path:resource)) +:: ++ scry-group |= rid=resource =/ m (strand ,(unit resource)) @@ -27,6 +29,7 @@ /noun == (pure:m (need ugroup)) +:: ++ delete-graph |= rid=resource =/ m (strand ,~) @@ -36,6 +39,7 @@ (poke-our %graph-store %graph-update [%archive-graph rid.action]) (pure:m ~) -- +:: ^- thread:spider |= arg=vase =/ m (strand ,vase) @@ -53,9 +57,8 @@ ?. hidden.u.ugroup (delete-graph rid.action) ;< ~ bind:m - (poke-our %group-push-hook %pull-hook-action [%remove rid.action]) + (poke-our %group-push-hook %push-hook-action [%remove rid.action]) ;< ~ bind:m (poke-our %group-store %group-action !>([%remove-group rid.action]) ;< ~ bind:m (delete-graph rid.action) (pure:m !>(~)) - diff --git a/pkg/arvo/ted/graph/join.hoon b/pkg/arvo/ted/graph/join.hoon index 13c57cc35e..a61d20c91c 100644 --- a/pkg/arvo/ted/graph/join.hoon +++ b/pkg/arvo/ted/graph/join.hoon @@ -5,14 +5,16 @@ ++ strand strand:spider ++ poke poke:strandio ++ poke-our poke-our:strandio +:: ++ check-live |= who=ship =/ m (strand ,~) ^- form:m - %+ (set-timeout:strandio ,~) ~s10 + %+ (set-timeout:strandio ,~) ~s20 ;< ~ bind:m (poke [who %hood] %helm-hi !>(~)) (pure:m ~) +:: ++ scry-metadata |= rid=resource =/ m (strand ,(unit resource)) @@ -29,6 +31,7 @@ ?~ u.pax ~ `(de-path:resource n.u.pax) -- +:: ^- thread:spider |= arg=vase =/ m (strand ,vase) @@ -63,4 +66,3 @@ %+ poke-our %graph-pull-hook pull-hook-action+!>([%add ship.action rid.action])) (pure:m !>(~)) - diff --git a/pkg/arvo/ted/graph/leave.hoon b/pkg/arvo/ted/graph/leave.hoon index aa2fe45e36..84660d109e 100644 --- a/pkg/arvo/ted/graph/leave.hoon +++ b/pkg/arvo/ted/graph/leave.hoon @@ -5,6 +5,7 @@ ++ strand strand:spider ++ poke poke:strandio ++ poke-our poke-our:strandio +:: ++ scry-metadata |= rid=resource =/ m (strand ,(unit resource)) @@ -16,6 +17,7 @@ /noun == (pure:m (bind pax de-path:resource)) +:: ++ scry-group |= rid=resource =/ m (strand ,(unit resource)) @@ -27,6 +29,7 @@ /noun == (pure:m (need ugroup)) +:: ++ delete-graph |= rid=resource =/ m (strand ,~) @@ -36,6 +39,7 @@ (poke-our %graph-store %graph-update [%archive-graph rid.action]) (pure:m ~) -- +:: ^- thread:spider |= arg=vase =/ m (strand ,vase) @@ -58,4 +62,3 @@ (poke-our %group-store %group-action !>([%remove-group rid.action]) ;< ~ bind:m (delete-graph rid.action) (pure:m !>(~)) -