Merge branch 'dev'

Signed-off-by: salmonik <raisersoft@proton.me>

1 files changed, 56 insertions, 16 deletions

diff --git a/cogs/vclogs.py b/cogs/vclogs.py
index fb0a2e0..e5ca202 100644
--- a/cogs/vclogs.py
+++ b/cogs/vclogs.py
@@ -4,7 +4,6 @@
 # https://codeberg.org/salmonik/senator-sperma
 
 import datetime
-import json
 import logging
 import os
 import asyncio
@@ -13,24 +12,66 @@ from discord.ext import commands
 from gtts import gTTS
 from cogs.voice import get_voice_manager
 from cogs.utils.settings import get_volume, save_settings
+from cogs.utils.database import get_connection, init_database
 
 import tempfile
 
 logger = logging.getLogger(__name__)
 
-ACTIVITY_FILE = os.path.join(tempfile.gettempdir(), 'voice_activity.json')
+init_database()
 
 
 def load_activity_data():
-    if os.path.exists(ACTIVITY_FILE):
-        with open(ACTIVITY_FILE, 'r') as f:
-            return json.load(f)
-    return {}
+    try:
+        with get_connection() as conn:
+            c = conn.cursor()
+            c.execute("SELECT user_id, join_time, total_active, total_afk, is_afk, afk_start, active_start, channel_name FROM voice_activity")
+            rows = c.fetchall()
+
+        return {
+            row[0]: {
+                "join_time": row[1],
+                "total_active": row[2],
+                "total_afk": row[3],
+                "is_afk": bool(row[4]),
+                "afk_start": row[5],
+                "active_start": row[6],
+                "channel_name": row[7],
+            }
+            for row in rows
+        }
+    except Exception as e:
+        logger.error(f"Error loading voice activity: {e}")
+        return {}
 
 
 def save_activity_data(data):
-    with open(ACTIVITY_FILE, 'w') as f:
-        json.dump(data, f, indent=4)
+    try:
+        with get_connection() as conn:
+            c = conn.cursor()
+            c.execute("PRAGMA foreign_keys = ON")
+
+            c.execute("DELETE FROM voice_activity")
+
+            for user_id, user_data in data.items():
+                c.execute(
+                    """INSERT INTO voice_activity (user_id, join_time, total_active, total_afk, is_afk, afk_start, active_start, channel_name)
+                    VALUES (?, ?, ?, ?, ?, ?, ?, ?)""",
+                    (
+                        user_id,
+                        user_data.get("join_time"),
+                        user_data.get("total_active", 0),
+                        user_data.get("total_afk", 0),
+                        int(user_data.get("is_afk", False)),
+                        user_data.get("afk_start"),
+                        user_data.get("active_start"),
+                        user_data.get("channel_name"),
+                    ),
+                )
+            conn.commit()
+        logger.info(f"Saved voice activity for {len(data)} users")
+    except Exception as e:
+        logger.error(f"Error saving voice activity: {e}")
 
 
 def format_duration(seconds):
@@ -104,9 +145,8 @@ class VcLogs(commands.Cog):
 
             if voice_client:
                 if is_playing:
-                    logger.info("voice already playing, stopping current audio")
-                    voice_client.stop()
-                    await asyncio.sleep(0.1)
+                    logger.info("voice already playing, skipping TTS")
+                    return
 
                 logger.info("preparing to play audio")
                 audio_source = discord.FFmpegPCMAudio(tts_file)
@@ -169,7 +209,7 @@ class VcLogs(commands.Cog):
             }
             save_activity_data(activity_data)
 
-            message = f"[{current_time}] {member.name} dołączył na {after.channel.name}"
+            message = f"[{current_time}] {member.name} dołączył na {after.channel.name} <t:{int(current_ts)}:R>"
             tts_text = f"{member.display_name} sie zespawnił"
             tts_channel = after.channel
             await log_channel.send(message)
@@ -190,7 +230,7 @@ class VcLogs(commands.Cog):
                 afk_str = format_duration(data['total_afk'])
 
                 message = (
-                    f"[{current_time}] {member.name} rozłączył się z {before.channel.name}\n"
+                    f"[{current_time}] {member.name} rozłączył się z {before.channel.name} <t:{int(current_ts)}:R>\n"
                     f"Aktywny: {active_str} | AFK: {afk_str}"
                 )
                 tts_text = f"{member.display_name} jest chujem"
@@ -201,7 +241,7 @@ class VcLogs(commands.Cog):
                 del activity_data[user_id]
                 save_activity_data(activity_data)
             else:
-                message = f"[{current_time}] {member.name} rozłączył się z {before.channel.name}"
+                message = f"[{current_time}] {member.name} rozłączył się z {before.channel.name} <t:{int(current_ts)}:R>"
                 tts_text = f"{member.display_name} jest chujem"
                 tts_channel = before.channel
                 await log_channel.send(message)
@@ -225,7 +265,7 @@ class VcLogs(commands.Cog):
                 else:
                     activity = "odgłuchnął"
 
-                message = ( f"[{current_time}] {member.name} {activity} się na {after.channel.name}\n"
+                message = ( f"[{current_time}] {member.name} {activity} się na {after.channel.name} <t:{int(current_ts)}:R>\n"
                                  f"AFK: {afk_str}" )
                 await log_channel.send(message)
                 logger.info(f"User returned from AFK: {message}")
@@ -245,7 +285,7 @@ class VcLogs(commands.Cog):
                     activity = "ogłuchnął"
 
                 active_str = format_duration(active_since_start)
-                message = ( f"[{current_time}] {member.name} {activity} się na {after.channel.name}\n"
+                message = ( f"[{current_time}] {member.name} {activity} się na {after.channel.name} <t:{int(current_ts)}:R>\n"
                                  f"Aktywny: {active_str}" )
                 await log_channel.send(message)
                 logger.info(f"User went AFK: {message}")