fix: correct command logging and improve error message output

lua/autorun/gmod_integration.lua

@@ -1,6 +1,6 @@
 if game.SinglePlayer() then return print("Gmod Integration is not supported in Singleplayer!") end
 gmInte = gmInte || {}
-gmInte.version = "0.4.3"
+gmInte.version = "0.4.9"
 gmInte.config = {}
 gmInte.materials = {}
 local function loadServerConfig()

lua/gmod_integration/client/cl_gui_admin.lua

@@ -99,11 +99,12 @@ function gmInte.openConfigMenu(data)
             ["reloadOnEdit"] = true,
             ["category"] = gmInte.getTranslation("admin.main", "Main"),
             ["values"] = {
-                ["en"] = "English",
-                ["fr"] = "Français",
                 ["de"] = "Deutsch",
+                ["en"] = "English",
                 ["es"] = "Español",
+                ["fr"] = "Français",
                 ["it"] = "Italiano",
+                ["pl"] = "Polski",
                 ["ru"] = "Русский",
                 ["tr"] = "Türkçe",
             }
@@ -122,9 +123,10 @@ function gmInte.openConfigMenu(data)
             ["label"] = gmInte.getTranslation("admin.force_player_link", "Force Player Verif"),
             ["description"] = gmInte.getTranslation("admin.force_player_link_description", "Force player verification."),
             ["type"] = "checkbox",
+            ["reloadOnEdit"] = true,
             ["value"] = function(setting, value) return value end,
             ["onEdit"] = function(setting, value) saveConfig(setting, value) end,
-            ["category"] = gmInte.getTranslation("admin.main", "Main")
+            ["category"] = gmInte.getTranslation("admin.trust_safety", "Trust & Safety")
         },
         {
             ["id"] = "supportLink",
@@ -136,6 +138,50 @@ function gmInte.openConfigMenu(data)
             ["onEditDelay"] = 0.5,
             ["category"] = gmInte.getTranslation("admin.trust_safety", "Trust & Safety")
         },
+        {
+            ["id"] = "verifyFamilySharing",
+            ["label"] = gmInte.getTranslation("admin.verifyFamilySharing", "Block Family Sharing"),
+            ["description"] = gmInte.getTranslation("admin.verifyFamilySharing_description", "Block family sharing players."),
+            ["type"] = "checkbox",
+            ["value"] = function(setting, value) return value end,
+            ["onEdit"] = function(setting, value) saveConfig(setting, value) end,
+            ["category"] = gmInte.getTranslation("admin.trust_safety", "Trust & Safety")
+        },
+        {
+            ["id"] = "verifyOnJoin",
+            ["label"] = gmInte.getTranslation("admin.verify_on_join", "Verify on Join"),
+            ["description"] = gmInte.getTranslation("admin.verify_on_join_description", "Verify the player when they join the server or on player ready."),
+            ["type"] = "checkbox",
+            ["condition"] = function(data) return data.forcePlayerLink end,
+            ["value"] = function(setting, value) return value end,
+            ["onEdit"] = function(setting, value) saveConfig(setting, value) end,
+            ["category"] = gmInte.getTranslation("admin.trust_safety", "Trust & Safety")
+        },
+        {
+            ["id"] = "verifyOnReadyKickTime",
+            ["label"] = gmInte.getTranslation("admin.verify_on_ready_kick_time", "Kick Time if not Verified"),
+            ["description"] = gmInte.getTranslation("admin.verify_on_ready_kick_time_description", "Time in seconds before kicking a player that is not verified."),
+            ["type"] = "textEntry",
+            ["condition"] = function(data) return data.forcePlayerLink end,
+            ["value"] = function(setting, value) return value end,
+            ["onEdit"] = function(setting, value) saveConfig(setting, value) end,
+            ["category"] = gmInte.getTranslation("admin.trust_safety", "Trust & Safety")
+        },
+        {
+            ["id"] = "clientBranch",
+            ["label"] = gmInte.getTranslation("admin.client_force_branch", "Client Force Branch"),
+            ["description"] = gmInte.getTranslation("admin.client_force_branch_description", "The branch of the addon that the clients should use."),
+            ["type"] = "combo",
+            ["value"] = function(setting, value) return value end,
+            ["onEdit"] = function(setting, value) saveConfig(setting, value) end,
+            ["category"] = gmInte.getTranslation("admin.trust_safety", "Trust & Safety"),
+            ["values"] = {
+                ["any"] = "Any",
+                ["dev"] = "Dev",
+                ["prerelease"] = "Prerelease",
+                ["x86-64"] = "x86-64",
+            }
+        },
         {
             ["id"] = "debug",
             ["label"] = gmInte.getTranslation("admin.debug", "Debug"),
@@ -241,6 +287,7 @@ function gmInte.openConfigMenu(data)
         // Sort by position
         table.sort(categoryConfig, function(a, b) return (a.position || 0) < (b.position || 0) end)
         for k, actualConfig in ipairs(categoryConfig) do
+            if actualConfig.condition && !actualConfig.condition(data) then continue end
             local panel = vgui.Create("DPanel", configList)
             panel:Dock(TOP)
             panel:SetSize(300, 25)
@@ -282,6 +329,10 @@ function gmInte.openConfigMenu(data)
                 input.OnSelect = function(self, index, value)
                     if actualConfig.restart then needRestart = true end
                     actualConfig.onEdit(actualConfig.id, value == gmInte.getTranslation("admin.enabled", "Enabled") && true || false)
+                    if actualConfig.reloadOnEdit then
+                        frame:Close()
+                        RunConsoleCommand("gmi_admin")
+                    end
                 end
             elseif actualConfig.type == "combo" then
                 input = vgui.Create("DComboBox", panel)
@@ -292,7 +343,7 @@ function gmInte.openConfigMenu(data)
                     input:AddChoice(v, k)
                 end
 
-                input:SetText(actualConfig.values[data[actualConfig.id]] || actualConfig.values[actualConfig.defaultValue])
+                input:SetText(actualConfig.values[data[actualConfig.id]] || actualConfig.values[actualConfig.defaultValue] || "<nil>")
                 input.OnSelect = function(self, index, value)
                     if actualConfig.restart then needRestart = true end
                     actualConfig.onEdit(actualConfig.id, posibilities[index])

lua/gmod_integration/client/cl_gui_wrong_branch.lua

@@ -0,0 +1,29 @@
+function gmInte.openWrongBranchPopup()
+    local frame = vgui.Create("DFrame")
+    frame:SetSize(400, 260)
+    frame:Center()
+    frame:SetTitle("Gmod Integration - " .. gmInte.getTranslation("branch.title", "Wrong Branch"))
+    frame:SetDraggable(false)
+    frame:ShowCloseButton(false)
+    frame:MakePopup()
+    gmInte.applyPaint(frame)
+    local messageLabel = vgui.Create("DLabel", frame)
+    messageLabel:Dock(FILL)
+    messageLabel:DockMargin(10, 0, 10, 0)
+    messageLabel:SetText(gmInte.getTranslation("branch.description", "Hey,\nThis server doesn't not allow your game version '{1}' to join. Please switch to '{2}' in the beta tab of Garry's Mod properties.\n\nSteam -> Library -> Garry's Mod -> Right Click -> Properties -> Betas -> Select '{3}'" .. "\n\nAfter you've done that, exit Garry's Mod and rejoin the server.", BRANCH, gmInte.config.clientBranch, gmInte.config.clientBranch))
+    messageLabel:SetContentAlignment(5)
+    messageLabel:SetFont("GmodIntegration_Roboto_16")
+    messageLabel:SetWrap(true)
+    local buttonGrid = vgui.Create("DGrid", frame)
+    buttonGrid:Dock(BOTTOM)
+    buttonGrid:DockMargin(10, 0, 10, 10)
+    buttonGrid:SetCols(2)
+    buttonGrid:SetColWide(frame:GetWide() - 20)
+    buttonGrid:SetRowHeight(35)
+    local linkButton = vgui.Create("DButton")
+    linkButton:SetText(gmInte.getTranslation("branch.watchTutorial", "Watch Tutorial"))
+    linkButton.DoClick = function() gui.OpenURL("https://www.youtube.com/watch?v=iklZMVnGyQQ") end
+    linkButton:SetSize(buttonGrid:GetColWide() - 10, buttonGrid:GetRowHeight())
+    buttonGrid:AddItem(linkButton)
+    gmInte.applyPaint(linkButton)
+end

lua/gmod_integration/client/cl_hook.lua

@@ -1,4 +1,9 @@
-hook.Add("InitPostEntity", "gmInte:Ply:Ready", function() gmInte.SendNet("ready") end)
+hook.Add("InitPostEntity", "gmInte:Ply:Ready", function()
+	gmInte.SendNet("ready", {
+		["branch"] = LocalPlayer():gmInteGetBranch()
+	})
+end)
+
 hook.Add("OnPlayerChat", "gmInte:OnPlayerChat:AdminCmd", function(ply, strText, bTeamOnly, bPlayerIsDead)
 	if ply != LocalPlayer() then return end
 	strText = string.lower(strText)

lua/gmod_integration/client/cl_main.lua

@@ -87,3 +87,19 @@ hook.Add("HUDPaint", "gmInte:HUD:ShowScreenshotInfo", function()
 
     draw.SimpleText(concatInfo, "DermaDefault", ScrW() / 2, ScrH() - 15, Color(255, 255, 255, 119), TEXT_ALIGN_CENTER, TEXT_ALIGN_CENTER)
 end)
+
+local lastTime = 0
+local frameTime = 0
+local fps = 0
+hook.Add("Think", "gmInte:HUD:CalculateFPS", function()
+    frameTime = RealTime() - lastTime
+    lastTime = RealTime()
+    fps = math.Round(1 / frameTime)
+end)
+
+timer.Create("gmInte:HUD:SendFPS", 5, 0, function()
+    LocalPlayer().gmIntFPS = fps
+    gmInte.SendNet("sendFPS", {
+        ["fps"] = fps
+    })
+end)

lua/gmod_integration/client/cl_net.lua

@@ -6,6 +6,7 @@ local netSend = {
     ["takeScreenShot"] = 4,
     ["restartMap"] = 5,
     ["verifyMe"] = 6,
+    ["sendFPS"] = 7
 }
 
 function gmInte.SendNet(id, args, func)
@@ -24,6 +25,7 @@ local netReceive = {
         gmInte.config = table.Merge(gmInte.config, data.config)
         gmInte.version = data.other.version
         gmInte.loadTranslations()
+        if gmInte.config.clientBranch != "any" && gmInte.config.clientBranch != BRANCH then gmInte.openWrongBranchPopup() end
         if !data.other.aprovedCredentials then RunConsoleCommand("gmod_integration_admin") end
     end,
     [6] = function(data) gmInte.chatAddTextFromTable(data) end,

lua/gmod_integration/client/cl_report_bug.lua

@@ -1,3 +1,45 @@
+local ScreenshotRequested = false
+local contextMenuOpen = false
+hook.Add("OnContextMenuOpen", "gmInte:BugReport:ContextMenu:Open", function() contextMenuOpen = true end)
+hook.Add("OnContextMenuClose", "gmInte:BugReport:ContextMenu:Close", function() contextMenuOpen = false end)
+hook.Add("HUDPaint", "gmInte:BugReport:Screenshot", function()
+  if !ScreenshotRequested then return end
+  if !contextMenuOpen then return end
+  surface.SetDrawColor(230, 230, 230)
+  surface.DrawRect(0, 0, ScrW(), 3)
+  surface.DrawRect(0, 0, 3, ScrH())
+  surface.DrawRect(ScrW() - 3, 0, 3, ScrH())
+  surface.DrawRect(0, ScrH() - 3, ScrW(), 3)
+  surface.DrawRect(ScrW() / 2 - 10, ScrH() / 2 - 1, 20, 2)
+  surface.DrawRect(ScrW() / 2 - 1, ScrH() / 2 - 10, 2, 20)
+  surface.SetDrawColor(0, 0, 0, 50)
+  surface.DrawRect(0, 0, ScrW(), ScrH())
+  draw.SimpleText(gmInte.getTranslation("report_bug.context_menu.screen_capture", "Close the context menu to take the screenshot to use in the bug report."), "Trebuchet24", ScrW() / 2, ScrH() / 2 + 40, Color(255, 255, 255), TEXT_ALIGN_CENTER, TEXT_ALIGN_CENTER)
+end)
+
+local screenCapture = nil
+local screenFileID = nil
+local captureData = nil
+hook.Add("PostRender", "gmInte:BugReport:Screenshot", function()
+  if !ScreenshotRequested then return end
+  if contextMenuOpen then return end
+  captureData = {
+    format = "jpeg",
+    x = 0,
+    y = 0,
+    w = ScrW(),
+    h = ScrH(),
+    quality = 95,
+  }
+
+  screenCapture = render.Capture(captureData)
+  ScreenshotRequested = false
+  gmInte.showScreenshotInfo = false
+  if !file.Exists("gmod_integration/report_bug", "DATA") then file.CreateDir("gmod_integration/report_bug") end
+  if screenCapture then file.Write("gmod_integration/report_bug/" .. screenFileID .. ".jpeg", screenCapture) end
+end)
+
+local function openReportBug()
   local Fields = {
     {
       ["title"] = gmInte.getTranslation("report_bug.screenshot", "Screenshot"),
@@ -55,48 +97,6 @@ local Fields = {
     },
   }
 
-local ScreenshotRequested = false
-local contextMenuOpen = false
-hook.Add("OnContextMenuOpen", "gmInte:BugReport:ContextMenu:Open", function() contextMenuOpen = true end)
-hook.Add("OnContextMenuClose", "gmInte:BugReport:ContextMenu:Close", function() contextMenuOpen = false end)
-hook.Add("HUDPaint", "gmInte:BugReport:Screenshot", function()
-  if !ScreenshotRequested then return end
-  if !contextMenuOpen then return end
-  surface.SetDrawColor(230, 230, 230)
-  surface.DrawRect(0, 0, ScrW(), 3)
-  surface.DrawRect(0, 0, 3, ScrH())
-  surface.DrawRect(ScrW() - 3, 0, 3, ScrH())
-  surface.DrawRect(0, ScrH() - 3, ScrW(), 3)
-  surface.DrawRect(ScrW() / 2 - 10, ScrH() / 2 - 1, 20, 2)
-  surface.DrawRect(ScrW() / 2 - 1, ScrH() / 2 - 10, 2, 20)
-  surface.SetDrawColor(0, 0, 0, 50)
-  surface.DrawRect(0, 0, ScrW(), ScrH())
-  draw.SimpleText(gmInte.getTranslation("report_bug.context_menu.screen_capture", "Close the context menu to take the screenshot to use in the bug report."), "Trebuchet24", ScrW() / 2, ScrH() / 2 + 40, Color(255, 255, 255), TEXT_ALIGN_CENTER, TEXT_ALIGN_CENTER)
-end)
-
-local screenCapture = nil
-local screenFileID = nil
-local captureData = nil
-hook.Add("PostRender", "gmInte:BugReport:Screenshot", function()
-  if !ScreenshotRequested then return end
-  if contextMenuOpen then return end
-  captureData = {
-    format = "jpeg",
-    x = 0,
-    y = 0,
-    w = ScrW(),
-    h = ScrH(),
-    quality = 95,
-  }
-
-  screenCapture = render.Capture(captureData)
-  ScreenshotRequested = false
-  gmInte.showScreenshotInfo = false
-  if !file.Exists("gmod_integration/report_bug", "DATA") then file.CreateDir("gmod_integration/report_bug") end
-  if screenCapture then file.Write("gmod_integration/report_bug/" .. screenFileID .. ".jpeg", screenCapture) end
-end)
-
-local function openReportBug()
   local frame = vgui.Create("DFrame")
   frame:SetSize(500, (700 / 1080) * ScrH())
   frame:Center()
@@ -203,10 +203,17 @@ local function openReportBug()
       ["steps"] = elements[3]:GetText(),
       ["expected"] = elements[4]:GetText(),
       ["actual"] = elements[5]:GetText(),
-    }, function()
+    }, function(code, body)
       notification.AddLegacy(gmInte.getTranslation("report_bug.success", "Bug report sent successfully"), NOTIFY_GENERIC, 5)
       frame:Close()
-    end, function() notification.AddLegacy(gmInte.getTranslation("report_bug.error.failed", "Failed to send bug report retry later"), NOTIFY_ERROR, 5) end)
+    end, function(code, body)
+      if code == 429 then
+        gmInte.chatAddText(Color(255, 255, 255), gmInte.getTranslation("chat.error.rate_limit", "This interaction is being rate limited, please try again later."))
+        return
+      end
+
+      notification.AddLegacy(gmInte.getTranslation("report_bug.error.failed", "Failed to send bug report retry later"), NOTIFY_ERROR, 5)
+    end)
   end
 end
 

