forked from jmug/stoatchat
Fix bot logon, should do nested match.
Add comment to migrations. Fix attachment deletes on messages.
This commit is contained in:
@@ -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",
|
||||
})?;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user