Merge remote-tracking branch 'revoltchat/master' into webhooks

crates/quark/src/impl/generic/admin/migrations.rs

@@ -1 +0,0 @@
-

crates/quark/src/impl/generic/channels/message.rs

@@ -1,5 +1,6 @@
 use std::collections::HashSet;
 
+use revolt_presence::filter_online;
 use serde_json::json;
 use ulid::Ulid;
 use validator::Validate;
@@ -14,7 +15,6 @@ use crate::{
         Channel, Emoji, Message, User,
     },
     permissions::PermissionCalculator,
-    presence::presence_filter_online,
     tasks::ack::AckEvent,
     types::{
         january::{Embed, Text},
@@ -79,7 +79,7 @@ impl Message {
                     Channel::DirectMessage { recipients, .. }
                     | Channel::Group { recipients, .. } => {
                         target_ids = (&recipients.iter().cloned().collect::<HashSet<String>>()
-                            - &presence_filter_online(recipients).await)
+                            - &filter_online(recipients).await)
                             .into_iter()
                             .collect::<Vec<String>>();
                     }
@@ -313,12 +313,12 @@ impl IntoUsers for Message {
 
 impl IntoUsers for Vec<Message> {
     fn get_user_ids(&self) -> Vec<String> {
-        let mut ids = vec![];
+        let mut ids = HashSet::new();
         for message in self {
-            ids.append(&mut message.get_user_ids());
+            ids.extend(&mut message.get_user_ids().into_iter());
         }
 
-        ids
+        ids.into_iter().collect()
     }
 }
 

crates/quark/src/impl/generic/mod.rs

@@ -1,9 +1,5 @@
 //! Database agnostic implementations.
 
-pub mod admin {
-    pub mod migrations;
-}
-
 pub mod media {
     pub mod attachment;
     pub mod emoji;

crates/quark/src/impl/generic/users/user.rs

@@ -4,11 +4,11 @@ use crate::models::user::{
 };
 use crate::permissions::defn::UserPerms;
 use crate::permissions::r#impl::user::get_relationship;
-use crate::presence::presence_filter_online;
 use crate::{perms, Database, Error, Result};
 
 use futures::try_join;
 use impl_ops::impl_op_ex_commutative;
+use revolt_presence::filter_online;
 use std::ops;
 
 impl_op_ex_commutative!(+ |a: &i32, b: &Badges| -> i32 { *a | *b as i32 });
@@ -98,7 +98,7 @@ impl User {
 
     /// Fetch foreign users by a list of IDs
     pub async fn fetch_foreign_users(db: &Database, user_ids: &[String]) -> Result<Vec<User>> {
-        let online_ids = presence_filter_online(user_ids).await;
+        let online_ids = filter_online(user_ids).await;
 
         Ok(db
             .fetch_users(user_ids)