jmug/stoatchat
1
0
Fork 1
mirror of https://github.com/stoatchat/stoatchat.git synced 2026-07-13 21:17:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: rewrite requests to include events

Browse Source
This commit is contained in:
Paul Makles
2022-02-19 19:49:10 +00:00
parent 061af1f2c3
commit 489c2bdd87
25 changed files with 159 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/routes/channels/channel_ack.rs
View File

@@ -12,7 +12,8 @@ pub async fn req(db: &Db, user: User, target: Ref, message: Ref) -> Result<Empty
return Err(Error::NotFound);
}
db.acknowledge_message(channel.id(), &user.id, &message.id)
channel
.ack(db, &user.id, &message.id)
.await
.map(|_| EmptyResponse)
}

61
src/routes/channels/channel_delete.rs
View File

@@ -12,63 +12,26 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
return Err(Error::NotFound);
}
match channel {
match &channel {
Channel::SavedMessages { .. } => Err(Error::NoEffect),
Channel::DirectMessage { id, .. } => {
db.update_channel(
&id,
Channel::DirectMessage { id, .. } => db
.update_channel(
id,
&PartialChannel {
active: Some(false),
..Default::default()
},
vec![],
)
.await?;
Ok(EmptyResponse)
}
Channel::Group {
id,
owner,
recipients,
..
} => {
if user.id == owner {
if let Some(new_owner) = recipients.iter().find(|x| *x != &user.id) {
db.update_channel(
&id,
&PartialChannel {
owner: Some(new_owner.into()),
..Default::default()
},
vec![],
)
.await?;
} else {
db.delete_channel(&id).await?;
return Ok(EmptyResponse);
}
}
db.remove_user_from_group(&id, &user.id).await?;
/*ClientboundNotification::ChannelGroupLeave {
id: id.clone(),
user: user.id.clone(),
}
.publish(id.clone());
Content::SystemMessage(SystemMessage::UserLeft { id: user.id })
.send_as_system(&target)
.await
.ok();*/
Ok(EmptyResponse)
}
Channel::TextChannel { id, .. } | Channel::VoiceChannel { id, .. } => {
.await
.map(|_| EmptyResponse),
Channel::Group { .. } => channel
.remove_user_from_group(db, &user.id)
.await
.map(|_| EmptyResponse),
Channel::TextChannel { .. } | Channel::VoiceChannel { .. } => {
if perm.get_manage_channel() {
db.delete_channel(&id).await?;
Ok(EmptyResponse)
channel.delete(db).await.map(|_| EmptyResponse)
} else {
Err(Error::MissingPermission {
permission: ChannelPermission::ManageChannel as i32,

3
src/routes/channels/channel_edit.rs
View File

@@ -124,7 +124,8 @@ pub async fn req(
partial.nsfw = Some(new_nsfw);
}
db.update_channel(id, &partial, data.remove.unwrap_or_default())
channel
.update(db, partial, data.remove.unwrap_or_default())
.await?;
}
_ => return Err(Error::InvalidOperation),

12
src/routes/channels/group_add_member.rs
View File

@@ -17,11 +17,13 @@ pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyR
});
}
match channel {
Channel::Group { id, .. } => {
let user = member.as_user(db).await?;
db.add_user_to_group(&id, &user.id).await?;
Ok(EmptyResponse)
match &channel {
Channel::Group { .. } => {
let member = member.as_user(db).await?;
channel
.add_user_to_group(db, &member.id, &user.id)
.await
.map(|_| EmptyResponse)
}
_ => Err(Error::InvalidOperation),
}

2
src/routes/channels/group_create.rs
View File

@@ -64,6 +64,6 @@ pub async fn req(db: &Db, user: User, info: Json<Data>) -> Result<Json<Channel>>
nsfw: info.nsfw.unwrap_or(false),
};
db.insert_channel(&group).await?;
group.create(db).await?;
Ok(Json(group))
}

15
src/routes/channels/group_remove_member.rs
View File

@@ -7,14 +7,11 @@ use revolt_quark::{
pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyResponse> {
let channel = target.as_channel(db).await?;
match channel {
match &channel {
Channel::Group {
id,
owner,
recipients,
..
owner, recipients, ..
} => {
if user.id != owner {
if &user.id != owner {
return Err(Error::MissingPermission { permission: 0 });
}
@@ -27,8 +24,10 @@ pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyR
return Err(Error::NotInGroup);
}
db.remove_user_from_group(&id, &member.id).await?;
Ok(EmptyResponse)
channel
.remove_user_from_group(db, &member.id)
.await
.map(|_| EmptyResponse)
}
_ => Err(Error::InvalidOperation),
}

2
src/routes/channels/message_delete.rs
View File

@@ -21,5 +21,5 @@ pub async fn req(db: &Db, user: User, target: Ref, msg: Ref) -> Result<EmptyResp
});
}
db.delete_message(&message.id).await.map(|_| EmptyResponse)
message.delete(db).await.map(|_| EmptyResponse)
}

6
src/routes/channels/message_edit.rs
View File

@@ -48,8 +48,7 @@ pub async fn req(
// 1. Handle content update
if let Some(content) = edit.content {
message.content = Content::Text(content);
partial.content = Some(message.content.clone());
partial.content = Some(Content::Text(content));
}
// 2. Clear any auto generated embeds
@@ -71,9 +70,8 @@ pub async fn req(
}
}
message.embeds = Some(new_embeds);
partial.embeds = message.embeds.clone();
db.update_message(&message.id, &partial).await?;
message.update(db, partial).await?;
Ok(Json(message))
}

2
src/routes/channels/message_send.rs
View File

@@ -152,6 +152,6 @@ pub async fn message_send(
// 6. Set content
message.content = Content::Text(data.content);
db.insert_message(&message).await?;
message.create(db).await?;
Ok(Json(message))
}

18
src/routes/channels/permissions_set.rs
View File

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
use revolt_quark::{
models::{Channel, User},
perms, ChannelPermission, Db, EmptyResponse, Error, Ref, Result,
perms, ChannelPermission, Db, Error, Ref, Result,
};
#[derive(Serialize, Deserialize)]
@@ -18,8 +18,8 @@ pub async fn req(
target: Ref,
role: String,
data: Json<Data>,
) -> Result<EmptyResponse> {
let channel = target.as_channel(db).await?;
) -> Result<Json<Channel>> {
let mut channel = target.as_channel(db).await?;
if !perms(&user)
.channel(&channel)
.calc_channel(db)
@@ -31,13 +31,9 @@ pub async fn req(
});
}
match channel {
Channel::TextChannel { id, .. } | Channel::VoiceChannel { id, .. } => {
db.set_channel_role_permission(&id, &role, data.permissions)
.await?;
}
_ => return Err(Error::InvalidOperation),
}
channel
.set_role_permission(db, &role, data.permissions)
.await?;
Ok(EmptyResponse)
Ok(Json(channel))
}

