JosephFerano/discord-bot-game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Query both DBs for user and player data

Browse Source
This commit is contained in:
Joseph Ferano 2022-02-22 11:31:05 +07:00
parent 5df4ed9399
commit 49d29a249a
10 changed files with 87 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Bot/Game.fs
View File

@ -32,7 +32,7 @@ module Game =
builder.IsEphemeral <- true builder.IsEphemeral <- true
builder.Content <- "Content" builder.Content <- "Content"
do! ctx.Respond(InteractionResponseType.DeferredChannelMessageWithSource, builder) |> Async.AwaitTask do! ctx.Respond(InteractionResponseType.DeferredChannelMessageWithSource, builder) |> Async.AwaitTask
let! playerResult = tryFindPlayer (ctx.GetDiscordMember().Id) let! playerResult = tryFindPlayer GuildEnvironment.pgDb (ctx.GetDiscordMember().Id)
match playerResult with match playerResult with
| Some player -> do! dispatch player | Some player -> do! dispatch player
| None -> do! Messaging.sendFollowUpMessage ctx "You are currently not a hacker, first use the /redpill command to become one" | None -> do! Messaging.sendFollowUpMessage ctx "You are currently not a hacker, first use the /redpill command to become one"
@ -45,8 +45,8 @@ module Game =
builder.Content <- "Content" builder.Content <- "Content"
do! ctx.Respond(InteractionResponseType.DeferredChannelMessageWithSource, builder) |> Async.AwaitTask do! ctx.Respond(InteractionResponseType.DeferredChannelMessageWithSource, builder) |> Async.AwaitTask
let! players = let! players =
[ tryFindPlayer (ctx.GetDiscordMember().Id) [ tryFindPlayer GuildEnvironment.pgDb (ctx.GetDiscordMember().Id)
tryFindPlayer targetPlayer.Id ] tryFindPlayer GuildEnvironment.pgDb targetPlayer.Id ]
|> Async.Parallel |> Async.Parallel
match players.[0] , players.[1] with match players.[0] , players.[1] with
| Some player , Some target -> do! dispatch player target | Some player , Some target -> do! dispatch player target
@ -65,8 +65,8 @@ module Game =
if defer then if defer then
do! ctx.Respond(InteractionResponseType.DeferredChannelMessageWithSource, builder) |> Async.AwaitTask do! ctx.Respond(InteractionResponseType.DeferredChannelMessageWithSource, builder) |> Async.AwaitTask
let! players = let! players =
[ tryFindPlayer (ctx.GetDiscordMember().Id) [ tryFindPlayer GuildEnvironment.pgDb (ctx.GetDiscordMember().Id)
tryFindPlayer targetId ] tryFindPlayer GuildEnvironment.pgDb targetId ]
|> Async.Parallel |> Async.Parallel
match players.[0] , players.[1] with match players.[0] , players.[1] with
| Some player , Some target -> do! dispatch player target | Some player , Some target -> do! dispatch player target

1
Bot/GuildEnvironment.fs
View File

