From 9da51b2d451b5b7e1011d5a6d6f5852cbe64bfa0 Mon Sep 17 00:00:00 2001 From: Paul Makles Date: Fri, 11 Feb 2022 22:21:37 +0000 Subject: [PATCH] fix: fix the thing (it is 10:20pm) --- src/routes/bots/invite.rs | 12 ++++++++++-- src/routes/invites/invite_join.rs | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/routes/bots/invite.rs b/src/routes/bots/invite.rs index ca9ce868..dacdd443 100644 --- a/src/routes/bots/invite.rs +++ b/src/routes/bots/invite.rs @@ -1,5 +1,5 @@ use revolt_quark::{ - models::{Channel, User}, + models::{Channel, User, Member, server_member::MemberCompositeKey}, perms, ChannelPermission, Db, EmptyResponse, Error, Ref, Result, ServerPermission, }; @@ -43,7 +43,15 @@ pub async fn invite_bot( }); } - db.insert_member(&server.id, &bot.id) + let member = Member { + id: MemberCompositeKey { + server: server.id, + user: bot.id + }, + ..Default::default() + }; + + db.insert_member(&member) .await .map(|_| EmptyResponse) } diff --git a/src/routes/invites/invite_join.rs b/src/routes/invites/invite_join.rs index 7a05e1e9..63b39335 100644 --- a/src/routes/invites/invite_join.rs +++ b/src/routes/invites/invite_join.rs @@ -1,5 +1,5 @@ use revolt_quark::{ - models::{Invite, User}, + models::{Invite, User, server_member::MemberCompositeKey, Member}, Db, Error, Ref, Result, }; @@ -30,7 +30,15 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result { } let channel = db.fetch_channel(channel).await?; - db.insert_member(&server.id, &user.id).await?; + let member = Member { + id: MemberCompositeKey { + server: server.id.clone(), + user: user.id.clone() + }, + ..Default::default() + }; + + db.insert_member(&member).await?; Ok(json!({ "type": "Server",