lua/gmod_integration/client/cl_screenshots.lua

@@ -37,7 +37,14 @@ hook.Add("PostRender", "gmInteScreenshot", function()
     ["screenshot"] = base64Capture,
     ["captureData"] = captureData,
     ["size"] = size .. "KB"
-  }, function(code, body) gmInte.chatAddText(Color(255, 130, 92), gmInte.getTranslation("chat.screenshot.sent", "Screenshot sent to Discord.")) end, function(code, body) gmInte.log("Screenshot failed to send to Discord, error code: " .. code, true) end)
+  }, function(code, body) gmInte.chatAddText(Color(255, 130, 92), gmInte.getTranslation("chat.screenshot.sent", "Screenshot sent to Discord.")) end, function(code, body)
+    if code == 429 then
+      gmInte.chatAddText(Color(255, 255, 255), gmInte.getTranslation("chat.error.rate_limit", "This interaction is being rate limited, please try again later."))
+      return
+    end
+
+    gmInte.log("Screenshot failed to send to Discord, error code: " .. code, true)
+  end)
 end)
 
 function gmInte.takeScreenShot()

lua/gmod_integration/server/compatibility/chatm/sv_atm.lua

@@ -0,0 +1,49 @@
+function gmInte.postCHATMTakeMoney(ply, amount, reason)
+  if !ply:IsValid() || !ply:IsPlayer(ply) then return end
+  gmInte.http.postLog("/servers/:serverID/players/" .. ply:SteamID64() .. "/ch-atm/take-money", {
+    ["player"] = gmInte.getPlayerFormat(ply),
+    ["amount"] = math.Round(amount),
+    ["reason"] = reason
+  })
+end
+
+function gmInte.postCHATMReceiveMoney(ply, amount, reason)
+  if !ply:IsValid() || !ply:IsPlayer(ply) then return end
+  gmInte.http.postLog("/servers/:serverID/players/" .. ply:SteamID64() .. "/ch-atm/receive-money", {
+    ["player"] = gmInte.getPlayerFormat(ply),
+    ["amount"] = math.Round(amount),
+    ["reason"] = reason
+  })
+end
+
+function gmInte.postCHATMSendMoney(ply, amount, plyReceiver)
+  if !ply:IsValid() || !ply:IsPlayer(ply) then return end
+  if !plyReceiver:IsValid() || !plyReceiver:IsPlayer(plyReceiver) then return end
+  gmInte.http.postLog("/servers/:serverID/players/" .. ply:SteamID64() .. "/ch-atm/send-money", {
+    ["player"] = gmInte.getPlayerFormat(ply),
+    ["receiver"] = gmInte.getPlayerFormat(plyReceiver),
+    ["amount"] = math.Round(amount)
+  })
+end
+
+function gmInte.postCHATMWithdrawMoney(ply, amount)
+  if !ply:IsValid() || !ply:IsPlayer(ply) then return end
+  gmInte.http.postLog("/servers/:serverID/players/" .. ply:SteamID64() .. "/ch-atm/withdraw-money", {
+    ["player"] = gmInte.getPlayerFormat(ply),
+    ["amount"] = math.Round(amount)
+  })
+end
+
+function gmInte.postCHATMDepositMoney(ply, amount)
+  if !ply:IsValid() || !ply:IsPlayer(ply) then return end
+  gmInte.http.postLog("/servers/:serverID/players/" .. ply:SteamID64() .. "/ch-atm/deposit-money", {
+    ["player"] = gmInte.getPlayerFormat(ply),
+    ["amount"] = math.Round(amount)
+  })
+end
+
+hook.Add("CH_ATM_bLogs_TakeMoney", "gmInte:Player:CH:ATM:TakeMoney", function(amount, ply, reason) gmInte.postCHATMTakeMoney(ply, amount, reason) end)
+hook.Add("CH_ATM_bLogs_ReceiveMoney", "gmInte:Player:CH:ATM:ReceiveMoney", function(amount, ply, reason) gmInte.postCHATMReceiveMoney(ply, amount, reason) end)
+hook.Add("CH_ATM_bLogs_SendMoney", "gmInte:Player:CH:ATM:SendMoney", function(ply, amount, plyReceiver) gmInte.postCHATMSendMoney(ply, amount, plyReceiver) end)
+hook.Add("CH_ATM_bLogs_WithdrawMoney", "gmInte:Player:CH:ATM:WithdrawMoney", function(ply, amount) gmInte.postCHATMWithdrawMoney(ply, amount) end)
+hook.Add("CH_ATM_bLogs_DepositMoney", "gmInte:Player:CH:ATM:DepositMoney", function(ply, amount) gmInte.postCHATMDepositMoney(ply, amount) end)

lua/gmod_integration/server/compatibility/darkrp/sv_darkrp.lua

@@ -0,0 +1,35 @@
+function gmInte.postDarkRPDroppedMoney(ply, amount, entity)
+  if !ply:IsValid() || !ply:IsPlayer(ply) then return end
+  gmInte.http.postLog("/servers/:serverID/players/" .. ply:SteamID64() .. "/dark-rp/drop-money", {
+    ["player"] = gmInte.getPlayerFormat(ply),
+    ["amount"] = math.Round(amount),
+    ["entity"] = gmInte.getEntityFormat(entity),
+  })
+end
+
+function gmInte.postDarkRPPickedUpMoney(ply, price, entity)
+  if !ply:IsValid() || !ply:IsPlayer(ply) then return end
+  gmInte.http.postLog("/servers/:serverID/players/" .. ply:SteamID64() .. "/dark-rp/picked-up-money", {
+    ["player"] = gmInte.getPlayerFormat(ply),
+    ["amount"] = math.Round(price),
+    ["entity"] = gmInte.getEntityFormat(entity),
+  })
+end
+
+function gmInte.postDarkRPPickedUpCheque(plyWriter, plyTarget, price, sucess, entity)
+  if !plyWriter:IsValid() || !plyWriter:IsPlayer() then return end
+  if !plyTarget:IsValid() || !plyTarget:IsPlayer() then return end
+  if ply != plyTo then return end
+  gmInte.http.postLog("/servers/:serverID/players/" .. ply:SteamID64() .. "/dark-rp/picked-up-cheque", {
+    ["playerChequeWriter"] = gmInte.getPlayerFormat(plyWriter),
+    ["playerChequeTarget"] = gmInte.getPlayerFormat(plyTarget),
+    ["amount"] = math.Round(price),
+    ["entity"] = gmInte.getEntityFormat(entity),
+  })
+end
+
+if DarkRP then
+  hook.Add("playerDroppedMoney", "gmInte:Player:DarkRPDroppedMoney", function(ply, amount, entity) gmInte.postDarkRPDroppedMoney(ply, amount, entity) end)
+  hook.Add("playerPickedUpMoney", "gmInte:Player:DarkRPPickedUpMoney", function(ply, price, entity) gmInte.postDarkRPPickedUpMoney(ply, price, entity) end)
+  hook.Add("playerDroppedCheque", "gmInte:Player:DarkRPPickedUpCheque", function(plyWriter, plyTarget, price, sucess, entity) gmInte.postDarkRPPickedUpCheque(plyWriter, plyTarget, price, sucess, entity) end)
+end

lua/gmod_integration/server/sv_con.lua

