diff --git a/desks/realm/lib/groups.hoon b/desks/realm/lib/groups.hoon index f2b9c9302f..b4f25a6b00 100644 --- a/desks/realm/lib/groups.hoon +++ b/desks/realm/lib/groups.hoon @@ -11,22 +11,22 @@ =/ groups .^(groups:g %gx /(scot %p our)/groups/(scot %da now)/groups/groups) :: find ours =/ hosted - ^- (list [f=flag:g g=group:g]) + ^- (list [f=flag:g g=group-ui:g]) %+ skim ~(tap by groups) - |= [f=flag:g g=group:g] + |= [f=flag:g g=group-ui:g] =(our -.f) :: get metadata for each %+ turn hosted - |= [=flag:g =group:g] + |= [=flag:g =group-ui:g] ^- group-space =/ access - ?: =(-.cordon.group %open) + ?: =(-.cordon.group-ui %open) %public %private - =/ metadata meta.group + =/ metadata meta.group-ui :: Get group data =/ member-count=@u - (lent ~(tap by fleet.group)) + (lent ~(tap by fleet.group-ui)) :: Get metadata =/ title=@t title.metadata =/ image=@t image.metadata @@ -43,7 +43,7 @@ :: ++ get-group |= [rid=[entity=ship name=@tas] our=ship now=@da] - ^- group:g + ^- group-ui:g =/ groups .^(groups:g %gx /(scot %p our)/groups/(scot %da now)/groups/groups) (~(got by groups) rid) :: @@ -122,4 +122,4 @@ [roles/a/[roles]] == -- --- +-- \ No newline at end of file diff --git a/desks/realm/lib/realm-chat.hoon b/desks/realm/lib/realm-chat.hoon index d088c8bdc5..6e82e78a46 100644 --- a/desks/realm/lib/realm-chat.hoon +++ b/desks/realm/lib/realm-chat.hoon @@ -175,7 +175,8 @@ body.request :- ~ %- as-octt:mimes:html - %- en-json:html + %- trip + %- en:json:html %+ notify-request:encode note devices.state @@ -223,7 +224,7 @@ ?: (dm-already-exists type.c.act all-ships bowl) =/ log1 (maybe-log hide-debug.state "dm between {} already exists") `state - =/ all-peers=ship-roles:db + =/ all-peers=ship-roles:db %+ turn all-ships |= s=ship @@ -255,7 +256,7 @@ =/ host-peer (snag 0 (skim pathpeers |=(p=peer-row:db =(role.p %host)))) =/ ogpath (scry-path-row path.act bowl) - =/ cards + =/ cards ?: &(=(type.ogpath %dm) ?!(=(patp.host-peer our.bowl))) :: non-hosts are allowed to edit %dm type chats, but can only do :: so by relaying the request through the host-peer, since chat-db @@ -281,7 +282,7 @@ (~(del in pins.pathrow) msg-id.act) =/ pathpeers (scry-peers path.act bowl) - =/ cards + =/ cards :: we poke all peers/members' db with edit-path-pins (including ourselves) %: turn pathpeers @@ -312,7 +313,7 @@ ?~ host.act !! :: have to pass the host if we are adding ourselves :_ state [%pass /dbpoke %agent [(need host.act) dap.bowl] %poke %chat-action !>([%add-ship-to-chat path.act ship.act ~])]~ - + =/ pathrow (scry-path-row path.act bowl) ?> ?| =(src.bowl our.bowl) &(?!(=(src.bowl our.bowl)) =(invites.pathrow %open)) @@ -380,7 +381,7 @@ :: read the peers for the path =/ pathpeers (scry-peers path.act bowl) =/ official-time t.act - =/ cards + =/ cards %: turn pathpeers |=(a=peer-row:db (into-insert-message-poke a +.act official-time)) @@ -397,7 +398,7 @@ :: just pass along the edit-message-action to all the peers chat-db :: %chat-db will disallow invalid signals =/ pathpeers (scry-peers path.act bowl) - =/ cards + =/ cards %: turn pathpeers |=(p=peer-row:db (into-edit-message-poke p act)) @@ -413,7 +414,7 @@ :: just pass along the delete msg-id to all the peers chat-db :: %chat-db will disallow invalid signals =/ pathpeers (scry-peers path.act bowl) - =/ cards + =/ cards %: turn pathpeers |=(p=peer-row:db (into-delete-message-poke p msg-id.act)) @@ -544,7 +545,7 @@ ^- json =/ player-ids ~(val by devices) =/ base-list - :~ + :~ ['app_id' s+app-id.notif] ['data' (mtd data.notif)] ['include_player_ids' a+(turn player-ids |=([id=@t] s+id))] @@ -562,7 +563,7 @@ ['contents' (contents contents.notif)] extended-list :: - ++ mtd + ++ mtd |= mtd=push-mtd ^- json %- pairs @@ -573,7 +574,7 @@ ['msg' a+(turn message.mtd |=(m=msg-part:db (messages-row:encode:chat-db [msg-id.m msg-part-id.m] m)))] == :: - ++ contents + ++ contents |= contents=(map cord cord) ^- json =/ message (~(got by contents) 'en') @@ -584,7 +585,7 @@ |= =devices ^- json %- pairs - :~ + :~ :- %devices %- pairs %+ turn ~(tap by devices) @@ -682,14 +683,14 @@ :: ++ path-and-ship %- ot - :~ + :~ [%path pa] [%ship de-ship] == :: ++ de-edit-info %- ot - :~ + :~ [%msg-id de-msg-id] [%path pa] de-frag @@ -710,7 +711,7 @@ :: ++ path-and-fragments %- ot - :~ + :~ [%path pa] de-frag [%expires-in null-or-dri] @@ -718,7 +719,7 @@ :: ++ de-content %- of - :~ + :~ [%plain so] [%markdown so] [%bold so] @@ -743,14 +744,14 @@ :: ++ path-and-msg-id %- ot - :~ + :~ [%path pa] [%msg-id de-msg-id] == :: ++ pin-message %- ot - :~ + :~ [%path pa] [%msg-id de-msg-id] [%pin bo] @@ -771,4 +772,4 @@ == -- -- --- +-- \ No newline at end of file diff --git a/desks/realm/sur/new-groups.hoon b/desks/realm/sur/new-groups.hoon index b6786b11d8..7a2c67502c 100644 --- a/desks/realm/sur/new-groups.hoon +++ b/desks/realm/sur/new-groups.hoon @@ -3,6 +3,14 @@ /- grp=group-store /- metadata-store |% +++ okay `epic:e`2 +++ mar + |% + ++ act `mark`(rap 3 %group-action '-' (scot %ud okay) ~) + ++ upd `mark`(rap 3 %group-update '-' (scot %ud okay) ~) + ++ log `mark`(rap 3 %group-log '-' (scot %ud okay) ~) + ++ int `mark`(rap 3 %group-init '-' (scot %ud okay) ~) + -- :: $flag: ID for a group :: +$ flag (pair ship term) @@ -17,7 +25,7 @@ :: :: $zone: channel grouping :: -:: includes its own metadata for display and keeps the order of +:: includes its own metadata for display and keeps the order of :: channels within. :: :: zone: the term that represents the ID of a zone @@ -28,7 +36,7 @@ :: %edit: modify the zone metadata :: %mov: reorders the zone in the group :: %mov-nest: reorders a channel within the zone -:: +:: ++ zone =< zone |% @@ -42,7 +50,7 @@ $% [%add meta=data:meta] [%del ~] [%edit meta=data:meta] - [%mov idx=@ud] + [%mov idx=@ud] [%mov-nest =nest idx=@ud] == -- @@ -98,7 +106,7 @@ == :: :: $diff: represents the set of actions you can take on a channel - :: + :: :: add: create a channel :: edit: edit a channel :: del: delete a channel @@ -112,7 +120,7 @@ [%edit =channel] [%del ~] :: - [%add-sects sects=(set sect)] + [%add-sects sects=(set sect)] [%del-sects sects=(set sect)] :: [%zone =zone] @@ -139,6 +147,7 @@ meta=data:meta == :: ++$ group-ui [group saga=(unit saga:e)] :: $cabal: metadata representing a $sect or role :: ++ cabal @@ -266,7 +275,7 @@ $: name=term title=cord description=cord - image=cord + image=cord cover=cord =cordon members=(jug ship sect) @@ -275,8 +284,9 @@ :: +$ init [=time =group] :: +:: $groups: map for frontend to display groups +$ groups - (map flag group) + (map flag group-ui) +$ net-groups (map flag [net group]) :: @@ -307,7 +317,7 @@ :: +$ knock flag :: -:: $progress: the state of a group join +:: $progress: the state of a group join :: +$ progress ?(%knocking %adding %watching %done %error) @@ -321,7 +331,7 @@ :: :: $preview: the metadata and entry policy for a group :: -+$ preview ++$ preview $: =flag meta=data:meta =cordon diff --git a/desks/realm/sys.kelvin b/desks/realm/sys.kelvin index 3fbd8589b0..87ac69c723 100644 --- a/desks/realm/sys.kelvin +++ b/desks/realm/sys.kelvin @@ -1 +1 @@ -[%zuse 413] \ No newline at end of file +[%zuse 412] \ No newline at end of file diff --git a/desks/usher/lib/dbug.hoon b/desks/usher/lib/dbug.hoon new file mode 120000 index 0000000000..0bcedb5cc7 --- /dev/null +++ b/desks/usher/lib/dbug.hoon @@ -0,0 +1 @@ +../../../urbit/pkg/base-dev/lib/dbug.hoon \ No newline at end of file diff --git a/desks/usher/lib/default-agent.hoon b/desks/usher/lib/default-agent.hoon new file mode 120000 index 0000000000..c4f6a6a7c4 --- /dev/null +++ b/desks/usher/lib/default-agent.hoon @@ -0,0 +1 @@ +../../../urbit/pkg/base-dev/lib/default-agent.hoon \ No newline at end of file diff --git a/desks/usher/lib/skeleton.hoon b/desks/usher/lib/skeleton.hoon new file mode 120000 index 0000000000..06f4252796 --- /dev/null +++ b/desks/usher/lib/skeleton.hoon @@ -0,0 +1 @@ +../../../urbit/pkg/base-dev/lib/skeleton.hoon \ No newline at end of file diff --git a/desks/usher/lib/verb.hoon b/desks/usher/lib/verb.hoon new file mode 120000 index 0000000000..ec5ae02aae --- /dev/null +++ b/desks/usher/lib/verb.hoon @@ -0,0 +1 @@ +../../../urbit/pkg/base-dev/lib/verb.hoon \ No newline at end of file diff --git a/desks/usher/mar/bill.hoon b/desks/usher/mar/bill.hoon new file mode 120000 index 0000000000..0009b1e9cb --- /dev/null +++ b/desks/usher/mar/bill.hoon @@ -0,0 +1 @@ +../../../urbit/pkg/base-dev/mar/bill.hoon \ No newline at end of file diff --git a/desks/usher/mar/mime.hoon b/desks/usher/mar/mime.hoon new file mode 120000 index 0000000000..7b2120a8b6 --- /dev/null +++ b/desks/usher/mar/mime.hoon @@ -0,0 +1 @@ +../../../urbit/pkg/base-dev/mar/mime.hoon \ No newline at end of file diff --git a/desks/usher/mar/ship.hoon b/desks/usher/mar/ship.hoon new file mode 120000 index 0000000000..6c01c7d9e1 --- /dev/null +++ b/desks/usher/mar/ship.hoon @@ -0,0 +1 @@ +../../../urbit/pkg/base-dev/mar/ship.hoon \ No newline at end of file diff --git a/desks/usher/sur/verb.hoon b/desks/usher/sur/verb.hoon new file mode 120000 index 0000000000..1df2c10acf --- /dev/null +++ b/desks/usher/sur/verb.hoon @@ -0,0 +1 @@ +../../../urbit/pkg/base-dev/sur/verb.hoon \ No newline at end of file diff --git a/desks/usher/sys.kelvin b/desks/usher/sys.kelvin index 3fbd8589b0..87ac69c723 100644 --- a/desks/usher/sys.kelvin +++ b/desks/usher/sys.kelvin @@ -1 +1 @@ -[%zuse 413] \ No newline at end of file +[%zuse 412] \ No newline at end of file diff --git a/desks/watch-desks.sh b/desks/watch-desks.sh index 163f7057e7..db27728094 100755 --- a/desks/watch-desks.sh +++ b/desks/watch-desks.sh @@ -20,6 +20,6 @@ done echo "Watching for changes to copy to ${PIER}..." while [ 0 ] do - rsync -rL --del --exclude '.*' --exclude '*.sh' --exclude '*.md' --exclude '/usher' * $PIER/ + rsync -rL --del --exclude '.*' --exclude '*.sh' --exclude '*.md' * $PIER/ sleep 0.8 done diff --git a/urbit b/urbit index 77cfbe76c5..330d134a1c 160000 --- a/urbit +++ b/urbit @@ -1 +1 @@ -Subproject commit 77cfbe76c5b516c8b2362b594cf4394a1ec863cc +Subproject commit 330d134a1c81fe7180d0e80cf3792326b88c7319