Add workaround to fix #127

rc_core/src/persist/chat.rs

@@ -132,6 +132,7 @@ pub enum IntercomChatOperation {
     DevMessage,
     DevBroadcast,
     Maintenance,
+    KeybindLockFix, // https://git.ngram.ca/OpenJam/rc-servers/issues/127
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug)]

rc_core/src/persist/user/intercom.rs

@@ -118,6 +118,18 @@ impl super::IntercomUser for super::account_json::UserData {
         }
     }
 
+    async fn trigger_workaround(&self, msg: IntercomWorkaroundMessage, to: Vec<String>) {
+        let send_to_everyone = to.is_empty();
+        let data = IntercomWebServiceMessage {
+            public_ids: to,
+            data: IntercomWebServiceUserMessage::Workaround(msg),
+            everyone: send_to_everyone,
+        };
+        if let Err(e) = self.post_to_intercom(&data, ".oj_services", "messages").await {
+            log::error!("Failed to send intercom workaround message: {}", e);
+        }
+    }
+
     async fn update_custom_game(&self, msg: IntercomLobbyCustomGameDataMessage) {
         let data = IntercomLobbyStateMessage::CustomGame(msg);
         if let Err(e) = self.post_to_intercom(&data, ".oj_lobby", "state").await {
@@ -229,6 +241,7 @@ pub struct IntercomWebServiceMessage {
 pub enum IntercomWebServiceUserMessage {
     DevMessage(IntercomDevMessage),
     Maintenance(IntercomMaintenanceMessage),
+    Workaround(IntercomWorkaroundMessage),
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
@@ -242,6 +255,14 @@ pub struct IntercomMaintenanceMessage {
     pub message: String,
 }
 
+#[derive(Serialize, Deserialize, Clone, Debug)]
+#[serde(tag = "workaround")]
+pub enum IntercomWorkaroundMessage {
+    /// Trigger fix for getting stuck in build mode due to a bad/slow connection
+    /// more info: https://git.ngram.ca/OpenJam/rc-servers/issues/127
+    KeybindLockout { },
+}
+
 pub fn generate_token(salt: &[u8], key: &[u8]) -> String {
     use sha2::{Digest, Sha512};
     let mut hasher = Sha512::new();

rc_core/src/persist/user/traits.rs

@@ -434,6 +434,7 @@ pub trait IntercomUser: CommonUser {
     async fn webservice_listener(&self) -> Result<IntercomListener<super::intercom::IntercomWebServiceUserMessage>, polariton_server::operations::SimpleOpError>;
     async fn show_dev_message(&self, msg: super::intercom::IntercomDevMessage, to: Vec<String>);
     async fn enter_maintenance(&self, msg: super::intercom::IntercomMaintenanceMessage, to: Vec<String>);
+    async fn trigger_workaround(&self, msg: super::intercom::IntercomWorkaroundMessage, to: Vec<String>);
     async fn update_custom_game(&self, msg: super::intercom::IntercomLobbyCustomGameDataMessage);
     async fn update_status(&self, server_name: &str, msg: oj_serdes::ServerStatus);
 }