Skip to content

marks: patch up #5764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fang- merged 5 commits into from
Apr 29, 2026
Merged

marks: patch up #5764

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f0279b
marks: patch up
Fang- Apr 22, 2026
4249741
Merge branch 'develop' into m/mark-fixes
Fang- Apr 24, 2026
5ee91ca
marks: remove old, vestigial marks
Fang- Apr 29, 2026
47bca44
summarize: remove codepath for old groups
Fang- Apr 29, 2026
f6518f6
Merge branch 'develop' into m/mark-fixes
Fang- Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion desk/mar/activity/feed-init.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
--
++ grab
|%
++ noun [all=feed:v4:av mentions=feed:v4:av replies=feed:v4:av]
++ noun ,[all=feed:v4:av mentions=feed:v4:av replies=feed:v4:av]
--
--
2 changes: 1 addition & 1 deletion desk/mar/activity/summary-pairs-4.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
--
++ grab
|%
++ noun (list [source:v8:av activity-summary:v8:av])
++ noun (list ,[source:v8:av activity-summary:v8:av])
--
--
2 changes: 1 addition & 1 deletion desk/mar/broadcaster/action.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
+$ action
$% [%add-cohort cohort=@t targets=(set ship)]
[%del-cohort cohort=@t targets=(set ship)] :: ~ for full deletion
[%broadcast cohort=@t =story:s:d:c]
[%broadcast cohort=@t =story:s:dv:c]
==
--
|_ =action
Expand Down
2 changes: 1 addition & 1 deletion desk/mar/chat/block-ship.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
--
++ grab
|%
++ noun ship
++ noun ship:c
++ json block-ship:dejs:j
--
--
2 changes: 2 additions & 0 deletions desk/mar/chat/negotiate.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
++ grow
|%
++ noun who
++ ship who
--
++ grab
|%
++ noun @p
++ ship same
++ json (su:dejs:format ;~(pfix sig fed:ag))
--
--
2 changes: 1 addition & 1 deletion desk/mar/chat/unblock-ship.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
--
++ grab
|%
++ noun ship
++ noun ^ship
++ json unblock-ship:dejs:j
--
--
2 changes: 1 addition & 1 deletion desk/mar/chat/writs.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
++ grow
Comment thread
Fang- marked this conversation as resolved.
Outdated
|%
++ noun writs
++ json (writs:enjs:j writs)
++ json (writs:v7:enjs:j writs) ::REVIEW
--
++ grab
|%
Expand Down
2 changes: 1 addition & 1 deletion desk/mar/contact/changed-pages.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
--
++ grab
|%
++ noun (map kip:c (unit page:c))
++ noun (map kip:c ,[(unit contact:c) (unit contact:c)])
--
--
2 changes: 2 additions & 0 deletions desk/mar/emojimart.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
[n=@ a=@ b=@ c=@ d=@ e=@] :: neutral & with skin tones
--
|_ e=(map @t mote)
++ grad %noun
++ grab
|%
++ noun (map @t mote)
++ jam (cork cue (map @t mote))
--
++ grow
Expand Down
2 changes: 1 addition & 1 deletion desk/mar/group/create.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
++ grab
Comment thread
Fang- marked this conversation as resolved.
Outdated
|%
++ noun create:v7:gv
++ json create:v7:dejs:j
++ json |=(^json *create:v7:gv) ::TODO REVIEW create:v7:dejs:j doesn't exist
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot Apr 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Decode group-create JSON instead of returning default noun

grab now defines ++ json as |=(^json *create:v7:gv) which ignores the incoming JSON payload and always returns the bunt/default create:v7:gv value. In any path that decodes %group-create JSON through this mark, user-supplied fields (name, metadata, members, etc.) are dropped, so downstream logic receives incorrect data and can create the wrong group state or fail validation unexpectedly.

Useful? React with 👍 / 👎.