@ -11,6 +11,7 @@ DotEnv.Load(DotEnvOptions(envFilePaths = [ "../../../../.dev.env" ], overwriteEx
let getVar str = Environment.GetEnvironmentVariable(str) let getVar str = Environment.GetEnvironmentVariable(str)
let getId str = getVar str |> uint64 let getId str = getVar str |> uint64
let pgDb = getVar "CONN_STRING_2"
let guildId = getId "DISCORD_GUILD" let guildId = getId "DISCORD_GUILD"
let tokenPlayerInteractions = getVar "TOKEN_PLAYER_INTERACTIONS" let tokenPlayerInteractions = getVar "TOKEN_PLAYER_INTERACTIONS"
let tokenSteal = getVar "TOKEN_STEAL" let tokenSteal = getVar "TOKEN_STEAL"

2
Bot/HackerBattle.fs
View File

@ -138,7 +138,7 @@ let handleAttack (ctx : IDiscordContext) =
let hackId = int tokens.[1] let hackId = int tokens.[1]
let hack = Armory.getItem hackId let hack = Armory.getItem hackId
let resultId , targetId = UInt64.TryParse tokens.[2] let resultId , targetId = UInt64.TryParse tokens.[2]
let! resultTarget = DbService.tryFindPlayer targetId let! resultTarget = DbService.tryFindPlayer GuildEnvironment.pgDb targetId
match resultTarget , true , resultId with match resultTarget , true , resultId with
| Some defender , true , true -> | Some defender , true , true ->

20
Bot/PlayerInteractions.fs
View File

@ -21,27 +21,19 @@ module Commands =
Traits = PlayerTraits.empty Traits = PlayerTraits.empty
Bank = 100<GBT> } Bank = 100<GBT> }
let addHackerRole (ctx : InteractionContext) = let upsertPlayer discordId =
async { async {
let! player = DbService.tryFindPlayer ctx.Member.Id let! player = DbService.tryFindPlayer GuildEnvironment.pgDb discordId
let! newPlayer = let! newPlayer =
match player with match player with
| Some _ -> async.Return false | Some _ -> async.Return false
| None -> | None ->
async { async {
do! newPlayer ctx.Member.DisplayName ctx.Member.Id do! newPlayer "" discordId |> DbService.insertNewPlayer
|> DbService.insertNewPlayer
return true return true
} }
if newPlayer then return newPlayer
do! ctx.CreateResponseAsync("You are now an elite haxxor", true) }
|> Async.AwaitTask
else
do! ctx.CreateResponseAsync("Already registered as an elite haxxor", true)
|> Async.AwaitTask
} |> Async.StartAsTask
:> Task
[<CLIMutable>] [<CLIMutable>]
type LeaderboardEntry = { type LeaderboardEntry = {
@ -75,7 +67,7 @@ type PlayerInteractions() =
inherit ApplicationCommandModule () inherit ApplicationCommandModule ()
[<SlashCommand("redpill", "Take the redpill and become a hacker")>] [<SlashCommand("redpill", "Take the redpill and become a hacker")>]
member _.AddHackerRole (ctx : InteractionContext) = Commands.addHackerRole ctx member _.AddHackerRole (ctx : InteractionContext) = Commands.upsertPlayer ctx.Member.Id
// [<SlashCommand("leaderboard", "View the current list of players ranked by highest earnings")>] // [<SlashCommand("leaderboard", "View the current list of players ranked by highest earnings")>]
// member this.Leaderboard (ctx : InteractionContext) = Commands.leaderboard ctx // member this.Leaderboard (ctx : InteractionContext) = Commands.leaderboard ctx

2
Bot/Thief.fs
View File

@ -164,7 +164,7 @@ let handleSteal (ctx : IDiscordContext) =
| true -> | true ->
let embed = getResultEmbed' Success let embed = getResultEmbed' Success
do! Messaging.sendFollowUpEmbed ctx (embed.Build()) do! Messaging.sendFollowUpEmbed ctx (embed.Build())
match! DbService.tryFindPlayer targetId with match! DbService.tryFindPlayer GuildEnvironment.pgDb targetId with
| Some t -> | Some t ->
let mugged = { let mugged = {
ItemId = -1 ItemId = -1

1
Bot/paket.references
View File

@ -4,3 +4,4 @@ DSharpPlus.Interactivity
DSharpPlus.SlashCommands DSharpPlus.SlashCommands
dotenv.net dotenv.net
DanielStout.AsciiTableFormatter DanielStout.AsciiTableFormatter
Npgsql.FSharp

43
DbService/DbService.fs
View File

@ -6,6 +6,14 @@ open System
open MongoDB.Bson open MongoDB.Bson
open MongoDB.Bson.Serialization open MongoDB.Bson.Serialization
open MongoDB.Driver open MongoDB.Driver
open Npgsql.FSharp
type User = {
Name : string
DiscordId : uint64
Bank : int<GBT>
Strength : int
}
let mongo = MongoClient(Environment.GetEnvironmentVariable("CONN_STRING")) let mongo = MongoClient(Environment.GetEnvironmentVariable("CONN_STRING"))
let db = mongo.GetDatabase("degenz") let db = mongo.GetDatabase("degenz")
@ -17,9 +25,9 @@ let tryWithDefault (bson : BsonDocument) field (defaultValue : 'a) (map : BsonVa
if result then map bval else defaultValue if result then map bval else defaultValue
with _ -> defaultValue with _ -> defaultValue
let mapBack (bson : BsonDocument) : PlayerData = let mapBack user (bson : BsonDocument) : PlayerData =
{ DiscordId = tryWithDefault bson "DiscordId" 0uL (fun v -> v.AsInt64 |> uint64) { DiscordId = user.DiscordId
Name = tryWithDefault bson "Name" "Empty" (fun v -> v.AsString) Name = user.Name
Inventory = Inventory =
tryWithDefault bson "Inventory" [||] (fun v -> tryWithDefault bson "Inventory" [||] (fun v ->
v.AsBsonArray v.AsBsonArray
@ -31,24 +39,41 @@ let mapBack (bson : BsonDocument) : PlayerData =
BsonSerializer.Deserialize<PlayerEvent>(bv.ToBsonDocument())) BsonSerializer.Deserialize<PlayerEvent>(bv.ToBsonDocument()))
|> Seq.toArray) |> Seq.toArray)
Traits = Traits =
(let traits =
tryWithDefault bson "Traits" PlayerTraits.empty (fun v -> tryWithDefault bson "Traits" PlayerTraits.empty (fun v ->
BsonSerializer.Deserialize<PlayerTraits>(v.ToBsonDocument())) BsonSerializer.Deserialize<PlayerTraits>(v.ToBsonDocument()))
{ traits with Strength = user.Strength})
Achievements = Achievements =
tryWithDefault bson "Achievements" [||] (fun v -> tryWithDefault bson "Achievements" [||] (fun v ->
v.AsBsonArray |> Seq.map (fun (bv : BsonValue) -> bv.AsString) |> Seq.toArray) v.AsBsonArray |> Seq.map (fun (bv : BsonValue) -> bv.AsString) |> Seq.toArray)
XP = tryWithDefault bson "XP" 0 (fun v -> v.AsInt32) XP = tryWithDefault bson "XP" 0 (fun v -> v.AsInt32)
Bank = tryWithDefault bson "Bank" 0<GBT> (fun v -> v.AsInt32 * 1<GBT>) Bank = user.Bank
} }
let tryFindPlayer (id : uint64) = let tryFindPlayer connStr (id : uint64) =
async { async {
let filter = Builders<BsonDocument>.Filter.Eq("Player.DiscordId", id) let filter = Builders<BsonDocument>.Filter.Eq("Player.DiscordId", id)
let! player = players.FindAsync<BsonDocument>(filter) |> Async.AwaitTask let! player = players.FindAsync<BsonDocument>(filter) |> Async.AwaitTask
match player.FirstOrDefault() with let! user =
| null -> return None connStr
| p -> |> Sql.connect
|> Sql.query "SELECT * FROM users WHERE discordId = @did"
|> Sql.parameters [ "did", Sql.int64 (int64 id) ]
|> Sql.executeAsync (fun read ->
{
DiscordId = read.int64 "discordId" |> uint64
Bank = read.int "gbt" * 1<GBT>
Strength = read.int "strength"
Name = read.string "displayName"
})
|> Async.AwaitTask
match player.FirstOrDefault() , List.tryHead user with
| null , _
| _ , None -> return None
| p , Some u ->
let v = p.GetValue("Player") let v = p.GetValue("Player")
let playerData = v.ToBsonDocument() |> mapBack let playerData = mapBack u (v.ToBsonDocument())
return Some playerData return Some playerData
} }

1
DbService/paket.references
View File

@ -5,3 +5,4 @@ DSharpPlus
DSharpPlus.SlashCommands DSharpPlus.SlashCommands
MongoDB.Driver MongoDB.Driver
Npgsql.FSharp

1
paket.dependencies
View File

@ -16,3 +16,4 @@ nuget MongoDB.Driver
nuget dotenv.net 3.1.1 nuget dotenv.net 3.1.1
nuget DanielStout.AsciiTableFormatter nuget DanielStout.AsciiTableFormatter
nuget Npgsql.FSharp

37
paket.lock
View File

@ -15,8 +15,9 @@ NUGET
System.Runtime.CompilerServices.Unsafe (>= 5.0) System.Runtime.CompilerServices.Unsafe (>= 5.0)
System.ValueTuple (>= 4.5) System.ValueTuple (>= 4.5)
FSharp.Core (6.0.1) FSharp.Core (6.0.1)
Microsoft.Bcl.AsyncInterfaces (6.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) (&& (== netstandard2.1) (>= net461)) Microsoft.Bcl.AsyncInterfaces (6.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) (== netstandard2.1)
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) (&& (== netstandard2.1) (>= net461)) System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) (&& (== netstandard2.1) (>= net461))
Microsoft.Bcl.HashCode (1.1.1) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
Microsoft.Extensions.DependencyInjection (6.0) Microsoft.Extensions.DependencyInjection (6.0)
Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) (&& (== netstandard2.1) (>= net461)) Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) (&& (== netstandard2.1) (>= net461))
Microsoft.Extensions.DependencyInjection.Abstractions (>= 6.0) Microsoft.Extensions.DependencyInjection.Abstractions (>= 6.0)
@ -53,6 +54,24 @@ NUGET
System.Buffers (>= 4.5.1) System.Buffers (>= 4.5.1)
MongoDB.Libmongocrypt (1.3) MongoDB.Libmongocrypt (1.3)
Newtonsoft.Json (13.0.1) Newtonsoft.Json (13.0.1)
Npgsql (6.0.3)
Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
Microsoft.Bcl.HashCode (>= 1.1.1) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
System.Collections.Immutable (>= 6.0) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) (== netstandard2.1)
System.Diagnostics.DiagnosticSource (>= 6.0) - restriction: || (&& (== net6.0) (< net5.0)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) (== netstandard2.1)
System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 6.0)
System.Text.Json (>= 6.0) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) (== netstandard2.1)
System.Threading.Channels (>= 6.0) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) (== netstandard2.1)
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
System.ValueTuple (>= 4.5) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
Npgsql.FSharp (4.1)
FSharp.Core (>= 4.7.2)
Npgsql (>= 5.0.3)
Ply (>= 0.3.1)
Ply (0.3.1)
FSharp.Core (>= 4.6.2)
System.Threading.Tasks.Extensions (>= 4.5.4)
runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
@ -293,7 +312,7 @@ NUGET
System.Threading (>= 4.3) System.Threading (>= 4.3)
System.Threading.Tasks (>= 4.3) System.Threading.Tasks (>= 4.3)
System.Threading.Timer (>= 4.3) System.Threading.Timer (>= 4.3)
System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net6.0) (< netstandard2.0)) (== netstandard2.0) (&& (== netstandard2.1) (< netstandard2.0)) System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) (== netstandard2.1)
System.Reflection (4.3) System.Reflection (4.3)
Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Platforms (>= 1.1)
Microsoft.NETCore.Targets (>= 1.1) Microsoft.NETCore.Targets (>= 1.1)
@ -452,6 +471,18 @@ NUGET
Microsoft.NETCore.Targets (>= 1.1) Microsoft.NETCore.Targets (>= 1.1)
System.Runtime (>= 4.3) System.Runtime (>= 4.3)
System.Text.Encoding (>= 4.3) System.Text.Encoding (>= 4.3)
System.Text.Encodings.Web (6.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) (== netstandard2.1)
System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) (== netstandard2.1)
System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) (== netstandard2.1)
System.Runtime.CompilerServices.Unsafe (>= 6.0)
System.Text.Json (6.0.2) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) (== netstandard2.1)
Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) (== netstandard2.1)
System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) (== netstandard2.1)
System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) (== netstandard2.1)
System.Numerics.Vectors (>= 4.5) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) (== netstandard2.1)
System.Runtime.CompilerServices.Unsafe (>= 6.0)
System.Text.Encodings.Web (>= 6.0)
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) (== netstandard2.1)
System.Threading (4.3) System.Threading (4.3)
System.Runtime (>= 4.3) System.Runtime (>= 4.3)
System.Threading.Tasks (>= 4.3) System.Threading.Tasks (>= 4.3)
@ -461,7 +492,7 @@ NUGET
Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Platforms (>= 1.1)
Microsoft.NETCore.Targets (>= 1.1) Microsoft.NETCore.Targets (>= 1.1)
System.Runtime (>= 4.3) System.Runtime (>= 4.3)
System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) (&& (== netstandard2.1) (>= net461)) System.Threading.Tasks.Extensions (4.5.4)
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (== netstandard2.0) (== netstandard2.1) System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (== netstandard2.0) (== netstandard2.1)
System.Threading.ThreadPool (4.3) System.Threading.ThreadPool (4.3)
System.Runtime (>= 4.3) System.Runtime (>= 4.3)