Fixes mutual connections not being seen and hence requests failing.

Don't unwrap on subscription errors.
Make sure to check that they are friends.
2021-03-30 22:09:36 +01:00 · 2021-03-29 10:14:25 +01:00 · 2021-02-19 15:49:55 +00:00 · 2021-02-19 15:24:19 +00:00 · 2021-02-19 14:50:23 +00:00 · 2021-02-19 14:12:21 +00:00
45 changed files with 1124 additions and 431 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,3 @@
-assets
 target
+.mongo
 .env
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "addr2line"
 version = "0.14.1"
@@ -42,7 +44,7 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
 dependencies = [
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 ]

@@ -167,7 +169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d"
 dependencies = [
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 ]

@@ -181,7 +183,7 @@ dependencies = [
 "futures-io",
 "futures-util",
 "log",
- "pin-project 1.0.4",
+ "pin-project 1.0.5",
 "tungstenite",
 ]

@@ -243,6 +245,16 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"

+[[package]]
+name = "base64"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5032d51da2741729bfdaeb2664d9b8c6d9fd1e2b90715c660b6def36628499c2"
+dependencies = [
+ "byteorder",
+ "safemem",
+]
+
 [[package]]
 name = "base64"
 version = "0.11.0"
@@ -364,9 +376,9 @@ dependencies = [

 [[package]]
 name = "bumpalo"
-version = "3.5.0"
+version = "3.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f07aa6688c702439a1be0307b6a94dffe1168569e45b9500c1372bc580740d59"
+checksum = "099e596ef14349721d9016f6b80dd3419ea1bf289ab9b44df8e4dfd3a005d5d9"

 [[package]]
 name = "byte-tools"
@@ -514,6 +526,16 @@ dependencies = [
 "subtle",
 ]

+[[package]]
+name = "ctor"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19"
+dependencies = [
+ "quote 1.0.9",
+ "syn 1.0.60",
+]
+
 [[package]]
 name = "ctrlc"
 version = "3.1.7"
@@ -543,7 +565,7 @@ dependencies = [
 "fnv",
 "ident_case",
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "strsim 0.9.3",
 "syn 1.0.60",
 ]
@@ -555,7 +577,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
 dependencies = [
 "darling_core",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 ]

@@ -566,7 +588,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 ]

@@ -585,7 +607,7 @@ version = "0.3.0"
 source = "git+https://github.com/SergioBenitez/Devise.git?rev=3648468#3648468a9ede9ca896cd35bc1eb818c7a9fb3047"
 dependencies = [
 "devise_core",
- "quote 1.0.8",
+ "quote 1.0.9",
 ]

 [[package]]
@@ -596,7 +618,7 @@ dependencies = [
 "bitflags",
 "proc-macro2 1.0.24",
 "proc-macro2-diagnostics",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 ]

@@ -644,9 +666,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"

 [[package]]
 name = "encoding_rs"
-version = "0.8.26"
+version = "0.8.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "801bbab217d7f79c0062f4f7205b5d4427c6d1a7bd7aafdd1475f7c59d62b283"
+checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
 dependencies = [
 "cfg-if 1.0.0",
 ]
@@ -659,7 +681,7 @@ checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595"
 dependencies = [
 "heck",
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 ]

@@ -676,6 +698,15 @@ dependencies = [
 "termcolor",
 ]

+[[package]]
+name = "erased-serde"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0465971a8cc1fa2455c8465aaa377131e1f1cf4983280f474a13e68793aa770c"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "err-derive"
 version = "0.2.4"
