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

Fix bot logon, should do nested match.

Browse Source 
Add comment to migrations.
Fix attachment deletes on messages.
This commit is contained in:
Paul
2021-09-11 17:46:20 +01:00
parent fa8eb874d0
commit 8bb5fb25dd
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/database/entities/message.rs
View File

@@ -467,7 +467,7 @@ impl Message {
let attachment_ids: Vec<String> =
attachments.iter().map(|f| f.id.to_string()).collect();
get_collection("attachments")
.update_one(
.update_many(
doc! {
"_id": {
"$in": attachment_ids
@@ -482,7 +482,7 @@ impl Message {
)
.await
.map_err(|_| Error::DatabaseError {
operation: "update_one",
operation: "update_many",
with: "attachment",
})?;
}

2
src/database/migrations/scripts.rs
View File

@@ -284,6 +284,8 @@ pub async fn run_migrations(revision: i32) -> i32 {
.unwrap();
}
// Need to migrate fields on attachments, change `user_id`, `object_id`, etc to `parent`.
// Reminder to update LATEST_REVISION when adding new migrations.
LATEST_REVISION
}

16
src/notifications/websocket.rs
View File

@@ -169,23 +169,15 @@ async fn accept(stream: TcpStream) {
}
}
let id = if let Ok(result) =
let id = if let Ok(Some(session)) =
Session::find_one(&get_db(), doc! { "token": &auth.token }, None).await
{
if let Some(session) = result {
Some(session.user_id)
} else {
None
}
} else if let Ok(result) = get_collection("bots")
Some(session.user_id)
} else if let Ok(Some(bot)) = get_collection("bots")
.find_one(doc! { "token": auth.token }, None)
.await
{
if let Some(bot) = result {
Some(bot.get_str("_id").unwrap().to_string())
} else {
None
}
Some(bot.get_str("_id").unwrap().to_string())
} else {
None
};