From f8e214cc8d90c56655c889a316d514cec7a3706a Mon Sep 17 00:00:00 2001
From: Chris Beck <beck.ct@gmail.com>
Date: Sat, 6 Dec 2025 10:18:01 -0700
Subject: [PATCH] refactor to move functions onto signal-trust-set

---
 signal-gateway/src/gateway/mod.rs              | 16 ++--------------
 signal-gateway/src/gateway/signal_trust_set.rs |  2 +-
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/signal-gateway/src/gateway/mod.rs b/signal-gateway/src/gateway/mod.rs
index 1f93856..cf9f9b8 100644
--- a/signal-gateway/src/gateway/mod.rs
+++ b/signal-gateway/src/gateway/mod.rs
@@ -77,18 +77,6 @@ pub struct GatewayConfig {
     pub log_handler: LogHandlerConfig,
 }
 
-impl GatewayConfig {
-    /// Check if a UUID is a registered admin
-    pub fn is_admin(&self, uuid: &str) -> bool {
-        self.admin_signal_uuids.contains(uuid)
-    }
-
-    /// Get all admin UUIDs
-    pub fn admin_uuids(&self) -> Vec<String> {
-        self.admin_signal_uuids.uuids().cloned().collect()
-    }
-}
-
 /// Wrapper for parsing gateway commands
 #[derive(Clone, Debug, Conf)]
 struct GatewayCommandWrapper {
@@ -443,7 +431,7 @@ impl Gateway {
                                 if let Some(group_id) = &self.config.alert_group_id {
                                     MessageTarget::Group(group_id.clone())
                                 } else {
-                                    MessageTarget::Recipients(self.config.admin_uuids())
+                                    MessageTarget::Recipients(self.config.admin_signal_uuids.uuids().cloned().collect())
                                 }
                             }
                         };
@@ -480,7 +468,7 @@ impl Gateway {
                             let from_group = data_message.group_info.as_ref().map(|g| g.group_id.clone());
 
                             // Check if sender is an admin
-                            if !self.config.is_admin(&msg.envelope.source_uuid) {
+                            if !self.config.admin_signal_uuids.contains(&msg.envelope.source_uuid) {
                                 warn!("Ignoring message from non-admin: {msg:?}");
                                 continue;
                             }
diff --git a/signal-gateway/src/gateway/signal_trust_set.rs b/signal-gateway/src/gateway/signal_trust_set.rs
index 523979f..f325b4c 100644
--- a/signal-gateway/src/gateway/signal_trust_set.rs
+++ b/signal-gateway/src/gateway/signal_trust_set.rs
@@ -30,7 +30,7 @@ impl SignalTrustSet {
         self.map.contains_key(uuid)
     }
 
-    /// Get all admin UUIDs.
+    /// Get all UUIDs as an iterator.
     pub fn uuids(&self) -> impl Iterator<Item = &String> {
         self.map.keys()
     }