@@ -684,7 +715,7 @@ checksum = "22deed3a8124cff5fa835713fa105621e43bbdc46690c3a6b68328a012d350d4"
 dependencies = [
 "proc-macro-error",
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "rustversion",
 "syn 1.0.60",
 "synstructure",
@@ -865,7 +896,7 @@ checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd"
 dependencies = [
 "proc-macro-hack",
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 ]

@@ -990,6 +1021,20 @@ dependencies = [
 "tracing-futures",
 ]

+[[package]]
+name = "handlebars"
+version = "3.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "964d0e99a61fe9b1b347389b77ebf8b7e1587b70293676aaca7d27e59b9073b2"
+dependencies = [
+ "log",
+ "pest",
+ "pest_derive",
+ "quick-error 2.0.0",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.9.1"
@@ -1078,9 +1123,9 @@ dependencies = [

 [[package]]
 name = "httparse"
-version = "1.3.4"
+version = "1.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
+checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691"

 [[package]]
 name = "httpdate"
@@ -1094,14 +1139,14 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
 dependencies = [
- "quick-error",
+ "quick-error 1.2.3",
 ]

 [[package]]
 name = "hyper"
-version = "0.13.9"
+version = "0.13.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf"
+checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb"
 dependencies = [
 "bytes 0.5.6",
 "futures-channel",
@@ -1113,7 +1158,7 @@ dependencies = [
 "httparse",
 "httpdate",
 "itoa",
- "pin-project 1.0.4",
+ "pin-project 1.0.5",
 "socket2",
 "tokio",
 "tower-service",
@@ -1175,9 +1220,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"

 [[package]]
 name = "idna"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
+checksum = "de910d521f7cc3135c4de8db1cb910e0b5ed1dc6f57c381cd07e8e661ce10094"
 dependencies = [
 "matches",
 "unicode-bidi",
@@ -1311,9 +1356,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "lettre"
-version = "0.10.0-alpha.4"
+version = "0.10.0-alpha.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc8c2fc7873920aca23647e5e86d44ff3f40bbc5a5efaab445c9eb0e001c9f71"
+checksum = "34f3dd8d917156976a47ef421a2e771423d6da95e93696f1814e76768625c162"
 dependencies = [
 "base64 0.13.0",
 "hostname",
@@ -1325,7 +1370,7 @@ dependencies = [
 "once_cell",
 "quoted_printable",
 "r2d2",
- "rand 0.7.3",
+ "rand 0.8.3",
 "regex",
 "serde",
 "serde_json",
@@ -1334,9 +1379,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.82"
+version = "0.2.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
+checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"

 [[package]]
 name = "linked-hash-map"
@@ -1364,11 +1409,12 @@ dependencies = [

 [[package]]
 name = "log"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
+ "value-bag",
 ]

 [[package]]
@@ -1386,6 +1432,12 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff2806c88ab7215e5077fbaaf21a9baaab9caa2abd7adf6c0f63b535ad747547"

+[[package]]
+name = "maplit"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
+
 [[package]]
 name = "match_cfg"
 version = "0.1.0"
@@ -1409,6 +1461,12 @@ dependencies = [
 "opaque-debug 0.2.3",
 ]

+[[package]]
+name = "md5"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
+
 [[package]]
 name = "memchr"
 version = "2.3.4"
@@ -1647,7 +1705,7 @@ checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e"
 dependencies = [
 "proc-macro-crate",
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 ]

@@ -1802,7 +1860,7 @@ checksum = "602cf1780ee9bbca663ea75769e05643e16fe87d7c8ac9f4f385a2ed8940a75c"
 dependencies = [
 "proc-macro2 1.0.24",
 "proc-macro2-diagnostics",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 ]

@@ -1812,6 +1870,49 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"

+[[package]]
+name = "pest"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
+dependencies = [
+ "ucd-trie",
+]
+
+[[package]]
+name = "pest_derive"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
+dependencies = [
+ "pest",
+ "pest_generator",
+]
+
+[[package]]
+name = "pest_generator"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
+dependencies = [
+ "pest",
+ "pest_meta",
+ "proc-macro2 1.0.24",
+ "quote 1.0.9",
+ "syn 1.0.60",
+]
+
+[[package]]
+name = "pest_meta"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
+dependencies = [
+ "maplit",
+ "pest",
+ "sha-1 0.8.2",
+]
+
 [[package]]
 name = "pin-project"
 version = "0.4.27"
@@ -1823,11 +1924,11 @@ dependencies = [

 [[package]]
 name = "pin-project"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b70b68509f17aa2857863b6fa00bf21fc93674c7a8893de2f469f6aa7ca2f2"
+checksum = "96fa8ebb90271c4477f144354485b8068bd8f6b78b428b01ba892ca26caf0b63"
 dependencies = [
- "pin-project-internal 1.0.4",
+ "pin-project-internal 1.0.5",
 ]

 [[package]]
@@ -1837,18 +1938,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895"
 dependencies = [
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 ]

 [[package]]
 name = "pin-project-internal"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caa25a6393f22ce819b0f50e0be89287292fda8d425be38ee0ca14c4931d9e71"
+checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b"
 dependencies = [
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 ]

@@ -1912,7 +2013,7 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
 "proc-macro-error-attr",
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 "version_check",
 ]
@@ -1924,7 +2025,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "version_check",
 ]

@@ -1965,18 +2066,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada"
 dependencies = [
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 "version_check",
 "yansi",
 ]

+[[package]]
+name = "prometheus"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8425533e7122f0c3cc7a37e6244b16ad3a2cc32ae7ac6276e2a75da0d9c200d"
+dependencies = [
+ "cfg-if 1.0.0",
+ "fnv",
+ "lazy_static",
+ "parking_lot 0.11.1",
+ "regex",
+ "thiserror",
+]
+
 [[package]]
 name = "quick-error"
 version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"

+[[package]]
+name = "quick-error"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda"
+
 [[package]]
 name = "quote"
 version = "0.6.13"
@@ -1988,9 +2109,9 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
 "proc-macro2 1.0.24",
 ]
@@ -2052,9 +2173,9 @@ dependencies = [

 [[package]]
 name = "rand"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18519b42a40024d661e1714153e9ad0c3de27cd495760ceb09710920f1098b1e"
+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
 dependencies = [
 "libc",
 "rand_chacha 0.3.0",
@@ -2208,20 +2329,23 @@ dependencies = [

 [[package]]
 name = "rauth"
-version = "0.2.0"
-source = "git+https://gitlab.insrt.uk/insert/rauth?rev=8f3ea627#8f3ea627eb304945b0af0b79aca8e94e474e46ae"
+version = "0.2.5-alpha.0"
+source = "git+https://gitlab.insrt.uk/insert/rauth?rev=c52758a5087cd035b0ed9c6eacc942ba5468d2ce#c52758a5087cd035b0ed9c6eacc942ba5468d2ce"
 dependencies = [
 "chrono",
+ "handlebars",
 "json",
 "lazy_static",
 "lettre",
 "mongodb",
 "nanoid",
 "regex",
+ "reqwest",
 "rocket",
 "rocket_contrib",
 "rust-argon2",
 "serde",
+ "serde_json",
 "snafu",
 "tokio",
 "ulid",
@@ -2268,7 +2392,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2"
 dependencies = [
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 ]

@@ -2346,15 +2470,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
 dependencies = [
 "hostname",
- "quick-error",
+ "quick-error 1.2.3",
 ]

 [[package]]
 name = "revolt"
-version = "0.3.2"
+version = "0.3.3-alpha.8"
 dependencies = [
 "async-std",
 "async-tungstenite",
+ "base64 0.13.0",
 "bitfield",
 "chrono",
 "ctrlc",
@@ -2367,6 +2492,7 @@ dependencies = [
 "lettre",
 "log",
 "many-to-many",
+ "md5",
 "mongodb",
 "num_enum",
 "once_cell",
@@ -2377,25 +2503,28 @@ dependencies = [
 "rocket",
 "rocket_contrib",
 "rocket_cors",
+ "rocket_prometheus",
 "serde",
 "serde_json",
 "snafu",
 "time 0.2.25",
 "ulid",
+ "urlencoding",
 "validator",
+ "web-push",
 ]

 [[package]]
 name = "ring"
-version = "0.16.19"
+version = "0.16.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "024a1e66fea74c66c66624ee5622a7ff0e4b73a13b4f5c326ddb50c708944226"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
 dependencies = [
 "cc",
 "libc",
 "once_cell",
 "spin",
- "untrusted",
+ "untrusted 0.7.1",
 "web-sys",
 "winapi 0.3.9",
 ]
@@ -2437,7 +2566,7 @@ dependencies = [
 "devise",
 "glob",
 "indexmap",
- "quote 1.0.8",
+ "quote 1.0.9",
 "rocket_http",
 ]

@@ -2493,6 +2622,15 @@ dependencies = [
 "version_check",
 ]

+[[package]]
+name = "rocket_prometheus"
+version = "0.7.0"
+source = "git+https://github.com/insertish/rocket_prometheus?rev=3d825aedb42793246c306a81fe67c5b187948983#3d825aedb42793246c306a81fe67c5b187948983"
+dependencies = [
+ "prometheus",
+ "rocket",
+]
+
 [[package]]
 name = "rust-argon2"
 version = "0.8.3"
@@ -2558,6 +2696,12 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"

+[[package]]
+name = "safemem"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
+
 [[package]]
 name = "schannel"
 version = "0.1.19"
@@ -2590,7 +2734,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
 dependencies = [
 "ring",
- "untrusted",
+ "untrusted 0.7.1",
 ]

 [[package]]
@@ -2633,9 +2777,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"

 [[package]]
 name = "serde"
-version = "1.0.122"
+version = "1.0.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "974ef1bd2ad8a507599b336595454081ff68a9599b4890af7643c0c0ed73a62c"
+checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
 dependencies = [
 "serde_derive",
 ]
@@ -2651,20 +2795,20 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.122"
+version = "1.0.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dee1f300f838c8ac340ecb0112b3ac472464fa67e87292bdb3dfc9c49128e17"
+checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
 dependencies = [
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.61"
+version = "1.0.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
+checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486"
 dependencies = [
 "indexmap",
 "itoa",
@@ -2686,9 +2830,9 @@ dependencies = [

 [[package]]
 name = "serde_with"
-version = "1.6.1"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "012c1e1750318ba7d775e4104e34a4eca896b0016e6b90370f12381a28fb29f0"
+checksum = "42fa8fb0da0bf5aa7dd5d8fe1f9ec769833eb7cf97ff89942903809e600de908"
 dependencies = [
 "serde",
 "serde_with_macros",
@@ -2702,7 +2846,7 @@ checksum = "1197ff7de45494f290c1e3e1a6f80e108974681984c87a3e480991ef3d0f1950"
 dependencies = [
 "darling",
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 ]

@@ -2720,9 +2864,9 @@ dependencies = [

 [[package]]
 name = "sha-1"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c"
+checksum = "f4b312c3731e3fe78a185e6b9b911a7aa715b8e31cce117975219aab2acf285d"
 dependencies = [
 "block-buffer 0.9.0",
 "cfg-if 1.0.0",
@@ -2787,7 +2931,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b"
 dependencies = [
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 ]

@@ -2810,9 +2954,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"

 [[package]]
 name = "standback"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66a8cff4fa24853fdf6b51f75c6d7f8206d7c75cab4e467bcd7f25c2b1febe0"
+checksum = "a2beb4d1860a61f571530b3f855a1b538d0200f7871c63331ecd6f17b1f014f8"
 dependencies = [
 "version_check",
 ]
@@ -2844,7 +2988,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 dependencies = [
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "serde",
 "serde_derive",
 "syn 1.0.60",
@@ -2858,7 +3002,7 @@ checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
 dependencies = [
 "base-x",
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "serde",
 "serde_derive",
 "serde_json",
@@ -2918,7 +3062,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
 dependencies = [
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "unicode-xid 0.2.1",
 ]

@@ -2929,7 +3073,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
 dependencies = [
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 "unicode-xid 0.2.1",
 ]
@@ -2954,7 +3098,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
 dependencies = [
 "cfg-if 1.0.0",
 "libc",
- "rand 0.8.2",
+ "rand 0.8.3",
 "redox_syscall 0.2.4",
 "remove_dir_all",
 "winapi 0.3.9",
@@ -2985,15 +3129,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
 dependencies = [
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 ]

 [[package]]
 name = "thread_local"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8208a331e1cb318dd5bd76951d2b8fc48ca38a69f5f4e4af1b6a9f8c6236915"
+checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
 dependencies = [
 "once_cell",
 ]
@@ -3042,16 +3186,16 @@ checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa"
 dependencies = [
 "proc-macro-hack",
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "standback",
 "syn 1.0.60",
 ]

 [[package]]
 name = "tinyvec"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f"
+checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023"
 dependencies = [
 "tinyvec_macros",
 ]
@@ -3064,9 +3208,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"

 [[package]]
 name = "tokio"
-version = "0.2.24"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48"
+checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092"
 dependencies = [
 "bytes 0.5.6",
 "fnv",
@@ -3092,7 +3236,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
 dependencies = [
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 ]

@@ -3161,9 +3305,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"

 [[package]]
 name = "tracing"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"
+checksum = "f7d40a22fd029e33300d8d89a5cc8ffce18bb7c587662f54629e94c9de5487f3"
 dependencies = [
 "cfg-if 1.0.0",
 "log",
@@ -3250,7 +3394,7 @@ dependencies = [
 "input_buffer",
 "log",
 "rand 0.7.3",
- "sha-1 0.9.2",
+ "sha-1 0.9.3",
 "url",
 "utf-8",
 ]
@@ -3281,6 +3425,12 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "ucd-trie"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
+
 [[package]]
 name = "ulid"
 version = "0.4.1"
@@ -3331,9 +3481,9 @@ dependencies = [

 [[package]]
 name = "unicode-normalization"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"
+checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
 dependencies = [
 "tinyvec",
 ]
@@ -3356,6 +3506,12 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"

+[[package]]
+name = "untrusted"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
+
 [[package]]
 name = "untrusted"
 version = "0.7.1"
@@ -3374,6 +3530,12 @@ dependencies = [
 "percent-encoding",
 ]

+[[package]]
+name = "urlencoding"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9232eb53352b4442e40d7900465dfc534e8cb2dc8f18656fcb2ac16112b5593"
+
 [[package]]
 name = "utf-8"
 version = "0.7.5"
@@ -3416,7 +3578,7 @@ dependencies = [
 "lazy_static",
 "proc-macro-error",
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "regex",
 "syn 1.0.60",
 "validator_types",
@@ -3428,6 +3590,15 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "add324da7950ac1f76b1c16ce8b5406147953d5d6a2ac1c5da93785f2cfc738b"

+[[package]]
+name = "value-bag"
+version = "1.0.0-alpha.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b676010e055c99033117c2343b33a40a30b91fecd6c49055ac9cd2d6c305ab1"
+dependencies = [
+ "ctor",
+]
+
 [[package]]
 name = "vcpkg"
 version = "0.2.11"
@@ -3496,7 +3667,7 @@ dependencies = [
 "lazy_static",
 "log",
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 "wasm-bindgen-shared",
 ]
@@ -3519,7 +3690,7 @@ version = "0.2.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b8853882eef39593ad4174dd26fc9865a64e84026d223f63bb2c42affcbba2c"
 dependencies = [
- "quote 1.0.8",
+ "quote 1.0.9",
 "wasm-bindgen-macro-support",
 ]

@@ -3530,7 +3701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4133b5e7f2a531fa413b3a1695e925038a05a71cf67e87dafa295cb645a01385"
 dependencies = [
 "proc-macro2 1.0.24",
- "quote 1.0.8",
+ "quote 1.0.9",
 "syn 1.0.60",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
@@ -3542,6 +3713,31 @@ version = "0.2.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd4945e4943ae02d15c13962b38a5b1e81eadd4b71214eee75af64a4d6a4fd64"

+[[package]]
+name = "web-push"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8353dd6c7cfb9a02737fd6dc9a66a80dca2a93fb690f6ad264d2a7672e6f1c0"
+dependencies = [
+ "base64 0.7.0",
+ "chrono",
+ "erased-serde",
+ "futures",
+ "http",
+ "hyper",
+ "hyper-tls",
+ "lazy_static",
+ "log",
+ "native-tls",
+ "openssl",
+ "ring",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "time 0.1.44",
+ "untrusted 0.6.2",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.47"
@@ -3559,7 +3755,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
 dependencies = [
 "ring",
- "untrusted",
+ "untrusted 0.7.1",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,22 +1,25 @@
 [package]
 name = "revolt"
-version = "0.3.2"
+version = "0.3.3-alpha.8"
 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]
+base64 = "0.13.0"
 futures = "0.3.8"
-many-to-many = "0.1.2"
 impl_ops = "0.1.1"
+web-push = "0.7.2"
+many-to-many = "0.1.2"
 ctrlc = { version = "3.0", features = ["termination"] }
-async-tungstenite = { version = "0.10.0", features = ["async-std-runtime"] }
-rauth = { git = "https://gitlab.insrt.uk/insert/rauth", rev = "8f3ea627" }
 async-std = { version = "1.8.0", features = ["tokio02", "attributes"] }
+async-tungstenite = { version = "0.10.0", features = ["async-std-runtime"] }
+rauth = { git = "https://gitlab.insrt.uk/insert/rauth", rev = "c52758a5087cd035b0ed9c6eacc942ba5468d2ce" }

 hive_pubsub = { version = "0.4.3", features = ["mongo"] }
 rocket_cors = { git = "https://github.com/insertish/rocket_cors", branch = "master" }
+rocket_prometheus = { git = "https://github.com/insertish/rocket_prometheus", rev = "3d825aedb42793246c306a81fe67c5b187948983" }
 rocket_contrib = { git = "https://github.com/SergioBenitez/Rocket", rev = "031948c1daaa146128d8a435be116476f2adde00" }
 rocket = { git = "https://github.com/SergioBenitez/Rocket", rev = "031948c1daaa146128d8a435be116476f2adde00", default-features = false }
 mongodb = { version = "1.1.1", features = ["tokio-runtime"], default-features = false }
@@ -32,11 +35,13 @@ serde_json = "1.0.57"
 bitfield = "0.13.2"

 reqwest = { version = "0.10.8", features = ["json"] }
+urlencoding = "1.1.1"
 lazy_static = "1.4.0"
 num_enum = "0.5.1"
 chrono = "0.4.15"
 time = "0.2.16"
 rand = "0.7.3"
+md5 = "0.7.0"
 regex = "1"

 lettre = "0.10.0-alpha.1"
--- a/12
+++ b/12
@@ -1,16 +1,22 @@
 # 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 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"]
--- a/assets/templates/reset.html
+++ b/assets/templates/reset.html
@@ -0,0 +1,62 @@
+<!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 role="presentation" 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 style="margin: 0;">
+              Reset your password by <a href="{{url}}">clicking here</a>.
+            </p>
+            <p>
+              Or by manually navigating to the URL: {{url}}
+            </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; <a style="color: white;" href="https://revolt.chat">Website</a> &middot; <a style="color: white;" href="https://gitlab.insrt.uk/revolt">Source Code</a></p>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
--- a/assets/templates/verify.html
+++ b/assets/templates/verify.html
@@ -0,0 +1,62 @@
+<!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 role="presentation" 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;">Verify your account!</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 style="margin: 0;">
+              Please verify your account by <a href="{{url}}">clicking here</a>.
+            </p>
+            <p>
+              Or by manually navigating to the URL: {{url}}
+            </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; <a style="color: white;" href="https://revolt.chat">Website</a> &middot; <a style="color: white;" href="https://gitlab.insrt.uk/revolt">Source Code</a></p>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,5 +14,5 @@ services:
      - REVOLT_UNSAFE_NO_CAPTCHA=1
    ports:
      - "8000:8000"
-      - "9999:9999"
+      - "9000:9000"
    restart: unless-stopped
--- a/src/database/entities/autumn.rs
+++ b/src/database/entities/autumn.rs
@@ -0,0 +1,21 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(tag = "type")]
+enum Metadata {
+    File,
+    Image { width: isize, height: isize },
+    Video { width: isize, height: isize },
+    Audio,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct File {
+    #[serde(rename = "_id")]
+    pub id: String,
+    filename: String,
+    metadata: Metadata,
+    content_type: String,
+
+    message_id: Option<String>,
+}
--- a/src/database/entities/channel.rs
+++ b/src/database/entities/channel.rs
@@ -46,9 +46,9 @@ pub enum Channel {
 impl Channel {
    pub fn id(&self) -> &str {
        match self {
-            Channel::SavedMessages { id, .. } => id,
-            Channel::DirectMessage { id, .. } => id,
-            Channel::Group { id, .. } => id,
+            Channel::SavedMessages { id, .. }
+            | Channel::DirectMessage { id, .. }
+            | Channel::Group { id, .. } => id,
        }
    }

--- a/src/database/entities/message.rs
+++ b/src/database/entities/message.rs
@@ -1,12 +1,21 @@
+use crate::util::variables::VAPID_PRIVATE_KEY;
 use crate::{
    database::*,
-    notifications::events::ClientboundNotification,
+    notifications::{events::ClientboundNotification, websocket::is_online},
    util::result::{Error, Result},
 };
-use mongodb::bson::{doc, to_bson, DateTime};
+
+use futures::StreamExt;
+use mongodb::{
+    bson::{doc, to_bson, DateTime},
+    options::FindOptions,
+};
 use rocket_contrib::json::JsonValue;
 use serde::{Deserialize, Serialize};
 use ulid::Ulid;
+use web_push::{
+    ContentEncoding, SubscriptionInfo, VapidSignatureBuilder, WebPushClient, WebPushMessageBuilder,
+};

 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Message {
@@ -19,6 +28,8 @@ pub struct Message {

    pub content: String,
    #[serde(skip_serializing_if = "Option::is_none")]
+    pub attachment: Option<File>,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub edited: Option<DateTime>,
 }

@@ -31,6 +42,7 @@ impl Message {
            author,

            content,
+            attachment: None,
            edited: None,
        }
    }
@@ -46,7 +58,7 @@ impl Message {

        // ! FIXME: temp code
        let channels = get_collection("channels");
-        match channel {
+        match &channel {
            Channel::DirectMessage { id, .. } => {
                channels
                    .update_one(
@@ -93,11 +105,84 @@ impl Message {
            _ => {}
        }

+        let enc = serde_json::to_string(&self).unwrap();
        ClientboundNotification::Message(self)
            .publish(channel.id().to_string())
            .await
            .ok();

+        /*
+           Web Push Test Code
+           ! FIXME: temp code
+        */
+
+        // Find all offline users.
+        let mut target_ids = vec![];
+        match &channel {
+            Channel::DirectMessage { recipients, .. } | Channel::Group { recipients, .. } => {
+                for recipient in recipients {
+                    if !is_online(recipient) {
+                        target_ids.push(recipient.clone());
+                    }
+                }
+            }
+            _ => {}
+        }
+
+        // Fetch their corresponding sessions.
+        let mut cursor = get_collection("accounts")
+            .find(
+                doc! {
+                    "_id": {
+                        "$in": target_ids
+                    },
+                    "sessions.subscription": {
+                        "$exists": true
+                    }
+                },
+                FindOptions::builder()
+                    .projection(doc! { "sessions": 1 })
+                    .build(),
+            )
+            .await
+            .unwrap(); // !FIXME
+
+        let mut subscriptions = vec![];
+        while let Some(result) = cursor.next().await {
+            if let Ok(doc) = result {
+                if let Ok(sessions) = doc.get_array("sessions") {
+                    for session in sessions {
+                        if let Some(doc) = session.as_document() {
+                            if let Ok(sub) = doc.get_document("subscription") {
+                                let endpoint = sub.get_str("endpoint").unwrap().to_string();
+                                let p256dh = sub.get_str("p256dh").unwrap().to_string();
+                                let auth = sub.get_str("auth").unwrap().to_string();
+
+                                subscriptions.push(SubscriptionInfo::new(endpoint, p256dh, auth));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if subscriptions.len() > 0 {
+            let client = WebPushClient::new();
+            let key = base64::decode_config(VAPID_PRIVATE_KEY.clone(), base64::URL_SAFE).unwrap();
+
+            for subscription in subscriptions {
+                let mut builder = WebPushMessageBuilder::new(&subscription).unwrap();
+                let sig_builder =
+                    VapidSignatureBuilder::from_pem(std::io::Cursor::new(&key), &subscription)
+                        .unwrap();
+                let signature = sig_builder.build().unwrap();
+                builder.set_vapid_signature(signature);
+                builder.set_payload(ContentEncoding::AesGcm, enc.as_bytes());
+                let m = builder.build().unwrap();
+                let response = client.send(m).await.ok();
+            }
+        }
+
        Ok(())
    }

@@ -115,6 +200,26 @@ impl Message {
    }

    pub async fn delete(&self) -> Result<()> {
+        if let Some(attachment) = &self.attachment {
+            get_collection("attachments")
+                .update_one(
+                    doc! {
+                        "_id": &attachment.id
+                    },
+                    doc! {
+                        "$set": {
+                            "deleted": true
+                        }
+                    },
+                    None
+                )
+                .await
+                .map_err(|_| Error::DatabaseError {
+                    operation: "update_one",
+                    with: "attachment",
+                })?;
+        }
+
        get_collection("messages")
            .delete_one(
                doc! {
--- a/src/database/entities/mod.rs
+++ b/src/database/entities/mod.rs
@@ -1,8 +1,10 @@
+mod autumn;
 mod channel;
 mod guild;
 mod message;
 mod user;

+pub use autumn::*;
 pub use channel::*;
 pub use guild::*;
 pub use message::*;
--- a/src/database/entities/user.rs
+++ b/src/database/entities/user.rs
@@ -1,6 +1,11 @@
+use mongodb::bson::doc;
 use serde::{Deserialize, Serialize};
+use mongodb::options::{Collation, FindOneOptions};

-use crate::{database::permissions::user::UserPermissions, notifications::websocket::is_online};
+use crate::database::*;
+use crate::util::result::{Error, Result};
+use crate::notifications::websocket::is_online;
+use crate::database::permissions::user::UserPermissions;

 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub enum RelationshipStatus {
@@ -43,6 +48,7 @@ impl User {
            return self;
        }

+        self.relations = None;
        if let Some(relations) = &user.relations {
            if let Some(relationship) = relations.iter().find(|x| self.id == x.id) {
                self.relationship = Some(relationship.status.clone());
@@ -55,14 +61,38 @@ impl User {

    /// Mutate the user object to appear as seen by user.
    pub fn with(mut self, permissions: UserPermissions<[u32; 1]>) -> User {
-        if !permissions.get_view_all() {
-            self.relations = None;
-        }
-
        if permissions.get_view_profile() {
            self.online = Some(is_online(&self.id));
        }

        self
    }
+
+    /// Utility function for checking claimed usernames.
+    pub async fn is_username_taken(username: &str) -> Result<bool> {
+        if username == "revolt" && username == "admin" {
+            return Ok(true)
+        }
+    
+        if get_collection("users")
+            .find_one(
+                doc! {
+                    "username": username
+                },
+                FindOneOptions::builder()
+                    .collation(Collation::builder().locale("en").strength(2).build())
+                    .build(),
+            )
+            .await
+            .map_err(|_| Error::DatabaseError {
+                operation: "find_one",
+                with: "user",
+            })?
+            .is_some()
+        {
+            Ok(true)
+        } else {
+            Ok(false)
+        }
+    }
 }
--- a/src/database/permissions/channel.rs
+++ b/src/database/permissions/channel.rs
@@ -25,46 +25,6 @@ bitfield! {
 impl_op_ex!(+ |a: &ChannelPermission, b: &ChannelPermission| -> u32 { *a as u32 | *b as u32 });
 impl_op_ex_commutative!(+ |a: &u32, b: &ChannelPermission| -> u32 { *a | *b as u32 });

-/*pub async fn calculate(user: &User, target: &Channel) -> Result<u32> {
-    match target {
-        Channel::SavedMessages { user: owner, .. } => {
-            if &user.id == owner {
-                Ok(ChannelPermission::View
-                    + ChannelPermission::SendMessage
-                    + ChannelPermission::ManageMessages)
-            } else {
-                Ok(0)
-            }
-        }
-        Channel::DirectMessage { recipients, .. } => {
-            if recipients.iter().find(|x| *x == &user.id).is_some() {
-                if let Some(recipient) = recipients.iter().find(|x| *x != &user.id) {
-                    let perms = super::user::get(&user, recipient).await?;
-
-                    if perms.get_send_message() {
-                        return Ok(ChannelPermission::View + ChannelPermission::SendMessage);
-                    }
-
-                    return Ok(ChannelPermission::View as u32);
-                }
-            }
-
-            Ok(0)
-        }
-        Channel::Group { recipients, .. } => {
-            if recipients.iter().find(|x| *x == &user.id).is_some() {
-                Ok(ChannelPermission::View + ChannelPermission::SendMessage)
-            } else {
-                Ok(0)
-            }
-        }
-    }
-}
-
-pub async fn get(user: &User, target: &Channel) -> Result<ChannelPermissions<[u32; 1]>> {
-    Ok(ChannelPermissions([calculate(&user, &target).await?]))
-}*/
-
 impl<'a> PermissionCalculator<'a> {
    pub async fn calculate_channel(self) -> Result<u32> {
        let channel = if let Some(channel) = self.channel {
--- a/src/database/permissions/user.rs
+++ b/src/database/permissions/user.rs
@@ -14,8 +14,6 @@ pub enum UserPermission {
    ViewProfile = 2,
    SendMessage = 4,
    Invite = 8,
-
-    ViewAll = 2147483648,
 }

 bitfield! {
@@ -25,13 +23,9 @@ bitfield! {
    pub get_view_profile, _: 30;
    pub get_send_message, _: 29;
    pub get_invite, _: 28;
-
-    pub get_view_all, _: 0;
 }

 impl_op_ex!(+ |a: &UserPermission, b: &UserPermission| -> u32 { *a as u32 | *b as u32 });
-impl_op_ex!(-|a: &UserPermission, b: &UserPermission| -> u32 { *a as u32 & !(*b as u32) });
-impl_op_ex!(-|a: &u32, b: &UserPermission| -> u32 { *a & !(*b as u32) });
 impl_op_ex_commutative!(+ |a: &u32, b: &UserPermission| -> u32 { *a | *b as u32 });

 pub fn get_relationship(a: &User, b: &str) -> RelationshipStatus {
@@ -56,7 +50,7 @@ impl<'a> PermissionCalculator<'a> {

        let mut permissions: u32 = 0;
        match get_relationship(&self.perspective, &target) {
-            RelationshipStatus::Friend => return Ok(u32::MAX - UserPermission::ViewAll),
+            RelationshipStatus::Friend => return Ok(u32::MAX),
            RelationshipStatus::Blocked | RelationshipStatus::BlockedOther => {
                return Ok(UserPermission::Access as u32)
            }
@@ -74,10 +68,11 @@ impl<'a> PermissionCalculator<'a> {
            || get_collection("channels")
                .find_one(
                    doc! {
-                        "type": "Group",
-                        "$and": {
-                            "recipients": &self.perspective.id,
-                            "recipients": target
+                        "channel_type": {
+                            "$in": ["Group", "DirectMessage"]
+                        },
+                        "recipients": {
+                            "$all": [ &self.perspective.id, target ]
                        }
                    },
                    None,
--- a/src/main.rs
+++ b/src/main.rs
@@ -21,10 +21,17 @@ pub mod util;
 use chrono::Duration;
 use futures::join;
 use log::info;
-use rauth::auth::Auth;
 use rauth::options::{EmailVerification, Options, SMTP};
+use rauth::{
+    auth::Auth,
+    options::{Template, Templates},
+};
 use rocket_cors::AllowedOrigins;
-use util::variables::{PUBLIC_URL, SMTP_FROM, SMTP_HOST, SMTP_PASSWORD, SMTP_USERNAME, USE_EMAIL};
+use rocket_prometheus::PrometheusMetrics;
+use util::variables::{
+    APP_URL, HCAPTCHA_KEY, INVITE_ONLY, PUBLIC_URL, SMTP_FROM, SMTP_HOST, SMTP_PASSWORD,
+    SMTP_USERNAME, USE_EMAIL, USE_HCAPTCHA, USE_PROMETHEUS,
+};

 #[async_std::main]
 async fn main() {
@@ -58,29 +65,63 @@ async fn launch_web() {
    .to_cors()
    .expect("Failed to create CORS.");

-    let auth = Auth::new(
-        database::get_collection("accounts"),
-        Options::new()
-            .base_url(format!("{}/auth", *PUBLIC_URL))
-            .email_verification(if *USE_EMAIL {
-                EmailVerification::Enabled {
-                    success_redirect_uri: format!("{}/welcome", *PUBLIC_URL),
-                    verification_expiry: Duration::days(1),
-                    verification_ratelimit: Duration::minutes(1),
+    let mut options = Options::new()
+        .base_url(format!("{}/auth", *PUBLIC_URL))
+        .email_verification(if *USE_EMAIL {
+            EmailVerification::Enabled {
+                success_redirect_uri: format!("{}/login", *APP_URL),
+                welcome_redirect_uri: format!("{}/welcome", *APP_URL),
+                password_reset_url: Some(format!("{}/login/reset", *APP_URL)),

-                    smtp: SMTP {
-                        from: (*SMTP_FROM).to_string(),
-                        host: (*SMTP_HOST).to_string(),
-                        username: (*SMTP_USERNAME).to_string(),
-                        password: (*SMTP_PASSWORD).to_string(),
+                verification_expiry: Duration::days(1),
+                password_reset_expiry: Duration::hours(1),
+
+                templates: Templates {
+                    verify_email: Template {
+                        title: "Verify your REVOLT account.",
+                        text: "Verify your email here: {{url}}",
+                        html: include_str!("../assets/templates/verify.html"),
                    },
-                }
-            } else {
-                EmailVerification::Disabled
-            }),
-    );
+                    reset_password: Template {
+                        title: "Reset your REVOLT password.",
+                        text: "Reset your password here: {{url}}",
+                        html: include_str!("../assets/templates/reset.html"),
+                    },
+                    welcome: None,
+                },

-    routes::mount(rocket::ignite())
+                smtp: SMTP {
+                    from: (*SMTP_FROM).to_string(),
+                    host: (*SMTP_HOST).to_string(),
+                    username: (*SMTP_USERNAME).to_string(),
+                    password: (*SMTP_PASSWORD).to_string(),
+                },
+            }
+        } else {
+            EmailVerification::Disabled
+        });
+
+    if *INVITE_ONLY {
+        options = options.invite_only_collection(database::get_collection("invites"))
+    }
+
+    if *USE_HCAPTCHA {
+        options = options.hcaptcha_secret(HCAPTCHA_KEY.clone());
+    }
+
+    let auth = Auth::new(database::get_collection("accounts"), options);
+
+    let mut rocket = rocket::ignite();
+
+    if *USE_PROMETHEUS {
+        info!("Enabled Prometheus metrics!");
+        let prometheus = PrometheusMetrics::new();
+        rocket = rocket
+            .attach(prometheus.clone())
+            .mount("/metrics", prometheus);
+    }
+
+    routes::mount(rocket)
        .mount("/", rocket_cors::catch_all_options_routes())
        .mount("/auth", rauth::routes::routes())
        .manage(auth)
--- a/src/notifications/events.rs
+++ b/src/notifications/events.rs
@@ -26,6 +26,12 @@ pub enum WebSocketError {
 #[serde(tag = "type")]
 pub enum ServerboundNotification {
    Authenticate(Session),
+    BeginTyping {
+        channel: String
+    },
+    EndTyping {
+        channel: String
+    }
 }

 #[derive(Serialize, Deserialize, Debug)]
@@ -63,6 +69,14 @@ pub enum ClientboundNotification {
    ChannelDelete {
        id: String,
    },
+    ChannelStartTyping {
+        id: String,
+        user: String
+    },
+    ChannelStopTyping {
+        id: String,
+        user: String
+    },

    UserRelationship {
        id: String,
--- a/src/notifications/payload.rs
+++ b/src/notifications/payload.rs
@@ -59,6 +59,8 @@ pub async fn generate_ready(mut user: User) -> Result<ClientboundNotification> {

            if let Channel::Group { recipients, .. } = &channel {
                user_ids.extend(recipients.iter().cloned());
+            } else if let Channel::DirectMessage { recipients, .. } = &channel {
+                user_ids.extend(recipients.iter().cloned());
            }

            channels.push(channel);
@@ -97,11 +99,7 @@ pub async fn generate_ready(mut user: User) -> Result<ClientboundNotification> {
                    .for_user_given()
                    .await?;

-                users.push(
-                    other
-                        .from(&user)
-                        .with(permissions)
-                );
+                users.push(other.from(&user).with(permissions));
            }
        }
    }
--- a/src/notifications/websocket.rs
+++ b/src/notifications/websocket.rs
@@ -71,8 +71,6 @@ async fn accept(stream: TcpStream) {
    let fwd = rx.map(Ok).forward(write);
    let incoming = read.try_for_each(async move |msg| {
        let mutex = mutex_generator();
-        //dbg!(&mutex.lock().unwrap());
-
        if let Message::Text(text) = msg {
            if let Ok(notification) = serde_json::from_str::<ServerboundNotification>(&text) {
                match notification {
@@ -161,6 +159,54 @@ async fn accept(stream: TcpStream) {
                            ));
                        }
                    }
+                    // ! TEMP: verify user part of channel
+                    // ! Could just run permission check here.
+                    ServerboundNotification::BeginTyping { channel } => {
+                        if mutex.lock().unwrap().is_some() {
+                            let user = {
+                                let mutex = mutex.lock().unwrap();
+                                let session = mutex.as_ref().unwrap();
+                                session.user_id.clone()
+                            };
+
+                            ClientboundNotification::ChannelStartTyping {
+                                id: channel.clone(),
+                                user
+                            }
+                            .publish(channel)
+                            .await
+                            .ok();
+                        } else {
+                            send(ClientboundNotification::Error(
+                                WebSocketError::AlreadyAuthenticated,
+                            ));
+
+                            return Ok(());
+                        }
+                    }
+                    ServerboundNotification::EndTyping { channel } => {
+                        if mutex.lock().unwrap().is_some() {
+                            let user = {
+                                let mutex = mutex.lock().unwrap();
+                                let session = mutex.as_ref().unwrap();
+                                session.user_id.clone()
+                            };
+
+                            ClientboundNotification::ChannelStopTyping {
+                                id: channel.clone(),
+                                user
+                            }
+                            .publish(channel)
+                            .await
+                            .ok();
+                        } else {
+                            send(ClientboundNotification::Error(
+                                WebSocketError::AlreadyAuthenticated,
+                            ));
+
+                            return Ok(());
+                        }
+                    }
                }
            }
        }
--- a/src/routes/channels/delete_channel.rs
+++ b/src/routes/channels/delete_channel.rs
@@ -12,7 +12,7 @@ pub async fn req(user: User, target: Ref) -> Result<()> {
        .for_channel()
        .await?;
    if !perm.get_view() {
-        Err(Error::LabelMe)?
+        Err(Error::MissingPermission)?
    }

    match &target {
@@ -102,7 +102,8 @@ pub async fn req(user: User, target: Ref) -> Result<()> {
            Message::create(
                "00000000000000000000000000".to_string(),
                id.clone(),
-                format!("<@{}> left the group.", user.id),
+                // ! FIXME: make a schema for this
+                format!("{{\"type\":\"user_left\",\"id\":\"{}\"}}", user.id),
            )
            .publish(&target)
            .await
--- a/src/routes/channels/fetch_channel.rs
+++ b/src/routes/channels/fetch_channel.rs
@@ -12,7 +12,7 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
        .for_channel()
        .await?;
    if !perm.get_view() {
-        Err(Error::LabelMe)?
+        Err(Error::MissingPermission)?
    }

    Ok(json!(target))
--- a/src/routes/channels/group_add_member.rs
+++ b/src/routes/channels/group_add_member.rs
@@ -16,7 +16,7 @@ pub async fn req(user: User, target: Ref, member: Ref) -> Result<()> {
        .for_channel()
        .await?;
    if !perm.get_view() {
-        Err(Error::LabelMe)?
+        Err(Error::MissingPermission)?
    }

    if let Channel::Group { id, recipients, .. } = &channel {
@@ -59,7 +59,8 @@ pub async fn req(user: User, target: Ref, member: Ref) -> Result<()> {
        Message::create(
            "00000000000000000000000000".to_string(),
            id.clone(),
-            format!("<@{}> added <@{}> to the group.", user.id, member.id),
+            // ! FIXME: make a schema for this
+            format!("{{\"type\":\"user_added\",\"id\":\"{}\",\"by\":\"{}\"}}", member.id, user.id),
        )
        .publish(&channel)
        .await
--- a/src/routes/channels/group_remove_member.rs
+++ b/src/routes/channels/group_remove_member.rs
@@ -20,7 +20,7 @@ pub async fn req(user: User, target: Ref, member: Ref) -> Result<()> {
    {
        if &user.id != owner {
            // figure out if we want to use perm system here
-            Err(Error::LabelMe)?
+            Err(Error::MissingPermission)?
        }

        if recipients.iter().find(|x| *x == &member.id).is_none() {
@@ -56,7 +56,8 @@ pub async fn req(user: User, target: Ref, member: Ref) -> Result<()> {
        Message::create(
            "00000000000000000000000000".to_string(),
            id.clone(),
-            format!("<@{}> removed <@{}> from the group.", user.id, member.id),
+            // ! FIXME: make a schema for this
+            format!("{{\"type\":\"user_remove\",\"id\":\"{}\",\"by\":\"{}\"}}", member.id, user.id),
        )
        .publish(&channel)
        .await
--- a/src/routes/channels/message_delete.rs
+++ b/src/routes/channels/message_delete.rs
@@ -12,7 +12,7 @@ pub async fn req(user: User, target: Ref, msg: Ref) -> Result<()> {
        .for_channel()
        .await?;
    if !perm.get_view() {
-        Err(Error::LabelMe)?
+        Err(Error::MissingPermission)?
    }

    let message = msg.fetch_message(&channel).await?;
--- a/src/routes/channels/message_edit.rs
+++ b/src/routes/channels/message_edit.rs
@@ -24,7 +24,7 @@ pub async fn req(user: User, target: Ref, msg: Ref, edit: Json<Data>) -> Result<
        .for_channel()
        .await?;
    if !perm.get_view() {
-        Err(Error::LabelMe)?
+        Err(Error::MissingPermission)?
    }

    let message = msg.fetch_message(&channel).await?;
--- a/src/routes/channels/message_fetch.rs
+++ b/src/routes/channels/message_fetch.rs
@@ -12,7 +12,7 @@ pub async fn req(user: User, target: Ref, msg: Ref) -> Result<JsonValue> {
        .for_channel()
        .await?;
    if !perm.get_view() {
-        Err(Error::LabelMe)?
+        Err(Error::MissingPermission)?
    }

    let message = msg.fetch_message(&channel).await?;
--- a/src/routes/channels/message_query.rs
+++ b/src/routes/channels/message_query.rs
@@ -34,7 +34,7 @@ pub async fn req(user: User, target: Ref, options: Form<Options>) -> Result<Json
        .for_channel()
        .await?;
    if !perm.get_view() {
-        Err(Error::LabelMe)?
+        Err(Error::MissingPermission)?
    }

    let mut query = doc! { "channel": target.id() };
--- a/src/routes/channels/message_query_stale.rs
+++ b/src/routes/channels/message_query_stale.rs
@@ -0,0 +1,73 @@
+use crate::database::*;
+use crate::util::result::{Error, Result};
+
+use futures::StreamExt;
+use mongodb::bson::{doc, from_document};
+use rocket_contrib::json::{Json, JsonValue};
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize)]
+pub struct Options {
+    ids: Vec<String>,
+}
+
+#[post("/<target>/messages/stale", data = "<data>")]
+pub async fn req(user: User, target: Ref, data: Json<Options>) -> Result<JsonValue> {
+    if data.ids.len() > 150 {
+        return Err(Error::TooManyIds);
+    }
+
+    let target = target.fetch_channel().await?;
+
+    let perm = permissions::PermissionCalculator::new(&user)
+        .with_channel(&target)
+        .for_channel()
+        .await?;
+    if !perm.get_view() {
+        Err(Error::MissingPermission)?
+    }
+
+    let mut cursor = get_collection("messages")
+        .find(
+            doc! {
+                "_id": {
+                    "$in": &data.ids
+                },
+                "channel": target.id()
+            },
+            None,
+        )
+        .await
+        .map_err(|_| Error::DatabaseError {
+            operation: "find",
+            with: "messages",
+        })?;
+
+    let mut updated = vec![];
+    let mut found_ids = vec![];
+    while let Some(result) = cursor.next().await {
+        if let Ok(doc) = result {
+            let msg = from_document::<Message>(doc).map_err(|_| Error::DatabaseError {
+                operation: "from_document",
+                with: "message",
+            })?;
+
+            found_ids.push(msg.id.clone());
+            if msg.edited.is_some() {
+                updated.push(msg);
+            }
+        }
+    }
+
+    let mut deleted = vec![];
+    for id in &data.ids {
+        if found_ids.iter().find(|x| *x == id).is_none() {
+            deleted.push(id);
+        }
+    }
+
+    Ok(json!({
+        "updated": updated,
+        "deleted": deleted
+    }))
+}
--- a/src/routes/channels/message_send.rs
+++ b/src/routes/channels/message_send.rs
@@ -1,7 +1,10 @@
 use crate::database::*;
 use crate::util::result::{Error, Result};

-use mongodb::bson::doc;
+use mongodb::{
+    bson::{doc, from_document},
+    options::FindOneOptions,
+};
 use rocket_contrib::json::{Json, JsonValue};
 use serde::{Deserialize, Serialize};
 use ulid::Ulid;
@@ -9,11 +12,13 @@ use validator::Validate;

 #[derive(Validate, Serialize, Deserialize)]
 pub struct Data {
-    #[validate(length(min = 1, max = 2000))]
+    #[validate(length(min = 0, max = 2000))]
    content: String,
    // Maximum length of 36 allows both ULIDs and UUIDs.
    #[validate(length(min = 1, max = 36))]
    nonce: String,
+    #[validate(length(min = 1, max = 128))]
+    attachment: Option<String>,
 }

 #[post("/<target>/messages", data = "<message>")]
@@ -21,6 +26,10 @@ pub async fn req(user: User, target: Ref, message: Json<Data>) -> Result<JsonVal
    message
        .validate()
        .map_err(|error| Error::FailedValidation { error })?;
+    
+    if message.content.len() == 0 && message.attachment.is_none() {
+        return Err(Error::EmptyMessage);
+    }

    let target = target.fetch_channel().await?;

@@ -29,7 +38,7 @@ pub async fn req(user: User, target: Ref, message: Json<Data>) -> Result<JsonVal
        .for_channel()
        .await?;
    if !perm.get_send_message() {
-        Err(Error::LabelMe)?
+        Err(Error::MissingPermission)?
    }

    if get_collection("messages")
@@ -37,7 +46,9 @@ pub async fn req(user: User, target: Ref, message: Json<Data>) -> Result<JsonVal
            doc! {
                "nonce": &message.nonce
            },
-            None,
+            FindOneOptions::builder()
+                .projection(doc! { "_id": 1 })
+                .build(),
        )
        .await
        .map_err(|_| Error::DatabaseError {
@@ -49,12 +60,63 @@ pub async fn req(user: User, target: Ref, message: Json<Data>) -> Result<JsonVal
        Err(Error::DuplicateNonce)?
    }

+    let id = Ulid::new().to_string();
+    let attachments = get_collection("attachments");
+    let attachment = if let Some(attachment_id) = &message.attachment {
+        if let Some(doc) = attachments
+            .find_one(
+                doc! {
+                    "_id": attachment_id,
+                    "message_id": {
+                        "$exists": false
+                    }
+                },
+                None,
+            )
+            .await
+            .map_err(|_| Error::DatabaseError {
+                operation: "find_one",
+                with: "attachment",
+            })?
+        {
+            let attachment = from_document::<File>(doc).map_err(|_| Error::DatabaseError {
+                operation: "from_document",
+                with: "attachment",
+            })?;
+
+            attachments
+                .update_one(
+                    doc! {
+                        "_id": &attachment.id
+                    },
+                    doc! {
+                        "$set": {
+                            "message_id": &id
+                        }
+                    },
+                    None,
+                )
+                .await
+                .map_err(|_| Error::DatabaseError {
+                    operation: "update_one",
+                    with: "attachment",
+                })?;
+
+            Some(attachment)
+        } else {
+            return Err(Error::UnknownAttachment);
+        }
+    } else {
+        None
+    };
+
    let msg = Message {
-        id: Ulid::new().to_string(),
+        id,
        channel: target.id().to_string(),
        author: user.id,

        content: message.content.clone(),
+        attachment,
        nonce: Some(message.nonce.clone()),
        edited: None,
    };
--- a/src/routes/channels/mod.rs
+++ b/src/routes/channels/mod.rs
@@ -9,6 +9,7 @@ mod message_delete;
 mod message_edit;
 mod message_fetch;
 mod message_query;
+mod message_query_stale;
 mod message_send;

 pub fn routes() -> Vec<Route> {
@@ -17,6 +18,7 @@ pub fn routes() -> Vec<Route> {
        delete_channel::req,
        message_send::req,
        message_query::req,
+        message_query_stale::req,
        message_fetch::req,
        message_edit::req,
        message_delete::req,
--- a/src/routes/mod.rs
+++ b/src/routes/mod.rs
@@ -5,6 +5,7 @@ use rocket::Rocket;
 mod channels;
 mod guild;
 mod onboard;
+mod push;
 mod root;
 mod users;

@@ -15,4 +16,5 @@ pub fn mount(rocket: Rocket) -> Rocket {
        .mount("/users", users::routes())
        .mount("/channels", channels::routes())
        .mount("/guild", guild::routes())
+        .mount("/push", push::routes())
 }
--- a/src/routes/onboard/complete.rs
+++ b/src/routes/onboard/complete.rs
@@ -2,7 +2,6 @@ use crate::database::*;
 use crate::util::result::{Error, Result};

 use mongodb::bson::doc;
-use mongodb::options::{Collation, FindOneOptions};
 use rauth::auth::Session;
 use regex::Regex;
 use rocket_contrib::json::Json;
@@ -10,7 +9,7 @@ use serde::{Deserialize, Serialize};
 use validator::Validate;

 lazy_static! {
-    static ref RE_USERNAME: Regex = Regex::new(r"^[a-zA-Z0-9_]+$").unwrap();
+    static ref RE_USERNAME: Regex = Regex::new(r"^[a-zA-Z0-9_.]+$").unwrap();
 }

 #[derive(Validate, Serialize, Deserialize)]
@@ -28,31 +27,11 @@ pub async fn req(session: Session, user: Option<User>, data: Json<Data>) -> Resu
    data.validate()
        .map_err(|error| Error::FailedValidation { error })?;

-    if data.username == "revolt" {
-        Err(Error::UsernameTaken)?
+    if User::is_username_taken(&data.username).await? {
+        return Err(Error::UsernameTaken)
    }

-    let col = get_collection("users");
-    if col
-        .find_one(
-            doc! {
-                "username": &data.username
-            },
-            FindOneOptions::builder()
-                .collation(Collation::builder().locale("en").strength(2).build())
-                .build(),
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find_one",
-            with: "user",
-        })?
-        .is_some()
-    {
-        Err(Error::UsernameTaken)?
-    }
-
-    col.insert_one(
+    get_collection("users").insert_one(
        doc! {
            "_id": session.user_id,
            "username": &data.username
--- a/src/routes/push/mod.rs
+++ b/src/routes/push/mod.rs
@@ -0,0 +1,8 @@
+use rocket::Route;
+
+mod subscribe;
+mod unsubscribe;
+
+pub fn routes() -> Vec<Route> {
+    routes![subscribe::req, unsubscribe::req]
+}
--- a/src/routes/push/subscribe.rs
+++ b/src/routes/push/subscribe.rs
@@ -0,0 +1,37 @@
+use crate::database::*;
+use crate::util::result::{Error, Result};
+
+use mongodb::bson::{doc, to_document};
+use rauth::auth::Session;
+use rocket_contrib::json::Json;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize)]
+pub struct Subscription {
+    endpoint: String,
+    p256dh: String,
+    auth: String,
+}
+
+#[post("/subscribe", data = "<data>")]
+pub async fn req(session: Session, data: Json<Subscription>) -> Result<()> {
+    let data = data.into_inner();
+    get_collection("accounts")
+        .update_one(
+            doc! {
+                "_id": session.user_id,
+                "sessions.id": session.id.unwrap()
+            },
+            doc! {
+                "$set": {
+                    "sessions.$.subscription": to_document(&data)
+                        .map_err(|_| Error::DatabaseError { operation: "to_document", with: "subscription" })?
+                }
+            },
+            None,
+        )
+        .await
+        .map_err(|_| Error::DatabaseError { operation: "update_one", with: "account" })?;
+
+    Ok(())
+}
--- a/src/routes/push/unsubscribe.rs
+++ b/src/routes/push/unsubscribe.rs
@@ -0,0 +1,29 @@
+use crate::database::*;
+use crate::util::result::{Error, Result};
+
+use mongodb::bson::doc;
+use rauth::auth::Session;
+
+#[post("/unsubscribe")]
+pub async fn req(session: Session) -> Result<()> {
+    get_collection("accounts")
+        .update_one(
+            doc! {
+                "_id": session.user_id,
+                "sessions.id": session.id.unwrap()
+            },
+            doc! {
+                "$unset": {
+                    "sessions.$.subscription": 1
+                }
+            },
+            None,
+        )
+        .await
+        .map_err(|_| Error::DatabaseError {
+            operation: "to_document",
+            with: "subscription",
+        })?;
+
+    Ok(())
+}
--- a/src/routes/root.rs
+++ b/src/routes/root.rs
@@ -1,5 +1,6 @@
 use crate::util::variables::{
-    DISABLE_REGISTRATION, EXTERNAL_WS_URL, HCAPTCHA_SITEKEY, USE_EMAIL, USE_HCAPTCHA,
+    AUTUMN_URL, DISABLE_REGISTRATION, EXTERNAL_WS_URL, HCAPTCHA_SITEKEY, INVITE_ONLY, USE_AUTUMN,
+    USE_EMAIL, USE_HCAPTCHA, VAPID_PUBLIC_KEY,
 };

 use mongodb::bson::doc;
@@ -8,7 +9,7 @@ use rocket_contrib::json::JsonValue;
 #[get("/")]
 pub async fn root() -> JsonValue {
    json!({
-        "revolt": "0.3.1",
+        "revolt": "0.3.3-alpha.8",
        "features": {
            "registration": !*DISABLE_REGISTRATION,
            "captcha": {
@@ -16,7 +17,13 @@ pub async fn root() -> JsonValue {
                "key": HCAPTCHA_SITEKEY.to_string()
            },
            "email": *USE_EMAIL,
+            "invite_only": *INVITE_ONLY,
+            "autumn": {
+                "enabled": *USE_AUTUMN,
+                "url": *AUTUMN_URL
+            }
        },
        "ws": *EXTERNAL_WS_URL,
+        "vapid": *VAPID_PUBLIC_KEY
    })
 }
--- a/src/routes/users/fetch_user.rs
+++ b/src/routes/users/fetch_user.rs
@@ -13,12 +13,8 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
        .await?;

    if !perm.get_access() {
-        Err(Error::LabelMe)?
+        Err(Error::MissingPermission)?
    }

-    Ok(json!(
-        target
-            .from(&user)
-            .with(perm)
-    ))
+    Ok(json!(target.from(&user).with(perm)))
 }
--- a/src/routes/users/find_mutual.rs
+++ b/src/routes/users/find_mutual.rs
@@ -0,0 +1,34 @@
+use crate::database::*;
+use crate::util::result::{Error, Result};
+
+use futures::StreamExt;
+use mongodb::bson::{doc, Document};
+use mongodb::options::FindOptions;
+use rocket_contrib::json::JsonValue;
+
+#[get("/<target>/mutual")]
+pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
+    let users = get_collection("users")
+        .find(
+            doc! {
+                "$and": [
+                    { "relations._id": &user.id, "relations.status": "Friend" },
+                    { "relations._id": &target.id, "relations.status": "Friend" }
+                ]
+            },
+            FindOptions::builder().projection(doc! { "_id": 1 }).build(),
+        )
+        .await
+        .map_err(|_| Error::DatabaseError {
+            operation: "find",
+            with: "users",
+        })?
+        .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>>();
+
+    Ok(json!({ "users": users }))
+}
--- a/src/routes/users/get_avatar.rs
+++ b/src/routes/users/get_avatar.rs
@@ -1,29 +1,49 @@
-use rocket::response::NamedFile;
-use std::path::Path;
+use md5;
+use mongodb::bson::doc;
+use mongodb::options::FindOneOptions;
+use rocket::response::Redirect;
+use urlencoding;

-use crate::database::Ref;
+use crate::database::*;
+use crate::util::result::{Error, Result};
+use crate::util::variables::PUBLIC_URL;

 #[get("/<target>/avatar")]
-pub async fn req(target: Ref) -> Option<NamedFile> {
-    match target.id.chars().nth(25).unwrap() {
-        '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' => {
-            NamedFile::open(Path::new("assets/user_red.png")).await.ok()
-        }
-        '8' | '9' | 'A' | 'C' | 'B' | 'D' | 'E' | 'F' => {
-            NamedFile::open(Path::new("assets/user_green.png"))
-                .await
-                .ok()
-        }
-        'G' | 'H' | 'J' | 'K' | 'M' | 'N' | 'P' | 'Q' => {
-            NamedFile::open(Path::new("assets/user_blue.png"))
-                .await
-                .ok()
-        }
-        'R' | 'S' | 'T' | 'V' | 'W' | 'X' | 'Y' | 'Z' => {
-            NamedFile::open(Path::new("assets/user_yellow.png"))
-                .await
-                .ok()
-        }
-        _ => unreachable!(),
-    }
+pub async fn req(target: Ref) -> Result<Redirect> {
+    let doc = get_collection("accounts")
+        .find_one(
+            doc! {
+                "_id": &target.id
+            },
+            FindOneOptions::builder()
+                .projection(doc! { "email": 1 })
+                .build(),
+        )
+        .await
+        .map_err(|_| Error::DatabaseError {
+            operation: "find_one",
+            with: "user",
+        })?
+        .ok_or_else(|| Error::UnknownUser)?;
+
+    let email = doc
+        .get_str("email")
+        .map_err(|_| Error::DatabaseError {
+            operation: "get_str(email)",
+            with: "user",
+        })?
+        .to_lowercase();
+
+    let url = format!(
+        "https://www.gravatar.com/avatar/{:x}?s=128&d={}",
+        md5::compute(email),
+        urlencoding::encode(&format!(
+            "{}/users/{}/default_avatar",
+            *PUBLIC_URL, &target.id
+        ))
+    );
+
+    dbg!(&url);
+
+    Ok(Redirect::to(url))
 }
--- a/src/routes/users/get_default_avatar.rs
+++ b/src/routes/users/get_default_avatar.rs
@@ -0,0 +1,29 @@
+use rocket::response::NamedFile;
+use std::path::Path;
+
+use crate::database::Ref;
+
+#[get("/<target>/default_avatar")]
+pub async fn req(target: Ref) -> Option<NamedFile> {
+    match target.id.chars().nth(25).unwrap() {
+        '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' => {
+            NamedFile::open(Path::new("assets/user_red.png")).await.ok()
+        }
+        '8' | '9' | 'A' | 'C' | 'B' | 'D' | 'E' | 'F' => {
+            NamedFile::open(Path::new("assets/user_green.png"))
+                .await
+                .ok()
+        }
+        'G' | 'H' | 'J' | 'K' | 'M' | 'N' | 'P' | 'Q' => {
+            NamedFile::open(Path::new("assets/user_blue.png"))
+                .await
+                .ok()
+        }
+        'R' | 'S' | 'T' | 'V' | 'W' | 'X' | 'Y' | 'Z' => {
+            NamedFile::open(Path::new("assets/user_yellow.png"))
+                .await
+                .ok()
+        }
+        _ => unreachable!(),
+    }
+}
--- a/src/routes/users/mod.rs
+++ b/src/routes/users/mod.rs
@@ -6,7 +6,9 @@ mod fetch_dms;
 mod fetch_relationship;
 mod fetch_relationships;
 mod fetch_user;
+mod find_mutual;
 mod get_avatar;
+mod get_default_avatar;
 mod open_dm;
 mod remove_friend;
 mod unblock_user;
@@ -15,11 +17,13 @@ pub fn routes() -> Vec<Route> {
    routes![
        // User Information
        fetch_user::req,
+        get_default_avatar::req,
        get_avatar::req,
        // Direct Messaging
        fetch_dms::req,
        open_dm::req,
        // Relationships
+        find_mutual::req,
        fetch_relationships::req,
        fetch_relationship::req,
        add_friend::req,
--- a/src/util/captcha.rs
+++ b/src/util/captcha.rs
@@ -1,45 +0,0 @@
-use crate::util::variables::{HCAPTCHA_KEY, USE_HCAPTCHA};
-
-use reqwest::Client;
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-
-#[derive(Serialize, Deserialize)]
-struct CaptchaResponse {
-    success: bool,
-}
-
-pub async fn verify(user_token: &Option<String>) -> Result<(), String> {
-    if *USE_HCAPTCHA {
-        if let Some(token) = user_token {
-            let mut map = HashMap::new();
-            map.insert("secret", HCAPTCHA_KEY.to_string());
-            map.insert("response", token.to_string());
-
-            let client = Client::new();
-            if let Ok(response) = client
-                .post("https://hcaptcha.com/siteverify")
-                .form(&map)
-                .send()
-                .await
-            {
-                let result: CaptchaResponse = response
-                    .json()
-                    .await
-                    .map_err(|_| "Failed to deserialise captcha result.".to_string())?;
-
-                if result.success {
-                    Ok(())
-                } else {
-                    Err("Unsuccessful captcha verification".to_string())
-                }
-            } else {
-                Err("Failed to verify with hCaptcha".to_string())
-            }
-        } else {
-            Err("Missing hCaptcha token!".to_string())
-        }
-    } else {
-        Ok(())
-    }
-}
--- a/src/util/email.rs
+++ b/src/util/email.rs
@@ -1,96 +0,0 @@
-use lettre::message::{header, MultiPart, SinglePart};
-use lettre::transport::smtp::authentication::Credentials;
-use lettre::{Message, SmtpTransport, Transport};
-
-use super::variables::{PUBLIC_URL, SMTP_FROM, SMTP_HOST, SMTP_PASSWORD, SMTP_USERNAME};
-
-lazy_static! {
-    static ref MAILER: lettre::transport::smtp::SmtpTransport =
-        SmtpTransport::relay(SMTP_HOST.as_ref())
-            .unwrap()
-            .credentials(Credentials::new(
-                SMTP_USERNAME.to_string(),
-                SMTP_PASSWORD.to_string()
-            ))
-            .build();
-}
-
-fn send(message: Message) -> Result<(), String> {
-    MAILER
-        .send(&message)
-        .map_err(|err| format!("Failed to send email! {}", err.to_string()))?;
-
-    Ok(())
-}
-
-fn generate_multipart(text: &str, html: &str) -> MultiPart {
-    MultiPart::mixed().multipart(
-        MultiPart::alternative()
-            .singlepart(
-                SinglePart::quoted_printable()
-                    .header(header::ContentType(
-                        "text/plain; charset=utf8".parse().unwrap(),
-                    ))
-                    .body(text),
-            )
-            .multipart(
-                MultiPart::related().singlepart(
-                    SinglePart::eight_bit()
-                        .header(header::ContentType(
-                            "text/html; charset=utf8".parse().unwrap(),
-                        ))
-                        .body(html),
-                ),
-            ),
-    )
-}
-
-pub fn send_verification_email(email: String, code: String) -> Result<(), String> {
-    let url = format!("{}/api/account/verify/{}", PUBLIC_URL.to_string(), code);
-    let email = Message::builder()
-        .from(SMTP_FROM.to_string().parse().unwrap())
-        .to(email.parse().unwrap())
-        .subject("Verify your email!")
-        .multipart(generate_multipart(
-            &format!("Verify your email here: {}", url),
-            &format!("<a href=\"{}\">Click to verify your email!</a>", url),
-        ))
-        .unwrap();
-
-    send(email)
-}
-
-pub fn send_password_reset(email: String, code: String) -> Result<(), String> {
-    let url = format!("{}/api/account/reset/{}", PUBLIC_URL.to_string(), code);
-    let email = Message::builder()
-        .from(SMTP_FROM.to_string().parse().unwrap())
-        .to(email.parse().unwrap())
-        .subject("Reset your password.")
-        .multipart(generate_multipart(
-            &format!("Reset your password here: {}", url),
-            &format!("<a href=\"{}\">Click to reset your password!</a>", url),
-        ))
-        .unwrap();
-
-    send(email)
-}
-
-pub fn send_welcome_email(email: String, username: String) -> Result<(), String> {
-    let email = Message::builder()
-        .from(SMTP_FROM.to_string().parse().unwrap())
-        .to(email.parse().unwrap())
-        .subject("Welcome to REVOLT!")
-        .multipart(
-        generate_multipart(
-            &format!("Welcome, {}! You can now use REVOLT.", username),
-            &format!(
-                    "<b>Welcome, {}!</b><br/>You can now use REVOLT.<br/><a href=\"{}\">Go to REVOLT</a>",
-                    username,
-                    PUBLIC_URL.to_string()
-                )
-            )
-        )
-        .unwrap();
-
-    send(email)
-}
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -1,19 +1,2 @@
-use rand::{distributions::Alphanumeric, Rng};
-use std::collections::HashSet;
-use std::iter::FromIterator;
-
-pub mod captcha;
-pub mod email;
 pub mod result;
 pub mod variables;
-
-pub fn vec_to_set<T: Clone + Eq + std::hash::Hash>(data: &[T]) -> HashSet<T> {
-    HashSet::from_iter(data.iter().cloned())
-}
-
-pub fn gen_token(l: usize) -> String {
-    rand::thread_rng()
-        .sample_iter(&Alphanumeric)
-        .take(l)
-        .collect::<String>()
-}
--- a/src/util/result.rs
+++ b/src/util/result.rs
@@ -36,8 +36,12 @@ pub enum Error {
    // ? Channel related errors.
    #[snafu(display("This channel does not exist!"))]
    UnknownChannel,
+    #[snafu(display("Attachment does not exist!"))]
+    UnknownAttachment,
    #[snafu(display("Cannot edit someone else's message."))]
    CannotEditMessage,
+    #[snafu(display("Cannot send empty message."))]
+    EmptyMessage,
    #[snafu(display("Cannot remove yourself from a group, use delete channel instead."))]
    CannotRemoveYourself,
    #[snafu(display("Group size is too large."))]
@@ -48,6 +52,8 @@ pub enum Error {
    NotInGroup,

    // ? General errors.
+    #[snafu(display("Trying to fetch too much data."))]
+    TooManyIds,
    #[snafu(display("Failed to validate fields."))]
    FailedValidation { error: ValidationErrors },
    #[snafu(display("Encountered a database error."))]
@@ -57,6 +63,8 @@ pub enum Error {
    },
    #[snafu(display("Internal server error."))]
    InternalError,
+    #[snafu(display("Missing permission."))]
+    MissingPermission,
    #[snafu(display("Operation cannot be performed on this object."))]
    InvalidOperation,
    #[snafu(display("Already created an object with this nonce."))]
@@ -84,7 +92,9 @@ impl<'r> Responder<'r, 'static> for Error {
            Error::NotFriends => Status::Forbidden,

            Error::UnknownChannel => Status::NotFound,
+            Error::UnknownAttachment => Status::BadRequest,
            Error::CannotEditMessage => Status::Forbidden,
+            Error::EmptyMessage => Status::UnprocessableEntity,
            Error::CannotRemoveYourself => Status::BadRequest,
            Error::GroupTooLarge { .. } => Status::Forbidden,
            Error::AlreadyInGroup => Status::Conflict,
@@ -93,7 +103,9 @@ impl<'r> Responder<'r, 'static> for Error {
            Error::FailedValidation { .. } => Status::UnprocessableEntity,
            Error::DatabaseError { .. } => Status::InternalServerError,
            Error::InternalError => Status::InternalServerError,
+            Error::MissingPermission => Status::Forbidden,
            Error::InvalidOperation => Status::BadRequest,
+            Error::TooManyIds => Status::BadRequest,
            Error::DuplicateNonce => Status::Conflict,
            Error::NoEffect => Status::Ok,
        };
--- a/src/util/variables.rs
+++ b/src/util/variables.rs
@@ -7,19 +7,28 @@ lazy_static! {
    // Application Settings
    pub static ref MONGO_URI: String =
        env::var("REVOLT_MONGO_URI").expect("Missing REVOLT_MONGO_URI environment variable.");
+    pub static ref WS_HOST: String =
+        env::var("REVOLT_WS_HOST").unwrap_or_else(|_| "0.0.0.0:9000".to_string());
    pub static ref PUBLIC_URL: String =
        env::var("REVOLT_PUBLIC_URL").expect("Missing REVOLT_PUBLIC_URL environment variable.");
+    pub static ref APP_URL: String =
+        env::var("REVOLT_APP_URL").unwrap_or_else(|_| "https://app.revolt.chat".to_string());
    pub static ref EXTERNAL_WS_URL: String =
        env::var("REVOLT_EXTERNAL_WS_URL").expect("Missing REVOLT_EXTERNAL_WS_URL environment variable.");
+    pub static ref AUTUMN_URL: String =
+        env::var("AUTUMN_PUBLIC_URL").unwrap_or_else(|_| "https://example.com".to_string());
    pub static ref HCAPTCHA_KEY: String =
        env::var("REVOLT_HCAPTCHA_KEY").unwrap_or_else(|_| "0x0000000000000000000000000000000000000000".to_string());
    pub static ref HCAPTCHA_SITEKEY: String =
        env::var("REVOLT_HCAPTCHA_SITEKEY").unwrap_or_else(|_| "10000000-ffff-ffff-ffff-000000000001".to_string());
-    pub static ref WS_HOST: String =
-        env::var("REVOLT_WS_HOST").unwrap_or_else(|_| "0.0.0.0:9000".to_string());
+    pub static ref VAPID_PRIVATE_KEY: String =
+        env::var("REVOLT_VAPID_PRIVATE_KEY").expect("Missing REVOLT_VAPID_PRIVATE_KEY environment variable.");
+    pub static ref VAPID_PUBLIC_KEY: String =
+        env::var("REVOLT_VAPID_PUBLIC_KEY").expect("Missing REVOLT_VAPID_PUBLIC_KEY environment variable.");

    // Application Flags
-    pub static ref DISABLE_REGISTRATION: bool = env::var("REVOLT_DISABLE_REGISTRATION").map_or(false, |v| v == "*1");
+    pub static ref DISABLE_REGISTRATION: bool = env::var("REVOLT_DISABLE_REGISTRATION").map_or(false, |v| v == "1");
+    pub static ref INVITE_ONLY: bool = env::var("REVOLT_INVITE_ONLY").map_or(false, |v| v == "1");
    pub static ref USE_EMAIL: bool = env::var("REVOLT_USE_EMAIL_VERIFICATION").map_or(
        env::var("REVOLT_SMTP_HOST").is_ok()
            && env::var("REVOLT_SMTP_USERNAME").is_ok()
@@ -28,6 +37,8 @@ lazy_static! {
        |v| v == *"1"
    );
    pub static ref USE_HCAPTCHA: bool = env::var("REVOLT_HCAPTCHA_KEY").is_ok();
+    pub static ref USE_PROMETHEUS: bool = env::var("REVOLT_ENABLE_PROMETHEUS").map_or(false, |v| v == "1");
+    pub static ref USE_AUTUMN: bool = env::var("AUTUMN_PUBLIC_URL").is_ok();

    // SMTP Settings
    pub static ref SMTP_HOST: String =
Author	SHA1	Message	Date
Paul	37df18dbf7	Fixes mutual connections not being seen and hence requests failing.	2021-03-30 22:09:36 +01:00
Paul	0a9d5de369	Don't unwrap on subscription errors.	2021-03-29 10:14:25 +01:00
Paul	d2864ac025	Make sure to check that they are friends.	2021-02-19 15:49:55 +00:00
Paul	4eb76fd154	Fix mutex issues.	2021-02-19 15:24:19 +00:00
Paul	3c7852271a	Add temporary typing indicator impl.	2021-02-19 14:50:23 +00:00
Paul	dadad271b4	Mark attachments as deleted when deleting messages.	2021-02-19 14:12:21 +00:00
Paul	db6047f2d3	Allow empty messages with attachment.	2021-02-19 14:09:19 +00:00
Paul	5baf85a8e9	JSON system messages.	2021-02-19 14:03:41 +00:00
Paul	10cac358a9	Label permission errors, and too many ids for /stale.	2021-02-19 13:26:04 +00:00
Paul	64d2707366	Find mutual for users; allow dots in usernames.	2021-02-19 13:11:33 +00:00
Paul	78cfbf9d21	Clean up subscription code; handle error properly.	2021-02-19 12:48:52 +00:00
Paul	02077a4024	Check if online.	2021-02-18 16:47:59 +00:00
Paul	52e070c21c	Basic Web Push support.	2021-02-18 16:21:34 +00:00
Paul Makles	a2f14d2d37	Bump version.	2021-02-16 15:26:31 +00:00
Paul Makles	a7ea29d821	Add a way to send messages with attachments.	2021-02-16 15:25:33 +00:00
Paul Makles	b6b51bca26	Route which lets clients determine messages that have updated / deleted.	2021-02-16 09:34:24 +00:00
Paul Makles	2bafffbbc1	Case-insensitive search for emails.	2021-02-14 16:28:23 +00:00
Paul Makles	bdf5fb95d0	Add rAuth captcha support.	2021-02-13 20:18:38 +00:00
Paul Makles	ea8de2400a	Add support for rAuth invite-only mode.	2021-02-12 20:37:24 +00:00
Paul Makles	f5e0b49bbb	Update rAuth, add templates; add APP_URL variable.	2021-02-12 15:09:42 +00:00
Paul Makles	b0d07ec58f	Include DM users in payload; fix permission query. + cargo fmt	2021-02-09 16:41:08 +00:00
Paul Makles	4c99d079e0	Remove ViewAll; check for mutual DMs.	2021-02-09 15:51:35 +00:00
Paul Makles	38bedbaaea	Add Gravatar support.	2021-02-02 19:09:13 +00:00
Paul Makles	ea276c3517	Fix assets fr this time	2021-01-30 18:40:58 +00:00
Paul Makles	648e33a13e	Include assets in docker image.	2021-01-30 18:23:23 +00:00
Paul Makles	a76ec207b3	Add Prometheus metrics.	2021-01-29 21:56:37 +00:00
Paul Makles	687b300bfc	Include assets in Docker image.	2021-01-28 18:51:46 +00:00
Paul Makles	6586d8f02c	Fix SSL certificates in container.	2021-01-27 19:37:21 +00:00
Paul Makles	a8a8c08c29	Update Docker image and ports.	2021-01-27 18:31:27 +00:00
Paul Makles	1806ea824b	Bump rAuth revision.	2021-01-27 11:08:37 +00:00