--
--
4 changes: 2 additions & 2 deletions desk/mar/group/init-0.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/- gv=groups-ver
/+ j=groups-json
|_ =init:zer:old:gv
|_ =init:v0:gv
++ grad %noun
++ grow
|%
++ noun init
--
++ grab
|%
++ noun init:zer:old:gv
++ noun init:v0:gv
--
--
6 changes: 3 additions & 3 deletions desk/mar/group/invites-1.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/- gv=groups-ver
Comment thread
Fang- marked this conversation as resolved.
Outdated
/+ gj=groups-json
|_ =invites:v7:gv
|_ invites=(list invite:v7:gv)
++ grad %noun
++ grow
|%
++ noun invites
++ json (invites:v7:enjs:gvj invites)
++ json a+(turn invites invite:v7:enjs:gj)
--
++ grab
|%
++ noun invites:v7:gv
++ noun (list invite:v7:gv)
--
--
10 changes: 5 additions & 5 deletions desk/mar/group/invites.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/- gv=groups-ver
Comment thread
Fang- marked this conversation as resolved.
Outdated
/+ j=groups-json
|_ invites=(list invite:gv
|_ invites=(list invite:v2:gv) ::REVIEW
++ grad %noun
++ grow
|%
++ noun invite
++ json (invite:enjs:j invite)
++ noun invites
++ json a+(turn invites invite:v2:enjs:j)
--
++ grab
|%
++ noun invite:gv
++ json invite:dejs:j
++ noun (list invite:v2:gv)
++ json (ar:dejs:format invite:v2:dejs:j)
--
--
4 changes: 2 additions & 2 deletions desk/mar/group/preview-update.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/- gv=groups-ver
Comment thread
Fang- marked this conversation as resolved.
Outdated
|_ =preview-update:gv
|_ =preview-update:v7:gv
++ grad %noun
++ grow
|%
++ noun preview-update
--
++ grab
|%
++ noun preview-update:gv
++ noun preview-update:v7:gv
--
--
2 changes: 1 addition & 1 deletion desk/mar/hook/setup-template-args.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
--
++ grab
|%
++ noun [nest:c nest:c]
++ noun ,[nest:c nest:c]
++ json
=, dejs:format
%- ot
Expand Down
2 changes: 1 addition & 1 deletion desk/mar/hook/setup-template.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
--
++ grab
|%
++ noun [=nest:c =template:h]
++ noun ,[=nest:c =template:h]
--
--
2 changes: 1 addition & 1 deletion desk/mar/reel/metadata.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
++ grad %noun
++ grab
|%
++ noun metadata
++ noun metadata:reel
++ json dejs-metadata
--
++ grow
Expand Down
2 changes: 1 addition & 1 deletion desk/mar/reel/undescribe.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
++ grad %noun
++ grab
|%
++ noun (pair cord cord)
++ noun cord
++ json (ot:dejs:format ~[token+so:dejs:format])
--
++ grow
Expand Down
2 changes: 2 additions & 0 deletions desk/mar/sigil.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
/? 310
|_ s=(map cord (list manx))
++ grad %noun
++ grab
|%
++ noun (map cord (list manx))
++ jam (cork cue (map cord (list manx)))
--
++ grow
Expand Down
2 changes: 1 addition & 1 deletion desk/mar/ui/action.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
--
++ grab
|%
++ noun (list whom:u)
++ noun action:u
++ json ui-action:dejs:gj
--
--
8 changes: 4 additions & 4 deletions desk/mar/writ-diff.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/- c=chat
Comment thread
Fang- marked this conversation as resolved.
/- cv=chat-ver
/+ j=chat-json
|_ =diff:writs:c
|_ =diff:writs:v5:cv ::REVIEW unused
++ grad %noun
++ grow
|%
++ noun diff
++ json (writs-diff:enjs:j diff)
++ json (writs-diff:v5:enjs:j diff)
--
++ grab
|%
++ noun diff:writs:c
++ noun diff:writs:v5:cv
--
--
Loading