fix game ids, plugin perms

WildBamaBoy · WildBamaBoy · commit 625fb7a528d9 · 2024-11-27T05:57:07.000-06:00
diff --git a/Build.py b/Build.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python3
 import BuildConfig
 import time
-import websocket
-from websocket import create_connection
 import json
 import threading
 import argparse
diff --git a/TebexOxide/PluginEvent.cs b/TebexOxide/PluginEvent.cs
@@ -1,6 +1,5 @@
 ﻿using System.Net;
 using Newtonsoft.Json;
-using Oxide.Core.Libraries;
 using Oxide.Plugins;
 using Tebex.Adapters;
 using Tebex.API;
@@ -52,7 +51,7 @@ public PluginEvent(TebexPlugin plugin, TebexPlatform platform, EnumEventLevel le
 
             TebexTelemetry tel = platform.GetTelemetry();
 
-            GameId = "Rust"; // always Rust
+            GameId = platform.GetGameId();
             FrameworkId = tel.GetServerSoftware(); // Oxide / Carbon
             RuntimeVersion = tel.GetRuntimeVersion(); // version of Rust
             FrameworkVersion = tel.GetServerVersion(); // version of Oxide
diff --git a/TebexOxide/TebexPlatform.cs b/TebexOxide/TebexPlatform.cs
@@ -4,13 +4,15 @@ namespace Tebex.Triage
 {
     public class TebexPlatform
     {
+        private String _gameId;
         private String _pluginVersion;
         private TebexTelemetry _telemetry;
-        public TebexPlatform(String pluginVersion, TebexTelemetry _telemetry)
+        
+        public TebexPlatform(String gameId, String pluginVersion, TebexTelemetry _telemetry)
         {
             this._pluginVersion = pluginVersion;
             this._telemetry = _telemetry;
-
+            this._gameId = gameId;
         }
     
         public TebexTelemetry GetTelemetry()
@@ -22,5 +24,10 @@ public string GetPluginVersion()
         {
             return _pluginVersion;
         }
+
+        public string GetGameId()
+        {
+            return _gameId;
+        }
     }    
 }
diff --git a/TebexOxide/TebexPlugin.cs b/TebexOxide/TebexPlugin.cs
@@ -1,4 +1,3 @@
-using System.Globalization;
 using Newtonsoft.Json;
 using Oxide.Core.Libraries;
 using Oxide.Core.Libraries.Covalence;
@@ -8,7 +7,7 @@
 
 namespace Oxide.Plugins
 {
-    [Info("Tebex", "Tebex", "2.0.10")]
+    [Info("Tebex", "Tebex", "2.0.11")]
     [Description("Official support for the Tebex server monetization platform")]
     public class TebexPlugin : CovalencePlugin
     {
@@ -18,12 +17,20 @@ public class TebexPlugin : CovalencePlugin
 
         public static string GetPluginVersion()
         {
-            return "2.0.10";
+            return "2.0.11";
         }
 
         public TebexPlatform GetPlatform(IServer server)
         {
-            return new TebexPlatform(GetPluginVersion(), new TebexTelemetry("Oxide", server.Version, server.Protocol));
+            String gameId = "";
+            
+            #if RUST
+                gameId = "Rust";
+            #else
+                gameId = "7 Days";
+            #endif
+            
+            return new TebexPlatform(gameId, GetPluginVersion(), new TebexTelemetry("Oxide", server.Version, server.Protocol));
         }
         
         
@@ -41,21 +48,21 @@ private void Init()
             }
 
             // Register permissions
-            permission.RegisterPermission("tebex.secret", this);
-            permission.RegisterPermission("tebex.sendlink", this);
-            permission.RegisterPermission("tebex.forcecheck", this);
-            permission.RegisterPermission("tebex.refresh", this);
-            permission.RegisterPermission("tebex.report", this);
-            permission.RegisterPermission("tebex.ban", this);
-            permission.RegisterPermission("tebex.lookup", this);
-            permission.RegisterPermission("tebex.debug", this);
-            permission.RegisterPermission("tebex.setup", this);
+            permission.RegisterPermission("tebexplugin.secret", this);
+            permission.RegisterPermission("tebexplugin.sendlink", this);
+            permission.RegisterPermission("tebexplugin.forcecheck", this);
+            permission.RegisterPermission("tebexplugin.refresh", this);
+            permission.RegisterPermission("tebexplugin.report", this);
+            permission.RegisterPermission("tebexplugin.ban", this);
+            permission.RegisterPermission("tebexplugin.lookup", this);
+            permission.RegisterPermission("tebexplugin.debug", this);
+            permission.RegisterPermission("tebexplugin.setup", this);
 
             // Register user permissions
-            permission.RegisterPermission("tebex.info", this);
-            permission.RegisterPermission("tebex.categories", this);
-            permission.RegisterPermission("tebex.packages", this);
-            permission.RegisterPermission("tebex.checkout", this);
+            permission.RegisterPermission("tebexplugin.info", this);
+            permission.RegisterPermission("tebexplugin.categories", this);
+            permission.RegisterPermission("tebexplugin.packages", this);
+            permission.RegisterPermission("tebexplugin.checkout", this);
 
             // Check if auto reporting is disabled and show a warning if so.
             if (!BaseTebexAdapter.PluginConfig.AutoReportingEnabled)
@@ -321,7 +328,7 @@ private BaseTebexAdapter.TebexConfig GetDefaultConfig()
         private void TebexSecretCommand(IPlayer player, string command, string[] args)
         {
             // Secret can only be ran as the admin
-            if (!player.HasPermission("tebex.secret"))
+            if (!player.HasPermission("tebexplugin.secret"))
             {
                 _adapter.ReplyPlayer(player, "You do not have permission to run this command.");
                 _adapter.ReplyPlayer(player, "If you are an admin, grant permission to use `tebex.secret`");
@@ -357,7 +364,7 @@ private void TebexSecretCommand(IPlayer player, string command, string[] args)
         [Command("tebex.info", "tebex:info", "tebex.information", "tebex:information")]
         private void TebexInfoCommand(IPlayer player, string command, string[] args)
         {
-            if (!player.HasPermission("tebex.info"))
+            if (!player.HasPermission("tebexplugin.info"))
             {
                 _adapter.ReplyPlayer(player, "You do not have permission to run that command.");
                 return;
@@ -376,7 +383,7 @@ private void TebexInfoCommand(IPlayer player, string command, string[] args)
         [Command("tebex.checkout", "tebex:checkout")]
         private void TebexCheckoutCommand(IPlayer player, string command, string[] args)
         {
-            if (!player.HasPermission("tebex.checkout"))
+            if (!player.HasPermission("tebexplugin.checkout"))
             {
                 _adapter.ReplyPlayer(player, "You do not have permission to run that command.");
                 return;
@@ -449,7 +456,7 @@ private void TebexHelpCommand(IPlayer player, string command, string[] args)
         [Command("tebex.debug", "tebex:debug")]
         private void TebexDebugCommand(IPlayer player, string command, string[] args)
         {
-            if (!player.HasPermission("tebex.debug"))
+            if (!player.HasPermission("tebexplugin.debug"))
             {
                 _adapter.ReplyPlayer(player, "You do not have permission to run that command.");
                 return;
@@ -482,7 +489,7 @@ private void TebexDebugCommand(IPlayer player, string command, string[] args)
         [Command("tebex.forcecheck", "tebex:forcecheck")]
         private void TebexForceCheckCommand(IPlayer player, string command, string[] args)
         {
-            if (!player.HasPermission("tebex.forcecheck"))
+            if (!player.HasPermission("tebexplugin.forcecheck"))
             {
                 _adapter.ReplyPlayer(player, "You do not have permission to run that command.");
                 return;
@@ -497,7 +504,7 @@ private void TebexForceCheckCommand(IPlayer player, string command, string[] arg
         [Command("tebex.refresh", "tebex:refresh")]
         private void TebexRefreshCommand(IPlayer player, string command, string[] args)
         {
-            if (!player.HasPermission("tebex.refresh"))
+            if (!player.HasPermission("tebexplugin.refresh"))
             {
                 _adapter.ReplyPlayer(player, "You do not have permission to run that command.");
                 return;
@@ -523,7 +530,7 @@ private void TebexRefreshCommand(IPlayer player, string command, string[] args)
         [Command("tebex.ban", "tebex:ban")]
         private void TebexBanCommand(IPlayer commandRunner, string command, string[] args)
         {
-            if (!commandRunner.HasPermission("tebex.ban"))
+            if (!commandRunner.HasPermission("tebexplugin.ban"))
             {
                 _adapter.ReplyPlayer(commandRunner, $"{command} can only be used by administrators.");
                 return;
@@ -564,7 +571,7 @@ private void TebexUnbanCommand(IPlayer commandRunner, string command, string[] a
         [Command("tebex.categories", "tebex:categories", "tebex.listings", "tebex:listings")]
         private void TebexCategoriesCommand(IPlayer player, string command, string[] args)
         {
-            if (!player.HasPermission("tebex.categories"))
+            if (!player.HasPermission("tebexplugin.categories"))
             {
                 _adapter.ReplyPlayer(player, "You do not have permission to run that command.");
                 return;
@@ -576,7 +583,7 @@ private void TebexCategoriesCommand(IPlayer player, string command, string[] arg
         [Command("tebex.packages", "tebex:packages")]
         private void TebexPackagesCommand(IPlayer player, string command, string[] args)
         {
-            if (!player.HasPermission("tebex.packages"))
+            if (!player.HasPermission("tebexplugin.packages"))
             {
                 _adapter.ReplyPlayer(player, "You do not have permission to run that command.");
                 return;
@@ -588,7 +595,7 @@ private void TebexPackagesCommand(IPlayer player, string command, string[] args)
         [Command("tebex.lookup", "tebex:lookup")]
         private void TebexLookupCommand(IPlayer player, string command, string[] args)
         {
-            if (!player.HasPermission("tebex.lookup"))
+            if (!player.HasPermission("tebexplugin.lookup"))
             {
                 _adapter.ReplyPlayer(player, "You do not have permission to run that command.");
                 return;
@@ -623,7 +630,7 @@ private void TebexLookupCommand(IPlayer player, string command, string[] args)
         [Command("tebex.sendlink", "tebex:sendlink")]
         private void TebexSendLinkCommand(IPlayer commandRunner, string command, string[] args)
         {
-            if (!commandRunner.HasPermission("tebex.sendlink"))
+            if (!commandRunner.HasPermission("tebexplugin.sendlink"))
             {
                 _adapter.ReplyPlayer(commandRunner, "You must be an administrator to run this command.");
                 return;

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,15 @@ namespace Tebex.Triage`
`4`	`4`	`{`
`5`	`5`	`public class TebexPlatform`
`6`	`6`	`{`
	`7`	`+ private String _gameId;`
`7`	`8`	`private String _pluginVersion;`
`8`	`9`	`private TebexTelemetry _telemetry;`
`9`		`- public TebexPlatform(String pluginVersion, TebexTelemetry _telemetry)`
	`10`	`+`
	`11`	`+ public TebexPlatform(String gameId, String pluginVersion, TebexTelemetry _telemetry)`
`10`	`12`	`{`
`11`	`13`	`this._pluginVersion = pluginVersion;`
`12`	`14`	`this._telemetry = _telemetry;`
`13`		`-`
	`15`	`+ this._gameId = gameId;`
`14`	`16`	`}`
`15`	`17`
`16`	`18`	`public TebexTelemetry GetTelemetry()`
`@@ -22,5 +24,10 @@ public string GetPluginVersion()`
`22`	`24`	`{`
`23`	`25`	`return _pluginVersion;`
`24`	`26`	`}`
	`27`	`+`
	`28`	`+ public string GetGameId()`
	`29`	`+ {`
	`30`	`+ return _gameId;`
	`31`	`+ }`
`25`	`32`	`}`
`26`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System.Globalization;`
`2`	`1`	`using Newtonsoft.Json;`
`3`	`2`	`using Oxide.Core.Libraries;`
`4`	`3`	`using Oxide.Core.Libraries.Covalence;`
`@@ -8,7 +7,7 @@`
`8`	`7`
`9`	`8`	`namespace Oxide.Plugins`
`10`	`9`	`{`
`11`		`- [Info("Tebex", "Tebex", "2.0.10")]`
	`10`	`+ [Info("Tebex", "Tebex", "2.0.11")]`
`12`	`11`	`[Description("Official support for the Tebex server monetization platform")]`
`13`	`12`	`public class TebexPlugin : CovalencePlugin`
`14`	`13`	`{`
`@@ -18,12 +17,20 @@ public class TebexPlugin : CovalencePlugin`
`18`	`17`
`19`	`18`	`public static string GetPluginVersion()`
`20`	`19`	`{`
`21`		`- return "2.0.10";`
	`20`	`+ return "2.0.11";`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`public TebexPlatform GetPlatform(IServer server)`
`25`	`24`	`{`
`26`		`- return new TebexPlatform(GetPluginVersion(), new TebexTelemetry("Oxide", server.Version, server.Protocol));`
	`25`	`+ String gameId = "";`
	`26`	`+`
	`27`	`+ #if RUST`
	`28`	`+ gameId = "Rust";`
	`29`	`+ #else`
	`30`	`+ gameId = "7 Days";`
	`31`	`+ #endif`
	`32`	`+`
	`33`	`+ return new TebexPlatform(gameId, GetPluginVersion(), new TebexTelemetry("Oxide", server.Version, server.Protocol));`
`27`	`34`	`}`
`28`	`35`
`29`	`36`
`@@ -41,21 +48,21 @@ private void Init()`
`41`	`48`	`}`
`42`	`49`
`43`	`50`	`// Register permissions`
`44`		`- permission.RegisterPermission("tebex.secret", this);`
`45`		`- permission.RegisterPermission("tebex.sendlink", this);`
`46`		`- permission.RegisterPermission("tebex.forcecheck", this);`
`47`		`- permission.RegisterPermission("tebex.refresh", this);`
`48`		`- permission.RegisterPermission("tebex.report", this);`
`49`		`- permission.RegisterPermission("tebex.ban", this);`
`50`		`- permission.RegisterPermission("tebex.lookup", this);`
`51`		`- permission.RegisterPermission("tebex.debug", this);`
`52`		`- permission.RegisterPermission("tebex.setup", this);`
	`51`	`+ permission.RegisterPermission("tebexplugin.secret", this);`
	`52`	`+ permission.RegisterPermission("tebexplugin.sendlink", this);`
	`53`	`+ permission.RegisterPermission("tebexplugin.forcecheck", this);`
	`54`	`+ permission.RegisterPermission("tebexplugin.refresh", this);`
	`55`	`+ permission.RegisterPermission("tebexplugin.report", this);`
	`56`	`+ permission.RegisterPermission("tebexplugin.ban", this);`
	`57`	`+ permission.RegisterPermission("tebexplugin.lookup", this);`
	`58`	`+ permission.RegisterPermission("tebexplugin.debug", this);`
	`59`	`+ permission.RegisterPermission("tebexplugin.setup", this);`
`53`	`60`
`54`	`61`	`// Register user permissions`
`55`		`- permission.RegisterPermission("tebex.info", this);`
`56`		`- permission.RegisterPermission("tebex.categories", this);`
`57`		`- permission.RegisterPermission("tebex.packages", this);`
`58`		`- permission.RegisterPermission("tebex.checkout", this);`
	`62`	`+ permission.RegisterPermission("tebexplugin.info", this);`
	`63`	`+ permission.RegisterPermission("tebexplugin.categories", this);`
	`64`	`+ permission.RegisterPermission("tebexplugin.packages", this);`
	`65`	`+ permission.RegisterPermission("tebexplugin.checkout", this);`
`59`	`66`
`60`	`67`	`// Check if auto reporting is disabled and show a warning if so.`
`61`	`68`	`if (!BaseTebexAdapter.PluginConfig.AutoReportingEnabled)`
`@@ -321,7 +328,7 @@ private BaseTebexAdapter.TebexConfig GetDefaultConfig()`
`321`	`328`	`private void TebexSecretCommand(IPlayer player, string command, string[] args)`
`322`	`329`	`{`
`323`	`330`	`// Secret can only be ran as the admin`
`324`		`- if (!player.HasPermission("tebex.secret"))`
	`331`	`+ if (!player.HasPermission("tebexplugin.secret"))`
`325`	`332`	`{`
`326`	`333`	`_adapter.ReplyPlayer(player, "You do not have permission to run this command.");`
`327`	`334`	_adapter.ReplyPlayer(player, "If you are an admin, grant permission to use `tebex.secret`");
`@@ -357,7 +364,7 @@ private void TebexSecretCommand(IPlayer player, string command, string[] args)`
`357`	`364`	`[Command("tebex.info", "tebex:info", "tebex.information", "tebex:information")]`
`358`	`365`	`private void TebexInfoCommand(IPlayer player, string command, string[] args)`
`359`	`366`	`{`
`360`		`- if (!player.HasPermission("tebex.info"))`
	`367`	`+ if (!player.HasPermission("tebexplugin.info"))`
`361`	`368`	`{`
`362`	`369`	`_adapter.ReplyPlayer(player, "You do not have permission to run that command.");`
`363`	`370`	`return;`
`@@ -376,7 +383,7 @@ private void TebexInfoCommand(IPlayer player, string command, string[] args)`
`376`	`383`	`[Command("tebex.checkout", "tebex:checkout")]`
`377`	`384`	`private void TebexCheckoutCommand(IPlayer player, string command, string[] args)`
`378`	`385`	`{`
`379`		`- if (!player.HasPermission("tebex.checkout"))`
	`386`	`+ if (!player.HasPermission("tebexplugin.checkout"))`
`380`	`387`	`{`
`381`	`388`	`_adapter.ReplyPlayer(player, "You do not have permission to run that command.");`
`382`	`389`	`return;`
`@@ -449,7 +456,7 @@ private void TebexHelpCommand(IPlayer player, string command, string[] args)`
`449`	`456`	`[Command("tebex.debug", "tebex:debug")]`
`450`	`457`	`private void TebexDebugCommand(IPlayer player, string command, string[] args)`
`451`	`458`	`{`
`452`		`- if (!player.HasPermission("tebex.debug"))`
	`459`	`+ if (!player.HasPermission("tebexplugin.debug"))`
`453`	`460`	`{`
`454`	`461`	`_adapter.ReplyPlayer(player, "You do not have permission to run that command.");`
`455`	`462`	`return;`
`@@ -482,7 +489,7 @@ private void TebexDebugCommand(IPlayer player, string command, string[] args)`
`482`	`489`	`[Command("tebex.forcecheck", "tebex:forcecheck")]`
`483`	`490`	`private void TebexForceCheckCommand(IPlayer player, string command, string[] args)`
`484`	`491`	`{`
`485`		`- if (!player.HasPermission("tebex.forcecheck"))`
	`492`	`+ if (!player.HasPermission("tebexplugin.forcecheck"))`
`486`	`493`	`{`
`487`	`494`	`_adapter.ReplyPlayer(player, "You do not have permission to run that command.");`
`488`	`495`	`return;`
`@@ -497,7 +504,7 @@ private void TebexForceCheckCommand(IPlayer player, string command, string[] arg`
`497`	`504`	`[Command("tebex.refresh", "tebex:refresh")]`
`498`	`505`	`private void TebexRefreshCommand(IPlayer player, string command, string[] args)`
`499`	`506`	`{`
`500`		`- if (!player.HasPermission("tebex.refresh"))`
	`507`	`+ if (!player.HasPermission("tebexplugin.refresh"))`
`501`	`508`	`{`
`502`	`509`	`_adapter.ReplyPlayer(player, "You do not have permission to run that command.");`
`503`	`510`	`return;`
`@@ -523,7 +530,7 @@ private void TebexRefreshCommand(IPlayer player, string command, string[] args)`
`523`	`530`	`[Command("tebex.ban", "tebex:ban")]`
`524`	`531`	`private void TebexBanCommand(IPlayer commandRunner, string command, string[] args)`
`525`	`532`	`{`
`526`		`- if (!commandRunner.HasPermission("tebex.ban"))`
	`533`	`+ if (!commandRunner.HasPermission("tebexplugin.ban"))`
`527`	`534`	`{`
`528`	`535`	`_adapter.ReplyPlayer(commandRunner, $"{command} can only be used by administrators.");`
`529`	`536`	`return;`
`@@ -564,7 +571,7 @@ private void TebexUnbanCommand(IPlayer commandRunner, string command, string[] a`
`564`	`571`	`[Command("tebex.categories", "tebex:categories", "tebex.listings", "tebex:listings")]`
`565`	`572`	`private void TebexCategoriesCommand(IPlayer player, string command, string[] args)`
`566`	`573`	`{`
`567`		`- if (!player.HasPermission("tebex.categories"))`
	`574`	`+ if (!player.HasPermission("tebexplugin.categories"))`
`568`	`575`	`{`
`569`	`576`	`_adapter.ReplyPlayer(player, "You do not have permission to run that command.");`
`570`	`577`	`return;`
`@@ -576,7 +583,7 @@ private void TebexCategoriesCommand(IPlayer player, string command, string[] arg`
`576`	`583`	`[Command("tebex.packages", "tebex:packages")]`
`577`	`584`	`private void TebexPackagesCommand(IPlayer player, string command, string[] args)`
`578`	`585`	`{`
`579`		`- if (!player.HasPermission("tebex.packages"))`
	`586`	`+ if (!player.HasPermission("tebexplugin.packages"))`
`580`	`587`	`{`
`581`	`588`	`_adapter.ReplyPlayer(player, "You do not have permission to run that command.");`
`582`	`589`	`return;`
`@@ -588,7 +595,7 @@ private void TebexPackagesCommand(IPlayer player, string command, string[] args)`
`588`	`595`	`[Command("tebex.lookup", "tebex:lookup")]`
`589`	`596`	`private void TebexLookupCommand(IPlayer player, string command, string[] args)`
`590`	`597`	`{`
`591`		`- if (!player.HasPermission("tebex.lookup"))`
	`598`	`+ if (!player.HasPermission("tebexplugin.lookup"))`
`592`	`599`	`{`
`593`	`600`	`_adapter.ReplyPlayer(player, "You do not have permission to run that command.");`
`594`	`601`	`return;`
`@@ -623,7 +630,7 @@ private void TebexLookupCommand(IPlayer player, string command, string[] args)`
`623`	`630`	`[Command("tebex.sendlink", "tebex:sendlink")]`
`624`	`631`	`private void TebexSendLinkCommand(IPlayer commandRunner, string command, string[] args)`
`625`	`632`	`{`
`626`		`- if (!commandRunner.HasPermission("tebex.sendlink"))`
	`633`	`+ if (!commandRunner.HasPermission("tebexplugin.sendlink"))`
`627`	`634`	`{`
`628`	`635`	`_adapter.ReplyPlayer(commandRunner, "You must be an administrator to run this command.");`
`629`	`636`	`return;`