Database: Add user settings sync entity.

Run cargo fmt.

src/database/entities/message.rs

@@ -1,4 +1,4 @@
-use crate::util::variables::{VAPID_PRIVATE_KEY, USE_JANUARY};
+use crate::util::variables::{USE_JANUARY, VAPID_PRIVATE_KEY};
 use crate::{
     database::*,
     notifications::{events::ClientboundNotification, websocket::is_online},
@@ -297,12 +297,13 @@ impl Message {
         let channel = self.channel.clone();
         ClientboundNotification::MessageDelete {
             id: self.id.clone(),
-            channel: self.channel.clone()
+            channel: self.channel.clone(),
         }
         .publish(channel);
 
         if let Some(attachments) = &self.attachments {
-            let attachment_ids: Vec<String> = attachments.iter().map(|f| f.id.to_string()).collect();
+            let attachment_ids: Vec<String> =
+                attachments.iter().map(|f| f.id.to_string()).collect();
             get_collection("attachments")
                 .update_one(
                     doc! {

src/database/entities/microservice/mod.rs

@@ -0,0 +1,2 @@
+pub mod autumn;
+pub mod january;

src/database/entities/mod.rs

@@ -1,9 +1,11 @@
-mod autumn;
+mod microservice;
 mod channel;
-mod january;
 mod message;
 mod server;
 mod user;
+mod sync;
+
+use microservice::*;
 
 pub use autumn::*;
 pub use channel::*;
@@ -11,3 +13,4 @@ pub use january::*;
 pub use message::*;
 pub use server::*;
 pub use user::*;
+pub use sync::*;

src/database/entities/sync.rs

@@ -0,0 +1,3 @@
+use std::collections::HashMap;
+
+pub type UserSettings = HashMap<String, (i64, String)>;

src/database/entities/user.rs

@@ -4,11 +4,11 @@ use mongodb::{
     bson::{doc, from_document},
     options::FindOptions,
 };
-use serde::{Deserialize, Serialize};
-use validator::Validate;
 use num_enum::TryFromPrimitive;
-use ulid::Ulid;
+use serde::{Deserialize, Serialize};
 use std::ops;
+use ulid::Ulid;
+use validator::Validate;
 
 use crate::database::permissions::user::UserPermissions;
 use crate::database::*;
@@ -65,7 +65,7 @@ pub enum Badges {
     Developer = 1,
     Translator = 2,
     Supporter = 4,
-    EarlyAdopter = 256
+    EarlyAdopter = 256,
 }
 
 impl_op_ex_commutative!(+ |a: &i32, b: &Badges| -> i32 { *a | *b as i32 });

src/database/migrations/scripts.rs

@@ -1,9 +1,12 @@
 use crate::database::{get_collection, get_db};
 
-use log::info;
 use futures::StreamExt;
+use log::info;
+use mongodb::{
+    bson::{doc, from_document},
+    options::FindOptions,
+};
 use serde::{Deserialize, Serialize};
-use mongodb::{bson::{doc, from_document}, options::FindOptions};
 
 #[derive(Serialize, Deserialize)]
 struct MigrationInfo {
@@ -92,34 +95,36 @@ pub async fn run_migrations(revision: i32) -> i32 {
         info!("Running migration [revision 3 / 2021-05-25]: Support multiple file uploads, add channel_unreads and user_settings.");
 
         let messages = get_collection("messages");
-        let mut cursor = messages.find(
+        let mut cursor = messages
-            doc! {
+            .find(
-                "attachment": {
+                doc! {
-                    "$exists": 1
+                    "attachment": {
-                }
+                        "$exists": 1
-            },
+                    }
-            FindOptions::builder()
+                },
-                .projection(doc! {
+                FindOptions::builder()
-                    "_id": 1,
+                    .projection(doc! {
-                    "attachments": [ "$attachment" ]
+                        "_id": 1,
-                })
+                        "attachments": [ "$attachment" ]
-                .build()
+                    })
-        )
+                    .build(),
-        .await
+            )
-        .expect("Failed to fetch messages.");
+            .await
+            .expect("Failed to fetch messages.");
 
         while let Some(result) = cursor.next().await {
             let doc = result.unwrap();
             let id = doc.get_str("_id").unwrap();
             let attachments = doc.get_array("attachments").unwrap();
 
-            messages.update_one(
+            messages
-                doc! { "_id": id },
+                .update_one(
-                doc! { "$unset": { "attachment": 1 }, "$set": { "attachments": attachments } },
+                    doc! { "_id": id },
-                None
+                    doc! { "$unset": { "attachment": 1 }, "$set": { "attachments": attachments } },
-            )
+                    None,
-            .await
+                )
-            .unwrap();
+                .await
+                .unwrap();
         }
 
         get_db()

src/routes/channels/edit_channel.rs

@@ -111,7 +111,10 @@ pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<()> {
                 Message::create(
                     "00000000000000000000000000".to_string(),
                     id.clone(),
-                    Content::SystemMessage(SystemMessage::ChannelRenamed { name, by: user.id.clone() }),
+                    Content::SystemMessage(SystemMessage::ChannelRenamed {
+                        name,
+                        by: user.id.clone(),
+                    }),
                 )
                 .publish(&target)
                 .await
@@ -122,7 +125,9 @@ pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<()> {
                 Message::create(
                     "00000000000000000000000000".to_string(),
                     id.clone(),
-                    Content::SystemMessage(SystemMessage::ChannelDescriptionChanged { by: user.id.clone() }),
+                    Content::SystemMessage(SystemMessage::ChannelDescriptionChanged {
+                        by: user.id.clone(),
+                    }),
                 )
                 .publish(&target)
                 .await

src/routes/channels/message_query.rs

@@ -28,7 +28,7 @@ pub struct Options {
     #[validate(length(min = 26, max = 26))]
     after: Option<String>,
     sort: Option<Sort>,
-    include_users: Option<bool>
+    include_users: Option<bool>,
 }
 
 #[get("/<target>/messages?<options..>")]

src/routes/channels/message_send.rs

@@ -59,7 +59,9 @@ pub async fn req(user: User, target: Ref, message: Json<Data>) -> Result<JsonVal
 
     let id = Ulid::new().to_string();
     let attachments = if let Some(attachment_id) = &message.attachment {
-        Some(vec![ File::find_and_use(attachment_id, "attachments", "message", &id).await? ])
+        Some(vec![
+            File::find_and_use(attachment_id, "attachments", "message", &id).await?,
+        ])
     } else {
         None
     };

src/routes/root.rs

@@ -1,6 +1,7 @@
 use crate::util::variables::{
-    APP_URL, JANUARY_URL, AUTUMN_URL, DISABLE_REGISTRATION, EXTERNAL_WS_URL, HCAPTCHA_SITEKEY, INVITE_ONLY,
+    APP_URL, AUTUMN_URL, DISABLE_REGISTRATION, EXTERNAL_WS_URL, HCAPTCHA_SITEKEY, INVITE_ONLY,
-    USE_AUTUMN, USE_JANUARY, USE_EMAIL, USE_HCAPTCHA, USE_VOSO, VAPID_PUBLIC_KEY, VOSO_URL, VOSO_WS_HOST,
+    JANUARY_URL, USE_AUTUMN, USE_EMAIL, USE_HCAPTCHA, USE_JANUARY, USE_VOSO, VAPID_PUBLIC_KEY,
+    VOSO_URL, VOSO_WS_HOST,
 };
 
 use mongodb::bson::doc;

src/util/result.rs

@@ -29,13 +29,17 @@ pub enum Error {
     CannotEditMessage,
     EmptyMessage,
     CannotRemoveYourself,
-    GroupTooLarge { max: usize },
+    GroupTooLarge {
+        max: usize,
+    },
     AlreadyInGroup,
     NotInGroup,
 
     // ? General errors.
     TooManyIds,
-    FailedValidation { error: ValidationErrors },
+    FailedValidation {
+        error: ValidationErrors,
+    },
     DatabaseError {
         operation: &'static str,
         with: &'static str,