Merge branch 'lightning_bolt_option' into 'next'

Lightning bolt optional

See merge request famedly/conduit!366

conduit-example.toml

@@ -40,6 +40,9 @@ allow_registration = true
 
 allow_federation = true
 
+# Enable the display name lightning bolt on registration.
+enable_lightning_bolt = true
+
 trusted_servers = ["matrix.org"]
 
 #max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time

src/client_server/account.rs

@@ -1,10 +1,7 @@
-use std::sync::Arc;
-
 use super::{DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH};
 use crate::{
     database::{admin::make_user_admin, DatabaseGuard},
-    pdu::PduBuilder,
-    utils, Database, Error, Result, Ruma,
+    utils, Error, Result, Ruma,
 };
 use ruma::{
     api::client::{
@@ -15,16 +12,9 @@ use ruma::{
         error::ErrorKind,
         uiaa::{AuthFlow, AuthType, UiaaInfo},
     },
-    events::{
-        room::{
-            member::{MembershipState, RoomMemberEventContent},
-            message::RoomMessageEventContent,
-        },
-        GlobalAccountDataEventType, RoomEventType,
-    },
+    events::{room::message::RoomMessageEventContent, GlobalAccountDataEventType},
     push, UserId,
 };
-use serde_json::value::to_raw_value;
 use tracing::{info, warn};
 
 use register::RegistrationKind;
@@ -181,7 +171,13 @@ pub async fn register_route(
     db.users.create(&user_id, password)?;
 
     // Default to pretty displayname
-    let displayname = format!("{} ⚡️", user_id.localpart());
+    let mut displayname = user_id.localpart().to_owned();
+
+    // If enabled append lightning bolt to display name (default true)
+    if db.globals.enable_lightning_bolt() {
+        displayname.push_str(" ⚡️");
+    }
+
     db.users
         .set_displayname(&user_id, Some(displayname.clone()))?;
 

src/config.rs

@@ -26,6 +26,8 @@ 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")]
@@ -135,6 +137,10 @@ 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()),

src/database/admin.rs

@@ -598,7 +598,13 @@ async fn process_admin_command(
             db.users.create(&user_id, Some(password.as_str()))?;
 
             // Default to pretty displayname
-            let displayname = format!("{} ⚡️", user_id.localpart());
+            let mut displayname = user_id.localpart().to_owned();
+
+            // If enabled append lightning bolt to display name (default true)
+            if db.globals.enable_lightning_bolt() {
+                displayname.push_str(" ⚡️");
+            }
+
             db.users
                 .set_displayname(&user_id, Some(displayname.clone()))?;
 

src/database/globals.rs

@@ -267,6 +267,10 @@ impl Globals {
         self.config.default_room_version.clone()
     }
 
+    pub fn enable_lightning_bolt(&self) -> bool {
+        self.config.enable_lightning_bolt
+    }
+
     pub fn trusted_servers(&self) -> &[Box<ServerName>] {
         &self.config.trusted_servers
     }