52
src/routes/channels/permissions_set_default.rs
View File

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
use revolt_quark::{
models::{channel::PartialChannel, Channel, User},
perms, ChannelPermission, Db, EmptyResponse, Error, Ref, Result,
perms, ChannelPermission, Db, Error, Ref, Result,
};
#[derive(Serialize, Deserialize)]
@@ -12,8 +12,8 @@ pub struct Data {
}
#[put("/<target>/permissions/default", data = "<data>", rank = 1)]
pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<EmptyResponse> {
let channel = target.as_channel(db).await?;
pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<Json<Channel>> {
let mut channel = target.as_channel(db).await?;
if !perms(&user)
.channel(&channel)
.calc_channel(db)
@@ -25,31 +25,33 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<E
});
}
match channel {
Channel::Group { id, .. } => {
db.update_channel(
&id,
&PartialChannel {
permissions: Some(data.permissions as i32),
..Default::default()
},
vec![],
)
.await?;
match &channel {
Channel::Group { .. } => {
channel
.update(
db,
PartialChannel {
permissions: Some(data.permissions as i32),
..Default::default()
},
vec![],
)
.await?;
}
Channel::TextChannel { id, .. } | Channel::VoiceChannel { id, .. } => {
db.update_channel(
&id,
&PartialChannel {
default_permissions: Some(data.permissions as i32),
..Default::default()
},
vec![],
)
.await?;
Channel::TextChannel { .. } | Channel::VoiceChannel { .. } => {
channel
.update(
db,
PartialChannel {
default_permissions: Some(data.permissions as i32),
..Default::default()
},
vec![],
)
.await?;
}
_ => return Err(Error::InvalidOperation),
}
Ok(EmptyResponse)
Ok(Json(channel))
}

25
src/routes/servers/channel_create.rs
View File

@@ -40,7 +40,7 @@ pub async fn req(db: &Db, user: User, target: Ref, info: Json<Data>) -> Result<J
info.validate()
.map_err(|error| Error::FailedValidation { error })?;
let server = target.as_server(db).await?;
let mut server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc_server(db)
@@ -53,7 +53,7 @@ pub async fn req(db: &Db, user: User, target: Ref, info: Json<Data>) -> Result<J
}
let id = Ulid::new().to_string();
let mut channels = server.channels;
let mut channels = server.channels.clone();
channels.push(id.clone());
let Data {
@@ -93,16 +93,17 @@ pub async fn req(db: &Db, user: User, target: Ref, info: Json<Data>) -> Result<J
},
};
db.insert_channel(&channel).await?;
db.update_server(
&server.id,
&PartialServer {
channels: Some(channels),
..Default::default()
},
vec![],
)
.await?;
channel.create(db).await?;
server
.update(
db,
PartialServer {
channels: Some(channels),
..Default::default()
},
vec![],
)
.await?;
Ok(Json(channel))
}

