ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-08 08:08:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

group-view: fix breakage from merge

Browse Source
This commit is contained in:
Liam Fitzgerald 2021-01-29 14:52:36 +10:00
parent b7d832d467
commit ee34819cd2
No known key found for this signature in database
GPG Key ID: D390E12C61D1CFFB
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/arvo/app/group-view.hoon
View File

@ -1,4 +1,4 @@
/- view-sur=group-view, group-store, *group, *metadata-store /- view-sur=group-view, group-store, *group, metadata=metadata-store
/+ default-agent, agentio, mdl=metadata, resource, dbug, grpl=group, verb /+ default-agent, agentio, mdl=metadata, resource, dbug, grpl=group, verb
|% |%
++ card card:agent:gall ++ card card:agent:gall
@ -85,8 +85,7 @@
:: ::
++ tx-fact ++ tx-fact
|= =progress:view |= =progress:view
~& +< =; =cage
=; cage
(fact:io cage /all tx+(en-path:resource rid) ~) (fact:io cage /all tx+(en-path:resource rid) ~)
group-view-update+!>([%progress rid progress]) group-view-update+!>([%progress rid progress])
:: ::
@ -115,7 +114,7 @@
=. jn-core =. jn-core
(jn-abed rid) (jn-abed rid)
=/ maybe-group =/ maybe-group
(group-from-app-resource:met %contacts rid) (peek-group:met %contacts rid)
?^ maybe-group ?^ maybe-group
~|("already joined group {<rid>}" !!) ~|("already joined group {<rid>}" !!)
:_ state :_ state
@ -184,24 +183,25 @@
`state `state
:_ state :_ state
:_ ~ :_ ~
%+ poke-our:(jn-pass-io /pull-md) %metadata-hook %+ poke-our:(jn-pass-io /pull-md) %metadata-push-hook
metadata-hook-action+!>([%add-synced ship (en-path:resource rid)]) pull-hook-action+!>([%add [entity .]:rid])
:: ::
++ md-fact ++ md-fact
|= [=mark =vase] |= [=mark =vase]
?. ?=(%metadata-update mark) `state ?. ?=(%metadata-update mark) `state
=+ !<(upd=metadata-update vase) =+ !<(=update:metadata vase)
~& upd ?. ?=(%initial-group -.update) `state
?. ?=(%add -.upd) `state ?. =(group.update rid) `state
?. =(group-path.upd (en-path:resource rid)) `state
=^ cards state =^ cards state
(cleanup %done) (cleanup %done)
:_ state :_ state
%+ welp cards %+ welp cards
?. hidden:(need (scry-group:grp rid)) ~ ?. hidden:(need (scry-group:grp rid)) ~
=/ app-rid=resource %+ murn ~(tap by associations.update)
(de-path:resource app-path.resource.upd) |= [=md-resource:metadata =association:metadata]
:_ ~ ?. =(app-name.md-resource %graph) ~
=* rid resource.md-resource
:- ~
%+ poke-our:(jn-pass-io /pull-graph) %graph-pull-hook %+ poke-our:(jn-pass-io /pull-graph) %graph-pull-hook
pull-hook-action+!>([%add [entity .]:rid]) pull-hook-action+!>([%add [entity .]:rid])
:: ::

2
pkg/arvo/app/metadata-store.hoon
View File

@ -24,7 +24,7 @@
:: /group/%path associations for group :: /group/%path associations for group
:: ::
/- store=metadata-store /- store=metadata-store
/+ *metadata-json, default-agent, verb, dbug, resource, *migrate /+ default-agent, verb, dbug, resource, *migrate
|% |%
+$ card card:agent:gall +$ card card:agent:gall
+$ base-state-0 +$ base-state-0