Merge branch 'master' of github.com:revoltchat/backend into webhooks

2023-01-18 21:03:15 +00:00
parent c218db5047 d9d2735efa
commit a246cff7f0
25 changed files with 314 additions and 79 deletions
--- a/crates/quark/src/impl/generic/channels/message.rs
+++ b/crates/quark/src/impl/generic/channels/message.rs
@@ -395,7 +395,7 @@ impl BulkMessageResponse {
    ) -> Result<BulkMessageResponse> {
        if let Some(true) = include_users {
            let user_ids = messages.get_user_ids();
-            let users = db.fetch_users(&user_ids).await?;
+            let users = User::fetch_foreign_users(db, &user_ids).await?;

            Ok(match channel {
                Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => {