From 940891f197db30c9c71e913809f5f4e080537667 Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Sat, 18 Jun 2022 21:46:48 +0700 Subject: [PATCH] Fix more errors --- Bot/InviteTracker.fs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Bot/InviteTracker.fs b/Bot/InviteTracker.fs index 313935e..d1034e1 100644 --- a/Bot/InviteTracker.fs +++ b/Bot/InviteTracker.fs @@ -68,14 +68,13 @@ let private createInvite inviter code = |> Sql.executeNonQueryAsync |> Async.AwaitTask -let private addInvitedUser did inviterId code count = +let private addInvitedUser did inviterId code = connStr |> Sql.connect |> Sql.parameters [ "@code" , Sql.string code ; "@did" , Sql.string (string did) ; "@iid" , Sql.string (string inviterId) ] - |> Sql.query - """ + |> Sql.query """ INSERT INTO invited_user (inviter_id, discord_id, invite_id) - VALUES (@did, (SELECT id FROM invite WHERE code = @code)); + VALUES (@iid, @did, (SELECT id FROM invite WHERE code = @code)) """ |> Sql.executeNonQueryAsync |> Async.AwaitTask @@ -85,9 +84,7 @@ let private updateInviteCount code count = connStr |> Sql.connect |> Sql.parameters [ "count" , Sql.int count ; "code" , Sql.string code ] - |> Sql.query """ - UPDATE invite SET count = @count WHERE code = @code - """ + |> Sql.query "UPDATE invite SET count = @count WHERE code = @code" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.Ignore @@ -290,9 +287,9 @@ let private processNewUser (eventArgs : GuildMemberAddEventArgs) = match result with | Some (inviterId,count) -> if invite.Uses > count then - do! updateInviteCount invite.Code count try - do! addInvitedUser eventArgs.Member.Id inviterId invite.Code invite.Uses |> Async.Ignore + do! updateInviteCount invite.Code count + do! addInvitedUser eventArgs.Member.Id inviterId invite.Code |> Async.Ignore with ex -> printfn $"Tried to add existing user {eventArgs.Member.Id}:{eventArgs.Member.Username} to invites: {ex.Message}" do! Analytics.invitedUserEntered invite.Code invite.Inviter.Id eventArgs.Member.Id invite.Inviter.Username eventArgs.Member.Username | None -> ()