From 9919559b63051c149cb0a71911bc10ff5a7a1a7d Mon Sep 17 00:00:00 2001 From: Linventif Date: Sun, 15 Sep 2024 16:57:26 +0000 Subject: [PATCH] Fix: force player verif --- lua/gmod_integration/client/cl_gui_link.lua | 6 ++---- lua/gmod_integration/server/sv_players_verif.lua | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/lua/gmod_integration/client/cl_gui_link.lua b/lua/gmod_integration/client/cl_gui_link.lua index 914d301..231c156 100644 --- a/lua/gmod_integration/client/cl_gui_link.lua +++ b/lua/gmod_integration/client/cl_gui_link.lua @@ -29,10 +29,8 @@ function gmInte.openVerifPopup() local button = vgui.Create("DButton") button:SetText("Refresh Verification") button.DoClick = function() - gmInte.http.get("/users?steamID64" .. LocalPlayer():SteamID64(), function(code, body) - gmInte.SendNet("verifyMe") - frame:Close() - end, function(code, body) LocalPlayer():ChatPrint("Failed to refresh verification: " .. code) end) + gmInte.SendNet("verifyMe") + frame:Close() end button:SetSize(buttonGrid:GetColWide() - 10, buttonGrid:GetRowHeight()) diff --git a/lua/gmod_integration/server/sv_players_verif.lua b/lua/gmod_integration/server/sv_players_verif.lua index 23497a8..b1a0f9e 100644 --- a/lua/gmod_integration/server/sv_players_verif.lua +++ b/lua/gmod_integration/server/sv_players_verif.lua @@ -1,6 +1,6 @@ function gmInte.verifyPlayer(ply) if !ply:IsValid() || !ply:IsPlayer(ply) then return end - gmInte.http.get("/user?steamID64=" .. ply:SteamID64(), function(code, data) + gmInte.http.get("/users?steamID64=" .. ply:SteamID64(), function(code, data) if data && data.discordID then ply.gmIntVerified = true end if !gmInte.config.forcePlayerLink || !ply.gmIntIsReady then return end if ply:gmIntIsVerified() then @@ -15,7 +15,7 @@ function gmInte.verifyPlayer(ply) else gmInte.SendNet("chatColorMessage", { [1] = { - ["text"] = "You are not verified", + ["text"] = "Failed to verify you", ["color"] = Color(255, 0, 0) } }, ply) @@ -23,11 +23,22 @@ function gmInte.verifyPlayer(ply) ply:Freeze(true) gmInte.SendNet("openVerifPopup", nil, ply) end + end, function(code, data) + ply:Freeze(true) + gmInte.SendNet("chatColorMessage", { + [1] = { + ["text"] = "This server requires you to link your Discord account to play", + ["color"] = Color(255, 0, 0) + } + }, ply) + + gmInte.SendNet("openVerifPopup", nil, ply) end) end hook.Add("gmInte:PlayerReady", "gmInte:Verif:PlayerReady", function(ply) ply.gmIntIsReady = true if !gmInte.config.forcePlayerLink then return end + ply:Freeze(true) gmInte.verifyPlayer(ply) end) \ No newline at end of file