diff --git a/set_version.sh b/set_version.sh
index 92e7565db19fb51d64070c1972df3802c781063c..d003f77c1f4eb179eb5ab1949a3bf18b8b1a16e1 100755
--- a/set_version.sh
+++ b/set_version.sh
@@ -1,3 +1,3 @@
#!/bin/bash
-export version=0.5.0-alpha.4
+export version=0.5.0-alpha.5
echo "pub const VERSION: &str = \"${version}\";" > src/version.rs
diff --git a/src/database/entities/channel.rs b/src/database/entities/channel.rs
index aefa613316a8d5e204a13d49ff2258eb89ae6baa..5f102b2b6d1491dd63570c978698b88fba573b50 100644
--- a/src/database/entities/channel.rs
+++ b/src/database/entities/channel.rs
@@ -128,7 +128,7 @@ impl Channel {
operation: "delete_many",
with: "channel_invites",
})?;
-
+
// Delete any unreads.
get_collection("channel_unreads")
.delete_many(
diff --git a/src/database/entities/message.rs b/src/database/entities/message.rs
index bc1c8e893cdd209958cc9986d4c5269ab2c0c413..675ad35ef5fbdfa859ad2a26dee1edcf282ac26c 100644
--- a/src/database/entities/message.rs
+++ b/src/database/entities/message.rs
@@ -6,6 +6,7 @@ use crate::{
};
use futures::StreamExt;
+use mongodb::options::UpdateOptions;
use mongodb::{
bson::{doc, to_bson, DateTime},
options::FindOptions,
@@ -55,7 +56,7 @@ impl Content {
"00000000000000000000000000".to_string(),
target.id().to_string(),
self,
- None
+ None,
)
.publish(&target)
.await
@@ -79,11 +80,16 @@ pub struct Message {
#[serde(skip_serializing_if = "Option::is_none")]
pub embeds: Option<Vec<Embed>>,
#[serde(skip_serializing_if = "Option::is_none")]
- pub mentions: Option<Vec<String>>
+ pub mentions: Option<Vec<String>>,
}
impl Message {
- pub fn create(author: String, channel: String, content: Content, mentions: Option<Vec<String>>) -> Message {
+ pub fn create(
+ author: String,
+ channel: String,
+ content: Content,
+ mentions: Option<Vec<String>>,
+ ) -> Message {
Message {
id: Ulid::new().to_string(),
nonce: None,
@@ -94,7 +100,7 @@ impl Message {
attachments: None,
edited: None,
embeds: None,
- mentions
+ mentions,
}
}
@@ -208,7 +214,7 @@ impl Message {
"mentions": message
}
},
- None
+ UpdateOptions::builder().upsert(true).build(),
)
.await
/*.map_err(|_| Error::DatabaseError {
@@ -241,7 +247,7 @@ impl Message {
}
_ => {}
}
-
+
// Fetch their corresponding sessions.
if let Ok(mut cursor) = get_collection("accounts")
.find(
@@ -309,7 +315,7 @@ impl Message {
ClientboundNotification::MessageUpdate {
id: self.id.clone(),
channel: self.channel.clone(),
- data
+ data,
}
.publish(channel);
self.process_embed();
@@ -348,7 +354,7 @@ impl Message {
ClientboundNotification::MessageUpdate {
id,
channel: channel.clone(),
- data: json!({ "embeds": embeds })
+ data: json!({ "embeds": embeds }),
}
.publish(channel);
}
diff --git a/src/database/entities/microservice/january.rs b/src/database/entities/microservice/january.rs
index 5eee2b56636c46d1a8f0d58edbae8ec802cde52d..2b04559c1dd71c8352056b74f806f985a5ca8846 100644
--- a/src/database/entities/microservice/january.rs
+++ b/src/database/entities/microservice/january.rs
@@ -3,8 +3,8 @@ use crate::util::{
variables::JANUARY_URL,
};
use linkify::{LinkFinder, LinkKind};
-use serde::{Deserialize, Serialize};
use regex::Regex;
+use serde::{Deserialize, Serialize};
#[derive(Serialize, Deserialize, Debug, Clone)]
pub enum ImageSize {
diff --git a/src/database/entities/server.rs b/src/database/entities/server.rs
index 5726d448b2c48ff859a5f27233567363a1d75a9c..0c325b79e77185820d6d9c667e457024f8cf43b5 100644
--- a/src/database/entities/server.rs
+++ b/src/database/entities/server.rs
@@ -39,13 +39,13 @@ pub struct SystemMessageChannels {
pub user_joined: Option<String>,
pub user_left: Option<String>,
pub user_kicked: Option<String>,
- pub user_banned: Option<String>
+ pub user_banned: Option<String>,
}
pub enum RemoveMember {
Leave,
Kick,
- Ban
+ Ban,
}
#[derive(Serialize, Deserialize, Debug, Clone)]
@@ -361,14 +361,20 @@ impl Server {
}
RemoveMember::Kick => {
if let Some(cid) = &channels.user_kicked {
- Some((cid.clone(), SystemMessage::UserKicked { id: id.to_string() }))
+ Some((
+ cid.clone(),
+ SystemMessage::UserKicked { id: id.to_string() },
+ ))
} else {
None
}
}
RemoveMember::Ban => {
if let Some(cid) = &channels.user_banned {
- Some((cid.clone(), SystemMessage::UserBanned { id: id.to_string() }))
+ Some((
+ cid.clone(),
+ SystemMessage::UserBanned { id: id.to_string() },
+ ))
} else {
None
}
diff --git a/src/database/entities/sync.rs b/src/database/entities/sync.rs
index 07fb161d51f868fb9cc170f820d602913de1f6cb..c4883d8c18397a47f41e97c7f833fa6f7eaf14f6 100644
--- a/src/database/entities/sync.rs
+++ b/src/database/entities/sync.rs
@@ -1,5 +1,5 @@
+use serde::{Deserialize, Serialize};
use std::collections::HashMap;
-use serde::{Serialize, Deserialize};
pub type UserSettings = HashMap<String, (i64, String)>;
@@ -14,6 +14,6 @@ pub struct ChannelUnread {
#[serde(rename = "_id")]
pub id: ChannelCompositeKey,
- pub last_id: String,
+ pub last_id: Option<String>,
pub mentions: Option<Vec<String>>,
}
diff --git a/src/database/entities/user.rs b/src/database/entities/user.rs
index b94d7a52be990c454dc020e6fc1412a61fe2af2d..c4d199d284d497f0240769bbf69c8293c0662d51 100644
--- a/src/database/entities/user.rs
+++ b/src/database/entities/user.rs
@@ -261,7 +261,7 @@ impl User {
doc! {
"_id.user": &self.id
},
- None
+ None,
)
.await
.map_err(|_| Error::DatabaseError {
diff --git a/src/database/permissions/server.rs b/src/database/permissions/server.rs
index 6062c645553f303e7f055caa03a1c86c1a75019d..e0cad1589e241aad707850260094155ba05d65e0 100644
--- a/src/database/permissions/server.rs
+++ b/src/database/permissions/server.rs
@@ -8,18 +8,18 @@ use std::ops;
#[derive(Debug, PartialEq, Eq, TryFromPrimitive, Copy, Clone)]
#[repr(u32)]
pub enum ServerPermission {
- View = 0b00000000000000000000000000000001, // 1
- ManageRoles = 0b00000000000000000000000000000010, // 2
- ManageChannels = 0b00000000000000000000000000000100, // 4
- ManageServer = 0b00000000000000000000000000001000, // 8
- KickMembers = 0b00000000000000000000000000010000, // 16
- BanMembers = 0b00000000000000000000000000100000, // 32
+ View = 0b00000000000000000000000000000001, // 1
+ ManageRoles = 0b00000000000000000000000000000010, // 2
+ ManageChannels = 0b00000000000000000000000000000100, // 4
+ ManageServer = 0b00000000000000000000000000001000, // 8
+ KickMembers = 0b00000000000000000000000000010000, // 16
+ BanMembers = 0b00000000000000000000000000100000, // 32
// 6 bits of space
- ChangeNickname = 0b00000000000000000001000000000000, // 4096
+ ChangeNickname = 0b00000000000000000001000000000000, // 4096
ManageNicknames = 0b00000000000000000010000000000000, // 8192
- ChangeAvatar = 0b00000000000000000100000000000000, // 16392
- RemoveAvatars = 0b00000000000000001000000000000000, // 32784
- // 16 bits of space
+ ChangeAvatar = 0b00000000000000000100000000000000, // 16392
+ RemoveAvatars = 0b00000000000000001000000000000000, // 32784
+ // 16 bits of space
}
impl_op_ex!(+ |a: &ServerPermission, b: &ServerPermission| -> u32 { *a as u32 | *b as u32 });
diff --git a/src/database/permissions/user.rs b/src/database/permissions/user.rs
index bc369276ea3292070d669c56ab3c5a56db023ca9..50df7e016cf153a3cff34f46f22cdc47a5684544 100644
--- a/src/database/permissions/user.rs
+++ b/src/database/permissions/user.rs
@@ -55,8 +55,7 @@ impl<'a> PermissionCalculator<'a> {
.map(|v| v.to_owned())
.unwrap_or_else(|| get_relationship(&self.perspective, &target))
{
- RelationshipStatus::Friend |
- RelationshipStatus::User => return Ok(u32::MAX),
+ RelationshipStatus::Friend | RelationshipStatus::User => return Ok(u32::MAX),
RelationshipStatus::Blocked | RelationshipStatus::BlockedOther => {
return Ok(UserPermission::Access as u32)
}
diff --git a/src/notifications/events.rs b/src/notifications/events.rs
index 6218b92e24892b8a4a55c9b719d84ef5517ed705..b26b7c5bd1d7a2918b21049c39145093e4fdca92 100644
--- a/src/notifications/events.rs
+++ b/src/notifications/events.rs
@@ -5,10 +5,7 @@ use rocket_contrib::json::JsonValue;
use serde::{Deserialize, Serialize};
use super::hive::{get_hive, subscribe_if_exists};
-use crate::{
- database::*,
- util::result::{Result},
-};
+use crate::{database::*, util::result::Result};
#[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(tag = "error")]
@@ -63,14 +60,14 @@ pub enum ClientboundNotification {
Ready {
users: Vec<User>,
servers: Vec<Server>,
- channels: Vec<Channel>
+ channels: Vec<Channel>,
},
Message(Message),
MessageUpdate {
id: String,
channel: String,
- data: JsonValue
+ data: JsonValue,
},
MessageDelete {
id: String,
@@ -106,7 +103,7 @@ pub enum ClientboundNotification {
ChannelAck {
id: String,
user: String,
- message_id: String
+ message_id: String,
},
ServerUpdate {
diff --git a/src/notifications/payload.rs b/src/notifications/payload.rs
index 6a279f0f873017e9ad65ee1778e852e099072969..ac5c45395b27e9ddeafd2a1be9aa892eb5985a44 100644
--- a/src/notifications/payload.rs
+++ b/src/notifications/payload.rs
@@ -113,6 +113,6 @@ pub async fn generate_ready(mut user: User) -> Result<ClientboundNotification> {
Ok(ClientboundNotification::Ready {
users,
servers,
- channels
+ channels,
})
}
diff --git a/src/routes/channels/channel_ack.rs b/src/routes/channels/channel_ack.rs
index dfd45e457f34a90205d9d9a95478b3e35e648e0a..30cd7cd66e7af1ea008494f649203f305a11c7ac 100644
--- a/src/routes/channels/channel_ack.rs
+++ b/src/routes/channels/channel_ack.rs
@@ -1,6 +1,6 @@
+use crate::database::*;
use crate::notifications::events::ClientboundNotification;
use crate::util::result::{Error, Result};
-use crate::database::*;
use mongodb::bson::doc;
use mongodb::options::UpdateOptions;
@@ -33,21 +33,20 @@ pub async fn req(user: User, target: Ref, message: Ref) -> Result<()> {
"last_id": &message.id
}
},
- UpdateOptions::builder()
- .upsert(true)
- .build()
+ UpdateOptions::builder().upsert(true).build(),
)
.await
.map_err(|_| Error::DatabaseError {
operation: "update_one",
with: "channel_unreads",
})?;
-
+
ClientboundNotification::ChannelAck {
id: id.to_string(),
user: user.id.clone(),
- message_id: message.id
- }.publish(user.id);
-
+ message_id: message.id,
+ }
+ .publish(user.id);
+
Ok(())
}
diff --git a/src/routes/channels/delete_channel.rs b/src/routes/channels/delete_channel.rs
index 2869d177ad5f790b330566f6ceb73db63c92d5aa..d11d8fe7a377a62b04298e7ff8b6042c2139740c 100644
--- a/src/routes/channels/delete_channel.rs
+++ b/src/routes/channels/delete_channel.rs
@@ -99,8 +99,9 @@ pub async fn req(user: User, target: Ref) -> Result<()> {
.publish(id.clone());
Content::SystemMessage(SystemMessage::UserLeft { id: user.id })
- .send_as_system(&target)
- .await.ok();
+ .send_as_system(&target)
+ .await
+ .ok();
Ok(())
}
diff --git a/src/routes/channels/edit_channel.rs b/src/routes/channels/edit_channel.rs
index 668dfe095d5f348d648a37d5c7fdebadd3d539f5..544c464a4ec7123ae60bd09b63c3c863fd8e0f6c 100644
--- a/src/routes/channels/edit_channel.rs
+++ b/src/routes/channels/edit_channel.rs
@@ -117,7 +117,8 @@ pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<()> {
by: user.id.clone(),
})
.send_as_system(&target)
- .await.ok();
+ .await
+ .ok();
}
if let Some(_) = data.description {
@@ -125,13 +126,15 @@ pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<()> {
by: user.id.clone(),
})
.send_as_system(&target)
- .await.ok();
+ .await
+ .ok();
}
if let Some(_) = data.icon {
Content::SystemMessage(SystemMessage::ChannelIconChanged { by: user.id })
- .send_as_system(&target)
- .await.ok();
+ .send_as_system(&target)
+ .await
+ .ok();
}
}
diff --git a/src/routes/channels/group_add_member.rs b/src/routes/channels/group_add_member.rs
index e00c8afc71fb135482e93837a3ebdcf6207efbf1..a2361ed7c63e918f6f24f4a044136a8bf095e67a 100644
--- a/src/routes/channels/group_add_member.rs
+++ b/src/routes/channels/group_add_member.rs
@@ -60,7 +60,8 @@ pub async fn req(user: User, target: Ref, member: Ref) -> Result<()> {
by: user.id,
})
.send_as_system(&channel)
- .await.ok();
+ .await
+ .ok();
Ok(())
} else {
diff --git a/src/routes/channels/group_create.rs b/src/routes/channels/group_create.rs
index 4405c7ca2e279ed0c53be13bfe360c3e96a623e1..1746e78d0ace90d462f62e17e9ef8b450243fd33 100644
--- a/src/routes/channels/group_create.rs
+++ b/src/routes/channels/group_create.rs
@@ -39,8 +39,7 @@ pub async fn req(user: User, info: Json<Data>) -> Result<JsonValue> {
for target in &set {
match get_relationship(&user, target) {
- RelationshipStatus::Friend |
- RelationshipStatus::User => {},
+ RelationshipStatus::Friend | RelationshipStatus::User => {}
_ => {
return Err(Error::NotFriends);
}
diff --git a/src/routes/channels/group_remove_member.rs b/src/routes/channels/group_remove_member.rs
index 640bb8efa483cdc7c3b3a69d94e9994f555d7b02..fa59a214d329a49f61df1506d339d89fbb9bbbe0 100644
--- a/src/routes/channels/group_remove_member.rs
+++ b/src/routes/channels/group_remove_member.rs
@@ -56,7 +56,8 @@ pub async fn req(user: User, target: Ref, member: Ref) -> Result<()> {
by: user.id,
})
.send_as_system(&channel)
- .await.ok();
+ .await
+ .ok();
Ok(())
} else {
diff --git a/src/routes/channels/message_edit.rs b/src/routes/channels/message_edit.rs
index d33d60bda243557182611a897b5490a43025d821..19d95be37951c974c337f0447a3039b62d8a3fbc 100644
--- a/src/routes/channels/message_edit.rs
+++ b/src/routes/channels/message_edit.rs
@@ -2,7 +2,7 @@ use crate::database::*;
use crate::util::result::{Error, Result};
use chrono::Utc;
-use mongodb::bson::{Bson, DateTime, Document, doc};
+use mongodb::bson::{doc, Bson, DateTime, Document};
use rocket_contrib::json::Json;
use serde::{Deserialize, Serialize};
use validator::Validate;
@@ -45,10 +45,7 @@ pub async fn req(user: User, target: Ref, msg: Ref, edit: Json<Data>) -> Result<
for embed in embeds {
match embed {
- Embed::Website(_) |
- Embed::Image(_) |
- Embed::None => { }
- // Otherwise push to new_embeds.
+ Embed::Website(_) | Embed::Image(_) | Embed::None => {} // Otherwise push to new_embeds.
}
}
@@ -73,7 +70,5 @@ pub async fn req(user: User, target: Ref, msg: Ref, edit: Json<Data>) -> Result<
with: "message",
})?;
- message
- .publish_update(update)
- .await
+ message.publish_update(update).await
}
diff --git a/src/routes/channels/message_send.rs b/src/routes/channels/message_send.rs
index be68c45ebd3207065d7249055fa31244f03655ac..9bf0f9c6fb60ed2cd33ca1a432cdab1e89bcc299 100644
--- a/src/routes/channels/message_send.rs
+++ b/src/routes/channels/message_send.rs
@@ -2,11 +2,11 @@ use crate::database::*;
use crate::util::result::{Error, Result};
use mongodb::{bson::doc, options::FindOneOptions};
+use regex::Regex;
use rocket_contrib::json::{Json, JsonValue};
use serde::{Deserialize, Serialize};
-use validator::Validate;
-use regex::Regex;
use ulid::Ulid;
+use validator::Validate;
#[derive(Validate, Serialize, Deserialize)]
pub struct Data {
@@ -16,7 +16,7 @@ pub struct Data {
#[validate(length(min = 1, max = 36))]
nonce: String,
#[validate(length(min = 1, max = 128))]
- attachment: Option<String>,
+ attachments: Option<Vec<String>>,
}
lazy_static! {
@@ -29,7 +29,9 @@ pub async fn req(user: User, target: Ref, message: Json<Data>) -> Result<JsonVal
.validate()
.map_err(|error| Error::FailedValidation { error })?;
- if message.content.len() == 0 && message.attachment.is_none() {
+ if message.content.len() == 0
+ && (message.attachments.is_none() || message.attachments.as_ref().unwrap().len() == 0)
+ {
return Err(Error::EmptyMessage);
}
@@ -63,10 +65,19 @@ pub async fn req(user: User, target: Ref, message: Json<Data>) -> Result<JsonVal
}
let id = Ulid::new().to_string();
- let attachments = if let Some(attachment_id) = &message.attachment {
- Some(vec![
- File::find_and_use(attachment_id, "attachments", "message", &id).await?,
- ])
+ let attachments = if let Some(ids) = &message.attachments {
+ // ! FIXME: move this to app config
+ if ids.len() >= 5 {
+ return Err(Error::TooManyAttachments)
+ }
+
+ let mut attachments = vec![];
+ for attachment_id in ids {
+ attachments
+ .push(File::find_and_use(attachment_id, "attachments", "message", &id).await?);
+ }
+
+ Some(attachments)
} else {
None
};
@@ -77,6 +88,7 @@ pub async fn req(user: User, target: Ref, message: Json<Data>) -> Result<JsonVal
mentions.push(captures[1].to_string());
}
+
let msg = Message {
id,
channel: target.id().to_string(),
@@ -87,7 +99,11 @@ pub async fn req(user: User, target: Ref, message: Json<Data>) -> Result<JsonVal
nonce: Some(message.nonce.clone()),
edited: None,
embeds: None,
- mentions: if mentions.len() > 0 { Some(mentions) } else { None }
+ mentions: if mentions.len() > 0 {
+ Some(mentions)
+ } else {
+ None
+ },
};
msg.clone().publish(&target).await?;
diff --git a/src/routes/root.rs b/src/routes/root.rs
index 8256477f35ba6c0731b02177fdc1469c6fb651de..044394927e03af9c77291838820b9c9d1f4a8b65 100644
--- a/src/routes/root.rs
+++ b/src/routes/root.rs
@@ -1,7 +1,6 @@
use crate::util::variables::{
- APP_URL, AUTUMN_URL, EXTERNAL_WS_URL, HCAPTCHA_SITEKEY, INVITE_ONLY,
- JANUARY_URL, USE_AUTUMN, USE_EMAIL, USE_HCAPTCHA, USE_JANUARY, USE_VOSO, VAPID_PUBLIC_KEY,
- VOSO_URL, VOSO_WS_HOST,
+ APP_URL, AUTUMN_URL, EXTERNAL_WS_URL, HCAPTCHA_SITEKEY, INVITE_ONLY, JANUARY_URL, USE_AUTUMN,
+ USE_EMAIL, USE_HCAPTCHA, USE_JANUARY, USE_VOSO, VAPID_PUBLIC_KEY, VOSO_URL, VOSO_WS_HOST,
};
use mongodb::bson::doc;
diff --git a/src/routes/servers/ban_create.rs b/src/routes/servers/ban_create.rs
index aec2f53e50c32264b8674317f500d703ead7aee3..53c9d07133dea6b85b58e18ad09ea1e60fbfda2f 100644
--- a/src/routes/servers/ban_create.rs
+++ b/src/routes/servers/ban_create.rs
@@ -31,11 +31,11 @@ pub async fn req(user: User, server: Ref, target: Ref, data: Json<Data>) -> Resu
let target = target.fetch_user().await?;
if target.id == user.id {
- return Err(Error::InvalidOperation)
+ return Err(Error::InvalidOperation);
}
if target.id == server.owner {
- return Err(Error::MissingPermission)
+ return Err(Error::MissingPermission);
}
let mut document = doc! {
diff --git a/src/routes/servers/channel_create.rs b/src/routes/servers/channel_create.rs
index 5990d15420721565f7d9e1ee551fe8e97719a5b8..d98bec0ae1483eb0d05cde5ba101442ab87a3bd5 100644
--- a/src/routes/servers/channel_create.rs
+++ b/src/routes/servers/channel_create.rs
@@ -60,7 +60,7 @@ pub async fn req(user: User, target: Ref, info: Json<Data>) -> Result<JsonValue>
name: info.name,
description: info.description,
icon: None,
- last_message: None
+ last_message: None,
};
channel.clone().publish().await?;
diff --git a/src/routes/servers/member_remove.rs b/src/routes/servers/member_remove.rs
index fa2ba9c941d3a38984423d9e3cc1d9c6fe50c026..5e76b2b6f9b14ea993f1dcc202e3f5623c3f1676 100644
--- a/src/routes/servers/member_remove.rs
+++ b/src/routes/servers/member_remove.rs
@@ -25,5 +25,7 @@ pub async fn req(user: User, target: Ref, member: String) -> Result<()> {
return Err(Error::MissingPermission);
}
- target.remove_member(&member.id.user, RemoveMember::Kick).await
+ target
+ .remove_member(&member.id.user, RemoveMember::Kick)
+ .await
}
diff --git a/src/routes/servers/server_create.rs b/src/routes/servers/server_create.rs
index 55846d1a6d001984b864d4888c1c8918f5ddeaaf..b1adb2b1b4dd2f1e111187a177cae913db457426 100644
--- a/src/routes/servers/server_create.rs
+++ b/src/routes/servers/server_create.rs
@@ -52,14 +52,12 @@ pub async fn req(user: User, info: Json<Data>) -> Result<JsonValue> {
name: info.name,
description: info.description,
channels: vec![cid.clone()],
- system_messages: Some(
- SystemMessageChannels {
- user_joined: Some(cid.clone()),
- user_left: Some(cid.clone()),
- user_kicked: Some(cid.clone()),
- user_banned: Some(cid.clone())
- }
- ),
+ system_messages: Some(SystemMessageChannels {
+ user_joined: Some(cid.clone()),
+ user_left: Some(cid.clone()),
+ user_kicked: Some(cid.clone()),
+ user_banned: Some(cid.clone()),
+ }),
icon: None,
banner: None,
@@ -72,7 +70,7 @@ pub async fn req(user: User, info: Json<Data>) -> Result<JsonValue> {
name: "general".to_string(),
description: None,
icon: None,
- last_message: None
+ last_message: None,
}
.publish()
.await?;
diff --git a/src/routes/sync/get_unreads.rs b/src/routes/sync/get_unreads.rs
index 4d59bebfbb403952d59ce4db2340d2c4df2e7254..02e709b84d657b65f73ad9df8c93885cf4dfc76b 100644
--- a/src/routes/sync/get_unreads.rs
+++ b/src/routes/sync/get_unreads.rs
@@ -1,8 +1,8 @@
use crate::database::*;
use crate::util::result::Result;
-use rocket_contrib::json::JsonValue;
use mongodb::bson::doc;
+use rocket_contrib::json::JsonValue;
#[get("/unreads")]
pub async fn req(user: User) -> Result<JsonValue> {
diff --git a/src/routes/sync/mod.rs b/src/routes/sync/mod.rs
index 3bfe36d93f7453037cf8e6cf23be9b3780da3dd2..d9efc4ef2a5c9b9d46a7b06c55744109b817014e 100644
--- a/src/routes/sync/mod.rs
+++ b/src/routes/sync/mod.rs
@@ -1,8 +1,8 @@
use rocket::Route;
mod get_settings;
-mod set_settings;
mod get_unreads;
+mod set_settings;
pub fn routes() -> Vec<Route> {
routes![get_settings::req, set_settings::req, get_unreads::req]
diff --git a/src/util/result.rs b/src/util/result.rs
index 06dc96144e9119f4f7850875f6244e7b6ace2884..e0df9750c672bcfd681c36ba3ffe1d159f672a23 100644
--- a/src/util/result.rs
+++ b/src/util/result.rs
@@ -28,6 +28,7 @@ pub enum Error {
UnknownAttachment,
CannotEditMessage,
CannotJoinCall,
+ TooManyAttachments,
EmptyMessage,
CannotRemoveYourself,
GroupTooLarge {
@@ -81,6 +82,7 @@ impl<'r> Responder<'r, 'static> for Error {
Error::UnknownAttachment => Status::BadRequest,
Error::CannotEditMessage => Status::Forbidden,
Error::CannotJoinCall => Status::BadRequest,
+ Error::TooManyAttachments => Status::BadRequest,
Error::EmptyMessage => Status::UnprocessableEntity,
Error::CannotRemoveYourself => Status::BadRequest,
Error::GroupTooLarge { .. } => Status::Forbidden,
diff --git a/src/version.rs b/src/version.rs
index 20b580f069fd060c6c79a365280b352541f432c7..0c8c63dfa5c93d6011ff5f0053a58292ea14fbe5 100644
--- a/src/version.rs
+++ b/src/version.rs
@@ -1 +1 @@
-pub const VERSION: &str = "0.5.0-alpha.4";
+pub const VERSION: &str = "0.5.0-alpha.5";