chore: merge local branch 'feat/discoverability'

feat: add new index

.github/workflows/docker.yml

@@ -101,41 +101,3 @@ jobs:
               run: |
                rm -rf /tmp/.buildx-cache
                mv /tmp/.buildx-cache-new /tmp/.buildx-cache
-
-    publish_arm64:
-        needs: [test]
-        runs-on: ubuntu-latest
-        if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags')
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-              with:
-                  submodules: "recursive"
-            - name: Set up QEMU
-              uses: docker/setup-qemu-action@v1
-            - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v1
-            - name: Docker meta
-              id: meta
-              uses: docker/metadata-action@v3
-              with:
-                  images: revoltchat/server, ghcr.io/revoltchat/server
-            - name: Login to DockerHub
-              uses: docker/login-action@v1
-              with:
-                  username: ${{ secrets.DOCKERHUB_USERNAME }}
-                  password: ${{ secrets.DOCKERHUB_TOKEN }}
-            - name: Login to Github Container Registry
-              uses: docker/login-action@v1
-              with:
-                  registry: ghcr.io
-                  username: ${{ github.actor }}
-                  password: ${{ secrets.GITHUB_TOKEN }}
-            - name: Build and publish
-              uses: docker/build-push-action@v2
-              with:
-                  context: .
-                  push: true
-                  platforms: linux/arm64
-                  tags: ${{ steps.meta.outputs.tags }}
-                  labels: ${{ steps.meta.outputs.labels }}

.github/workflows/triage_issue.yml

