fix move users still allowing moves to restricted channels (#502)

unixporn · Oct 22, 2023 · 25106f0 · 25106f0
1 parent ca784e2
commit 25106f0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/crates/robbb_commands/src/commands/move_users.rs b/crates/robbb_commands/src/commands/move_users.rs
@@ -21,7 +21,10 @@ pub async fn move_users(
 
     if target_channel == ctx.channel_id() {
         abort_with!("You're already here!")
-    } else if target_channel == config.channel_showcase || target_channel == config.channel_feedback
+    } else if target_channel == config.channel_showcase
+        || target_channel == config.channel_feedback
+        || target_channel == config.channel_announcements
+        || target_channel == config.channel_rules
     {
         abort_with!("I won't move you there");
     }

diff --git a/crates/robbb_util/src/config.rs b/crates/robbb_util/src/config.rs
@@ -20,6 +20,8 @@ pub struct Config {
     pub roles_color: Vec<RoleId>,
 
     pub category_mod_private: ChannelId,
+    pub channel_announcements: ChannelId,
+    pub channel_rules: ChannelId,
     pub channel_showcase: ChannelId,
     pub channel_feedback: ChannelId,
     pub channel_modlog: ChannelId,
@@ -50,6 +52,8 @@ impl Config {
                 .map(|x| Ok(RoleId(x.trim().parse()?)))
                 .collect::<anyhow::Result<_>>()?,
             category_mod_private: ChannelId(parse_required_env_var("CATEGORY_MOD_PRIVATE")?),
+            channel_announcements: ChannelId(parse_required_env_var("CHANNEL_ANNOUNCEMENTS")?),
+            channel_rules: ChannelId(parse_required_env_var("CHANNEL_RULES")?),
             channel_showcase: ChannelId(parse_required_env_var("CHANNEL_SHOWCASE")?),
             channel_feedback: ChannelId(parse_required_env_var("CHANNEL_FEEDBACK")?),
             channel_modlog: ChannelId(parse_required_env_var("CHANNEL_MODLOG")?),

diff --git a/flake.nix b/flake.nix
@@ -72,7 +72,7 @@
             export $(cat .env)
           '';
           # Extra inputs can be added here
-          packages = commonArgs.nativeBuildInputs ++ commonArgs.buildInputs;
+          packages = [ pkgs.darwin.apple_sdk.frameworks.Security ] ++ commonArgs.nativeBuildInputs ++ commonArgs.buildInputs;
         };
       });
 }
diff --git a/gen-env.sh b/gen-env.sh
@@ -19,7 +19,7 @@ EOF
 
 # clean the env
 unset mod intern mute col start
-unset feedback showcase techsupport modcat botstuff modlog botmod botlog humantrafficking polls
+unset announcements rules feedback showcase techsupport modcat botstuff modlog botmod botlog humantrafficking polls
 
 
 #
@@ -65,6 +65,8 @@ channels=$(curl -s -X GET \
 # note: posix sh doesn't support escape codes in variables
 while IFS=$(printf '\t') read -r id name; do
 	case $name in
+		announcements)   announcements=$id;;
+		rules)           rules=$id;;
 		server-feedback) feedback=$id;;
 		showcase)        showcase=$id;;
 		tech-support)    techsupport=$id;;
@@ -91,6 +93,8 @@ export ROLE_HELPER=$intern
 export ROLE_MUTE=$mute
 export ROLES_COLOR=$col
 export CATEGORY_MOD_PRIVATE=$modcat
+export CHANNEL_ANNOUNCEMENTS=$announcements
+export CHANNEL_RULES=$rules
 export CHANNEL_SHOWCASE=$showcase
 export CHANNEL_FEEDBACK=$feedback
 export CHANNEL_MODLOG=$modlog