ignore missions starting with $

SynixeContractors · Jun 16, 2024 · 50a7319 · 50a7319
1 parent ace4907
commit 50a7319
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/bin/bot/src/discord/slash/missions.rs b/bin/bot/src/discord/slash/missions.rs
@@ -95,6 +95,9 @@ async fn load(
             .reply("Required option not provided: mission")
             .await;
     };
+    if mission_id.starts_with('$') {
+        return interaction.reply("Mission ID cannot start with `$`").await;
+    }
     let Ok(Ok((Response::FetchMissionList(Ok(missions)), _))) = events_request_2!(
         bootstrap::NC::get().await,
         synixe_events::missions::db,

diff --git a/...c6e7211e888217635f270ecca6dfc26c61be.json → ...3413b4109df34b2a20292dbdd0c6ff37d2d7.json b/...c6e7211e888217635f270ecca6dfc26c61be.json → ...3413b4109df34b2a20292dbdd0c6ff37d2d7.json
diff --git a/bin/db/src/handler/missions.rs b/bin/db/src/handler/missions.rs
@@ -373,7 +373,8 @@ impl Handler for Request {
                         (
                             LOWER(m.name) LIKE LOWER($1) OR
                             LOWER(m.id) LIKE LOWER($1)
-                        )
+                        ) AND
+                        m.id !~ '^\\$'
                     GROUP BY m.id
                     ORDER BY m.name ASC"#,
                     format!("%{search}%"),

diff --git a/bin/executor/src/handler/missions.rs b/bin/executor/src/handler/missions.rs
@@ -128,25 +128,25 @@ impl Handler for Request {
                             } else if let Some(event) = match minutes {
                                 // Warn the mission will change 80 minutes before it starts
                                 78..=82 => {
-                                    if scheduled.mission == "$SUBCON$" {
+                                    if scheduled.mission.starts_with('$') {
                                         None
                                     } else {
                                         Some(synixe_events::missions::publish::Publish::WarnChangeMission {
-                                        id: scheduled.mission.clone(),
-                                        mission_type: scheduled.typ,
-                                    })
+                                            id: scheduled.mission.clone(),
+                                            mission_type: scheduled.typ,
+                                        })
                                     }
                                 }
                                 // Change the mission 70 minutes before it starts
                                 68..=72 => {
-                                    if scheduled.mission == "$SUBCON$" {
+                                    if scheduled.mission.starts_with('$') {
                                         None
                                     } else {
                                         Some(synixe_events::missions::publish::Publish::ChangeMission {
-                                        id: scheduled.mission.clone(),
-                                        mission_type: scheduled.typ,
-                                        reason: "Scheduled".to_string(),
-                                    })
+                                            id: scheduled.mission.clone(),
+                                            mission_type: scheduled.typ,
+                                            reason: "Scheduled".to_string(),
+                                        })
                                     }
                                 }
                                 _ => None,