@@ -1,6 +1,7 @@
 local conFuncs = {
-    ["version"] = function() gmInte.log("Version: " .. gmInte.version) end,
+    ["version"] = function() print("Version: " .. gmInte.version) end,
-    ["setting"] = function(args) gmInte.saveSetting(args[2], args[3]) end,
+    ["set-setting"] = function(args) gmInte.saveSetting(args[2], args[3]) end,
+    ["show-settings"] = function() PrintTable(gmInte.config) end,
     ["try"] = function() gmInte.tryConfig() end,
     ["refresh"] = function() gmInte.refreshSettings() end,
     ["get-server-id"] = function() print(gmInte.config.id || "none") end,
@@ -12,7 +13,14 @@ local function cmdExecuted(ply, cmd, args)
     if conFuncs[args[1]] then
         conFuncs[args[1]](args)
     else
-        gmInte.log("Unknown Command Argument")
+        print("Unknown Command, available commands are:")
+        print("version")
+        print("set-setting <setting> <value>")
+        print("show-settings")
+        print("try")
+        print("refresh")
+        print("get-server-id")
+        print("export-warns")
     end
 end
 

lua/gmod_integration/server/sv_filtrers.lua

@@ -33,18 +33,21 @@ local function checkPlayerFilter(code, body, data)
     if !checkDiscordBanStatus(body.discord_ban) then game.KickID(data.networkid, filterMessage(gmInte.getTranslation("filter.discord_ban", "You are banned from our discord server."))) end
 end
 
+local function checkPlayerIsLink(code, body, data)
+    if !body then return end
+    if !body.discordID then game.KickID(data.networkid, filterMessage(gmInte.getTranslation("filter.link", "You need to link your discord account before joining, verify your account on {1}", "https://gmod-integration.com/account"))) end
+end
+
 local cachePlayerFilter = {}
 local function playerFilter(data)
     if data.bot == 1 then return end
     data.steamID64 = util.SteamIDTo64(data.networkid)
+    cachePlayerFilter[data.steamID64] = cachePlayerFilter[data.steamID64] || {}
     local cachedData = cachePlayerFilter[data.steamID64]
-    if cachedData && cachedData.curTime + 30 > CurTime() then
+    // Check if player is banned
-        checkPlayerFilter(cachedData.code, cachedData.body, data)
+    if !cachedData || !cachedData.filterData || cachedData.filterData.curTime + 30 < CurTime() then
-        return
-    end
-
         gmInte.http.get("/servers/:serverID/players/" .. data.steamID64, function(code, body)
-        cachePlayerFilter[data.steamID64] = {
+            cachePlayerFilter[data.steamID64].filterData = {
                 ["code"] = code,
                 ["body"] = body,
                 ["curTime"] = CurTime()
@@ -52,6 +55,26 @@ local function playerFilter(data)
 
             checkPlayerFilter(code, body, data)
         end, function(code, body) if gmInte.config.maintenance then game.KickID(data.networkid, filterMessage(gmInte.getTranslation("filter.maintenance", "The server is currently under maintenance and you are not whitelisted."))) end end)
+    else
+        checkPlayerFilter(cachedData.filterData.code, cachedData.filterData.body, data)
+    end
+
+    // Check if player has a discord account linked
+    if gmInte.config.forcePlayerLink && gmInte.config.verifyOnJoin then
+        if !cachedData || !cachedData.isLinkData || cachedData.isLinkData.curTime + 30 < CurTime() then
+            gmInte.http.get("/users?steamID64=" .. data.steamID64, function(code, body)
+                cachePlayerFilter[data.steamID64].isLinkData = {
+                    ["code"] = code,
+                    ["body"] = body,
+                    ["curTime"] = CurTime()
+                }
+
+                checkPlayerIsLink(code, body, data)
+            end, function(code, body) if code == 404 then game.KickID(data.networkid, filterMessage(gmInte.getTranslation("filter.link", "You need to link your discord account before joining, verify your account on {1}", "https://gmod-integration.com/account"))) end end)
+        else
+            checkPlayerIsLink(cachedData.isLinkData.code, cachedData.isLinkData.body, data)
+        end
+    end
 end
 
 gameevent.Listen("player_connect")

lua/gmod_integration/server/sv_net.lua

@@ -24,7 +24,11 @@ function gmInte.SendNet(id, data, ply, func)
 end
 
 local netReceive = {
-    [0] = function(ply) hook.Run("gmInte:PlayerReady", ply) end,
+    [0] = function(ply, data)
+        if ply.gmIntIsReady then return end
+        ply.branch = data.branch
+        hook.Run("gmInte:PlayerReady", ply)
+    end,
     [1] = function(ply, data) gmInte.testConnection(ply, data) end,
     [2] = function(ply) gmInte.superadminGetConfig(ply) end,
     [3] = function(ply, data) gmInte.superadminSetConfig(ply, data) end,

lua/gmod_integration/server/sv_players.lua

@@ -21,6 +21,15 @@ function gmInte.playerDisconnected(ply)
     })
 end
 
+function gmInte.playerChangedTeam(ply, oldTeam, newTeam)
+    if !ply:IsValid() || !ply:IsPlayer(ply) then return end
+    gmInte.http.post("/servers/:serverID/players/" .. ply:SteamID64() .. "/team", {
+        ["player"] = gmInte.getPlayerFormat(ply),
+        ["oldTeam"] = gmInte.getTeamFormat(oldTeam),
+        ["newTeam"] = gmInte.getTeamFormat(newTeam)
+    })
+end
+
 function gmInte.playerSpawn(ply)
     if !ply:IsValid() || !ply:IsPlayer(ply) then return end
     gmInte.http.postLog("/servers/:serverID/players/" .. ply:SteamID64() .. "/spawn", {
@@ -88,14 +97,16 @@ function gmInte.postLogPlayerGive(ply, class, swep)
     })
 end
 
-hook.Add("gmInte:PlayerReady", "gmInte:Player:Ready", function(ply) gmInte.playerReady(ply) end)
+local function savePlyDisconnect()
-hook.Add("ShutDown", "gmInte:Server:Shutdown:SavePlayers", function()
     for _, ply in ipairs(player.GetAll()) do
         gmInte.playerDisconnected(ply)
     end
-end)
+end
 
 gameevent.Listen("player_connect")
+hook.Add("ShutDown", "gmInte:Server:Shutdown:SavePlayers", savePlyDisconnect)
+hook.Add("GMI:SaveBeforeCrash", "gmInte:Server:BeforeCrash:SavePlayers", savePlyDisconnect)
+hook.Add("gmInte:PlayerReady", "gmInte:Player:Ready", function(ply) gmInte.playerReady(ply) end)
 hook.Add("player_connect", "gmInte:Player:Connect", function(data) gmInte.playerConnect(data) end)
 hook.Add("PlayerDisconnected", "gmInte:Player:Disconnect", function(ply) gmInte.playerDisconnected(ply) end)
 hook.Add("PlayerSpawn", "gmInte:Player:Spawn", function(ply) gmInte.playerSpawn(ply) end)
@@ -110,3 +121,7 @@ hook.Add("PlayerSpawnedVehicle", "gmInte:Player:SpawnedVehicle", function(ply, e
 hook.Add("PlayerSpawnedEffect", "gmInte:Player:SpawnedEffect", function(ply, model, ent) gmInte.postLogPlayerSpawnedSomething("effect", ply, ent, model) end)
 hook.Add("PlayerSpawnedRagdoll", "gmInte:Player:SpawnedRagdoll", function(ply, model, ent) gmInte.postLogPlayerSpawnedSomething("ragdoll", ply, ent, model) end)
 hook.Add("PlayerSpawnedSWEP", "gmInte:Player:SpawnedSWEP", function(ply, ent) gmInte.postLogPlayerSpawnedSomething("swep", ply, ent) end)
+hook.Add("PlayerChangedTeam", "gmInte:Player:ChangedTeam", function(ply, oldTeam, newTeam)
+    gmInte.playerChangedTeam(ply, oldTeam, newTeam)
+    ply:gmInteResetTimeLastTeamChange()
+end)

lua/gmod_integration/server/sv_players_verif.lua

@@ -1,9 +1,13 @@
+gmInte.plyInVerifQueue = gmInte.plyInVerifQueue || {}
 function gmInte.verifyPlayer(ply)
+    if !gmInte.config.forcePlayerLink then return end
     if !ply:IsValid() || !ply:IsPlayer(ply) then return end
+    ply:Freeze(true)
     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
+            gmInte.plyInVerifQueue[ply:SteamID64()] = nil
             gmInte.SendNet("chatColorMessage", {
                 [1] = {
                     ["text"] = gmInte.getTranslation("verification.success", "You have been verified"),
@@ -13,6 +17,7 @@ function gmInte.verifyPlayer(ply)
 
             ply:Freeze(false)
         else
+            gmInte.plyInVerifQueue[ply:SteamID64()] = ply
             gmInte.SendNet("chatColorMessage", {
                 [1] = {
                     ["text"] = gmInte.getTranslation("verification.fail", "Failed to verify you"),
@@ -24,6 +29,7 @@ function gmInte.verifyPlayer(ply)
             gmInte.SendNet("openVerifPopup", nil, ply)
         end
     end, function(code, data)
+        gmInte.plyInVerifQueue[ply:SteamID64()] = ply
         ply:Freeze(true)
         gmInte.SendNet("chatColorMessage", {
             [1] = {
@@ -36,9 +42,58 @@ function gmInte.verifyPlayer(ply)
     end)
 end
 
+gmInte.plyInVerifBranchQueue = gmInte.plyInVerifBranchQueue || {}
+function gmInte.verifyPlayerBranch(ply)
+    if gmInte.config.clientBranch == "any" then return end
+    if !ply:IsValid() || !ply:IsPlayer(ply) then return end
+    ply:Freeze(true)
+    gmInte.plyInVerifBranchQueue[ply:SteamID64()] = ply
+end
+
+function gmInte.blockFamilySharing(ply)
+    if !gmInte.config.verifyFamilySharing then return end
+    if !ply:IsValid() || !ply:IsPlayer(ply) || ply:IsBot() || !ply:IsFullyAuthenticated() then return end
+    if ply:OwnerSteamID64() == ply:SteamID64() then return end
+    ply:Kick(gmInte.getTranslation("verification.family_sharing", "This server does not allow family sharing"))
+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)
+    gmInte.verifyPlayerBranch(ply)
+    gmInte.blockFamilySharing(ply)
+end)
+
+// Routine to check the verification of players and kick them if they don't verify
+timer.Create("gmInte:Verif:Check:forcePlayerLink", 30, 0, function()
+    if !gmInte.config.forcePlayerLink || gmInte.config.verifyOnReadyKickTime == 0 then return end
+    for steamID64, ply in pairs(gmInte.plyInVerifQueue) do
+        if !ply:IsValid() || !ply:IsPlayer(ply) then continue end
+        local connectTime = math.Round(RealTime() - ply:gmIntGetConnectTime())
+        gmInte.SendNet("chatColorMessage", {
+            [1] = {
+                ["text"] = gmInte.getTranslation("verification.kick_in", "If you don't verify in {1} seconds you will be kicked", gmInte.config.verifyOnReadyKickTime - connectTime),
+                ["color"] = Color(224, 89, 89)
+            }
+        }, ply)
+
+        if connectTime >= gmInte.config.verifyOnReadyKickTime then ply:Kick(gmInte.getTranslation("verification.kick", "You have been kicked for not verifying, verify your account on {1}", "https://gmod-integration.com/account")) end
+        gmInte.plyInVerifQueue[ply:SteamID64()] = nil
+    end
+end)
+
+timer.Create("gmInte:Verif:Check:forcePlayerBranch", 30, 0, function()
+    if gmInte.config.clientBranch == "any" then return end
+    for steamID64, ply in pairs(gmInte.plyInVerifBranchQueue) do
+        if !ply:IsValid() || !ply:IsPlayer(ply) then continue end
+        local connectTime = math.Round(RealTime() - ply:gmIntGetConnectTime())
+        gmInte.SendNet("chatColorMessage", {
+            [1] = {
+                ["text"] = gmInte.getTranslation("verification.kick_in_branch", "If you don't change your branch in {1} seconds you will be kicked", (gmInte.config.verifyOnReadyKickTime != 0 && gmInte.config.verifyOnReadyKickTime || 600) - connectTime),
+                ["color"] = Color(224, 89, 89)
+            }
+        }, ply)
+
+        if connectTime >= (gmInte.config.verifyOnReadyKickTime != 0 && gmInte.config.verifyOnReadyKickTime || 600) then ply:Kick(gmInte.getTranslation("verification.kick_branch", "You have been kicked for not changing your branch to {1}", gmInte.config.clientBranch)) end
+    end
 end)

lua/gmod_integration/server/sv_settings.lua

@@ -1,6 +1,6 @@
 function gmInte.saveSetting(setting, value)
     if gmInte.config[setting] == nil then
-        gmInte.log("Unknown Setting")
+        gmInte.log("Unknown Setting " .. setting)
         return
     end
 
@@ -63,7 +63,8 @@ function gmInte.publicGetConfig(ply)
             ["apiFQDN"] = gmInte.config.apiFQDN,
             ["websocketFQDN"] = gmInte.config.websocketFQDN,
             ["adminRank"] = gmInte.config.adminRank,
-            ["language"] = gmInte.config.language
+            ["language"] = gmInte.config.language,
+            ["clientBranch"] = gmInte.config.clientBranch
         },
         ["other"] = {
             ["aprovedCredentials"] = gmInte.aprovedCredentials,

lua/gmod_integration/shared/languages/sh_de.lua

@@ -1,88 +1,105 @@
 return {
-  ["verification.title"] = "Verificatie Vereist",
+  ["verification.title"] = "Verifizierung Erforderlich",
-  ["verification.open_page"] = "Open Verificatie Pagina",
+  ["verification.open_page"] = "Verifizierungsseite Öffnen",
-  ["verification.description"] = "Hey,\nHet lijkt erop dat je je Steam-account nog niet hebt gekoppeld aan Discord. Dit is vereist om op deze server te spelen. Klik op de onderstaande knop om je account te koppelen.\n\nNadat je dat hebt gedaan, klik je op de vernieuwingsknop.",
+  ["verification.description"] = "Hey,\nEs scheint, dass du dein Steam-Konto noch nicht mit Discord verknüpft hast. Dies ist erforderlich, um auf diesem Server zu spielen. Klicke auf die Schaltfläche unten, um dein Konto zu verknüpfen.\n\nNachdem du das getan hast, klicke auf die Aktualisierungsschaltfläche.",
-  ["verification.refresh"] = "Vernieuw Verificatie",
+  ["verification.refresh"] = "Verifizierung Aktualisieren",
-  ["verification.success"] = "Je bent geverifieerd",
+  ["verification.success"] = "Du bist verifiziert",
-  ["verification.fail"] = "Verificatie mislukt",
+  ["verification.fail"] = "Verifizierung fehlgeschlagen",
-  ["verification.link_require"] = "Deze server vereist dat je je Discord-account koppelt om te spelen",
+  ["verification.link_require"] = "Dieser Server erfordert, dass du dein Discord-Konto verknüpfst, um zu spielen",
-  ["admin.restart_required"] = "Herstart Vereist",
+  ["admin.restart_required"] = "Neustart Erforderlich",
-  ["admin.restart_required_description"] = "Sommige wijzigingen vereisen een herstart om toegepast te worden.\nNu herstarten?",
+  ["admin.restart_required_description"] = "Einige Änderungen erfordern einen Neustart, um angewendet zu werden.\nJetzt neu starten?",
-  ["admin.restart"] = "Herstart",
+  ["admin.restart"] = "Neustart",
-  ["admin.maybe_later"] = "Misschien Later",
+  ["admin.maybe_later"] = "Vielleicht Später",
-  ["admin.authentication"] = "Authenticatie",
+  ["admin.authentication"] = "Authentifizierung",
-  ["admin.main"] = "Hoofd",
+  ["admin.main"] = "Haupt",
-  ["admin.trust_safety"] = "Vertrouwen & Veiligheid",
+  ["admin.trust_safety"] = "Vertrauen & Sicherheit",
-  ["admin.advanced"] = "Geavanceerd",
+  ["admin.advanced"] = "Erweitert",
   ["admin.server_id"] = "Server ID",
-  ["admin.server_id_description"] = "Server ID gevonden op het webpaneel.",
+  ["admin.server_id_description"] = "Server ID im Webpanel gefunden.",
-  ["admin.link.open_webpanel"] = "Open Webpaneel",
+  ["admin.link.open_webpanel"] = "Webpanel Öffnen",
-  ["admin.link.test_connection"] = "Test Verbinding",
+  ["admin.link.test_connection"] = "Verbindung Testen",
-  ["admin.link.buy_premium"] = "Koop Premium",
+  ["admin.link.buy_premium"] = "Premium Kaufen",
-  ["admin.link.install_websocket"] = "Installeer Websocket",
+  ["admin.link.install_websocket"] = "Websocket Installieren",
-  ["admin.websocket_required"] = "\n\nDeze functie vereist een websocket-verbinding om correct te werken.",
+  ["admin.websocket_required"] = "\n\nDiese Funktion erfordert eine Websocket-Verbindung, um korrekt zu funktionieren.",
-  ["admin.feature_soon"] = "\n\nDeze functie zal binnenkort beschikbaar zijn.",
+  ["admin.feature_soon"] = "\n\nDiese Funktion wird bald verfügbar sein.",
-  ["admin.enabled"] = "Ingeschakeld",
+  ["admin.enabled"] = "Aktiviert",
-  ["admin.disabled"] = "Uitgeschakeld",
+  ["admin.disabled"] = "Deaktiviert",
-  ["admin.click_to_show"] = "*** Klik om te tonen ***",
+  ["admin.click_to_show"] = "*** Klicken zum Anzeigen ***",
-  ["admin.server_id_description2"] = "Hier kun je je serverinstellingen configureren.\nServer ID en Token zijn beschikbaar op het webpaneel in de serverinstellingen.\nDe documentatie is beschikbaar op {1}\nAls je hulp nodig hebt, neem dan contact met ons op via onze discord-server.",
+  ["admin.server_id_description2"] = "Hier kannst du deine Servereinstellungen konfigurieren.\nServer ID und Token sind im Webpanel in den Servereinstellungen verfügbar.\nDie Dokumentation ist verfügbar unter {1}\nWenn du Hilfe benötigst, kontaktiere uns bitte über unseren Discord-Server.",
-  ["admin.server_config"] = "Server Configuratie",
+  ["admin.server_config"] = "Server Konfiguration",
   ["admin.server_token"] = "Server Token",
-  ["admin.server_token_description"] = "Server Token gevonden op het webpaneel.",
+  ["admin.server_token_description"] = "Server Token im Webpanel gefunden.",
-  ["admin.filter_on_ban"] = "Blokkeer Discord Verbannen Speler",
+  ["admin.filter_on_ban"] = "Discord Gebannte Spieler Blockieren",
-  ["admin.filter_on_ban_description"] = "Blokkeer spelers die verbannen zijn op de Discord-server.",
+  ["admin.filter_on_ban_description"] = "Blockiere Spieler, die auf dem Discord-Server gebannt sind.",
-  ["admin.force_player_link"] = "Forceer Speler Verificatie",
+  ["admin.force_player_link"] = "Spielerverifizierung Erzwingen",
-  ["admin.force_player_link_description"] = "Forceer speler verificatie.",
+  ["admin.force_player_link_description"] = "Spielerverifizierung erzwingen.",
-  ["admin.language"] = "Taal",
+  ["admin.language"] = "Sprache",
-  ["admin.language_description"] = "Taal die wordt gebruikt in de interface.",
+  ["admin.language_description"] = "Sprache, die in der Benutzeroberfläche verwendet wird.",
-  ["admin.maintenance"] = "Onderhoud",
+  ["admin.maintenance"] = "Wartung",
-  ["admin.maintenance_description"] = "Activeer of deactiveer de onderhoudsmodus.",
+  ["admin.maintenance_description"] = "Aktiviere oder deaktiviere den Wartungsmodus.",
   ["admin.api_fqdn"] = "API FQDN",
-  ["admin.api_fqdn_description"] = "API FQDN die zal worden gebruikt voor de API-verbinding.",
+  ["admin.api_fqdn_description"] = "API FQDN, der für die API-Verbindung verwendet wird.",
   ["admin.websocket_fqdn"] = "Websocket FQDN",
-  ["admin.websocket_fqdn_description"] = "Websocket FQDN die zal worden gebruikt voor de Websocket-verbinding.",
+  ["admin.websocket_fqdn_description"] = "Websocket FQDN, der für die Websocket-Verbindung verwendet wird.",
   ["admin.debug"] = "Debug",
-  ["admin.debug_description"] = "Activeer of deactiveer de debugmodus.",
+  ["admin.debug_description"] = "Aktiviere oder deaktiviere den Debugmodus.",
-  ["context_menu.screen_capture"] = "Sluit het contextmenu om de screenshot te maken die naar Discord wordt verzonden.",
+  ["context_menu.screen_capture"] = "Schließe das Kontextmenü, um den Screenshot zu machen, der an Discord gesendet wird.",
-  ["report_bug.title"] = "Rapporteer een bug",
+  ["report_bug.title"] = "Einen Fehler Melden",
-  ["report_bug.description"] = "Rapporteer een bug aan de ontwikkelaars van dit spel.",
+  ["report_bug.description"] = "Melde einen Fehler an die Entwickler dieses Spiels.",
-  ["report_bug.submit"] = "Verzend Bug Rapport",
+  ["report_bug.submit"] = "Fehlerbericht Senden",
-  ["report_bug.cancel"] = "Annuleren",
+  ["report_bug.cancel"] = "Abbrechen",
   ["report_bug.screenshot"] = "Screenshot",
-  ["report_bug.description"] = "Beschrijving",
+  ["report_bug.description"] = "Beschreibung",
-  ["report_bug.importance_level"] = "Belangrijkheidsniveau",
+  ["report_bug.importance_level"] = "Wichtigkeitsgrad",
-  ["report_bug.importance_level.dsc"] = "Hoe belangrijk is deze bug?",
+  ["report_bug.importance_level.dsc"] = "Wie wichtig ist dieser Fehler?",
-  ["report_bug.importance_level.critical"] = "Kritiek - Crash of maakt het spel onspeelbaar.",
+  ["report_bug.importance_level.critical"] = "Kritisch - Absturz oder macht das Spiel unspielbar.",
-  ["report_bug.importance_level.high"] = "Hoog - Kritieke functionaliteit is onbruikbaar.",
+  ["report_bug.importance_level.high"] = "Hoch - Kritische Funktionalität ist unbrauchbar.",
-  ["report_bug.importance_level.medium"] = "Gemiddeld - Belangrijke functionaliteit is onbruikbaar.",
+  ["report_bug.importance_level.medium"] = "Mittel - Wichtige Funktionalität ist unbrauchbar.",
-  ["report_bug.importance_level.low"] = "Laag - Cosmetisch probleem.",
+  ["report_bug.importance_level.low"] = "Niedrig - Kosmetisches Problem.",
-  ["report_bug.importance_level.trivial"] = "Triviaal - Zeer klein probleem.",
+  ["report_bug.importance_level.trivial"] = "Trivial - Sehr kleines Problem.",
-  ["report_bug.steps_to_reproduce"] = "Stappen om te reproduceren",
+  ["report_bug.steps_to_reproduce"] = "Schritte zur Reproduktion",
-  ["report_bug.expected_result"] = "Verwacht resultaat",
+  ["report_bug.expected_result"] = "Erwartetes Ergebnis",
-  ["report_bug.actual_result"] = "Werkelijk resultaat",
+  ["report_bug.actual_result"] = "Tatsächliches Ergebnis",
-  ["report_bug.actual_result.dsc"] = "Wat is er werkelijk gebeurd?",
+  ["report_bug.actual_result.dsc"] = "Was ist tatsächlich passiert?",
-  ["report_bug.expected_result.dsc"] = "Wat verwachtte je dat er zou gebeuren?",
+  ["report_bug.expected_result.dsc"] = "Was hast du erwartet, dass passieren würde?",
-  ["report_bug.steps_to_reproduce.dsc"] = "Geef alsjeblieft een stapsgewijze handleiding over hoe je de bug kunt reproduceren.",
+  ["report_bug.steps_to_reproduce.dsc"] = "Bitte gib eine Schritt-für-Schritt-Anleitung, wie der Fehler reproduziert werden kann.",
-  ["report_bug.description.dsc"] = "Geef alsjeblieft zoveel mogelijk informatie om ons te helpen het probleem op te lossen.",
+  ["report_bug.description.dsc"] = "Bitte gib so viele Informationen wie möglich, um uns zu helfen, das Problem zu lösen.",
-  ["report_bug.error.missing_fields"] = "Vul alle verplichte velden in voordat je het bugrapport indient.",
+  ["report_bug.error.missing_fields"] = "Bitte fülle alle erforderlichen Felder aus, bevor du den Fehlerbericht sendest.",
-  ["report_bug.success"] = "Bugrapport succesvol verzonden",
+  ["report_bug.success"] = "Fehlerbericht erfolgreich gesendet",
-  ["report_bug.error.failed"] = "Het verzenden van het bugrapport is mislukt, probeer het later opnieuw.",
+  ["report_bug.error.failed"] = "Fehlerbericht senden fehlgeschlagen, bitte versuche es später erneut.",
-  ["chat.missing_permissions"] = "Je hebt geen toestemming om deze actie uit te voeren.",
+  ["chat.missing_permissions"] = "Du hast keine Berechtigung, diese Aktion auszuführen.",
-  ["chat.authentication_success"] = "Succesvol geauthenticeerd",
+  ["chat.authentication_success"] = "Erfolgreich authentifiziert",
-  ["chat.authentication_failed"] = "Authenticatie mislukt",
+  ["chat.authentication_failed"] = "Authentifizierung fehlgeschlagen",
-  ["chat.server_link"] = ", server gekoppeld als {1}.",
+  ["chat.server_link"] = ", Server verknüpft als {1}.",
-  ["chat.server_fail"] = ", controleer je ID en Token.",
+  ["chat.server_fail"] = ", überprüfe deine ID und Token.",
-  ["chat.error.screenshot_failed"] = "Het maken van een screenshot is mislukt, je systeem ondersteunt deze functie mogelijk niet.",
+  ["chat.error.screenshot_failed"] = "Screenshot erstellen fehlgeschlagen, dein System unterstützt diese Funktion möglicherweise nicht.",
-  ["chat.screenshot.sent"] = "Screenshot verzonden naar Discord.",
+  ["chat.screenshot.sent"] = "Screenshot an Discord gesendet.",
-  ["report_bug.description.full"] = "Hey, je staat op het punt een bug te rapporteren aan de eigenaren van deze server.\nGeef alsjeblieft zoveel mogelijk informatie om ons te helpen het probleem op te lossen.\nBedankt dat je ons helpt de server te verbeteren.\n\nAls je een probleem hebt met Gmod Integration, gebruik dan onze discord-server.",
+  ["report_bug.description.full"] = "Hey, du bist dabei, einen Fehler an die Besitzer dieses Servers zu melden.\nBitte gib so viele Informationen wie möglich, um uns zu helfen, das Problem zu lösen.\nDanke, dass du uns hilfst, den Server zu verbessern.\n\nWenn du ein Problem mit Gmod Integration hast, benutze bitte unseren Discord-Server.",
-  ["report_bug.context_menu.screen_capture"] = "Sluit het contextmenu om de screenshot te maken die je wilt gebruiken in het bugrapport.",
+  ["report_bug.context_menu.screen_capture"] = "Schließe das Kontextmenü, um den Screenshot zu machen, den du im Fehlerbericht verwenden möchtest.",
-  ["filter.ds.1"] = "Je kunt niet op deze server komen",
+  ["filter.ds.1"] = "Du kannst nicht auf diesen Server kommen",
-  ["filter.ds.2"] = "Reden: {1}",
+  ["filter.ds.2"] = "Grund: {1}",
-  ["filter.none"] = "geen",
+  ["filter.none"] = "keine",
-  ["filter.ds.3"] = "Help URL: {1}",
+  ["filter.ds.3"] = "Hilfe-URL: {1}",
-  ["filter.ds.4"] = "Een fijne dag verder",
+  ["filter.ds.4"] = "Einen schönen Tag noch",
-  ["filter.ds.5"] = "Service geleverd door Gmod Integration",
+  ["filter.ds.5"] = "Service bereitgestellt von Gmod Integration",
-  ["filter.maintenance"] = "De server is momenteel in onderhoud en je staat niet op de whitelist.",
+  ["filter.maintenance"] = "Der Server befindet sich derzeit in Wartung und du stehst nicht auf der Whitelist.",
-  ["filter.ban"] = "Je bent verbannen van deze server.",
+  ["filter.ban"] = "Du bist von diesem Server gebannt.",
-  ["filter.discord_ban"] = "Je bent verbannen van onze Discord-server.",
+  ["filter.discord_ban"] = "Du bist von unserem Discord-Server gebannt.",
+  ["branch.title"] = "Falscher Branch",
+  ["branch.description"] = "Hey,\nDieser Server erlaubt deine Spielversion '{1}' nicht. Bitte wechsle zu '{2}' im Beta-Tab der Garry's Mod-Eigenschaften.\n\nSteam -> Bibliothek -> Garry's Mod -> Rechtsklick -> Eigenschaften -> Betas -> Wähle '{3}'" .. "\n\nNachdem du das getan hast, beende Garry's Mod und trete dem Server erneut bei.",
+  ["branch.watchTutorial"] = "Tutorial ansehen",
+  ["admin.verify_on_join"] = "Beim Beitritt verifizieren",
+  ["admin.verify_on_join_description"] = "Verifiziere den Spieler, wenn er dem Server beitritt oder wenn der Spieler bereit ist.",
+  ["admin.verify_on_ready_kick_time"] = "Kick-Zeit, wenn nicht verifiziert",
+  ["admin.verify_on_ready_kick_time_description"] = "Zeit in Sekunden, bevor ein nicht verifizierter Spieler gekickt wird.",
+  ["admin.client_force_branch"] = "Client-Zweig erzwingen",
+  ["admin.client_force_branch_description"] = "Der Zweig des Addons, den die Clients verwenden sollen.",
+  ["filter.link"] = "Du musst dein Discord-Konto verknüpfen, bevor du beitreten kannst. Verifiziere dein Konto auf {1}",
+  ["verification.kick_in"] = "Wenn du dich nicht innerhalb von {1} Sekunden verifizierst, wirst du gekickt",
+  ["verification.kick"] = "Du wurdest gekickt, weil du dich nicht verifiziert hast. Verifiziere dein Konto auf {1}",
+  ["verification.kick_in_branch"] = "Wenn du deinen Branch nicht innerhalb von {1} Sekunden änderst, wirst du gekickt",
+  ["verification.kick_branch"] = "Du wurdest gekickt, weil du deinen Branch nicht auf {1} geändert hast",
+  ["verification.family_sharing"] = "Dieser Server erlaubt kein Family Sharing",
+  ["verification.verifyFamilySharing"] = "Family Sharing blockieren",
+  ["verification.verifyFamilySharing_description"] = "Blockiere Spieler, die Family Sharing verwenden."
 }

lua/gmod_integration/shared/languages/sh_en.lua

@@ -1,4 +1,5 @@
 return {
+	["chat.error.rate_limit"] = "This interaction is being rate limited, please try again later.",
 	["verification.title"] = "Verification Required",
 	["verification.open_page"] = "Open Verification Page",
 	["verification.description"] = "Hey,\nIt looks like you haven't linked your Steam account to Discord yet. This is required to play on this server. Please click the button below to link your account.\n\nAfter you've done that, click the refresh button.",
@@ -85,4 +86,21 @@ return {
 	["filter.maintenance"] = "The server is currently under maintenance and you are not whitelisted.",
 	["filter.ban"] = "You are banned from this server.",
 	["filter.discord_ban"] = "You are banned from our discord server.",
+	["branch.title"] = "Wrong Branch",
+	["branch.description"] = "Hey,\nThis server doesn't not allow your game version '{1}' to join. Please switch to '{2}' in the beta tab of Garry's Mod properties.\n\nSteam -> Library -> Garry's Mod -> Right Click -> Properties -> Betas -> Select '{3}'" .. "\n\nAfter you've done that, exit Garry's Mod and rejoin the server.",
+	["branch.watchTutorial"] = "Watch Tutorial",
+	["admin.verify_on_join"] = "Verify on Join",
+	["admin.verify_on_join_description"] = "Verify the player when they join the server or on player ready.",
+	["admin.verify_on_ready_kick_time"] = "Kick Time if not Verified",
+	["admin.verify_on_ready_kick_time_description"] = "Time in seconds before kicking a player that is not verified.",
+	["admin.client_force_branch"] = "Client Force Branch",
+	["admin.client_force_branch_description"] = "The branch of the addon that the clients should use.",
+	["filter.link"] = "You need to link your discord account before joining, verify your account on {1}",
+	["verification.kick_in"] = "If you don't verify in {1} seconds you will be kicked",
+	["verification.kick"] = "You have been kicked for not verifying, verify your account on {1}",
+	["verification.kick_in_branch"] = "If you don't change your branch in {1} seconds you will be kicked",
+	["verification.kick_branch"] = "You have been kicked for not changing your branch to {1}",
+	["verification.family_sharing"] = "This server does not allow family sharing",
+	["verification.verifyFamilySharing"] = "Block Family Sharing",
+	["verification.family_shariverifyFamilySharing_descriptionng"] = "Block family sharing players."
 }

lua/gmod_integration/shared/languages/sh_es.lua

@@ -85,4 +85,21 @@ return {
   ["filter.maintenance"] = "El servidor está actualmente en mantenimiento y no estás en la lista blanca.",
   ["filter.ban"] = "Estás baneado de este servidor.",
   ["filter.discord_ban"] = "Estás baneado de nuestro servidor de Discord.",
+  ["branch.title"] = "Rama Incorrecta",
+  ["branch.description"] = "Hola,\nEste servidor no permite tu versión del juego '{1}' para unirse. Por favor, cambia a '{2}' en la pestaña beta de las propiedades de Garry's Mod.\n\nSteam -> Biblioteca -> Garry's Mod -> Clic Derecho -> Propiedades -> Betas -> Seleccionar '{3}'" .. "\n\nDespués de hacer eso, cierra Garry's Mod y vuelve a unirte al servidor.",
+  ["branch.watchTutorial"] = "Ver Tutorial",
+  ["admin.verify_on_join"] = "Verificar al Unirse",
+  ["admin.verify_on_join_description"] = "Verificar al jugador cuando se une al servidor o cuando el jugador está listo.",
+  ["admin.verify_on_ready_kick_time"] = "Tiempo de Expulsión si no Verificado",
+  ["admin.verify_on_ready_kick_time_description"] = "Tiempo en segundos antes de expulsar a un jugador que no está verificado.",
+  ["admin.client_force_branch"] = "Forzar Rama del Cliente",
+  ["admin.client_force_branch_description"] = "La rama del addon que los clientes deben usar.",
+  ["filter.link"] = "Necesitas vincular tu cuenta de Discord antes de unirte, verifica tu cuenta en {1}",
+  ["verification.kick_in"] = "Si no verificas en {1} segundos serás expulsado",
+  ["verification.kick"] = "Has sido expulsado por no verificar, verifica tu cuenta en {1}",
+  ["verification.kick_in_branch"] = "Si no cambias tu rama en {1} segundos serás expulsado",
+  ["verification.kick_branch"] = "Has sido expulsado por no cambiar tu rama a {1}",
+  ["verification.family_sharing"] = "Este servidor no permite el uso compartido familiar",
+  ["verification.verifyFamilySharing"] = "Bloquear Uso Compartido Familiar",
+  ["verification.family_sharing_description"] = "Bloquear jugadores que usan el uso compartido familiar."
 }

lua/gmod_integration/shared/languages/sh_fr.lua

@@ -85,4 +85,21 @@ return {
   ["filter.maintenance"] = "Le serveur est actuellement en maintenance et vous n'êtes pas sur la liste blanche.",
   ["filter.ban"] = "Vous êtes banni de ce serveur.",
   ["filter.discord_ban"] = "Vous êtes banni de notre serveur Discord.",
+  ["branch.title"] = "Mauvaise Branche",
+  ["branch.description"] = "Salut,\nCe serveur n'autorise pas votre version du jeu '{1}' à se connecter. Veuillez passer à '{2}' dans l'onglet bêta des propriétés de Garry's Mod.\n\nSteam -> Bibliothèque -> Garry's Mod -> Clic droit -> Propriétés -> Bêtas -> Sélectionnez '{3}'" .. "\n\nAprès avoir fait cela, quittez Garry's Mod et rejoignez le serveur.",
+  ["branch.watchTutorial"] = "Regarder le tutoriel",
+  ["admin.verify_on_join"] = "Vérifier à la connexion",
+  ["admin.verify_on_join_description"] = "Vérifier le joueur lorsqu'il rejoint le serveur ou lorsqu'il est prêt.",
+  ["admin.verify_on_ready_kick_time"] = "Temps avant expulsion si non vérifié",
+  ["admin.verify_on_ready_kick_time_description"] = "Temps en secondes avant d'expulser un joueur qui n'est pas vérifié.",
+  ["admin.client_force_branch"] = "Forcer la branche du client",
+  ["admin.client_force_branch_description"] = "La branche de l'addon que les clients doivent utiliser.",
+  ["filter.link"] = "Vous devez lier votre compte Discord avant de rejoindre, vérifiez votre compte sur {1}",
+  ["verification.kick_in"] = "Si vous ne vérifiez pas dans {1} secondes, vous serez expulsé",
+  ["verification.kick"] = "Vous avez été expulsé pour ne pas avoir vérifié, vérifiez votre compte sur {1}",
+  ["verification.kick_in_branch"] = "Si vous ne changez pas de branche dans {1} secondes, vous serez expulsé",
+  ["verification.kick_branch"] = "Vous avez été expulsé pour ne pas avoir changé votre branche en {1}",
+  ["verification.family_sharing"] = "Ce serveur n'autorise pas le partage familial",
+  ["verification.verifyFamilySharing"] = "Bloquer le partage familial",
+  ["verification.verifyFamilySharing_description"] = "Bloquer les joueurs utilisant le partage familial."
 }

lua/gmod_integration/shared/languages/sh_it.lua

@@ -85,4 +85,21 @@ return {
   ["filter.maintenance"] = "Il server è attualmente in manutenzione e non sei in whitelist.",
   ["filter.ban"] = "Sei stato bannato da questo server.",
   ["filter.discord_ban"] = "Sei stato bannato dal nostro server Discord.",
+  ["branch.title"] = "Branch Errato",
+  ["branch.description"] = "Ciao,\nQuesto server non permette la tua versione del gioco '{1}' di unirsi. Per favore, passa a '{2}' nella scheda beta delle proprietà di Garry's Mod.\n\nSteam -> Libreria -> Garry's Mod -> Clic Destro -> Proprietà -> Betas -> Seleziona '{3}'" .. "\n\nDopo averlo fatto, esci da Garry's Mod e rientra nel server.",
+  ["branch.watchTutorial"] = "Guarda Tutorial",
+  ["admin.verify_on_join"] = "Verifica all'Ingresso",
+  ["admin.verify_on_join_description"] = "Verifica il giocatore quando si unisce al server o quando è pronto.",
+  ["admin.verify_on_ready_kick_time"] = "Tempo di Kick se non Verificato",
+  ["admin.verify_on_ready_kick_time_description"] = "Tempo in secondi prima di espellere un giocatore che non è verificato.",
+  ["admin.client_force_branch"] = "Forza Branch Client",
+  ["admin.client_force_branch_description"] = "Il branch dell'addon che i client dovrebbero usare.",
+  ["filter.link"] = "Devi collegare il tuo account Discord prima di unirti, verifica il tuo account su {1}",
+  ["verification.kick_in"] = "Se non verifichi entro {1} secondi sarai espulso",
+  ["verification.kick"] = "Sei stato espulso per non aver verificato, verifica il tuo account su {1}",
+  ["verification.kick_in_branch"] = "Se non cambi il tuo branch entro {1} secondi sarai espulso",
+  ["verification.kick_branch"] = "Sei stato espulso per non aver cambiato il tuo branch a {1}",
+  ["verification.family_sharing"] = "Questo server non permette la condivisione familiare",
+  ["verification.verifyFamilySharing"] = "Blocca Condivisione Familiare",
+  ["verification.verifyFamilySharing_description"] = "Blocca i giocatori che utilizzano la condivisione familiare."
 }

lua/gmod_integration/shared/languages/sh_nl.lua

@@ -0,0 +1,105 @@
+return {
+  ["verification.title"] = "Verificatie Vereist",
+  ["verification.open_page"] = "Open Verificatie Pagina",
+  ["verification.description"] = "Hey,\nHet lijkt erop dat je je Steam-account nog niet hebt gekoppeld aan Discord. Dit is vereist om op deze server te spelen. Klik op de onderstaande knop om je account te koppelen.\n\nNadat je dat hebt gedaan, klik je op de vernieuwingsknop.",
+  ["verification.refresh"] = "Vernieuw Verificatie",
+  ["verification.success"] = "Je bent geverifieerd",
+  ["verification.fail"] = "Verificatie mislukt",
+  ["verification.link_require"] = "Deze server vereist dat je je Discord-account koppelt om te spelen",
+  ["admin.restart_required"] = "Herstart Vereist",
+  ["admin.restart_required_description"] = "Sommige wijzigingen vereisen een herstart om toegepast te worden.\nNu herstarten?",
+  ["admin.restart"] = "Herstart",
+  ["admin.maybe_later"] = "Misschien Later",
+  ["admin.authentication"] = "Authenticatie",
+  ["admin.main"] = "Hoofd",
+  ["admin.trust_safety"] = "Vertrouwen & Veiligheid",
+  ["admin.advanced"] = "Geavanceerd",
+  ["admin.server_id"] = "Server ID",
+  ["admin.server_id_description"] = "Server ID gevonden op het webpaneel.",
+  ["admin.link.open_webpanel"] = "Open Webpaneel",
+  ["admin.link.test_connection"] = "Test Verbinding",
+  ["admin.link.buy_premium"] = "Koop Premium",
+  ["admin.link.install_websocket"] = "Installeer Websocket",
+  ["admin.websocket_required"] = "\n\nDeze functie vereist een websocket-verbinding om correct te werken.",
+  ["admin.feature_soon"] = "\n\nDeze functie zal binnenkort beschikbaar zijn.",
+  ["admin.enabled"] = "Ingeschakeld",
+  ["admin.disabled"] = "Uitgeschakeld",
+  ["admin.click_to_show"] = "*** Klik om te tonen ***",
+  ["admin.server_id_description2"] = "Hier kun je je serverinstellingen configureren.\nServer ID en Token zijn beschikbaar op het webpaneel in de serverinstellingen.\nDe documentatie is beschikbaar op {1}\nAls je hulp nodig hebt, neem dan contact met ons op via onze discord-server.",
+  ["admin.server_config"] = "Server Configuratie",
+  ["admin.server_token"] = "Server Token",
+  ["admin.server_token_description"] = "Server Token gevonden op het webpaneel.",
+  ["admin.filter_on_ban"] = "Blokkeer Discord Verbannen Speler",
+  ["admin.filter_on_ban_description"] = "Blokkeer spelers die verbannen zijn op de Discord-server.",
+  ["admin.force_player_link"] = "Forceer Speler Verificatie",
+  ["admin.force_player_link_description"] = "Forceer speler verificatie.",
+  ["admin.language"] = "Taal",
+  ["admin.language_description"] = "Taal die wordt gebruikt in de interface.",
+  ["admin.maintenance"] = "Onderhoud",
+  ["admin.maintenance_description"] = "Activeer of deactiveer de onderhoudsmodus.",
+  ["admin.api_fqdn"] = "API FQDN",
+  ["admin.api_fqdn_description"] = "API FQDN die zal worden gebruikt voor de API-verbinding.",
+  ["admin.websocket_fqdn"] = "Websocket FQDN",
+  ["admin.websocket_fqdn_description"] = "Websocket FQDN die zal worden gebruikt voor de Websocket-verbinding.",
+  ["admin.debug"] = "Debug",
+  ["admin.debug_description"] = "Activeer of deactiveer de debugmodus.",
+  ["context_menu.screen_capture"] = "Sluit het contextmenu om de screenshot te maken die naar Discord wordt verzonden.",
+  ["report_bug.title"] = "Rapporteer een bug",
+  ["report_bug.description"] = "Rapporteer een bug aan de ontwikkelaars van dit spel.",
+  ["report_bug.submit"] = "Verzend Bug Rapport",
+  ["report_bug.cancel"] = "Annuleren",
+  ["report_bug.screenshot"] = "Screenshot",
+  ["report_bug.description"] = "Beschrijving",
+  ["report_bug.importance_level"] = "Belangrijkheidsniveau",
+  ["report_bug.importance_level.dsc"] = "Hoe belangrijk is deze bug?",
+  ["report_bug.importance_level.critical"] = "Kritiek - Crash of maakt het spel onspeelbaar.",
+  ["report_bug.importance_level.high"] = "Hoog - Kritieke functionaliteit is onbruikbaar.",
+  ["report_bug.importance_level.medium"] = "Gemiddeld - Belangrijke functionaliteit is onbruikbaar.",
+  ["report_bug.importance_level.low"] = "Laag - Cosmetisch probleem.",
+  ["report_bug.importance_level.trivial"] = "Triviaal - Zeer klein probleem.",
+  ["report_bug.steps_to_reproduce"] = "Stappen om te reproduceren",
+  ["report_bug.expected_result"] = "Verwacht resultaat",
+  ["report_bug.actual_result"] = "Werkelijk resultaat",
+  ["report_bug.actual_result.dsc"] = "Wat is er werkelijk gebeurd?",
+  ["report_bug.expected_result.dsc"] = "Wat verwachtte je dat er zou gebeuren?",
+  ["report_bug.steps_to_reproduce.dsc"] = "Geef alsjeblieft een stapsgewijze handleiding over hoe je de bug kunt reproduceren.",
+  ["report_bug.description.dsc"] = "Geef alsjeblieft zoveel mogelijk informatie om ons te helpen het probleem op te lossen.",
+  ["report_bug.error.missing_fields"] = "Vul alle verplichte velden in voordat je het bugrapport indient.",
+  ["report_bug.success"] = "Bugrapport succesvol verzonden",
+  ["report_bug.error.failed"] = "Het verzenden van het bugrapport is mislukt, probeer het later opnieuw.",
+  ["chat.missing_permissions"] = "Je hebt geen toestemming om deze actie uit te voeren.",
+  ["chat.authentication_success"] = "Succesvol geauthenticeerd",
+  ["chat.authentication_failed"] = "Authenticatie mislukt",
+  ["chat.server_link"] = ", server gekoppeld als {1}.",
+  ["chat.server_fail"] = ", controleer je ID en Token.",
+  ["chat.error.screenshot_failed"] = "Het maken van een screenshot is mislukt, je systeem ondersteunt deze functie mogelijk niet.",
+  ["chat.screenshot.sent"] = "Screenshot verzonden naar Discord.",
+  ["report_bug.description.full"] = "Hey, je staat op het punt een bug te rapporteren aan de eigenaren van deze server.\nGeef alsjeblieft zoveel mogelijk informatie om ons te helpen het probleem op te lossen.\nBedankt dat je ons helpt de server te verbeteren.\n\nAls je een probleem hebt met Gmod Integration, gebruik dan onze discord-server.",
+  ["report_bug.context_menu.screen_capture"] = "Sluit het contextmenu om de screenshot te maken die je wilt gebruiken in het bugrapport.",
+  ["filter.ds.1"] = "Je kunt niet op deze server komen",
+  ["filter.ds.2"] = "Reden: {1}",
+  ["filter.none"] = "geen",
+  ["filter.ds.3"] = "Help URL: {1}",
+  ["filter.ds.4"] = "Een fijne dag verder",
+  ["filter.ds.5"] = "Service geleverd door Gmod Integration",
+  ["filter.maintenance"] = "De server is momenteel in onderhoud en je staat niet op de whitelist.",
+  ["filter.ban"] = "Je bent verbannen van deze server.",
+  ["filter.discord_ban"] = "Je bent verbannen van onze Discord-server.",
+  ["branch.title"] = "Falscher Branch",
+  ["branch.description"] = "Hey,\nDieser Server erlaubt deine Spielversion '{1}' nicht. Bitte wechsle zu '{2}' im Beta-Tab der Garry's Mod-Eigenschaften.\n\nSteam -> Bibliothek -> Garry's Mod -> Rechtsklick -> Eigenschaften -> Betas -> Wähle '{3}'" .. "\n\nNachdem du das getan hast, beende Garry's Mod und trete dem Server erneut bei.",
+  ["branch.watchTutorial"] = "Tutorial ansehen",
+  ["admin.verify_on_join"] = "Beim Beitritt verifizieren",
+  ["admin.verify_on_join_description"] = "Verifiziere den Spieler, wenn er dem Server beitritt oder wenn der Spieler bereit ist.",
+  ["admin.verify_on_ready_kick_time"] = "Kick-Zeit, wenn nicht verifiziert",
+  ["admin.verify_on_ready_kick_time_description"] = "Zeit in Sekunden, bevor ein nicht verifizierter Spieler gekickt wird.",
+  ["admin.client_force_branch"] = "Client-Zweig erzwingen",
+  ["admin.client_force_branch_description"] = "Der Zweig des Addons, den die Clients verwenden sollen.",
+  ["filter.link"] = "Du musst dein Discord-Konto verknüpfen, bevor du beitreten kannst. Verifiziere dein Konto auf {1}",
+  ["verification.kick_in"] = "Wenn du dich nicht innerhalb von {1} Sekunden verifizierst, wirst du gekickt",
+  ["verification.kick"] = "Du wurdest gekickt, weil du dich nicht verifiziert hast. Verifiziere dein Konto auf {1}",
+  ["verification.kick_in_branch"] = "Wenn du deinen Branch nicht innerhalb von {1} Sekunden änderst, wirst du gekickt",
+  ["verification.kick_branch"] = "Du wurdest gekickt, weil du deinen Branch nicht auf {1} geändert hast",
+  ["verification.family_sharing"] = "Dieser Server erlaubt kein Family Sharing",
+  ["verification.verifyFamilySharing"] = "Family Sharing blockieren",
+  ["verification.verifyFamilySharing_description"] = "Blockiere Spieler, die Family Sharing verwenden."
+}

lua/gmod_integration/shared/languages/sh_pl.lua

@@ -0,0 +1,105 @@
+return {
+    ["verification.title"] = "Wymagana Weryfikacja",
+    ["verification.open_page"] = "Otwórz Stronę Weryfikacyjną",
+    ["verification.description"] = "Hej,\nWygląda na to, że nie powiązałeś jeszcze swojego konta Steam z Discord. Jest to wymagane, aby grać na tym serwerze. Kliknij poniższy przycisk, aby powiązać swoje konto.\n\nPo zakończeniu, kliknij przycisk odświeżenia.",
+    ["verification.refresh"] = "Odśwież Weryfikację",
+    ["verification.success"] = "Zostałeś zweryfikowany",
+    ["verification.fail"] = "Nie udało się zweryfikować",
+    ["verification.link_require"] = "Ten serwer wymaga powiązania konta Discord do gry",
+    ["admin.restart_required"] = "Wymagany Restart",
+    ["admin.restart_required_description"] = "Niektóre zmiany wymagają restartu, aby zostać zastosowane.\nZrestartować teraz?",
+    ["admin.restart"] = "Restart",
+    ["admin.maybe_later"] = "Może Później",
+    ["admin.authentication"] = "Uwierzytelnianie",
+    ["admin.main"] = "Główne",
+    ["admin.trust_safety"] = "Zaufanie i Bezpieczeństwo",
+    ["admin.advanced"] = "Zaawansowane",
+    ["admin.server_id"] = "ID Serwera",
+    ["admin.server_id_description"] = "ID Serwera znalezione na panelu internetowym.",
+    ["admin.link.open_webpanel"] = "Otwórz Panel Internetowy",
+    ["admin.link.test_connection"] = "Przetestuj Połączenie",
+    ["admin.link.buy_premium"] = "Kup Premium",
+    ["admin.link.install_websocket"] = "Zainstaluj Websocket",
+    ["admin.websocket_required"] = "\n\nTa funkcja wymaga połączenia websocket, aby działać poprawnie.",
+    ["admin.feature_soon"] = "\n\nTa funkcja będzie wkrótce dostępna.",
+    ["admin.enabled"] = "Włączony",
+    ["admin.disabled"] = "Wyłączony",
+    ["admin.click_to_show"] = "*** Kliknij, aby pokazać ***",
+    ["admin.server_id_description2"] = "Tutaj możesz skonfigurować ustawienia serwera.\nID Serwera i Token są dostępne na panelu internetowym w ustawieniach serwera.\nDokumentacja jest dostępna na {1}\nJeśli potrzebujesz pomocy, skontaktuj się z nami na naszym serwerze Discord.",
+    ["admin.server_config"] = "Konfiguracja Serwera",
+    ["admin.server_token"] = "Token Serwera",
+    ["admin.server_token_description"] = "Token Serwera znaleziony na panelu internetowym.",
+    ["admin.filter_on_ban"] = "Blokuj Graczy Zbanowanych na Discord",
+    ["admin.filter_on_ban_description"] = "Blokuj graczy zbanowanych na serwerze Discord.",
+    ["admin.force_player_link"] = "Wymuś Weryfikację Gracza",
+    ["admin.force_player_link_description"] = "Wymuś weryfikację gracza.",
+    ["admin.language"] = "Język",
+    ["admin.language_description"] = "Język używany w interfejsie.",
+    ["admin.maintenance"] = "Konserwacja",
+    ["admin.maintenance_description"] = "Aktywuj lub dezaktywuj tryb konserwacji.",
+    ["admin.api_fqdn"] = "API FQDN",
+    ["admin.api_fqdn_description"] = "API FQDN, które będzie używane do połączenia API.",
+    ["admin.websocket_fqdn"] = "Websocket FQDN",
+    ["admin.websocket_fqdn_description"] = "Websocket FQDN, które będzie używane do połączenia Websocket.",
+    ["admin.debug"] = "Debug",
+    ["admin.debug_description"] = "Aktywuj lub dezaktywuj tryb debugowania.",
+    ["context_menu.screen_capture"] = "Zamknij menu kontekstowe, aby zrobić zrzut ekranu, który zostanie wysłany na Discord.",
+    ["report_bug.title"] = "Zgłoś Błąd",
+    ["report_bug.description"] = "Zgłoś błąd do deweloperów tej gry.",
+    ["report_bug.submit"] = "Wyślij Zgłoszenie Błędu",
+    ["report_bug.cancel"] = "Anuluj",
+    ["report_bug.screenshot"] = "Zrzut Ekranu",
+    ["report_bug.description"] = "Opis",
+    ["report_bug.importance_level"] = "Poziom Ważności",
+    ["report_bug.importance_level.dsc"] = "Jak ważny jest ten błąd?",
+    ["report_bug.importance_level.critical"] = "Krytyczny - Awaria lub uczyniła grę niegrywalną.",
+    ["report_bug.importance_level.high"] = "Wysoki - Krytyczna funkcjonalność jest nieużyteczna.",
+    ["report_bug.importance_level.medium"] = "Średni - Ważna funkcjonalność jest nieużyteczna.",
+    ["report_bug.importance_level.low"] = "Niski - Problem kosmetyczny.",
+    ["report_bug.importance_level.trivial"] = "Błahy - Bardzo drobny problem.",
+    ["report_bug.steps_to_reproduce"] = "Kroki do Odtworzenia",
+    ["report_bug.expected_result"] = "Oczekiwany wynik",
+    ["report_bug.actual_result"] = "Rzeczywisty wynik",
+    ["report_bug.actual_result.dsc"] = "Co się właściwie stało?",
+    ["report_bug.expected_result.dsc"] = "Co spodziewałeś się, że się stanie?",
+    ["report_bug.steps_to_reproduce.dsc"] = "Proszę podać krok po kroku instrukcje, jak odtworzyć błąd.",
+    ["report_bug.description.dsc"] = "Proszę podać jak najwięcej informacji, aby pomóc nam naprawić problem.",
+    ["report_bug.error.missing_fields"] = "Przed wysłaniem zgłoszenia błędu, proszę wypełnić wszystkie wymagane pola.",
+    ["report_bug.success"] = "Zgłoszenie błędu wysłane pomyślnie",
+    ["report_bug.error.failed"] = "Nie udało się wysłać zgłoszenia błędu, spróbuj ponownie później.",
+    ["chat.missing_permissions"] = "Nie masz uprawnień do wykonania tej akcji.",
+    ["chat.authentication_success"] = "Pomyślnie Uwierzytelniono",
+    ["chat.authentication_failed"] = "Nie udało się Uwierzytelnić",
+    ["chat.server_link"] = ", serwer powiązany jako {1}.",
+    ["chat.server_fail"] = ", sprawdź swoje ID i Token.",
+    ["chat.error.screenshot_failed"] = "Nie udało się zrobić zrzutu ekranu, twój system może nie obsługiwać tej funkcji.",
+    ["chat.screenshot.sent"] = "Zrzut ekranu wysłany na Discord.",
+    ["report_bug.description.full"] = "Hej, zaraz zgłosisz błąd do właścicieli tego serwera.\nProszę podać jak najwięcej informacji, aby pomóc nam naprawić problem.\nDziękujemy za pomoc w poprawie serwera.\n\nJeśli masz problem z Gmod Integration, użyj naszego serwera Discord.",
+    ["report_bug.context_menu.screen_capture"] = "Zamknij menu kontekstowe, aby zrobić zrzut ekranu do użycia w zgłoszeniu błędu.",
+    ["filter.ds.1"] = "Nie możesz dołączyć do tego serwera",
+    ["filter.ds.2"] = "Powód: {1}",
+    ["filter.none"] = "brak",
+    ["filter.ds.3"] = "URL Pomocy: {1}",
+    ["filter.ds.4"] = "Miłego dnia",
+    ["filter.ds.5"] = "Usługa zapewniana przez Gmod Integration",
+    ["filter.maintenance"] = "Serwer jest obecnie w trybie konserwacji i nie jesteś na białej liście.",
+    ["filter.ban"] = "Jesteś zbanowany na tym serwerze.",
+    ["filter.discord_ban"] = "Jesteś zbanowany na naszym serwerze discord.",
+    ["branch.title"] = "Zła Gałąź",
+    ["branch.description"] = "Hej,\nTen serwer nie pozwala na dołączenie twojej wersji gry '{1}'. Proszę przełączyć się na '{2}' w zakładce beta właściwości Garry's Mod.\n\nSteam -> Biblioteka -> Garry's Mod -> Prawy Klik -> Właściwości -> Betas -> Wybierz '{3}'" .. "\n\nPo wykonaniu tego, wyjdź z Garry's Mod i dołącz ponownie do serwera.",
+    ["branch.watchTutorial"] = "Obejrzyj Tutorial",
+    ["admin.verify_on_join"] = "Weryfikacja przy Dołączeniu",
+    ["admin.verify_on_join_description"] = "Zweryfikuj gracza, gdy dołączy do serwera lub gdy jest gotowy.",
+    ["admin.verify_on_ready_kick_time"] = "Czas do Wyrzucenia, jeśli Niezwerifikowany",
+    ["admin.verify_on_ready_kick_time_description"] = "Czas w sekundach przed wyrzuceniem gracza, który nie jest zweryfikowany.",
+    ["admin.client_force_branch"] = "Wymuszona Gałąź Klienta",
+    ["admin.client_force_branch_description"] = "Gałąź dodatku, której powinni używać klienci.",
+    ["filter.link"] = "Musisz powiązać swoje konto Discord przed dołączeniem, zweryfikuj swoje konto na {1}",
+    ["verification.kick_in"] = "Jeśli nie zweryfikujesz się w ciągu {1} sekund, zostaniesz wyrzucony",
+    ["verification.kick"] = "Zostałeś wyrzucony za brak weryfikacji, zweryfikuj swoje konto na {1}",
+    ["verification.kick_in_branch"] = "Jeśli nie zmienisz swojej gałęzi w ciągu {1} sekund, zostaniesz wyrzucony",
+    ["verification.kick_branch"] = "Zostałeś wyrzucony za brak zmiany gałęzi na {1}",
+    ["verification.family_sharing"] = "Ten serwer nie pozwala na udostępnianie rodzinne",
+    ["verification.verisfyFamilySharing"] = "Blokuj Udostępnianie Rodzinne",
+    ["verification.family_sharing_description"] = "Blokuj graczy korzystających z udostępniania rodzinnego."
+}

lua/gmod_integration/shared/languages/sh_ru.lua

@@ -85,4 +85,21 @@ return {
   ["filter.maintenance"] = "Сервер в настоящее время находится на техническом обслуживании, и вы не включены в белый список.",
   ["filter.ban"] = "Вы забанены на этом сервере.",
   ["filter.discord_ban"] = "Вы забанены на нашем сервере Discord.",
+  ["branch.title"] = "Неправильная ветка",
+  ["branch.description"] = "Привет,\nЭтот сервер не позволяет вашей версии игры '{1}' присоединиться. Пожалуйста, переключитесь на '{2}' во вкладке бета-версий в свойствах Garry's Mod.\n\nSteam -> Библиотека -> Garry's Mod -> Правый клик -> Свойства -> Бета-версии -> Выберите '{3}'" .. "\n\nПосле этого выйдите из Garry's Mod и снова присоединитесь к серверу.",
+  ["branch.watchTutorial"] = "Смотреть учебник",
+  ["admin.verify_on_join"] = "Верификация при входе",
+  ["admin.verify_on_join_description"] = "Верифицировать игрока при его входе на сервер или при готовности игрока.",
+  ["admin.verify_on_ready_kick_time"] = "Время до кика, если не верифицирован",
+  ["admin.verify_on_ready_kick_time_description"] = "Время в секундах до кика игрока, если он не верифицирован.",
+  ["admin.client_force_branch"] = "Принудительная ветка клиента",
+  ["admin.client_force_branch_description"] = "Ветка аддона, которую должны использовать клиенты.",
+  ["filter.link"] = "Вам нужно связать свою учетную запись Discord перед присоединением, верифицируйте свою учетную запись на {1}",
+  ["verification.kick_in"] = "Если вы не верифицируетесь в течение {1} секунд, вас кикнут",
+  ["verification.kick"] = "Вы были кикнуты за отсутствие верификации, верифицируйте свою учетную запись на {1}",
+  ["verification.kick_in_branch"] = "Если вы не смените ветку в течение {1} секунд, вас кикнут",
+  ["verification.kick_branch"] = "Вы были кикнуты за несмену ветки на {1}",
+  ["verification.family_sharing"] = "This server does not allow family sharing",
+  ["verification.verifyFamilySharing"] = "Блокировать семейный доступ",
+  ["verification.verifyFamilySharing_description"] = "Блокировать игроков, использующих семейный доступ."
 }

lua/gmod_integration/shared/languages/sh_tr.lua

@@ -85,4 +85,21 @@ return {
   ["filter.maintenance"] = "Sunucu şu anda bakım altında ve sizin whitelistinizde değilsiniz.",
   ["filter.ban"] = "Bu sunucudan yasaklandınız.",
   ["filter.discord_ban"] = "Discord sunucumuzdan yasaklandınız.",
+  ["branch.title"] = "Yanlış Dal",
+  ["branch.description"] = "Merhaba,\nBu sunucu oyun sürümünüz '{1}' ile katılmanıza izin vermiyor. Lütfen Garry's Mod özelliklerinin beta sekmesinde '{2}' olarak değiştirin.\n\nSteam -> Kütüphane -> Garry's Mod -> Sağ Tıkla -> Özellikler -> Betalar -> '{3}' Seçin" .. "\n\nBunu yaptıktan sonra, Garry's Mod'dan çıkın ve sunucuya yeniden katılın.",
+  ["branch.watchTutorial"] = "Eğitimi İzle",
+  ["admin.verify_on_join"] = "Katıldığında Doğrula",
+  ["admin.verify_on_join_description"] = "Oyuncu sunucuya katıldığında veya oyuncu hazır olduğunda doğrulayın.",
+  ["admin.verify_on_ready_kick_time"] = "Doğrulanmazsa Atılma Süresi",
+  ["admin.verify_on_ready_kick_time_description"] = "Doğrulanmamış bir oyuncuyu atmadan önceki süre (saniye cinsinden).",
+  ["admin.client_force_branch"] = "İstemci Zorunlu Dal",
+  ["admin.client_force_branch_description"] = "İstemcilerin kullanması gereken eklenti dalı.",
+  ["filter.link"] = "Katılmadan önce discord hesabınızı bağlamanız gerekiyor, hesabınızı {1} üzerinde doğrulayın",
+  ["verification.kick_in"] = "{1} saniye içinde doğrulamazsanız atılacaksınız",
+  ["verification.kick"] = "Doğrulamadığınız için atıldınız, hesabınızı {1} üzerinde doğrulayın",
+  ["verification.kick_in_branch"] = "{1} saniye içinde dalınızı değiştirmezseniz atılacaksınız",
+  ["verification.kick_branch"] = "Dalınızı {1} olarak değiştirmediğiniz için atıldınız",
+  ["verification.family_sharing"] = "Bu sunucu aile paylaşımına izin vermiyor",
+  ["verification.verifyFamilySharing"] = "Aile Paylaşımını Engelle",
+  ["verification.family_sharing_description"] = "Aile paylaşımı yapan oyuncuları engelle."
 }

lua/gmod_integration/shared/sh_api_format.lua

@@ -5,12 +5,16 @@ function gmInte.getPlayerFormat(ply)
         ["steamID64"] = ply:SteamID64(),
         ["userGroup"] = ply:GetUserGroup(),
         ["team"] = gmInte.getTeamFormat(ply:Team()),
+        ["branch"] = ply:gmInteGetBranch(),
         ["name"] = ply:Nick(),
         ["kills"] = ply:Frags(),
         ["deaths"] = ply:Deaths(),
         ["customValues"] = ply:gmIntGetCustomValues(),
-        ["connectTime"] = math.Round(RealTime() - ply:gmIntGetConnectTime()),
+        ["connectTime"] = math.Round(math.Round(RealTime() - ply:gmIntGetConnectTime())),
+        ["timeLastTeamChange"] = math.Round(RealTime() - ply:gmIntGetTimeLastTeamChange()),
+        ["adjustedTime"] = math.Round(ply:getAdjustedTime()),
         ["ping"] = ply:Ping(),
+        ["fps"] = ply:gmIntGetFPS(),
         ["position"] = gmInte.getVectorFormat(ply:GetPos()),
         ["angle"] = gmInte.getAngleFormat(ply:EyeAngles()),
         ["weapon"] = gmInte.getWeaponFormat(ply:GetActiveWeapon())

lua/gmod_integration/shared/sh_http.lua

@@ -108,6 +108,7 @@ local function flushLogs()
 end
 
 hook.Add("ShutDown", "gmInte:Server:ShutDown:FlushLogs", flushLogs)
+hook.Add("GMI:SaveBeforeCrash", "gmInte:Server:BeforeCrash:SavePlayers", flushLogs)
 timer.Create("gmInte:http:flushLogs", 3, 0, flushLogs)
 function gmInte.http.postLog(endpoint, data)
     table.insert(nextLogPacket, {

lua/gmod_integration/shared/sh_player_meta.lua

@@ -7,6 +7,18 @@ function ply:gmIntIsVerified()
     return self.gmIntVerified || false
 end
 
+function ply:gmIntGetTimeLastTeamChange()
+    return self.gmIntTimeLastTeamChange || RealTime()
+end
+
+function ply:gmInteResetTimeLastTeamChange()
+    self.gmIntTimeLastTeamChange = RealTime()
+end
+
+function ply:gmInteGetBranch()
+    return CLIENT && BRANCH || self.branch || "unknown"
+end
+
 function ply:gmIntSetCustomValue(key, value)
     self.gmIntCustomValues = self.gmIntCustomValues || {}
     self.gmIntCustomValues[key] = value
@@ -43,6 +55,8 @@ local function getCustomCompatability(ply)
         values.ps2Points = ply.PS2_Wallet.points
         values.ps2PremiumPoints = ply.PS2_Wallet.premiumPoints
     end
+
+    if CH_ATM && SERVER then values.bank = CH_ATM.GetMoneyBankAccount(ply) end
     return values
 end
 
@@ -65,3 +79,81 @@ end
 function ply:gmIntGetCustomValues()
     return getCustomValues(self)
 end
+
+function ply:gmIntGetFPS()
+    return self.gmIntFPS || 0
+end
+
+gmInte.restoreFileCache = gmInte.restoreFileCache || {}
+function ply:getAdjustedTime()
+    if gmInte.restoreFileCache == nil || gmInte.restoreFileCache.sysTime == nil || gmInte.restoreFileCache.playersList == nil then return 0 end
+    if SERVER then
+        if table.IsEmpty(gmInte.restoreFileCache) then
+            if file.Exists("gm_integration/player_before_map_change.json", "DATA") then
+                gmInte.restoreFileCache = util.JSONToTable(file.Read("gm_integration/player_before_map_change.json", "DATA"))
+            else
+                return 0
+            end
+        end
+    else
+        if table.IsEmpty(gmInte.restoreFileCache) then
+            if file.Exists("gmod_integration/player_before_map_change.json", "DATA") then
+                gmInte.restoreFileCache = util.JSONToTable(file.Read("gmod_integration/player_before_map_change.json", "DATA"))
+            else
+                return 0
+            end
+
+            gmInte.restoreFileCache = gmInte.restoreFileCache[gmInte.config.id]
+        end
+    end
+
+    if !gmInte.restoreFileCache.sysTime || !gmInte.restoreFileCache.playersList then return 0 end
+    if (gmInte.restoreFileCache.sysTime + 60 * 5) < (os.time() - self:gmIntGetConnectTime()) then return 0 end
+    if !gmInte.restoreFileCache.playersList[self:SteamID()] then return 0 end
+    return gmInte.restoreFileCache.playersList[self:SteamID()].connectTime || 0
+end
+
+if SERVER then
+    gameevent.Listen("player_connect")
+    hook.Add("player_connect", "gmInte:Player:Connect:RemoveRestore", function(data)
+        if table.IsEmpty(gmInte.restoreFileCache) then
+            if file.Exists("gm_integration/player_before_map_change.json", "DATA") then
+                gmInte.restoreFileCache = util.JSONToTable(file.Read("gm_integration/player_before_map_change.json", "DATA"))
+            else
+                return
+            end
+        end
+
+        if gmInte.restoreFileCache.playersList && gmInte.restoreFileCache.playersList[data.networkid] then
+            gmInte.restoreFileCache.playersList[data.networkid] = nil
+            file.Write("gm_integration/player_before_map_change.json", util.TableToJSON(gmInte.restoreFileCache, true))
+        end
+    end)
+end
+
+local function saveTimeToLocal()
+    local dataToSave = {
+        ["version"] = "1.0",
+        ["serverID"] = gmInte.config.id,
+        ["playersList"] = {},
+        ["sysTime"] = os.time()
+    }
+
+    if SERVER then
+        for _, ply in ipairs(player.GetAll()) do
+            dataToSave.playersList[ply:SteamID()] = gmInte.getPlayerFormat(ply)
+        end
+
+        if !file.Exists("gm_integration", "DATA") then file.CreateDir("gm_integration") end
+        file.Write("gm_integration/player_before_map_change.json", util.TableToJSON(dataToSave, true))
+    else
+        dataToSave.playersList[LocalPlayer():SteamID()] = gmInte.getPlayerFormat(LocalPlayer())
+        local oldData = {}
+        if file.Exists("gmod_integration/player_before_map_change.json", "DATA") then oldData = util.JSONToTable(file.Read("gmod_integration/player_before_map_change.json", "DATA")) end
+        oldData[gmInte.config.id] = dataToSave
+        file.Write("gmod_integration/player_before_map_change.json", util.TableToJSON(oldData, true))
+    end
+end
+
+hook.Add("ShutDown", "gmInte:Server:ShutDown:SavePlayer", saveTimeToLocal)
+hook.Add("GMI:SaveBeforeCrash", "gmInte:Server:BeforeCrash:SavePlayers", saveTimeToLocal)

lua/gmod_integration/sv_config.lua

@@ -28,11 +28,17 @@ gmInte.config.filterOnBan = true // If true, the addon will filter the players a
 gmInte.config.redownloadMaterials = false // If true, the addon will redownload the materials of the addon (useful if you have a problem with the materials)
 // Debug & Development
 gmInte.config.debug = false // If true, the addon will show debug informations in the console
-// Other
+// Security
 gmInte.config.forcePlayerLink = false // If true, the addon will force the players to link their discord account to their steam account before playing
+gmInte.config.verifyOnJoin = false // If true, the addon will verify the players when they join the server or on player ready
+gmInte.config.verifyOnReadyKickTime = 600 // The time in seconds before kicking a player that is not verified (0 to disable)
+gmInte.config.verifyFamilySharing = false // If true, the addon will verify the family sharing of the players
+gmInte.config.clientBranch = "any" // The branch of the addon that the clients should use (none, dev, prerelease, x86-64)
+// Other
 gmInte.config.supportLink = "" // The link of your support (shown when a player do not have the requiments to join the server)
 gmInte.config.maintenance = false // If true, the addon will only allow the players with the "gmod-integration.maintenance" permission to join the server
 gmInte.config.language = "en" // The language of the addon (en, fr, de, es, it, tr, ru)
-gmInte.config.adminRank = { // How can edit the configuration of the addon / bypass the maintenance mode
+gmInte.config.adminRank = {
+    // How can edit the configuration of the addon / bypass the maintenance mode
     ["superadmin"] = true,
 }