Merge branch 'master' into main-dolly11

Author: Rushaway

README.md

@@ -6,6 +6,8 @@ Bot for source engine games with a lot of commands:
   * Play tts messages
   * And much more!
 
+> [!IMPORTANT]
+> You need to run SMJSONAPI 1.1.x at minimum in order to have all features working properly
 
 ## Requirements
 ### Linux

config/config.json

@@ -29,8 +29,29 @@
 		"Host": "127.0.0.1",
 		"Port": 27019,
 		"SampleRate": 22050,
-		"Volume": 1.0,
-		"Proxy": ""
+		"Proxy": "",
+
+		"AudioParams":
+		{
+			"Volume":
+			{
+				"Default": 1.0,
+				"Min": 0.0,
+				"Max": 1.0
+			},
+			"Speed":
+			{
+				"Default": 1.0,
+				"Min": 0.5,
+				"Max": 2.0
+			},
+			"Pitch":
+			{
+				"Default": 1.0,
+				"Min": 0.5,
+				"Max": 2.0
+			}
+		}
 	},
 
 	"GeoIP":
@@ -194,7 +215,35 @@
 			"triggers": [
 				{
 					"command": "!say",
-					"starts_with": true
+					"starts_with": true,
+					"force_default": true
+				},
+				{
+					"command": "!speak",
+					"starts_with": true,
+					"force_default": true
+				}
+			],
+			"parameters": {
+				"default": {
+					"language": "en",
+					"tld": "com"
+				}
+			}
+		},
+		"TranslateSay":
+		{
+			"level": 2,
+			"triggers": [
+				{
+					"command": "!tsay",
+					"starts_with": true,
+					"force_default": true
+				},
+				{
+					"command": "!translate",
+					"starts_with": true,
+					"force_default": true
 				}
 			],
 			"parameters": {
@@ -276,6 +325,9 @@
 		},
 		"Search": {
 			"level": 0,
+			"parameters":{
+				"max_results": 30
+			},
 			"triggers": [
 				{
 					"command": "!search"
@@ -325,6 +377,27 @@
 		},
 		"URLFilter": {
 			"level": 0
+		},
+		"MyInstantsSearch": {
+			"level": 2,
+			"Cooldown": 10,
+			"triggers": [
+				{
+					"command": "!mi"
+				},
+				{
+					"command": "!mis"
+				}
+			],
+			"parameters": {
+				"keywords_banned": [
+					"earrape",
+					"rape",
+					"porn",
+					"algorithm",
+					"loud"
+				]
+			}
 		}
 	}
 }

config/triggers.json

@@ -1,8 +1,74 @@
 [
-    {"names": ["!tuturu"],                "sound": "Tutturuu_v1.wav"},
-    {"names": ["!tuturulist"],            "sound": ["Tutturuu_v1.wav", "Tutturuu_v1.wav"]},
-    {
-        "names": ["!china"],
-        "sound": ["china1.mp3", "china 2.mp3"]
-    }
+	{
+		"names": [
+		"!tuturu"
+		],
+		"sound": "Tutturuu_v1.wav"
+	},
+	{
+		"names": [
+		"#usa"
+		],
+		"sound": "usa.wav"
+	},
+	{
+		"names": [
+		"_life"
+		],
+		"sound": "life_sing.wav"
+	},
+	{
+		"names": [
+		"!tuturulist"
+		],
+		"sound": [
+		"Tutturuu_v1.wav",
+		"Tutturuu_v1.wav"
+		]
+	},
+	{
+		"names": [
+		"!china"
+		],
+		"sound": [
+		"china1.mp3",
+		"china 2.mp3"
+		]
+	},
+	{
+		"names": [
+		"$cash"
+		],
+		"sound": "cash.wav"
+	},
+	{
+		"names": [
+		"@call"
+		],
+		"sound": "call.wav"
+	},
+	{
+		"names": [
+		"%boost"
+		],
+		"sound": "boost.mp3"
+	},
+	{
+		"names": [
+		"^power"
+		],
+		"sound": "power.mp3"
+	},
+	{
+		"names": [
+		"&combo"
+		],
+		"sound": "combo.mp3"
+	},
+	{
+		"names": [
+		"*star"
+		],
+		"sound": "star.mp3"
+	}
 ]

pyproject.toml

@@ -22,7 +22,9 @@ dependencies = [
     "geoip2",
     "lxml",
     "python-magic",
-    "yt-dlp @ git+https://github.com/yt-dlp/yt-dlp@master#egg=yt-dlp"
+    "yt-dlp @ git+https://github.com/yt-dlp/yt-dlp@master#egg=yt-dlp",
+    "translatepy",
+    "requests"
 ]
 
 [project.scripts]
@@ -42,6 +44,7 @@ version = {file = "VERSION"}
 [project.optional-dependencies]
 dev = [
     "memory_profiler",
+    "types-requests",
     "mypy",
     "ruff",
 ]

requirements-dev.txt

@@ -111,3 +111,13 @@ yt-dlp @ git+https://github.com/yt-dlp/yt-dlp@5ff7a43623e3a92270f66a7e37b5fc53d7
     # via
     #   -c requirements.txt
     #   torchlight (pyproject.toml)
+types-requests
+    # via requests
+translatepy==2.3
+    # via
+    #   -c requirements.txt
+    #   torchlight (pyproject.toml)
+langdetect==1.0.9
+    # via 
+    #   -c requirements.txt
+    #   translatepy

requirements.txt

@@ -60,3 +60,7 @@ yarl==1.9.4
     # via aiohttp
 yt-dlp @ git+https://github.com/yt-dlp/yt-dlp@5ff7a43623e3a92270f66a7e37b5fc53d7a57fdf#egg=yt-dlp
     # via torchlight (pyproject.toml)
+translatepy==2.3
+    # via torchlight (pyproject.toml)
+langdetect==1.0.9
+    # via translatepy

src/torchlight/AudioClip.py

@@ -33,8 +33,15 @@ def __init__(
     def __del__(self) -> None:
         self.logger.debug("~AudioClip()")
 
-    def Play(self, seconds: int | None = None, *args: Any) -> bool:
-        return self.audio_player.PlayURI(self.uri, seconds, *args)
+    def Play(
+        self,
+        seconds: int | None = None,
+        *args: Any,
+        volume: float | None = None,
+        speed: float | None = None,
+        pitch: float | None = None,
+    ) -> bool:
+        return self.audio_player.PlayURI(self.uri, seconds, *args, volume=volume, speed=speed, pitch=pitch)
 
     def Stop(self) -> bool:
         return self.audio_player.Stop()

src/torchlight/AudioManager.py

@@ -21,6 +21,45 @@ def __init__(self, torchlight: Torchlight) -> None:
     def __del__(self) -> None:
         self.logger.info("~AudioManager()")
 
+    def ParseParams(self, trigger_params: dict, msg: str) -> dict[str, float]:
+        this_config = self.torchlight.config.config.get("VoiceServer", {}).get("AudioParams", {})
+        if not this_config:
+            return trigger_params
+
+        params: dict[str, float] = {}
+        for param in this_config:
+            if param in trigger_params and trigger_params[param] is not None:
+                params[param] = float(trigger_params[param])
+            else:
+                if isinstance(this_config[param], dict) and "Default" in this_config[param]:
+                    params[param] = float(this_config[param]["Default"])
+
+        msg_args = msg.split()
+        for arg in msg_args:
+            if "=" in arg:
+                key, value = arg.split("=", 1)
+                if not key or not value:
+                    continue
+
+                key = key.capitalize()
+                if key not in this_config:
+                    continue
+
+                if isinstance(this_config[key], dict):
+                    val: float = 1.0
+                    try:
+                        val = float(value)
+                    except ValueError:
+                        continue
+
+                    if "Min" not in this_config[key] or "Max" not in this_config[key]:
+                        continue
+
+                    val = max(this_config[key]["Min"], min(val, this_config[key]["Max"]))
+                    params[key] = val
+
+        return params
+
     def CheckLimits(self, player: Player) -> bool:
         level = player.admin.level
 

src/torchlight/CommandHandler.py

@@ -7,7 +7,7 @@
 
 from torchlight.AccessManager import AccessManager
 from torchlight.AudioManager import AudioManager
-from torchlight.Commands import BaseCommand, VoiceTrigger
+from torchlight.Commands import BaseCommand, Say, VoiceTrigger
 from torchlight.PlayerManager import Player, PlayerManager
 from torchlight.Torchlight import Torchlight
 from torchlight.TriggerManager import TriggerManager
@@ -41,6 +41,7 @@ def Setup(self) -> None:
         subklasses: list[type[Any]] = []
         subklasses.extend(BaseCommand.__subclasses__())
         subklasses.extend(VoiceTrigger.__subclasses__())
+        subklasses.extend(Say.__subclasses__())
         for subklass in sorted(subklasses, key=lambda x: x.order, reverse=True):
             try:
                 command = subklass(
@@ -69,10 +70,15 @@ def Reload(self) -> None:
             self.logger.error(traceback.format_exc())
         else:
             self.Setup()
+            self.logger.info("Commands reloaded successfully")
 
     # @profile
-    async def HandleCommand(self, line: str, player: Player) -> int | None:
-        message = line.split(sep=" ", maxsplit=1)
+    async def HandleCommand(self, line: str, player: Player, from_menu: bool = False) -> int | None:
+        if from_menu:
+            message = line.split(sep=" ", maxsplit=2)  # 2 because the !search command requires another arg for page
+        else:
+            message = line.split(sep=" ", maxsplit=1)
+
         if len(message) < 2:
             message.append("")
         message[1] = message[1].strip()
@@ -83,10 +89,9 @@ async def HandleCommand(self, line: str, player: Player) -> int | None:
 
         level = player.admin.level
 
-        if not message[0].startswith("!"):
+        if not message[0].startswith(("!", "#", "_", "$", "@", "%", "^", "&", "*")):
             return None
 
-        self.logger.info(f"{player.name}: {message}")
         ret_message: str | None = None
         ret: int | None = None
         for command in self.commands:
@@ -125,6 +130,9 @@ async def HandleCommand(self, line: str, player: Player) -> int | None:
                             ret = ret_temp
                     else:
                         ret = await command._func(message, player)
+                        if from_menu and command.__class__.__name__ == "VoiceTrigger" and ret:
+                            self.torchlight.SayChat(f"{{olive}}{player.name}: {{default}}{line}")
+
                 except Exception as e:
                     self.logger.error(traceback.format_exc())
                     self.torchlight.SayChat(f"Error: {str(e)}")