From 7a9adb45f714feb63eef6843b2b45fa8213d3785 Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Fri, 11 Feb 2022 12:52:34 +0000
Subject: [PATCH] fix(invites): account for server bans

---
 src/routes/invites/invite_join.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/routes/invites/invite_join.rs b/src/routes/invites/invite_join.rs
index 298f27ba..b3be28c6 100644
--- a/src/routes/invites/invite_join.rs
+++ b/src/routes/invites/invite_join.rs
@@ -19,11 +19,14 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<Value> {
     let invite = target.as_invite(db).await?;
     match &invite {
         Invite::Server { channel, server, .. } => {
-            let channel = db.fetch_channel(channel).await?;
             let server = db.fetch_server(server).await?;
+            if db.fetch_ban(&server.id, &user.id).await.is_ok() {
+                return Err(Error::Banned)
+            }
 
+            let channel = db.fetch_channel(channel).await?;
             db.insert_member(&server.id, &user.id).await?;
-
+            
             Ok(json!({
                 "type": "Server",
                 "channel": channel,