urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-13 16:03:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'publish-fixes' (#1865)

Browse Source 
* publish-fixes:
  publish: auto-resubscribe on quit, crash on failed subscription
  publish: added permission logic to %serve and import flows

Signed-off-by: Jared Tobin <jared@tlon.io>
This commit is contained in:
Jared Tobin 2019-10-23 08:35:01 +08:00
commit 095a0a155a
No known key found for this signature in database
GPG Key ID: 0E4647D58F8A69E4
1 changed files with 81 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
pkg/arvo/app/publish.hoon
View File

@ -1244,6 +1244,8 @@
::
%serve
:: XX specialize this check for subfiles
?. =(our.bol src.bol)
[~ this]
?: (~(has by pubs.sat) coll.act)
[~ this]
=/ files=(list path)
@ -1264,9 +1266,25 @@
*coin
[[our.bol q.byk.bol] /[coll.act]/publish/web]
==
=/ blog-perms=card
:* %perm /perms q.byk.bol
/web/publish/[coll.act]
%rw `[%black ~] `[%white (ships-to-whom (sy our.bol ~))]
==
=/ info-perms=card
:* %perm /perms q.byk.bol
/web/publish/[coll.act]/publish-info
%rw `*rule:clay `*rule:clay
==
%= out
moves [[ost.bol %build wir %.y schema] moves.out]
builds (~(put in builds.out) wir)
::
moves
:* [ost.bol %build wir %.y schema]
[ost.bol blog-perms]
[ost.bol info-perms]
moves.out
==
==
::
[%web %publish @tas @tas %udon ~]
@ -1287,10 +1305,22 @@
*coin
[[our.bol q.byk.bol] /[post]/[coll.act]/publish/web]
==
=/ post-perms=card
:* %perm /perms q.byk.bol
/web/publish/[coll.act]/[post]/udon
%w `[%white (ships-to-whom (sy our.bol ~))]
==
=/ comment-perms=card
:* %perm /perms q.byk.bol
/web/publish/[coll.act]/[post]
%w `[%black ~]
==
%= out
moves
:* [ost.bol %build post-wir %.y post-schema]
[ost.bol %build comments-wir %.y comments-schema]
[ost.bol post-perms]
[ost.bol comment-perms]
moves.out
==
::
@ -1390,6 +1420,13 @@
::
==
::
++ quit-collection
|= wir=wire
^- (quip move _this)
=/ pax=path (weld /collection wir)
:_ this
[ost.bol %peer pax [src.bol %publish] pax]~
::
++ bound
|= [wir=wire success=? binding=binding:eyre]
^- (quip move _this)
@ -1589,7 +1626,21 @@
*coin
[[our.bol q.byk.bol] /[col]/publish/web]
==
:- [[ost.bol %build wir %.y schema] mow]
=/ blog-perms=card
:* %perm /perms q.byk.bol
/web/publish/[col]
%rw `[%black ~] `[%white (ships-to-whom (sy our.bol ~))]
==
=/ info-perms=card
:* %perm /perms q.byk.bol
/web/publish/[col]/publish-info
%rw `*rule:clay `*rule:clay
==
:- :* [ost.bol %build wir %.y schema]
[ost.bol blog-perms]
[ost.bol info-perms]
mow
==
[[pax mis] sob]
::
[%web %publish * * %udon ~]
@ -1609,9 +1660,22 @@
*coin
[[our.bol q.byk.bol] /[pos]/[col]/publish/web]
==
:- :+ [ost.bol %build post-wir %.y post-schema]
=/ post-perms=card
:* %perm /perms q.byk.bol
/web/publish/[col]/[pos]/udon
%w `[%white (ships-to-whom (sy our.bol ~))]
==
=/ comment-perms=card
:* %perm /perms q.byk.bol
/web/publish/[col]/[pos]
%w `[%black ~]
==
:- :* [ost.bol %build post-wir %.y post-schema]
[ost.bol %build comment-wir %.y comment-schema]
[ost.bol post-perms]
[ost.bol comment-perms]
mow
==
[[pax mis] sob]
::
[%web %publish * * * %publish-comment ~]
@ -1693,21 +1757,26 @@
[~ this]
=/ coll=@tas i.wir
=/ pax /web/publish/[coll]
?. (allowed src.bol %read pax)
:_ this
[ost.bol %quit ~]~
::
=/ col=(unit collection) (~(get by pubs.sat) coll)
?~ col
:_ this
[ost.bol %quit ~]~
?> (allowed src.bol %read pax)
=/ col=collection (~(got by pubs.sat) coll)
=/ new=collection
u.col(subscribers (~(put in subscribers.u.col) src.bol))
col(subscribers (~(put in subscribers.col) src.bol))
=/ rum=rumor
[%total our.bol coll new]
:_ this(pubs.sat (~(put by pubs.sat) coll new))
[ost.bol %diff %publish-rumor rum]~
::
++ reap
|= [wir=wire err=(unit tang)]
^- (quip move _this)
?~ err
[~ this]
?> ?=([%collection @tas ~] wir)
=/ col=@tas i.t.wir
%- (slog [leaf+"failed to subscribe to blog: {<col>}"]~)
:- ~
this(outgoing.sat (~(del by outgoing.sat) wir))
::
++ diff-publish-rumor
|= [wir=wire rum=rumor]
^- (quip move _this)