chore: format code

This commit is contained in:
Paul Makles
2022-02-04 22:19:40 +00:00
parent 88273021a2
commit 8b4541feb0
6 changed files with 39 additions and 26 deletions

View File

@@ -1,15 +1,22 @@
use revolt_quark::{Error, EmptyResponse, Result, models::{User, Channel}, Ref, Db, perms, ChannelPermission};
use revolt_quark::{
models::{Channel, User},
perms, ChannelPermission, Db, EmptyResponse, Error, Ref, Result,
};
use mongodb::bson::doc;
#[put("/<target>/recipients/<member>")]
pub async fn req(
db: &Db,
user: User, target: Ref, member: Ref
) -> Result<EmptyResponse> {
pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyResponse> {
let channel = target.as_channel(db).await?;
if !perms(&user).channel(&channel).calc_channel(db).await.get_invite_others() {
return Err(Error::MissingPermission { permission: ChannelPermission::InviteOthers as i32 })
if !perms(&user)
.channel(&channel)
.calc_channel(db)
.await
.get_invite_others()
{
return Err(Error::MissingPermission {
permission: ChannelPermission::InviteOthers as i32,
});
}
match channel {
@@ -18,6 +25,6 @@ pub async fn req(
db.add_user_to_group(&id, &user.id).await?;
Ok(EmptyResponse)
}
_ => Err(Error::InvalidOperation)
_ => Err(Error::InvalidOperation),
}
}

View File

@@ -35,7 +35,9 @@ pub async fn req(db: &Db, user: User, info: Json<Data>) -> Result<Json<Channel>>
set.insert(user.id.clone());
if set.len() > *MAX_GROUP_SIZE {
return Err(Error::GroupTooLarge { max: *MAX_GROUP_SIZE });
return Err(Error::GroupTooLarge {
max: *MAX_GROUP_SIZE,
});
}
for target in &set {

View File

@@ -1,18 +1,23 @@
use revolt_quark::{Error, EmptyResponse, Result, Ref, Db, models::{Channel, User}};
use revolt_quark::{
models::{Channel, User},
Db, EmptyResponse, Error, Ref, Result,
};
use mongodb::bson::doc;
#[delete("/<target>/recipients/<member>")]
pub async fn req(
db: &Db,
user: User, target: Ref, member: Ref
) -> Result<EmptyResponse> {
pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyResponse> {
let channel = target.as_channel(db).await?;
match channel {
Channel::Group { id, owner, recipients, .. } => {
Channel::Group {
id,
owner,
recipients,
..
} => {
if user.id != owner {
return Err(Error::MissingPermission { permission: 0 })
return Err(Error::MissingPermission { permission: 0 });
}
let member = member.as_user(db).await?;
@@ -27,6 +32,6 @@ pub async fn req(
db.remove_user_from_group(&id, &member.id).await?;
Ok(EmptyResponse)
}
_ => Err(Error::InvalidOperation)
_ => Err(Error::InvalidOperation),
}
}

View File

@@ -1,4 +1,7 @@
use revolt_quark::{models::message::Masquerade, Result};
use revolt_quark::{
models::{message::Masquerade, User},
Ref, Result,
};
use mongodb::bson::doc;
use regex::Regex;
@@ -43,10 +46,6 @@ lazy_static! {
}
#[post("/<target>/messages", data = "<message>")]
pub async fn message_send(
/*user: UserRef, _r: Ratelimiter, mut idempotency: IdempotencyKey, target: Ref,*/
target: String,
message: Json<Data>,
) -> Result<Value> {
pub async fn message_send(user: User, target: Ref, message: Json<Data>) -> Result<Value> {
todo!()
}

View File

@@ -1,4 +1,4 @@
use revolt_quark::{Result, models::User, Ref};
use revolt_quark::{models::User, Ref, Result};
use rocket::serde::json::Value;
use serde::{Deserialize, Serialize};

View File

@@ -1,7 +1,7 @@
use crate::util::{/*ratelimit::Ratelimiter,*/ variables::{
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,
}};
};
use mongodb::bson::doc;
use rocket::{http::Status, serde::json::Value};