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

Really make sure MongoDB driver can't screw up.

Browse Source
This commit is contained in:
Paul
2021-05-03 21:02:12 +01:00
parent efc3794f3d
commit cf7bb832da
4 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
set_version.sh
View File

@@ -1,3 +1,3 @@
#!/bin/bash
export version=0.4.1-alpha.7-patch.0
export version=0.4.1-alpha.7-patch.2
echo "pub const VERSION: &str = \"${version}\";" > src/version.rs

20
src/routes/channels/edit_channel.rs
View File

@@ -26,7 +26,7 @@ pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<()> {
data.validate()
.map_err(|error| Error::FailedValidation { error })?;
if data.name.is_none() || data.description.is_none() || data.icon.is_none() || data.remove.is_none() {
if data.name.is_none() && data.description.is_none() && data.icon.is_none() && data.remove.is_none() {
return Ok(())
}
@@ -85,14 +85,16 @@ pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<()> {
operations.insert("$unset", unset);
}
get_collection("channels")
.update_one(
doc! { "_id": &id },
operations,
None
)
.await
.map_err(|_| Error::DatabaseError { operation: "update_one", with: "channel" })?;
if operations.len() > 0 {
get_collection("channels")
.update_one(
doc! { "_id": &id },
operations,
None
)
.await
.map_err(|_| Error::DatabaseError { operation: "update_one", with: "channel" })?;
}
ClientboundNotification::ChannelUpdate {
id: id.clone(),

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

@@ -35,7 +35,7 @@ pub async fn req(user: User, data: Json<Data>, _ignore_id: String) -> Result<()>
data.validate()
.map_err(|error| Error::FailedValidation { error })?;
if data.status.is_none() || data.profile.is_none() || data.avatar.is_none() || data.remove.is_none() {
if data.status.is_none() && data.profile.is_none() && data.avatar.is_none() && data.remove.is_none() {
return Ok(())
}
@@ -119,13 +119,15 @@ pub async fn req(user: User, data: Json<Data>, _ignore_id: String) -> Result<()>
operations.insert("$unset", unset);
}
get_collection("users")
.update_one(doc! { "_id": &user.id }, operations, None)
.await
.map_err(|_| Error::DatabaseError {
operation: "update_one",
with: "user",
})?;
if operations.len() > 0 {
get_collection("users")
.update_one(doc! { "_id": &user.id }, operations, None)
.await
.map_err(|_| Error::DatabaseError {
operation: "update_one",
with: "user",
})?;
}
if let Some(status) = &data.status {
ClientboundNotification::UserUpdate {

2
src/version.rs
View File

@@ -1 +1 @@
pub const VERSION: &str = "0.4.1-alpha.7-patch.0";
pub const VERSION: &str = "0.4.1-alpha.7-patch.2";