17
src/routes/servers/member_edit.rs
View File

@@ -63,28 +63,15 @@ pub async fn req(
db.mark_attachment_as_deleted(&avatar.id).await?;
}
}
for field in fields {
member.remove(field);
}
}
// 2. Apply new avatar
if let Some(avatar) = avatar {
partial.avatar = Some(File::use_avatar(db, &avatar, &user.id).await?);
member.avatar = partial.avatar.clone();
}
// 3. Copy over other fields
if let Some(nickname) = &partial.nickname {
member.nickname.replace(nickname.clone());
}
if let Some(roles) = &partial.roles {
member.roles.replace(roles.clone());
}
db.update_member(&member.id, &partial, remove.unwrap_or_else(Vec::new))
member
.update(db, partial, remove.unwrap_or_default())
.await?;
Ok(Json(member))

2
src/routes/servers/member_remove.rs
View File

@@ -17,5 +17,5 @@ pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyR
let member = member.as_member(db, &server.id).await?;
// ! FIXME: calculate permission against member
db.delete_member(&member.id).await.map(|_| EmptyResponse)
member.delete(db).await.map(|_| EmptyResponse)
}

33
src/routes/servers/permissions_set.rs
View File

@@ -1,7 +1,10 @@
use rocket::serde::json::Json;
use serde::{Deserialize, Serialize};
use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Ref, Result};
use revolt_quark::{
models::{Server, User},
perms, Db, Error, Ref, Result,
};
#[derive(Serialize, Deserialize)]
pub struct Values {
@@ -21,8 +24,8 @@ pub async fn req(
target: Ref,
role_id: String,
data: Json<Data>,
) -> Result<EmptyResponse> {
let server = target.as_server(db).await?;
) -> Result<Json<Server>> {
let mut server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc_server(db)
@@ -34,18 +37,16 @@ pub async fn req(
// ! FIXME: calculate permission against role
if !server.roles.contains_key(&role_id) {
return Err(Error::NotFound);
}
server
.set_role_permission(
db,
&role_id,
&(
data.permissions.server as i32,
data.permissions.channel as i32,
),
)
.await?;
db.update_role_permission(
&server.id,
&role_id,
&(
data.permissions.server as i32,
data.permissions.channel as i32,
),
)
.await
.map(|_| EmptyResponse)
Ok(Json(server))
}

36
src/routes/servers/permissions_set_default.rs
View File

@@ -2,8 +2,8 @@ use rocket::serde::json::Json;
use serde::{Deserialize, Serialize};
use revolt_quark::{
models::{server::PartialServer, User},
perms, Db, EmptyResponse, Error, Ref, Result,
models::{server::PartialServer, Server, User},
perms, Db, Error, Ref, Result,
};
#[derive(Serialize, Deserialize)]
@@ -18,10 +18,10 @@ pub struct Data {
}
#[put("/<target>/permissions/default", data = "<data>", rank = 1)]
pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<EmptyResponse> {
pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<Json<Server>> {
let data = data.into_inner();
let server = target.as_server(db).await?;
let mut server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc_server(db)
@@ -31,17 +31,19 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<E
return Err(Error::NotFound);
}
db.update_server(
&server.id,
&PartialServer {
default_permissions: Some((
data.permissions.server as i32,
data.permissions.channel as i32,
)),
..Default::default()
},
vec![],
)
.await
.map(|_| EmptyResponse)
server
.update(
db,
PartialServer {
default_permissions: Some((
data.permissions.server as i32,
data.permissions.channel as i32,
)),
..Default::default()
},
vec![],
)
.await?;
Ok(Json(server))
}

27
src/routes/servers/roles_create.rs
View File

@@ -5,7 +5,6 @@ use revolt_quark::{
use rocket::serde::json::{Json, Value};
use serde::{Deserialize, Serialize};
use ulid::Ulid;
use validator::Validate;
#[derive(Validate, Serialize, Deserialize)]
@@ -30,20 +29,16 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<V
return Err(Error::NotFound);
}
let role_id = Ulid::new().to_string();
db.insert_role(
&server.id,
&role_id,
&Role {
name: data.name,
permissions: (
*DEFAULT_SERVER_PERMISSION as i32,
*DEFAULT_PERMISSION_CHANNEL_SERVER as i32,
),
..Default::default()
},
)
.await?;
let role = Role {
name: data.name,
permissions: (
*DEFAULT_SERVER_PERMISSION as i32,
*DEFAULT_PERMISSION_CHANNEL_SERVER as i32,
),
..Default::default()
};
Ok(json!({ "id": role_id }))
Ok(json!({
"id": role.create(db, &server.id).await?
}))
}

12
src/routes/servers/roles_delete.rs
View File

@@ -2,7 +2,7 @@ use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Ref, Result};
#[delete("/<target>/roles/<role_id>")]
pub async fn req(db: &Db, user: User, target: Ref, role_id: String) -> Result<EmptyResponse> {
let server = target.as_server(db).await?;
let mut server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc_server(db)
@@ -14,7 +14,11 @@ pub async fn req(db: &Db, user: User, target: Ref, role_id: String) -> Result<Em
// ! FIXME: check perms against role
db.delete_role(&server.id, &role_id)
.await
.map(|_| EmptyResponse)
if let Some(role) = server.roles.remove(&role_id) {
role.delete(db, &server.id, &role_id)
.await
.map(|_| EmptyResponse)
} else {
Err(Error::NotFound)
}
}

