From cddf6991f280008b5af5acfab6a9719bb0cfb7f1 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Mon, 29 Apr 2024 21:34:47 -0700
Subject: [PATCH] remove optional automatic display name emoji

---
 src/api/client_server/account.rs | 7 +------
 src/config/mod.rs                | 6 ------
 src/service/admin/mod.rs         | 7 +------
 src/service/globals/mod.rs       | 4 ----
 4 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/api/client_server/account.rs b/src/api/client_server/account.rs
index 0226abc7..f4dbd280 100644
--- a/src/api/client_server/account.rs
+++ b/src/api/client_server/account.rs
@@ -206,12 +206,7 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
     services().users.create(&user_id, password)?;
 
     // Default to pretty displayname
-    let mut displayname = user_id.localpart().to_owned();
-
-    // If enabled append lightning bolt to display name (default true)
-    if services().globals.enable_lightning_bolt() {
-        displayname.push_str(" ⚡️");
-    }
+    let displayname = user_id.localpart().to_owned();
 
     services()
         .users
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 85df6e6a..4b532f2b 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -25,8 +25,6 @@ pub struct Config {
     pub database_path: String,
     #[serde(default = "default_db_cache_capacity_mb")]
     pub db_cache_capacity_mb: f64,
-    #[serde(default = "true_fn")]
-    pub enable_lightning_bolt: bool,
     #[serde(default = "default_conduit_cache_capacity_modifier")]
     pub conduit_cache_capacity_modifier: f64,
     #[serde(default = "default_rocksdb_max_open_files")]
@@ -140,10 +138,6 @@ impl fmt::Display for Config {
                 &self.max_concurrent_requests.to_string(),
             ),
             ("Allow registration", &self.allow_registration.to_string()),
-            (
-                "Enabled lightning bolt",
-                &self.enable_lightning_bolt.to_string(),
-            ),
             ("Allow encryption", &self.allow_encryption.to_string()),
             ("Allow federation", &self.allow_federation.to_string()),
             ("Allow room creation", &self.allow_room_creation.to_string()),
diff --git a/src/service/admin/mod.rs b/src/service/admin/mod.rs
index 484fc134..9d66863a 100644
--- a/src/service/admin/mod.rs
+++ b/src/service/admin/mod.rs
@@ -619,12 +619,7 @@ impl Service {
                 services().users.create(&user_id, Some(password.as_str()))?;
 
                 // Default to pretty displayname
-                let mut displayname = user_id.localpart().to_owned();
-
-                // If enabled append lightning bolt to display name (default true)
-                if services().globals.enable_lightning_bolt() {
-                    displayname.push_str(" ⚡️");
-                }
+                let displayname = user_id.localpart().to_owned();
 
                 services()
                     .users
diff --git a/src/service/globals/mod.rs b/src/service/globals/mod.rs
index 3088ac9b..6429a2af 100644
--- a/src/service/globals/mod.rs
+++ b/src/service/globals/mod.rs
@@ -299,10 +299,6 @@ impl Service {
         self.config.default_room_version.clone()
     }
 
-    pub fn enable_lightning_bolt(&self) -> bool {
-        self.config.enable_lightning_bolt
-    }
-
     pub fn trusted_servers(&self) -> &[OwnedServerName] {
         &self.config.trusted_servers
     }