From 4f29b82fda2fc4287e184f9d0c5bc971525e7d03 Mon Sep 17 00:00:00 2001 From: Hunter Miller Date: Thu, 13 Jun 2024 18:01:58 -0500 Subject: [PATCH 1/2] activity: dont set channel defaults if group has setting --- desk/app/activity.hoon | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/desk/app/activity.hoon b/desk/app/activity.hoon index 17a299333b..fb4585b534 100644 --- a/desk/app/activity.hoon +++ b/desk/app/activity.hoon @@ -227,6 +227,7 @@ (welp writs replies) ++ set-volumes |= =channels:c + =+ .^(=volume:v %gx (scry-path %groups /volume/all/noun)) :: set all existing channels to old default since new default is different =^ checkers cor =/ checkers=(map flag:g $-([ship nest:g] ?)) ~ @@ -247,11 +248,12 @@ .^($-([ship nest] ?) %gx path) [test (~(put by checkers) group test)] =. cor + :: don't set channel default if group above it has setting + ?^ (~(get by area.volume) group) cor %+ adjust [%channel nest group] ?: (can-read our.bowl nest) `(my [%post & |] ~) `mute:a $(entries t.entries) - =+ .^(=volume:v %gx (scry-path %groups /volume/all/noun)) :: set any overrides from previous volume settings =. cor (adjust [%base ~] `(~(got by old-volumes:a) base.volume)) =. cor From 4dd9472df671a8da8383e0f49221e0360d368e06 Mon Sep 17 00:00:00 2001 From: Hunter Miller Date: Fri, 14 Jun 2024 12:15:24 -0500 Subject: [PATCH 2/2] activity: better check Co-authored-by: fang --- desk/app/activity.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desk/app/activity.hoon b/desk/app/activity.hoon index fb4585b534..6ff77076b6 100644 --- a/desk/app/activity.hoon +++ b/desk/app/activity.hoon @@ -249,7 +249,7 @@ [test (~(put by checkers) group test)] =. cor :: don't set channel default if group above it has setting - ?^ (~(get by area.volume) group) cor + ?: (~(has by area.volume) group) cor %+ adjust [%channel nest group] ?: (can-read our.bowl nest) `(my [%post & |] ~) `mute:a