14
src/routes/servers/roles_edit.rs
View File

@@ -61,21 +61,15 @@ pub async fn req(
..Default::default()
};
if let Some(remove) = &remove {
for field in remove {
role.remove(field);
}
}
db.update_role(
role.update(
db,
&server.id,
&role_id,
&partial,
remove.unwrap_or_else(Vec::new),
partial,
remove.unwrap_or_default(),
)
.await?;
role.apply_options(partial.clone());
Ok(Json(role))
} else {
Err(Error::NotFound)

6
src/routes/servers/server_create.rs
View File

@@ -82,7 +82,9 @@ pub async fn req(db: &Db, user: User, info: Json<Data>) -> Result<Json<Server>>
};
db.insert_channel(&channel).await?;
db.insert_server(&server).await?;
db.insert_member(&member).await?;
server.create(db).await?;
member.create(db).await?;
Ok(Json(server))
}

7
src/routes/servers/server_delete.rs
View File

@@ -6,10 +6,9 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
let member = db.fetch_member(&target.id, &user.id).await?;
if server.owner == user.id {
db.delete_server(&server.id).await?;
server.delete(db).await
} else {
db.delete_member(&member.id).await?;
member.delete(db).await
}
Ok(EmptyResponse)
.map(|_| EmptyResponse)
}