@@ -0,0 +1,49 @@
+name: Add Issue to Board
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  track_issue:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get project data
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+        run: |
+          gh api graphql -f query='
+            query {
+              organization(login: "revoltchat"){
+                projectNext(number: 3) {
+                  id
+                  fields(first:20) {
+                    nodes {
+                      id
+                      name
+                      settings
+                    }
+                  }
+                }
+              }
+            }' > project_data.json
+
+          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
+          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
+          echo 'TODO_OPTION_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Todo") |.id' project_data.json) >> $GITHUB_ENV
+
+      - name: Add issue to project
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+          ISSUE_ID: ${{ github.event.issue.node_id }}
+        run: |
+          item_id="$( gh api graphql -f query='
+            mutation($project:ID!, $issue:ID!) {
+              addProjectNextItem(input: {projectId: $project, contentId: $issue}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
+          
+          echo 'ITEM_ID='$item_id >> $GITHUB_ENV

.github/workflows/triage_pr.yml

@@ -0,0 +1,72 @@
+name: Add PR to Board
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, ready_for_review, review_requested]
+
+jobs:
+  track_pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get project data
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+        run: |
+          gh api graphql -f query='
+            query {
+              organization(login: "revoltchat"){
+                projectNext(number: 3) {
+                  id
+                  fields(first:20) {
+                    nodes {
+                      id
+                      name
+                      settings
+                    }
+                  }
+                }
+              }
+            }' > project_data.json
+
+          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
+          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
+          echo 'INCOMING_OPTION_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Incoming PRs") |.id' project_data.json) >> $GITHUB_ENV
+
+      - name: Add PR to project
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+          PR_ID: ${{ github.event.pull_request.node_id }}
+        run: |
+          item_id="$( gh api graphql -f query='
+            mutation($project:ID!, $pr:ID!) {
+              addProjectNextItem(input: {projectId: $project, contentId: $pr}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }' -f project=$PROJECT_ID -f pr=$PR_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
+          
+          echo 'ITEM_ID='$item_id >> $GITHUB_ENV
+
+      - name: Set fields
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+        run: |
+          gh api graphql -f query='
+            mutation (
+              $project: ID!
+              $item: ID!
+              $status_field: ID!
+              $status_value: String!
+            ) {
+              set_status: updateProjectNextItemField(input: {
+                projectId: $project
+                itemId: $item
+                fieldId: $status_field
+                value: $status_value
+              }) {
+                projectNextItem {
+                  id
+                  }
+              }
+            }' -f project=$PROJECT_ID -f item=$ITEM_ID -f status_field=$STATUS_FIELD_ID -f status_value=${{ env.INCOMING_OPTION_ID }} --silent

Cargo.lock

@@ -2577,7 +2577,7 @@ dependencies = [
 [[package]]
 name = "rauth"
 version = "1.0.0"
-source = "git+https://github.com/insertish/rauth?rev=775a6f3ffb9ffc0e382af32fac2924e9a707e890#775a6f3ffb9ffc0e382af32fac2924e9a707e890"
+source = "git+https://github.com/insertish/rauth?rev=157263ffcbd6cb1073e288b215db227634c4c29a#157263ffcbd6cb1073e288b215db227634c4c29a"
 dependencies = [
  "async-std",
  "base32",
@@ -2852,7 +2852,7 @@ dependencies = [
 [[package]]
 name = "rmp"
 version = "0.8.10"
-source = "git+https://github.com/3Hren/msgpack-rust?rev=5bf2c24203ad422233cf35b7b7bfad9f7e811814#5bf2c24203ad422233cf35b7b7bfad9f7e811814"
+source = "git+https://github.com/insertish/msgpack-rust?rev=5bf2c24203ad422233cf35b7b7bfad9f7e811814#5bf2c24203ad422233cf35b7b7bfad9f7e811814"
 dependencies = [
  "byteorder",
  "num-traits",
@@ -2861,7 +2861,7 @@ dependencies = [
 [[package]]
 name = "rmp-serde"
 version = "0.15.5"
-source = "git+https://github.com/3Hren/msgpack-rust?rev=5bf2c24203ad422233cf35b7b7bfad9f7e811814#5bf2c24203ad422233cf35b7b7bfad9f7e811814"
+source = "git+https://github.com/insertish/msgpack-rust?rev=5bf2c24203ad422233cf35b7b7bfad9f7e811814#5bf2c24203ad422233cf35b7b7bfad9f7e811814"
 dependencies = [
  "byteorder",
  "rmp",

Cargo.toml

@@ -37,7 +37,7 @@ base64 = "0.13.0"
 serde_json = "1.0.57"
 serde = { version = "1.0.115", features = ["derive"] }
 validator = { version = "0.11", features = ["derive"] }
-rmp-serde = { git = "https://github.com/3Hren/msgpack-rust", rev = "5bf2c24203ad422233cf35b7b7bfad9f7e811814" }
+rmp-serde = { git = "https://github.com/insertish/msgpack-rust", rev = "5bf2c24203ad422233cf35b7b7bfad9f7e811814" }
 
 # async
 futures = "0.3.8"
@@ -50,7 +50,7 @@ async-std = { version = "1.8.0", features = ["tokio1", "tokio02", "attributes"]
 web-push = "0.7.2"
 many-to-many = "0.1.2"
 lettre = "0.10.0-alpha.4"
-rauth = { git = "https://github.com/insertish/rauth", rev = "775a6f3ffb9ffc0e382af32fac2924e9a707e890" }
+rauth = { git = "https://github.com/insertish/rauth", rev = "157263ffcbd6cb1073e288b215db227634c4c29a" }
 hive_pubsub = { git = "https://gitlab.insrt.uk/insert/hive", rev = "b0f3db9d33990530d7640d4bbb309c8d9eb5c0cf", features = ["redis-backend"] }
 
 # redis

set_version.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-export version=0.5.3-alpha.7
+export version=0.5.3-alpha.13
 echo "pub const VERSION: &str = \"${version}\";" > src/version.rs

src/database/entities/bots.rs

@@ -1,5 +1,9 @@
 use serde::{Serialize, Deserialize};
 
+pub fn if_false(t: &bool) -> bool {
+    !t
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Bot {
     #[serde(rename = "_id")]
@@ -7,6 +11,10 @@ pub struct Bot {
     pub owner: String,
     pub token: String,
     pub public: bool,
+    #[serde(skip_serializing_if = "if_false", default)]
+    pub analytics: bool,
+    #[serde(skip_serializing_if = "if_false", default)]
+    pub discoverable: bool,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub interactions_url: Option<String>,
 }

src/database/entities/message.rs

@@ -1,4 +1,4 @@
-use crate::util::variables::{USE_JANUARY, PUBLIC_URL};
+use crate::util::variables::{USE_JANUARY, PUBLIC_URL, APP_URL};
 use crate::{
     database::*,
     notifications::{events::ClientboundNotification, websocket::is_online},
@@ -9,6 +9,8 @@ use mongodb::bson::{doc, to_bson, DateTime};
 use rocket::serde::json::Value;
 use serde::{Deserialize, Serialize};
 use ulid::Ulid;
+use validator::Validate;
+use std::collections::HashSet;
 use std::time::SystemTime;
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -20,6 +22,7 @@ pub struct PushNotification {
     pub body: String,
     pub tag: String,
     pub timestamp: u64,
+    pub url: String,
 }
 
 impl PushNotification {
@@ -63,6 +66,7 @@ impl PushNotification {
             body,
             tag: channel.id().to_string(),
             timestamp,
+            url: format!("{}/channel/{}/{}", *APP_URL, channel.id(), msg.id),
         }
     }
 }
@@ -123,6 +127,7 @@ impl Content {
             target.id().to_string(),
             self,
             None,
+            None,
             None
         )
         .publish(&target, false)
@@ -130,6 +135,16 @@ impl Content {
     }
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone, Validate)]
+pub struct Masquerade {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[validate(length(min = 1, max = 32))]
+    name: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[validate(length(min = 1, max = 128))]
+    avatar: Option<String>
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Message {
     #[serde(rename = "_id")]
@@ -149,7 +164,9 @@ pub struct Message {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub mentions: Option<Vec<String>>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub replies: Option<Vec<String>>
+    pub replies: Option<Vec<String>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub masquerade: Option<Masquerade>
 }
 
 impl Message {
@@ -159,6 +176,7 @@ impl Message {
         content: Content,
         mentions: Option<Vec<String>>,
         replies: Option<Vec<String>>,
+        masquerade: Option<Masquerade>,
     ) -> Message {
         Message {
             id: Ulid::new().to_string(),
@@ -170,7 +188,8 @@ impl Message {
             edited: None,
             embeds: None,
             mentions,
-            replies
+            replies,
+            masquerade
         }
     }
 
@@ -322,4 +341,23 @@ impl Message {
 
         Ok(())
     }
+
+    pub fn add_associated_user_ids(&self, ids: &mut HashSet<String>) {
+        ids.insert(self.author.clone());
+
+        if let Content::SystemMessage(sys) = &self.content {
+            match sys {
+                SystemMessage::Text { .. } => {},
+                SystemMessage::UserAdded { id, by } => { ids.insert(id.clone()); ids.insert(by.clone()); },
+                SystemMessage::UserRemove { id, by } => { ids.insert(id.clone()); ids.insert(by.clone()); },
+                SystemMessage::UserJoined { id } => { ids.insert(id.clone()); },
+                SystemMessage::UserLeft { id } => { ids.insert(id.clone()); },
+                SystemMessage::UserKicked { id } => { ids.insert(id.clone()); },
+                SystemMessage::UserBanned { id } => { ids.insert(id.clone()); },
+                SystemMessage::ChannelRenamed { by, .. } => { ids.insert(by.clone()); },
+                SystemMessage::ChannelDescriptionChanged { by } => { ids.insert(by.clone()); },
+                SystemMessage::ChannelIconChanged { by } => { ids.insert(by.clone()); }
+            }
+        }
+    }
 }

src/database/entities/server.rs

@@ -110,7 +110,11 @@ pub struct Server {
     pub flags: Option<i32>,
 
     #[serde(skip_serializing_if = "if_false", default)]
-    pub nsfw: bool
+    pub nsfw: bool,
+    #[serde(skip_serializing_if = "if_false", default)]
+    pub analytics: bool,
+    #[serde(skip_serializing_if = "if_false", default)]
+    pub discoverable: bool
 }
 
 impl Server {
@@ -232,6 +236,30 @@ impl Server {
             .collect::<Vec<Member>>())
     }
 
+    pub async fn fetch_members_with_ids(id: &str, ids: &Vec<String>) -> Result<Vec<Member>> {
+        Ok(get_collection("server_members")
+            .find(
+                doc! {
+                    "_id.server": id,
+                    "_id.user": {
+                        "$in": ids
+                    }
+                },
+                None,
+            )
+            .await
+            .map_err(|_| Error::DatabaseError {
+                operation: "find",
+                with: "server_members",
+            })?
+            .filter_map(async move |s| s.ok())
+            .collect::<Vec<Document>>()
+            .await
+            .into_iter()
+            .filter_map(|x| from_document(x).ok())
+            .collect::<Vec<Member>>())
+    }
+
     pub async fn fetch_member_ids(id: &str) -> Result<Vec<String>> {
         Ok(get_collection("server_members")
             .find(

src/database/entities/user.rs

@@ -68,8 +68,12 @@ pub enum Badges {
     Translator = 2,
     Supporter = 4,
     ResponsibleDisclosure = 8,
-    RevoltTeam = 16,
+    Founder = 16,
+    PlatformModeration = 32,
+    ActiveSupporter = 64,
+    Paw = 128,
     EarlyAdopter = 256,
+    ReservedRelevantJokeBadge1 = 512
 }
 
 impl_op_ex_commutative!(+ |a: &i32, b: &Badges| -> i32 { *a | *b as i32 });
@@ -214,7 +218,7 @@ impl User {
 
     /// Utility function for fetching multiple users from the perspective of one.
     /// Assumes user has a mutual connection with others.
-    pub async fn fetch_multiple_users(&self, user_ids: Vec<String>) -> Result<Vec<User>> {
+    pub async fn fetch_multiple_users(&self, user_ids: &Vec<String>) -> Result<Vec<User>> {
         let mut users = vec![];
         let mut cursor = get_collection("users")
             .find(

src/database/guards/reference.rs

@@ -58,7 +58,25 @@ impl Ref {
     }
 
     pub async fn fetch_invite(&self) -> Result<Invite> {
-        self.fetch("channel_invites").await
+        match self.fetch("channel_invites").await {
+            Ok(invite) => Ok(invite),
+            Err(err) => {
+                if let Ok(server) = self.fetch::<Server>("servers").await {
+                    if server.discoverable {
+                        return Ok(
+                            Invite::Server {
+                                code: server.id.clone(),
+                                server: server.id,
+                                creator: server.owner,
+                                channel: server.channels[0].clone(),
+                            }
+                        )
+                    }
+                }
+
+                Err(err)
+            }
+        }
     }
 
     pub async fn fetch_bot(&self) -> Result<Bot> {

src/database/migrations/init.rs

@@ -102,6 +102,19 @@ pub async fn create_database() {
                         "content": "text"
                     },
                     "name": "content"
+                },
+                {
+                    "key": {
+                        "channel": 1
+                    },
+                    "name": "channel"
+                },
+                {
+                    "key": {
+                        "channel": 1,
+                        "_id": 1
+                    },
+                    "name": "channel_id_compound"
                 }
             ]
         },
@@ -110,6 +123,56 @@ pub async fn create_database() {
     .await
     .expect("Failed to create message index.");
 
+    get_db()
+    .run_command(
+        doc! {
+            "createIndexes": "channel_unreads",
+            "indexes": [
+                {
+                    "key": {
+                        "_id.channel": 1,
+                        "_id.user": 1,
+                    },
+                    "name": "compound_id"
+                },
+                {
+                    "key": {
+                        "_id.user": 1,
+                    },
+                    "name": "user_id"
+                }
+            ]
+        },
+        None,
+    )
+    .await
+    .expect("Failed to create channel_unreads index.");
+
+    get_db()
+    .run_command(
+        doc! {
+            "createIndexes": "server_members",
+            "indexes": [
+                {
+                    "key": {
+                        "_id.server": 1,
+                        "_id.user": 1,
+                    },
+                    "name": "compound_id"
+                },
+                {
+                    "key": {
+                        "_id.user": 1,
+                    },
+                    "name": "user_id"
+                }
+            ]
+        },
+        None,
+    )
+    .await
+    .expect("Failed to create server_members index.");
+
     db.collection("migrations")
         .insert_one(
             doc! {

src/database/migrations/scripts.rs

@@ -11,7 +11,7 @@ struct MigrationInfo {
     revision: i32,
 }
 
-pub const LATEST_REVISION: i32 = 10;
+pub const LATEST_REVISION: i32 = 13;
 
 pub async fn migrate_database() {
     let migrations = get_collection("migrations");
@@ -372,6 +372,101 @@ pub async fn run_migrations(revision: i32) -> i32 {
             .unwrap();
     }
 
+    if revision <= 11 {
+        info!("Running migration [revision 11 / 2021-11-14]: Add indexes to database.");
+
+        get_db()
+        .run_command(
+            doc! {
+                "createIndexes": "messages",
+                "indexes": [
+                    {
+                        "key": {
+                            "channel": 1
+                        },
+                        "name": "channel"
+                    }
+                ]
+            },
+            None,
+        )
+        .await
+        .expect("Failed to create message index.");
+
+        get_db()
+        .run_command(
+            doc! {
+                "createIndexes": "channel_unreads",
+                "indexes": [
+                    {
+                        "key": {
+                            "_id.channel": 1,
+                            "_id.user": 1,
+                        },
+                        "name": "compound_id"
+                    },
+                    {
+                        "key": {
+                            "_id.user": 1,
+                        },
+                        "name": "user_id"
+                    }
+                ]
+            },
+            None,
+        )
+        .await
+        .expect("Failed to create channel_unreads index.");
+
+        get_db()
+        .run_command(
+            doc! {
+                "createIndexes": "server_members",
+                "indexes": [
+                    {
+                        "key": {
+                            "_id.server": 1,
+                            "_id.user": 1,
+                        },
+                        "name": "compound_id"
+                    },
+                    {
+                        "key": {
+                            "_id.user": 1,
+                        },
+                        "name": "user_id"
+                    }
+                ]
+            },
+            None,
+        )
+        .await
+        .expect("Failed to create server_members index.");
+    }
+
+    if revision <= 12 {
+        info!("Running migration [revision 12 / 2021-11-21]: Add indexes to database.");
+
+        get_db()
+        .run_command(
+            doc! {
+                "createIndexes": "messages",
+                "indexes": [
+                    {
+                        "key": {
+                            "channel": 1,
+                            "_id": 1
+                        },
+                        "name": "channel_id_compound"
+                    }
+                ]
+            },
+            None,
+        )
+        .await
+        .expect("Failed to create message index.");
+    }
+
     // Need to migrate fields on attachments, change `user_id`, `object_id`, etc to `parent`.
 
     // Reminder to update LATEST_REVISION when adding new migrations.

src/database/permissions/channel.rs

@@ -17,6 +17,7 @@ pub enum ChannelPermission {
     InviteOthers = 0b00000000000000000000000000100000,   // 32
     EmbedLinks = 0b00000000000000000000000001000000,     // 64
     UploadFiles = 0b00000000000000000000000010000000,   // 128
+    Masquerade = 0b00000000000000000000000100000000,   // 256
 }
 
 lazy_static! {
@@ -27,7 +28,8 @@ lazy_static! {
         + ChannelPermission::VoiceCall
         + ChannelPermission::InviteOthers
         + ChannelPermission::EmbedLinks
-        + ChannelPermission::UploadFiles;
+        + ChannelPermission::UploadFiles
+        + ChannelPermission::Masquerade;
 
     pub static ref DEFAULT_PERMISSION_SERVER: u32 =
         ChannelPermission::View
@@ -52,6 +54,7 @@ bitfield! {
     pub get_invite_others, _: 26;
     pub get_embed_links, _: 25;
     pub get_upload_files, _: 24;
+    pub get_masquerade, _: 23;
 }
 
 impl<'a> PermissionCalculator<'a> {

src/notifications/payload.rs

@@ -104,7 +104,7 @@ pub async fn generate_ready(mut user: User) -> Result<ClientboundNotification> {
 
     user_ids.remove(&user.id);
     let mut users = if user_ids.len() > 0 {
-        user.fetch_multiple_users(user_ids.into_iter().collect::<Vec<String>>())
+        user.fetch_multiple_users(&user_ids.into_iter().collect::<Vec<String>>())
             .await?
     } else {
         vec![]

src/routes/bots/create.rs

@@ -48,6 +48,8 @@ pub async fn create_bot(user: User, info: Json<Data>) -> Result<Value> {
         owner: user.id.clone(),
         token,
         public: false,
+        analytics: false,
+        discoverable: false,
         interactions_url: None
     };
 

src/routes/bots/edit.rs

@@ -14,6 +14,7 @@ pub struct Data {
     #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
     public: Option<bool>,
+    analytics: Option<bool>,
     interactions_url: Option<String>,
     remove: Option<RemoveBotField>,
 }
@@ -30,6 +31,7 @@ pub async fn edit_bot(user: User, target: Ref, data: Json<Data>) -> Result<Empty
 
     if data.name.is_none()
         && data.public.is_none()
+        && data.analytics.is_none()
         && data.interactions_url.is_none()
         && data.remove.is_none()
     {
@@ -87,6 +89,10 @@ pub async fn edit_bot(user: User, target: Ref, data: Json<Data>) -> Result<Empty
         set.insert("public", public);
     }
 
+    if let Some(analytics) = &data.analytics {
+        set.insert("analytics", analytics);
+    }
+
     if let Some(interactions_url) = &data.interactions_url {
         set.insert("interactions_url", interactions_url);
     }

src/routes/channels/members_fetch.rs

@@ -16,7 +16,7 @@ pub async fn req(user: User, target: Ref) -> Result<Value> {
     }
 
     if let Channel::Group { recipients, .. } = target {
-        Ok(json!(user.fetch_multiple_users(recipients).await?))
+        Ok(json!(user.fetch_multiple_users(&recipients).await?))
     } else {
         Err(Error::InvalidOperation)
     }

src/routes/channels/message_query.rs

@@ -161,18 +161,18 @@ pub async fn req(user: User, target: Ref, options: Options) -> Result<Value> {
     if options.include_users.unwrap_or_else(|| false) {
         let mut ids = HashSet::new();
         for message in &messages {
-            ids.insert(message.author.clone());
+            message.add_associated_user_ids(&mut ids);
         }
 
         ids.remove(&user.id);
         let user_ids = ids.into_iter().collect();
-        let users = user.fetch_multiple_users(user_ids).await?;
+        let users = user.fetch_multiple_users(&user_ids).await?;
 
         if let Channel::TextChannel { server, .. } = target {
             Ok(json!({
                 "messages": messages,
                 "users": users,
-                "members": Server::fetch_members(&server).await?
+                "members": Server::fetch_members_with_ids(&server, &user_ids).await?
             }))
         } else {
             Ok(json!({

src/routes/channels/message_search.rs

@@ -108,10 +108,10 @@ pub async fn req(user: User, target: Ref, options: Json<Options>) -> Result<Valu
                             }
                         },
                         Sort::Latest => doc! {
-                            "_id": -1
+                            "_id": -1 as i32
                         },
                         Sort::Oldest => doc! {
-                            "_id": 1
+                            "_id": 1 as i32
                         }
                     }
                 )
@@ -137,18 +137,18 @@ pub async fn req(user: User, target: Ref, options: Json<Options>) -> Result<Valu
     if options.include_users.unwrap_or_else(|| false) {
         let mut ids = HashSet::new();
         for message in &messages {
-            ids.insert(message.author.clone());
+            message.add_associated_user_ids(&mut ids);
         }
 
         ids.remove(&user.id);
         let user_ids = ids.into_iter().collect();
-        let users = user.fetch_multiple_users(user_ids).await?;
+        let users = user.fetch_multiple_users(&user_ids).await?;
 
         if let Channel::TextChannel { server, .. } = target {
             Ok(json!({
                 "messages": messages,
                 "users": users,
-                "members": Server::fetch_members(&server).await?
+                "members": Server::fetch_members_with_ids(&server, &user_ids).await?
             }))
         } else {
             Ok(json!({

src/routes/channels/message_send.rs

@@ -26,6 +26,8 @@ pub struct Data {
     attachments: Option<Vec<String>>,
     nonce: Option<String>,
     replies: Option<Vec<Reply>>,
+    #[validate]
+    masquerade: Option<Masquerade>
 }
 
 lazy_static! {
@@ -62,11 +64,17 @@ pub async fn message_send(user: User, _r: Ratelimiter, mut idempotency: Idempote
 
     let mut mentions = HashSet::new();
     for capture in RE_MENTION.captures_iter(&message.content) {
-        if let Some(mention) =  capture.get(1) {
+        if let Some(mention) = capture.get(1) {
             mentions.insert(mention.as_str().to_string());
         }
     }
 
+    if let Some(_) = &message.masquerade {
+        if !perm.get_masquerade() {
+            return Err(Error::MissingPermission)
+        }
+    }
+
     let mut replies = HashSet::new();
     if let Some(entries) = message.replies {
         // ! FIXME: move this to app config
@@ -127,6 +135,7 @@ pub async fn message_send(user: User, _r: Ratelimiter, mut idempotency: Idempote
         } else {
             None
         },
+        masquerade: message.masquerade
     };
 
     msg.clone().publish(&target, perm.get_embed_links()).await?;

src/routes/servers/member_fetch_all.rs

@@ -46,6 +46,6 @@ pub async fn req(user: User, target: Ref) -> Result<Value> {
 
     Ok(json!({
         "members": members,
-        "users": user.fetch_multiple_users(member_ids).await?
+        "users": user.fetch_multiple_users(&member_ids).await?
     }))
 }

src/routes/servers/server_create.rs

@@ -66,7 +66,9 @@ pub async fn req(_idempotency: IdempotencyKey, user: User, info: Json<Data>) ->
         banner: None,
 
         flags: None,
-        nsfw: info.nsfw.unwrap_or_default()
+        nsfw: info.nsfw.unwrap_or_default(),
+        analytics: false,
+        discoverable: false,
     };
 
     Channel::TextChannel {

src/routes/servers/server_edit.rs

@@ -18,8 +18,8 @@ pub struct Data {
     categories: Option<Vec<Category>>,
     system_messages: Option<SystemMessageChannels>,
     remove: Option<RemoveServerField>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    nsfw: Option<bool>
+    nsfw: Option<bool>,
+    analytics: Option<bool>,
 }
 
 #[patch("/<target>", data = "<data>")]
@@ -28,7 +28,7 @@ pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<EmptyRespo
     data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    if data.name.is_none() && data.description.is_none() && data.icon.is_none() && data.banner.is_none() && data.remove.is_none() && data.categories.is_none() && data.system_messages.is_none()
+    if data.name.is_none() && data.description.is_none() && data.icon.is_none() && data.banner.is_none() && data.remove.is_none() && data.categories.is_none() && data.system_messages.is_none() && data.nsfw.is_none() && data.analytics.is_none()
     {
         return Ok(EmptyResponse {});
     }
@@ -111,6 +111,10 @@ pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<EmptyRespo
         set.insert("nsfw", nsfw);
     }
 
+    if let Some(analytics) = &data.analytics {
+        set.insert("analytics", analytics);
+    }
+
     let mut operations = doc! {};
     if set.len() > 0 {
         operations.insert("$set", &set);

src/task_queue/task_web_push.rs

@@ -30,7 +30,7 @@ pub async fn run() {
         if let Ok(mut cursor) = Session::find(
             &get_db(),
             doc! {
-                "_id": {
+                "user_id": {
                     "$in": recipients
                 },
                 "subscription": {

src/version.rs

@@ -1 +1 @@
-pub const VERSION: &str = "0.5.3-alpha.7";
+pub const VERSION: &str = "0.5.3-alpha.13";