.dockerignore

-assets
 target
+.mongo
 .env
\ No newline at end of file

.gitignore

 Rocket.toml
 /target
+/target_backup
 **/*.rs.bk
 .mongo
 .env

.vscode/settings.json

+{
+    "rust-analyzer.diagnostics.disabled": [
+        "unresolved-macro-call"
+    ]
+}
\ No newline at end of file

Cargo.toml

 [package]
 name = "revolt"
-version = "0.3.0-alpha"
+# To help optimise CI and Docker builds.
+# Version here is left as 0.0.0, please
+# adjust and run ./set_version.sh instead.
+version = "0.0.0"
 authors = ["Paul Makles <paulmakles@gmail.com>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+regex = "1"
+md5 = "0.7.0"
+log = "0.4.11"
+ulid = "0.4.1"
+rand = "0.7.3"
+time = "0.2.16"
+nanoid = "0.4.0"
+base64 = "0.13.0"
+linkify = "0.6.0"
+dotenv = "0.15.0"
 futures = "0.3.8"
-many-to-many = "0.1.2"
+chrono = "0.4.15"
+num_enum = "0.5.1"
 impl_ops = "0.1.1"
-ctrlc = { version = "3.0", features = ["termination"] }
-async-tungstenite = { version = "0.10.0", features = ["async-std-runtime"] }
-rauth = { git = "https://gitlab.insrt.uk/insert/rauth" }
-async-std = { version = "1.8.0", features = ["tokio02", "attributes"] }
-
-hive_pubsub = { version = "0.4.3", features = ["mongo"] }
-rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", branch = "master" }
-rocket_contrib = { git = "https://github.com/SergioBenitez/Rocket", branch = "master" }
-rocket = { git = "https://github.com/SergioBenitez/Rocket", branch = "master", default-features = false }
-# ! FIXME: Switch to async-std runtime.
-mongodb = { version = "1.1.1", features = ["tokio-runtime"], default-features = false }
-
+web-push = "0.7.2"
 once_cell = "1.4.1"
-dotenv = "0.15.0"
-ulid = "0.4.1"
-
-serde = { version = "1.0.115", features = ["derive"] }
-validator = { version = "0.11", features = ["derive"] }
-snafu = { version = "0.6.9" }
-serde_json = "1.0.57"
 bitfield = "0.13.2"
-
-reqwest = { version = "0.10.8", features = ["json"] }
+env_logger = "0.7.1"
+serde_json = "1.0.57"
 lazy_static = "1.4.0"
-num_enum = "0.5.1"
-chrono = "0.4.15"
-time = "0.2.16"
-rand = "0.7.3"
-regex = "1"
-
+urlencoding = "1.1.1"
+many-to-many = "0.1.2"
 lettre = "0.10.0-alpha.1"
-env_logger = "0.7.1"
-log = "0.4.11"
+reqwest = { version = "0.10.8", features = ["json"] }
+serde = { version = "1.0.115", features = ["derive"] }
+validator = { version = "0.11", features = ["derive"] }
+ctrlc = { version = "3.0", features = ["termination"] }
+hive_pubsub = { version = "0.4.4", features = ["mongo"] }
+async-std = { version = "1.8.0", features = ["tokio02", "attributes"] }
+async-tungstenite = { version = "0.10.0", features = ["async-std-runtime"] }
+rocket_cors = { git = "https://github.com/insertish/rocket_cors", branch = "master" }
+mongodb = { version = "1.1.1", features = ["tokio-runtime"], default-features = false }
+rauth = { git = "https://gitlab.insrt.uk/insert/rauth", rev = "00d3c3dff51cf3242a7d4adda4c5184c97fa2a03" }
+rocket_contrib = { git = "https://github.com/SergioBenitez/Rocket", rev = "031948c1daaa146128d8a435be116476f2adde00" }
+rocket_prometheus = { git = "https://github.com/insertish/rocket_prometheus", rev = "3d825aedb42793246c306a81fe67c5b187948983" }
+rocket = { git = "https://github.com/SergioBenitez/Rocket", rev = "031948c1daaa146128d8a435be116476f2adde00", default-features = false }

Dockerfile

 # Build Stage
-FROM ekidd/rust-musl-builder:nightly-2020-11-19 AS builder
+FROM ekidd/rust-musl-builder:nightly-2021-01-01 AS builder
+USER 0:0
 WORKDIR /home/rust/src
 
 RUN USER=root cargo new --bin revolt
-WORKDIR ./revolt
+WORKDIR /home/rust/src/revolt
 COPY Cargo.toml Cargo.lock ./
+COPY src/bin/dummy.rs ./src/bin/dummy.rs
+RUN cargo build --release --bin dummy
+
+COPY assets/templates ./assets/templates
 COPY src ./src
 RUN cargo build --release
 
 # Bundle Stage
-FROM scratch
+FROM alpine:latest
+RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
 COPY --from=builder /home/rust/src/revolt/target/x86_64-unknown-linux-musl/release/revolt ./
+COPY assets ./assets
 EXPOSE 8000
 EXPOSE 9000
+ENV ROCKET_ADDRESS 0.0.0.0
+ENV ROCKET_PORT 8000
 CMD ["./revolt"]

assets/templates/reset.html

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-GB">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>Reset your password.</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+	
+	<style type="text/css">
+		a[x-apple-data-detectors] {color: inherit !important;}
+	</style>
+	
+</head>
+<body style="margin: 0; padding: 0;">
+	<table border="0" cellpadding="0" cellspacing="0" width="100%">
+		<tr>
+			<td style="padding: 20px 0 30px 0;">
+				
+				<table align="center" border="0" cellpadding="0" cellspacing="0" width="600" style="border-collapse: collapse; border: 1px solid #cccccc;">
+					<tr>
+						<td align="center" bgcolor="#ff4654">
+							<img src="https://revolt.chat/header.png" alt="Revolt logo" width="600" height="168" style="display: block;" />
+						</td>
+					</tr>
+					<tr>
+						<td bgcolor="#ffffff" style="padding: 40px 30px 40px 30px;">
+							<table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
+								<tr>
+									<td style="color: #153643; font-family: Arial, sans-serif;">
+										<h1 style="font-size: 24px; margin: 0;">Reset your password!</h1>
+									</td>
+								</tr>
+								<tr>
+									<td style="color: #153643; font-family: Arial, sans-serif; font-size: 16px; line-height: 24px; padding: 20px 0 0 0;">
+										<p>
+											You requested a password reset, if you didn't perform this action you can safely ignore this email.
+										</p>
+										<p style="margin: 0;">
+											Reset your password by navigating to <a href="{{url}}">{{url}}</a>.
+										</p>
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+					<tr>
+						<td bgcolor="#ff4654" style="padding: 30px 30px;">
+							<table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
+								<tr>
+									<td style="color: #ffffff; font-family: Arial, sans-serif; font-size: 14px;">
+										<p style="margin: 0;">Sent by Revolt. &middot; Website: <a style="color: white;" href="https://revolt.chat">https://revolt.chat</a></p>
+										<p>Revolt is a user-first chat platform built with modern web technologies.</p>
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
\ No newline at end of file

assets/templates/reset_plain.html

+<h2>Reset your password.</h2>
+<p>
+    You requested a password reset, if you did not perform this action you can safely ignore this email.
+</p>
+<p>
+    Reset your password here: <a href="{{url}}">{{url}}</a>
+</p>
+<br/>
+<p>
+   Sent by Revolt. · Website: <a href="https://revolt.chat">https://revolt.chat</a>
+</p>
+<p>
+    Revolt is a user-first chat platform built with modern web technologies.
+</p>
\ No newline at end of file

assets/templates/verify.html

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-GB">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>Verify your account.</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+	
+	<style type="text/css">
+		a[x-apple-data-detectors] {color: inherit !important;}
+	</style>
+	
+</head>
+<body style="margin: 0; padding: 0;">
+	<table border="0" cellpadding="0" cellspacing="0" width="100%">
+		<tr>
+			<td style="padding: 20px 0 30px 0;">
+				
+				<table align="center" border="0" cellpadding="0" cellspacing="0" width="600" style="border-collapse: collapse; border: 1px solid #cccccc;">
+					<tr>
+						<td align="center" bgcolor="#ff4654">
+							<img src="https://revolt.chat/header.png" alt="Revolt logo" width="600" height="168" style="display: block;" />
+						</td>
+					</tr>
+					<tr>
+						<td bgcolor="#ffffff" style="padding: 40px 30px 40px 30px;">
+							<table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
+								<tr>
+									<td style="color: #153643; font-family: Arial, sans-serif;">
+										<h1 style="font-size: 24px; margin: 0;">You're almost there!</h1>
+									</td>
+								</tr>
+								<tr>
+									<td style="color: #153643; font-family: Arial, sans-serif; font-size: 16px; line-height: 24px; padding: 20px 0 0 0;">
+										<p>
+											Verify your account to be able to log into the platform. If you didn't perform this action you can safely ignore this email.
+										</p>
+										<p style="margin: 0;">
+											Please verify your account by navigating to <a href="{{url}}">{{url}}</a>.
+										</p>
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+					<tr>
+						<td bgcolor="#ff4654" style="padding: 30px 30px;">
+							<table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
+								<tr>
+									<td style="color: #ffffff; font-family: Arial, sans-serif; font-size: 14px;">
+										<p style="margin: 0;">Sent by Revolt. &middot; Website: <a style="color: white;" href="https://revolt.chat">https://revolt.chat</a></p>
+										<p>Revolt is a user-first chat platform built with modern web technologies.</p>
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
\ No newline at end of file

assets/templates/verify_plain.html

+<h2>You're almost there!</h2>
+<p>
+    Verify your account to be able to log into the platform.<br/>
+    If you did not perform this action you can safely ignore this email.
+</p>
+<p>
+    Please verify your account here: <a href="{{url}}">{{url}}</a>
+</p>
+<br/>
+<p>
+   Sent by Revolt. · Website: <a href="https://revolt.chat">https://revolt.chat</a>
+</p>
+<p>
+    Revolt is a user-first chat platform built with modern web technologies.
+</p>
\ No newline at end of file

docker-compose.yml

@@ -14,5 +14,5 @@ services:
       - REVOLT_UNSAFE_NO_CAPTCHA=1
     ports:
       - "8000:8000"
-      - "9999:9999"
+      - "9000:9000"
     restart: unless-stopped

publish.sh

+#!/bin/bash
+source set_version.sh
+
+                  docker build -t revoltchat/server:${version} . &&
+docker tag revoltchat/server:${version} revoltchat/server:latest &&
+                        docker push revoltchat/server:${version} &&
+                            docker push revoltchat/server:latest

set_version.sh

+#!/bin/bash
+export version=0.5.1-alpha.21
+echo "pub const VERSION: &str = \"${version}\";" > src/version.rs

src/bin/dummy.rs

+fn main() {}

src/database/entities/channel.rs

-use crate::{
-    database::get_collection,
-    util::result::{Error, Result},
+use std::collections::HashMap;
+
+use crate::database::*;
+use crate::notifications::events::ClientboundNotification;
+use crate::util::result::{Error, Result};
+use futures::StreamExt;
+use mongodb::bson::Bson;
+use mongodb::{
+    bson::{doc, to_document, Document},
+    options::FindOptions,
 };
-use mongodb::bson::to_document;
+use rocket_contrib::json::JsonValue;
 use serde::{Deserialize, Serialize};
 
-/*#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct LastMessage {
+    #[serde(rename = "_id")]
     id: String,
-    user_id: String,
-    short_content: String,
+    author: String,
+    short: String,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Channel {
-    #[serde(rename = "_id")]
-    pub id: String,
-    #[serde(rename = "type")]
-    pub channel_type: u8,
-
-    // DM: whether the DM is active
-    pub active: Option<bool>,
-    // DM + GDM: last message in channel
-    pub last_message: Option<LastMessage>,
-    // DM + GDM: recipients for channel
-    pub recipients: Option<Vec<String>>,
-    // GDM: owner of group
-    pub owner: Option<String>,
-    // GUILD: channel parent
-    pub guild: Option<String>,
-    // GUILD + GDM: channel name
-    pub name: Option<String>,
-    // GUILD + GDM: channel description
-    pub description: Option<String>,
-}*/
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(tag = "type")]
+#[serde(tag = "channel_type")]
 pub enum Channel {
     SavedMessages {
         #[serde(rename = "_id")]
@@ -46,21 +31,94 @@ pub enum Channel {
     DirectMessage {
         #[serde(rename = "_id")]
         id: String,
+
         active: bool,
         recipients: Vec<String>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        last_message: Option<LastMessage>,
     },
     Group {
         #[serde(rename = "_id")]
         id: String,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        nonce: Option<String>,
+
         name: String,
         owner: String,
-        description: String,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        description: Option<String>,
         recipients: Vec<String>,
+
+        #[serde(skip_serializing_if = "Option::is_none")]
+        icon: Option<File>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        last_message: Option<LastMessage>,
+
+        #[serde(skip_serializing_if = "Option::is_none")]
+        permissions: Option<i32>,
+    },
+    TextChannel {
+        #[serde(rename = "_id")]
+        id: String,
+        server: String,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        nonce: Option<String>,
+
+        name: String,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        description: Option<String>,
+
+        #[serde(skip_serializing_if = "Option::is_none")]
+        icon: Option<File>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        last_message: Option<String>,
+
+        #[serde(skip_serializing_if = "Option::is_none")]
+        default_permissions: Option<i32>,
+        #[serde(default = "HashMap::new", skip_serializing_if = "HashMap::is_empty")]
+        role_permissions: HashMap<String, i32>
+    },
+    VoiceChannel {
+        #[serde(rename = "_id")]
+        id: String,
+        server: String,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        nonce: Option<String>,
+
+        name: String,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        description: Option<String>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        icon: Option<File>,
+
+        #[serde(skip_serializing_if = "Option::is_none")]
+        default_permissions: Option<i32>,
+        #[serde(default = "HashMap::new", skip_serializing_if = "HashMap::is_empty")]
+        role_permissions: HashMap<String, i32>
     },
 }
 
 impl Channel {
-    pub async fn save(&self) -> Result<()> {
+    pub fn id(&self) -> &str {
+        match self {
+            Channel::SavedMessages { id, .. }
+            | Channel::DirectMessage { id, .. }
+            | Channel::Group { id, .. }
+            | Channel::TextChannel { id, .. }
+            | Channel::VoiceChannel { id, .. } => id,
+        }
+    }
+    pub fn has_messaging(&self) -> Result<()> {
+        match self {
+            Channel::SavedMessages { .. }
+            | Channel::DirectMessage { .. }
+            | Channel::Group { .. }
+            | Channel::TextChannel { .. } => Ok(()),
+            Channel::VoiceChannel { .. } => Err(Error::InvalidOperation)
+        }
+    }
+
+    pub async fn publish(self) -> Result<()> {
         get_collection("channels")
             .insert_one(
                 to_document(&self).map_err(|_| Error::DatabaseError {
@@ -75,6 +133,215 @@ impl Channel {
                 with: "channel",
             })?;
 
+        let channel_id = self.id().to_string();
+        ClientboundNotification::ChannelCreate(self).publish(channel_id);
+
+        Ok(())
+    }
+
+    pub async fn publish_update(&self, data: JsonValue) -> Result<()> {
+        let id = self.id().to_string();
+        ClientboundNotification::ChannelUpdate {
+            id: id.clone(),
+            data,
+            clear: None,
+        }
+        .publish(id);
+
+        Ok(())
+    }
+
+    pub async fn delete_associated_objects(id: Bson) -> Result<()> {
+        get_collection("channel_invites")
+            .delete_many(
+                doc! {
+                    "channel": id
+                },
+                None,
+            )
+            .await
+            .map(|_| ())
+            .map_err(|_| Error::DatabaseError {
+                operation: "delete_many",
+                with: "channel_invites",
+            })
+    }
+
+    pub async fn delete_messages(id: Bson) -> Result<()> {
+        let messages = get_collection("messages");
+
+        // Delete any unreads.
+        get_collection("channel_unreads")
+            .delete_many(
+                doc! {
+                    "_id.channel": &id
+                },
+                None,
+            )
+            .await
+            .map_err(|_| Error::DatabaseError {
+                operation: "delete_many",
+                with: "channel_unreads",
+            })?;
+
+        // Check if there are any attachments we need to delete.
+        let message_ids = messages
+            .find(
+                doc! {
+                    "channel": &id,
+                    "attachment": {
+                        "$exists": 1
+                    }
+                },
+                FindOptions::builder().projection(doc! { "_id": 1 }).build(),
+            )
+            .await
+            .map_err(|_| Error::DatabaseError {
+                operation: "fetch_many",
+                with: "messages",
+            })?
+            .filter_map(async move |s| s.ok())
+            .collect::<Vec<Document>>()
+            .await
+            .into_iter()
+            .filter_map(|x| x.get_str("_id").ok().map(|x| x.to_string()))
+            .collect::<Vec<String>>();
+
+        // If we found any, mark them as deleted.
+        if message_ids.len() > 0 {
+            get_collection("attachments")
+                .update_many(
+                    doc! {
+                        "message_id": {
+                            "$in": message_ids
+                        }
+                    },
+                    doc! {
+                        "$set": {
+                            "deleted": true
+                        }
+                    },
+                    None,
+                )
+                .await
+                .map_err(|_| Error::DatabaseError {
+                    operation: "update_many",
+                    with: "attachments",
+                })?;
+        }
+
+        // And then delete said messages.
+        messages
+            .delete_many(
+                doc! {
+                    "channel": id
+                },
+                None,
+            )
+            .await
+            .map(|_| ())
+            .map_err(|_| Error::DatabaseError {
+                operation: "delete_many",
+                with: "messages",
+            })
+    }
+
+    pub async fn delete(&self) -> Result<()> {
+        let id = self.id();
+
+        // Delete any invites.
+        Channel::delete_associated_objects(Bson::String(id.to_string())).await?;
+
+        // Delete messages.
+        match &self {
+            Channel::VoiceChannel { .. } => {},
+            _ => {
+                Channel::delete_messages(Bson::String(id.to_string())).await?;
+            }
+        }
+
+        // Remove from server object.
+        match &self {
+            Channel::TextChannel { server, .. }
+            | Channel::VoiceChannel { server, .. } => {
+                let server = Ref::from_unchecked(server.clone()).fetch_server().await?;
+                let mut update = doc! {
+                    "$pull": {
+                        "channels": id
+                    }
+                };
+
+                if let Some(sys) = &server.system_messages {
+                    let mut unset = doc! {};
+
+                    if let Some(cid) = &sys.user_joined {
+                        if id == cid {
+                            unset.insert("system_messages.user_joined", 1);
+                        }
+                    }
+
+                    if let Some(cid) = &sys.user_left {
+                        if id == cid {
+                            unset.insert("system_messages.user_left", 1);
+                        }
+                    }
+
+                    if let Some(cid) = &sys.user_kicked {
+                        if id == cid {
+                            unset.insert("system_messages.user_kicked", 1);
+                        }
+                    }
+
+                    if let Some(cid) = &sys.user_banned {
+                        if id == cid {
+                            unset.insert("system_messages.user_banned", 1);
+                        }
+                    }
+
+                    if unset.len() > 0 {
+                        update.insert("$unset", unset);
+                    }
+                }
+
+                get_collection("servers")
+                    .update_one(
+                        doc! {
+                            "_id": server.id
+                        },
+                        update,
+                        None,
+                    )
+                    .await
+                    .map_err(|_| Error::DatabaseError {
+                        operation: "update_one",
+                        with: "servers",
+                    })?;
+            },
+            _ => {}
+        }
+
+        // Finally, delete the channel object.
+        get_collection("channels")
+            .delete_one(
+                doc! {
+                    "_id": id
+                },
+                None,
+            )
+            .await
+            .map_err(|_| Error::DatabaseError {
+                operation: "delete_one",
+                with: "channel",
+            })?;
+
+        ClientboundNotification::ChannelDelete { id: id.to_string() }.publish(id.to_string());
+
+        if let Channel::Group { icon, .. } = self {
+            if let Some(attachment) = icon {
+                attachment.delete().await?;
+            }
+        }
+
         Ok(())
     }
 }