32
src/routes/servers/server_edit.rs
View File

@@ -109,10 +109,6 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<J
db.mark_attachment_as_deleted(&icon.id).await?;
}
}
for field in fields {
server.remove(field);
}
}
// 2. Apply new icon
@@ -127,19 +123,7 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<J
server.banner = partial.banner.clone();
}
// 4. Pass-through and validate changes
if let Some(name) = &partial.name {
server.name = name.clone();
}
if let Some(description) = &partial.description {
server.description.replace(description.clone());
}
if let Some(categories) = &partial.categories {
server.categories.replace(categories.clone());
}
// 4. Validate changes
if let Some(system_messages) = &partial.system_messages {
let channels = system_messages.clone().into_channel_ids();
if !db
@@ -148,19 +132,11 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<J
{
return Err(Error::NotFound);
}
server.system_messages.replace(system_messages.clone());
}
if let Some(analytics) = &partial.analytics {
server.analytics = *analytics;
}
if let Some(nsfw) = &partial.nsfw {
server.nsfw = *nsfw;
}
db.update_server(&server.id, &partial, remove.unwrap_or_else(Vec::new))
server
.update(db, partial, remove.unwrap_or_default())
.await?;
Ok(Json(server))
}

5
src/routes/sync/set_settings.rs
View File

@@ -1,4 +1,5 @@
use revolt_quark::models::User;
use revolt_quark::r#impl::generic::users::user_settings::UserSettingsImpl;
use revolt_quark::{Db, EmptyResponse, Result};
use chrono::prelude::*;
@@ -32,7 +33,5 @@ pub async fn req(db: &Db, user: User, data: Json<Data>, options: Options) -> Res
settings.insert(key, (timestamp, data));
}
db.set_user_settings(&user.id, &settings)
.await
.map(|_| EmptyResponse)
settings.set(db, &user.id).await.map(|_| EmptyResponse)
}

5
src/routes/users/edit_user.rs
View File

@@ -72,7 +72,6 @@ pub async fn req(db: &State<Database>, mut user: User, data: Json<Data>) -> Resu
// 2. Apply new avatar
if let Some(avatar) = data.avatar {
partial.avatar = Some(File::use_avatar(db, &avatar, &user.id).await?);
user.avatar = partial.avatar.clone();
}
// 3. Apply new status
@@ -87,7 +86,6 @@ pub async fn req(db: &State<Database>, mut user: User, data: Json<Data>) -> Resu
}
partial.status = Some(new_status);
user.status = partial.status.clone();
}
// 4. Apply new profile
@@ -102,10 +100,9 @@ pub async fn req(db: &State<Database>, mut user: User, data: Json<Data>) -> Resu
}
partial.profile = Some(new_profile);
user.profile = partial.profile.clone();
}
db.update_user(&user.id, &partial, data.remove.unwrap_or_default())
user.update(db, partial, data.remove.unwrap_or_default())
.await?;
Ok(Json(user.foreign()))

2
src/routes/users/open_dm.rs
View File

@@ -27,7 +27,7 @@ pub async fn req(db: &State<Database>, user: User, target: Ref) -> Result<Json<C
last_message_id: None,
};
db.insert_channel(&new_channel).await?;
new_channel.create(db).await?;
Ok(Json(new_channel))
} else {
Error::from_permission(UserPermission::SendMessage)