fix: bug fixes

zaunchat · Jun 27, 2022 · fcffc19 · fcffc19
1 parent b6af0ff
commit fcffc19
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/gateway/events/authenticate.rs b/src/gateway/events/authenticate.rs
@@ -31,7 +31,9 @@ pub async fn run(client: &mut Client, payload: Payload) {
     let servers = user.fetch_servers().await;
     let server_ids: Vec<u64> = servers.iter().map(|x| x.id).collect();
 
-    channels.append(&mut Channel::find(|q| q.r#in("server_id", &server_ids)).await);
+    if !server_ids.is_empty() {
+        channels.append(&mut Channel::find(|q| q.r#in("server_id", &server_ids)).await);
+    }
 
     for server in &servers {
         subscriptions.push(server.id);

diff --git a/src/structures/member.rs b/src/structures/member.rs
@@ -42,7 +42,11 @@ impl Member {
     }
 
     pub async fn fetch_roles(&self) -> Vec<Role> {
-        Role::find(|q| q.r#in("id", &self.roles)).await
+        if self.roles.is_empty() {
+            return vec![];
+        }
+
+        Role::find(|q| q.eq("server_id", &self.server_id).r#in("id", &self.roles)).await
     }
 
     #[cfg(test)]