diff --git a/.gitignore b/.gitignore
index 4e636f2e..041f8b7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,7 @@ MiniKick_Backup_*.json
# Archivos de configuración de IDEs
build/
dist/
-resources/models/
+resources/
.agents/
tests/
tools/
\ No newline at end of file
diff --git a/assets/icons/apps.svg b/assets/icons/apps.svg
deleted file mode 100644
index c7cadc1e..00000000
--- a/assets/icons/apps.svg
+++ /dev/null
@@ -1 +0,0 @@
-grid-circle-plus-filled arrow-down-filled arrow-left-filled arrow-right-filled arrow-up-filled programming-filled calendar-duotone calendar4-filled bubbles-solid file-text-duotone gift4-filled megaphone-filled music-notes-duotone prism shield-duotone safe-shield-2-fill treasure-chest-bold widget-add-duotone MiniKick Alerts Overlay
+
+ 🔊 Haz clic aquí para activar el audio de las alertas
+
+
+
+
+
+
KICK
+
¡Nuevo Seguidor!
+
+
+
+
MiniKick Custom Alert Example
+
+
+
+
+
+
+
KICK
+
¡Nuevo Seguidor!
+
se ha unido a la comunidad
+
+
MiniKick Chat Overlay
+
+
+
@@ -864,20 +746,21 @@
-
-
+
@@ -888,6 +771,7 @@
+
+
diff --git a/assets/overlays/widgets/deaths.html b/assets/overlays/widgets/deaths.html
index 5f3c2666..8b6c234c 100644
--- a/assets/overlays/widgets/deaths.html
+++ b/assets/overlays/widgets/deaths.html
@@ -198,11 +198,11 @@
}
function scheduleReconnect() {
- if (!reconnectTimer) {
- reconnectTimer = setTimeout(() => {
- connectWS();
- }, 3000);
- }
+ if (reconnectTimer) clearTimeout(reconnectTimer);
+ reconnectTimer = setTimeout(() => {
+ reconnectTimer = null;
+ connectWS();
+ }, 3000);
}
function setWidgetActive(isActive) {
diff --git a/assets/overlays/widgets/emote_combo.html b/assets/overlays/widgets/emote_combo.html
index 346edcba..a56c77be 100644
--- a/assets/overlays/widgets/emote_combo.html
+++ b/assets/overlays/widgets/emote_combo.html
@@ -308,11 +308,11 @@
}
function scheduleReconnect() {
- if (!reconnectTimer) {
- reconnectTimer = setTimeout(() => {
- connectWS();
- }, 3000);
- }
+ if (reconnectTimer) clearTimeout(reconnectTimer);
+ reconnectTimer = setTimeout(() => {
+ reconnectTimer = null;
+ connectWS();
+ }, 3000);
}
connectWS();
diff --git a/assets/overlays/widgets/emote_explosion.html b/assets/overlays/widgets/emote_explosion.html
index 24358230..8b862515 100644
--- a/assets/overlays/widgets/emote_explosion.html
+++ b/assets/overlays/widgets/emote_explosion.html
@@ -241,11 +241,11 @@
}
function scheduleReconnect() {
- if (!reconnectTimer) {
- reconnectTimer = setTimeout(() => {
- connectWS();
- }, 3000);
- }
+ if (reconnectTimer) clearTimeout(reconnectTimer);
+ reconnectTimer = setTimeout(() => {
+ reconnectTimer = null;
+ connectWS();
+ }, 3000);
}
connectWS();
diff --git a/assets/overlays/widgets/pinned.html b/assets/overlays/widgets/pinned.html
index 5eae7a73..1a8ad95d 100644
--- a/assets/overlays/widgets/pinned.html
+++ b/assets/overlays/widgets/pinned.html
@@ -206,11 +206,11 @@
}
function scheduleReconnect() {
- if (!reconnectTimer) {
- reconnectTimer = setTimeout(() => {
- connectWS();
- }, 3000);
- }
+ if (reconnectTimer) clearTimeout(reconnectTimer);
+ reconnectTimer = setTimeout(() => {
+ reconnectTimer = null;
+ connectWS();
+ }, 3000);
}
function renderPinned(pinned) {
diff --git a/assets/overlays/widgets/poll.html b/assets/overlays/widgets/poll.html
index 92dec580..b8e467f6 100644
--- a/assets/overlays/widgets/poll.html
+++ b/assets/overlays/widgets/poll.html
@@ -367,11 +367,11 @@
}
function scheduleReconnect() {
- if (!reconnectTimer) {
- reconnectTimer = setTimeout(() => {
- connectWS();
- }, 3000);
- }
+ if (reconnectTimer) clearTimeout(reconnectTimer);
+ reconnectTimer = setTimeout(() => {
+ reconnectTimer = null;
+ connectWS();
+ }, 3000);
}
function handlePollUpdate(poll) {
diff --git a/assets/overlays/widgets/score.html b/assets/overlays/widgets/score.html
index 07b69157..3854f5b9 100644
--- a/assets/overlays/widgets/score.html
+++ b/assets/overlays/widgets/score.html
@@ -257,11 +257,11 @@
}
function scheduleReconnect() {
- if (!reconnectTimer) {
- reconnectTimer = setTimeout(() => {
- connectWS();
- }, 3000);
- }
+ if (reconnectTimer) clearTimeout(reconnectTimer);
+ reconnectTimer = setTimeout(() => {
+ reconnectTimer = null;
+ connectWS();
+ }, 3000);
}
connectWS();
diff --git a/assets/overlays/widgets/shoutout.html b/assets/overlays/widgets/shoutout.html
index 219e9d15..2f81d229 100644
--- a/assets/overlays/widgets/shoutout.html
+++ b/assets/overlays/widgets/shoutout.html
@@ -204,11 +204,11 @@
}
function scheduleReconnect() {
- if (!reconnectTimer) {
- reconnectTimer = setTimeout(() => {
- connectWS();
- }, 3000);
- }
+ if (reconnectTimer) clearTimeout(reconnectTimer);
+ reconnectTimer = setTimeout(() => {
+ reconnectTimer = null;
+ connectWS();
+ }, 3000);
}
function showShoutout(data) {
diff --git a/backend/config/__init__.py b/backend/config/__init__.py
new file mode 100644
index 00000000..16501cc6
--- /dev/null
+++ b/backend/config/__init__.py
@@ -0,0 +1,27 @@
+# backend\config\__init__.py
+
+from .version import APP_VERSION
+from .api_keys import (
+ KICK_CLIENT_ID,
+ KICK_CLIENT_SECRET,
+ KICK_REDIRECT_URI,
+ KICK_PUSHER_CLUSTER,
+ KICK_PUSHER_KEY,
+ DISCORD_WEBHOOK_URL,
+ TWITCH_CLIENT_ID,
+ TWITCH_CLIENT_SECRET,
+)
+from .default_en_locale import DEFAULT_DICTIONARY
+
+__all__ = [
+ "APP_VERSION",
+ "KICK_CLIENT_ID",
+ "KICK_CLIENT_SECRET",
+ "KICK_REDIRECT_URI",
+ "KICK_PUSHER_CLUSTER",
+ "KICK_PUSHER_KEY",
+ "DISCORD_WEBHOOK_URL",
+ "TWITCH_CLIENT_ID",
+ "TWITCH_CLIENT_SECRET",
+ "DEFAULT_DICTIONARY",
+]
diff --git a/backend/config/default_en_locale.py b/backend/config/default_en_locale.py
index d64b58b5..9e0a7a9f 100644
--- a/backend/config/default_en_locale.py
+++ b/backend/config/default_en_locale.py
@@ -1,6 +1,121 @@
# backend\config\default_en_locale.py
DEFAULT_DICTIONARY = {
+ "alerts": {
+ "align": {
+ "center": "Center",
+ "left": "Left",
+ "right": "Right"
+ },
+ "buttons": {
+ "browse": "Browse...",
+ "discard": "Discard",
+ "save": "Save Changes",
+ "test": "Test Alert",
+ "test_sent": "Test alert sent to OBS."
+ },
+ "events": {
+ "cheer": "Bits / Cheers (Twitch)",
+ "cheer_desc": "Alert when a viewer sends Bits on Twitch.",
+ "follow": "New Follower",
+ "follow_desc": "Alert when a user follows your channel.",
+ "raid": "Raid / Host",
+ "raid_desc": "Alert when another streamer raids your stream with viewers.",
+ "resub": "Subscription Renewal",
+ "resub_desc": "Alert when a subscriber renews their subscription.",
+ "sub_gift": "Gifted Subscriptions",
+ "sub_gift_desc": "Alert when a user gifts subscriptions to the community.",
+ "subscription": "New Subscription",
+ "subscription_desc": "Alert when a user subscribes for the first time."
+ },
+ "fields": {
+ "active": "Alert Enabled",
+ "duration": "Duration (seconds)",
+ "duration_desc": "Time in seconds the alert is displayed on screen.",
+ "font_family": "Typography / Font",
+ "font_family_desc": "Font family for the alert text.",
+ "font_size": "Font Size",
+ "font_size_desc": "Font size in pixels for the alert text.",
+ "highlight_color": "Highlight Color",
+ "highlight_color_desc": "Highlight color for the username.",
+ "media": "Media or HTML",
+ "media_filter": "Media & Web (*.png *.gif *.webp *.mp4 *.webm *.html *.htm);;HTML (*.html *.htm);;Media Files (*.png *.gif *.webp *.mp4 *.webm);;All Files (*.*)",
+ "media_placeholder": "Path to .png, .gif, .mp4, .webm, or .html file",
+ "sound": "Alert Sound",
+ "sound_placeholder": "Path to .mp3, .wav, or .ogg file",
+ "template": "Text Template",
+ "template_hint": "Variables: {user}, {amount}, {tier}, {platform}",
+ "text_align": "Text Alignment",
+ "text_align_desc": "Horizontal text alignment within the layout.",
+ "text_color": "Text Color",
+ "text_color_desc": "Main text color for alert messages.",
+ "tts": "Read alert with TTS voice",
+ "volume": "Volume"
+ },
+ "header": {
+ "subtitle": "Configure and customize your stream alerts for OBS on Kick and Twitch.",
+ "title": "Live Alerts"
+ },
+ "layout": {
+ "above": "Image Above (Centered)",
+ "below": "Image Below",
+ "desc": "Choose the visual arrangement between media and text.",
+ "overlay": "Text Overlay",
+ "side": "Image Left",
+ "side_right": "Image Right",
+ "title": "Layout"
+ },
+ "notice": {
+ "connect_btn": "Link {platform}",
+ "disconnected_msg": "{platform} is not connected. Alerts will not trigger live until you link your account.",
+ "disconnected_title": "Account Not Linked"
+ },
+ "overlay_card": {
+ "copied_msg": "The alerts overlay URL was copied to the clipboard.",
+ "copied_title": "URL Copied",
+ "copy_btn": "Copy URL",
+ "desc": "Add this URL as a 'Browser Source' in OBS (1920x1080 with transparent background).",
+ "open_btn": "Preview Overlay",
+ "title": "OBS Overlay URL"
+ },
+ "platforms": {
+ "kick": "Kick",
+ "twitch": "Twitch"
+ },
+ "preview": {
+ "sample_amount": "500",
+ "sample_template": "{user} just followed!",
+ "sample_tier": "1",
+ "sample_user": "TheAndro2K",
+ "title": "Alert Preview"
+ },
+ "sections": {
+ "appearance": "Layout & Appearance",
+ "general": "General Settings"
+ },
+ "sidebar": {
+ "title": "Alert Variants"
+ },
+ "status": {
+ "disabled_msg": "The '{event}' alert has been disabled.",
+ "disabled_title": "Alert Disabled",
+ "disconnected": "Disconnected",
+ "enabled_msg": "The '{event}' alert has been enabled.",
+ "enabled_title": "Alert Enabled",
+ "platform_offline": "Platform not connected: alerts will not trigger live until your account is linked",
+ "saved_msg": "Alert configuration saved successfully.",
+ "saved_title": "Alert Saved",
+ "unsaved": "Unsaved changes"
+ },
+ "style": {
+ "compact": "Compact",
+ "desc": "Visual style of the alert container and frame.",
+ "glass": "Glassmorphism",
+ "minimal": "Minimalist",
+ "sticker": "Sticker / Transparent",
+ "title": "Style"
+ }
+ },
"chat": {
"banned_words": {
"input_placeholder": "ex. insult or banned word",
@@ -37,6 +152,11 @@
"orientation_horizontal": "Horizontal (Ticker)",
"orientation_title": "Chat Orientation",
"orientation_vertical": "Vertical (Column)",
+ "preview_sample_bot_msg": "What's up @TheAndro2K! Welcome to the stream, make yourself comfortable. 👾",
+ "preview_sample_bot_user": "theandro2k",
+ "preview_sample_msg_1": "hola xd",
+ "preview_sample_user": "TheAndro2K",
+ "preview_title": "Overlay Preview",
"recommended_dim": "Recommended OBS source size: {dim}",
"show_bots_desc": "Display messages from muted bots on the stream screen.",
"show_bots_title": "Show Bots",
@@ -79,6 +199,7 @@
"prefix_placeholder": "Ex. !tts",
"prefix_title": "Command Prefix",
"provider_title": "TTS Voice Engine",
+ "search_voice_placeholder": "Search voice...",
"speed_desc": "Adjust voice speech speed and pacing.",
"speed_title": "Speech Speed",
"tts_desc": "Enable or disable automated message reading out loud.",
@@ -211,6 +332,7 @@
"update": "Check for updates",
"view_release_notes": "View Notes"
},
+ "no_results": "No results found",
"status": {
"error": "Error",
"offline": "Offline",
@@ -358,6 +480,7 @@
"header": "**BUG REPORT**",
"lbl_contact": "Contact / Discord (Optional):",
"lbl_description": "Problem Description (Required):",
+ "lbl_diagnostics": "System Diagnostics (Optional):",
"lbl_image": "Attach Screenshot / Image (Optional):",
"placeholder_contact": "Your username or contact info...",
"placeholder_desc": "Briefly describe what you were doing and what error occurred...",
@@ -390,7 +513,6 @@
"title": "Release Notes"
},
"tiktok_connect": {
- "btn_clear": "Clear",
"btn_connect": "Connect Chat",
"desc": "Enter the username (@username) of the TikTok Live channel:",
"placeholder": "e.g. @streamer or username",
@@ -434,7 +556,6 @@
"step_indicator": "Step {current}/{total}"
},
"youtube_connect": {
- "btn_clear": "Clear",
"btn_connect": "Connect Chat",
"desc": "Enter your channel handle (@channel), full live stream URL, or YouTube video ID:",
"placeholder": "e.g. @lofigirl or https://youtube.com/watch?v=...",
@@ -557,6 +678,7 @@
"navigate": "Navigate"
},
"tabs": {
+ "alerts": "Alerts",
"chat": "Chat",
"comandos": "Commands",
"dashboard": "Dashboard",
@@ -579,6 +701,8 @@
"version": "Version {version}"
},
"toast": {
+ "auth_in_progress_msg": "An authentication process is already running in your browser. Please complete or close that window before starting another.",
+ "auth_in_progress_title": "Authentication in Progress",
"kick_connected_msg": "Successfully connected to Kick chat: @{username}",
"kick_connected_title": "Kick Connected",
"kick_disconnected_msg": "Kick session unlinked.",
@@ -626,11 +750,6 @@
},
"chat": {
"error_room_id": "Could not retrieve ChatRoom ID from API."
- },
- "reward": {
- "poll_error": "Error querying rewards: {error}",
- "someone": "Someone",
- "unknown_reward": "Unknown Reward"
}
}
},
@@ -731,8 +850,6 @@
"title": "Playback Queue"
},
"stats": {
- "badge_active": "O ENABLED",
- "badge_disabled": "O DISABLED",
"cmd_desc": "Allows viewers to request songs using the !sr command",
"cmd_title": "Chat command",
"duration_desc": "Total accumulated duration of all queued songs",
@@ -903,10 +1020,6 @@
"col_volume": "Volume",
"file_not_found_tag": "Not found",
"file_not_found_tooltip": "Media file does not exist on disk or was moved",
- "status_unlinked_tag": "Unlinked",
- "status_unlinked_tooltip": "This reward was deleted or does not exist on {platform}",
- "status_offline_tag": "Offline",
- "status_offline_tooltip": "{platform} is not connected",
"filter_all": "All",
"filter_cost_asc": "Lowest to highest cost",
"filter_cost_desc": "Highest to lowest cost",
@@ -916,6 +1029,10 @@
"pos_random": "Random",
"pts_suffix": "{cost} pts",
"search_placeholder": "Search by name, file...",
+ "status_offline_tag": "Offline",
+ "status_offline_tooltip": "{platform} is not connected",
+ "status_unlinked_tag": "Unlinked",
+ "status_unlinked_tooltip": "This reward was deleted or does not exist on {platform}",
"title": "Linked Rewards",
"tooltip_delete": "Delete Reward",
"tooltip_edit": "Modify settings",
@@ -1095,6 +1212,8 @@
},
"schedule_dialog": {
"btn_clear": "Clear Form",
+ "btn_now": "Now",
+ "btn_now_tooltip": "Set to current date and time",
"btn_save": "Save Schedule",
"category_placeholder": "e.g. Just Chatting",
"date_label": "Execution Date:",
@@ -1176,7 +1295,7 @@
"step_filters_title": "Timer Filters",
"step_general_subtitle": "Configure timer name, intervals, and responses.",
"step_general_title": "Configure Timer",
- "suffix_lines": "messages",
+ "suffix_lines": "lines",
"suffix_min": "min"
},
"empty": {
@@ -1283,4 +1402,4 @@
"deactivated_msg": "Widget '{widget_name}' is now inactive."
}
}
-}
+}
\ No newline at end of file
diff --git a/backend/config/version.py b/backend/config/version.py
index 95fc7b4e..ec58ea12 100644
--- a/backend/config/version.py
+++ b/backend/config/version.py
@@ -1,3 +1,3 @@
# backend\config\version.py
-APP_VERSION = "v1.5.7"
+APP_VERSION = "v1.5.8"
diff --git a/backend/controllers/__init__.py b/backend/controllers/__init__.py
index 3914dfcb..25a64b0f 100644
--- a/backend/controllers/__init__.py
+++ b/backend/controllers/__init__.py
@@ -1,29 +1,31 @@
# backend\controllers\__init__.py
+from .alerts_controller import AlertsController
from .chat_controller import ChatController
from .command_controller import CommandController
from .dashboard_controller import DashboardController
from .log_controller import LogController
from .music_controller import MusicController
from .rewards_controller import RewardsController
+from .schedule_controller import ScheduleController
from .settings_controller import SettingsController
from .spam_controller import SpamController
from .timer_controller import TimerController
from .update_controller import UpdateController
from .widget_controller import WidgetController
-from .schedule_controller import ScheduleController
__all__ = [
+ "AlertsController",
"ChatController",
"CommandController",
"DashboardController",
"LogController",
"MusicController",
"RewardsController",
+ "ScheduleController",
"SettingsController",
"SpamController",
"TimerController",
"UpdateController",
- "WidgetController",
- "ScheduleController"
+ "WidgetController"
]
diff --git a/backend/controllers/alerts_controller.py b/backend/controllers/alerts_controller.py
new file mode 100644
index 00000000..806d3773
--- /dev/null
+++ b/backend/controllers/alerts_controller.py
@@ -0,0 +1,138 @@
+# backend\controllers\alerts_controller.py
+
+import logging
+from PySide6.QtCore import QObject, Slot, QUrl
+from PySide6.QtGui import QGuiApplication, QDesktopServices
+from backend.models import AlertConfig
+
+logger = logging.getLogger("minikick.controllers.alerts")
+
+class AlertsController(QObject):
+ def __init__(self, view=None, service=None, toast_manager=None, i18n=None):
+ super().__init__()
+ self.view = view
+ self.service = service
+ self.toast = toast_manager
+ self.i18n = i18n
+ self._view_connected = False
+ self._previous_enabled: dict[tuple[str, str], bool] = {}
+ if self.view is not None:
+ self._connect_signals()
+ self.load_initial_data()
+
+ def attach_view(self, view) -> None:
+ self.view = view
+ if self.view is not None:
+ self._connect_signals()
+ self.load_initial_data()
+
+ def _connect_signals(self):
+ if not self.view or self._view_connected:
+ return
+ self._view_connected = True
+ self.view.config_changed.connect(self._handle_config_changed)
+ self.view.test_alert_requested.connect(self._handle_test_alert)
+ self.view.copy_url_requested.connect(self._handle_copy_url)
+ self.view.open_browser_requested.connect(self._handle_open_browser)
+ self.view.view_shown.connect(self.load_initial_data)
+
+ def load_initial_data(self):
+ if not self.service or not self.view:
+ return
+ configs = None
+ if hasattr(self.service, "load_all_configs"):
+ try:
+ res = self.service.load_all_configs()
+ if isinstance(res, (dict, list)):
+ configs = res
+ except Exception:
+ pass
+ if configs is None and hasattr(self.service, "storage") and hasattr(self.service.storage, "load_all"):
+ configs = self.service.storage.load_all()
+ if configs:
+ self.view.populate_configs(configs)
+ items = configs.items() if isinstance(configs, dict) else [((c.platform, c.alert_type), c) for c in configs]
+ for key, cfg in items:
+ plat = key[0] if isinstance(key, tuple) else getattr(cfg, "platform", None)
+ atype = key[1] if isinstance(key, tuple) else getattr(cfg, "alert_type", None)
+ if plat and atype:
+ self._previous_enabled[(plat, atype)] = bool(getattr(cfg, "enabled", True))
+
+ @Slot(object)
+ def _handle_config_changed(self, config: AlertConfig):
+ if not self.service:
+ return
+ logger.info(
+ "[User Action] Updated alert config: platform='%s', type='%s', enabled=%s, duration=%sms",
+ config.platform, config.alert_type, config.enabled, config.duration_ms
+ )
+ self.service.save_config(config)
+
+ key = (config.platform, config.alert_type)
+ prev_enabled = self._previous_enabled.get(key, True)
+ self._previous_enabled[key] = bool(config.enabled)
+
+ if self.toast and self.i18n:
+ if prev_enabled != config.enabled:
+ event_name = self.i18n.get(f"alerts.events.{config.alert_type}")
+ if config.enabled:
+ title = self.i18n.get("alerts.status.enabled_title")
+ msg = self.i18n.get("alerts.status.enabled_msg").replace("{event}", event_name)
+ state = "success"
+ else:
+ title = self.i18n.get("alerts.status.disabled_title")
+ msg = self.i18n.get("alerts.status.disabled_msg").replace("{event}", event_name)
+ state = "warning"
+ self.toast.show_toast(
+ title=title,
+ message=msg,
+ state=state,
+ tag=f"alert_{config.platform}_{config.alert_type}"
+ )
+ else:
+ self.toast.show_toast(
+ title=self.i18n.get("alerts.status.saved_title"),
+ message=self.i18n.get("alerts.status.saved_msg"),
+ state="success",
+ tag=f"alert_{config.platform}_{config.alert_type}"
+ )
+
+ @Slot(str, str)
+ def _handle_test_alert(self, platform: str, alert_type: str):
+ if not self.service:
+ return
+ logger.info("[User Action] Test alert requested: platform='%s', alert_type='%s'", platform, alert_type)
+ self.service.trigger_test_alert(platform=platform, alert_type=alert_type)
+ if self.toast and self.i18n:
+ self.toast.show_toast(
+ title=self.i18n.get("alerts.buttons.test"),
+ message=self.i18n.get("alerts.buttons.test_sent"),
+ state="info",
+ tag=f"test_alert_{platform}_{alert_type}"
+ )
+
+ @Slot()
+ def _handle_copy_url(self):
+ if not self.view:
+ return
+ url = self.view.alerts_overlay_url
+ if url:
+ clipboard = QGuiApplication.clipboard()
+ if clipboard:
+ clipboard.setText(url)
+ if self.toast and self.i18n:
+ self.toast.show_toast(
+ title=self.i18n.get("alerts.overlay_card.copied_title"),
+ message=self.i18n.get("alerts.overlay_card.copied_msg"),
+ state="success",
+ tag="alert_overlay_copy"
+ )
+
+ @Slot()
+ def _handle_open_browser(self):
+ if not self.view:
+ return
+ url = self.view.alerts_overlay_url
+ if url:
+ logger.info("[User Action] Opening alerts overlay in default browser: %s", url)
+ QDesktopServices.openUrl(QUrl(url))
diff --git a/backend/controllers/chat_controller.py b/backend/controllers/chat_controller.py
index db4e4bf7..87dac4d9 100644
--- a/backend/controllers/chat_controller.py
+++ b/backend/controllers/chat_controller.py
@@ -1,14 +1,23 @@
# backend\controllers\chat_controller.py
-from PySide6.QtCore import QTimer
from collections import deque
+import datetime
import logging
-from PySide6.QtCore import QObject, Slot, Signal
+from PySide6.QtCore import QObject, QTimer, Signal, Slot
from backend.handlers import TTSVoiceHandler, ChatFilterHandler
from backend.services import MessagePipeline, ChatMessageDTO
logger = logging.getLogger("minikick.controllers.chat")
+_SYSTTS_ON_KEYWORDS = frozenset({"on", "1", "enable", "activar", "encender"})
+_SYSTTS_OFF_KEYWORDS = frozenset({"off", "0", "disable", "desactivar", "apagar"})
+
+def _find_command_by_response(commands: list[dict], response_tag: str) -> dict | None:
+ for cmd in commands:
+ if cmd.get("response") == response_tag:
+ return cmd
+ return None
+
class ChatController(QObject):
tts_state_changed = Signal(bool)
spam_blocked = Signal()
@@ -142,29 +151,18 @@ def _load_initial_data(self) -> None:
self.service.set_volume(settings.get("volume", 100))
self.service.set_speed(settings.get("speed", 100))
- overlay_theme = self.service.storage.load_string("chat_overlay_theme", "glass")
- try:
- overlay_size = int(self.service.storage.load_string("chat_overlay_size", "14"))
- except ValueError:
- overlay_size = 14
- try:
- overlay_fade = int(self.service.storage.load_string("chat_overlay_fade", "15"))
- except ValueError:
- overlay_fade = 15
- overlay_show_bots = self.service.storage.load_bool("chat_overlay_show_bots", False)
- overlay_show_time = self.service.storage.load_bool("chat_overlay_show_time", False)
-
+ overlay_settings = self.service.get_overlay_settings()
if self.view is not None:
self.view.set_overlay_settings_ui(
- theme=overlay_theme,
- size=overlay_size,
- fade=overlay_fade,
- show_bots=overlay_show_bots,
- show_time=overlay_show_time
+ theme=overlay_settings["theme"],
+ size=overlay_settings["size"],
+ fade=overlay_settings["fade"],
+ show_bots=overlay_settings["show_bots"],
+ show_time=overlay_settings["show_time"]
)
commands = self.command_service.get_all_commands()
- existing = next((c for c in commands if c["response"] == "[PLUGIN_CHAT_TTS]"), None)
+ existing = _find_command_by_response(commands, "[PLUGIN_CHAT_TTS]")
if not existing:
self.command_service.blockSignals(True)
try:
@@ -180,7 +178,7 @@ def _load_initial_data(self) -> None:
finally:
self.command_service.blockSignals(False)
- existing_systts = next((c for c in commands if c["response"] == "[PLUGIN_CHAT_SYSTTS]"), None)
+ existing_systts = _find_command_by_response(commands, "[PLUGIN_CHAT_SYSTTS]")
if not existing_systts:
self.command_service.blockSignals(True)
try:
@@ -240,12 +238,20 @@ def _step_commands(self, dto: ChatMessageDTO) -> None:
self.widget_plugin_triggered.emit(plugin_tag, dto.user, dto.content, prefix, platform)
def _handle_plugin_tts(self, dto: ChatMessageDTO, prefix: str) -> None:
+ settings = self._tts_settings_cache
+ if not self._tts_enabled or not settings.get("enabled", True):
+ return
+ if self.filter_handler.is_bot(dto.user):
+ return
+
msg_content = dto.content[len(prefix):].strip()
if not msg_content:
return
- settings = self._tts_settings_cache
if not self.voice_handler.is_role_enabled(dto.badges, settings):
return
+ if self.filter_handler.is_message_banned(msg_content):
+ return
+
emotes_tag = getattr(dto, "emotes_tag", "")
cleaned = self.filter_handler.clean_message_for_tts(msg_content, emotes_tag=emotes_tag)
if cleaned:
@@ -260,9 +266,9 @@ def _handle_plugin_systts(self, dto: ChatMessageDTO, prefix: str) -> None:
def _handle_systts_command(self, user: str, arg: str, platform: str = "kick") -> None:
arg_clean = arg.strip().lower()
- if arg_clean in ("on", "1", "enable", "activar", "encender"):
+ if arg_clean in _SYSTTS_ON_KEYWORDS:
new_state = True
- elif arg_clean in ("off", "0", "disable", "desactivar", "apagar"):
+ elif arg_clean in _SYSTTS_OFF_KEYWORDS:
new_state = False
elif not arg_clean or arg_clean == "status":
state_str = self.i18n.get("chat.status.enabled_upper") if self._tts_enabled else self.i18n.get("chat.status.disabled_upper")
@@ -275,7 +281,7 @@ def _handle_systts_command(self, user: str, arg: str, platform: str = "kick") ->
return
self._tts_enabled = new_state
- self.service.storage.save_bool("tts_enabled", new_state)
+ self.service.set_tts_enabled(new_state)
self._tts_settings_cache["enabled"] = new_state
self.tts_state_changed.emit(new_state)
@@ -288,23 +294,17 @@ def _handle_systts_command(self, user: str, arg: str, platform: str = "kick") ->
resp_msg = resp_template.replace("{user}", user)
self.command_service.send_response(resp_msg, platform=platform)
- @Slot(object)
- def handle_incoming_message(self, dto: ChatMessageDTO) -> None:
- self._step_chat_filter(dto)
- self._step_ui_render(dto)
- self._step_plugins(dto)
- self._step_tts(dto)
-
def _resolve_user_role(self, badges: list, user: str) -> str:
- if "broadcaster" in badges:
+ badge_set = set(badges) if badges else set()
+ if "broadcaster" in badge_set:
return self.i18n.get("chat.roles.name_broadcaster")
- elif "moderator" in badges:
+ if "moderator" in badge_set:
return self.i18n.get("chat.roles.name_moderator")
- elif "vip" in badges:
+ if "vip" in badge_set:
return self.i18n.get("chat.roles.name_vip")
- elif "subscriber" in badges:
+ if "subscriber" in badge_set:
return self.i18n.get("chat.roles.name_subscriber")
- elif self.filter_handler.is_bot(user, badges):
+ if self.filter_handler.is_bot(user, badges):
return self.i18n.get("chat.roles.name_bot")
return self.i18n.get("chat.roles.name_user")
@@ -319,6 +319,7 @@ def _step_ui_render(self, dto: ChatMessageDTO) -> None:
"role": role_name, "platform": platform
}
self._message_buffer.append(item)
+ logger.info("[Chat] [%s] [%s] %s: %s", platform.upper(), dto.timestamp, dto.user, dto.content)
if self.view is not None:
self.view.append_message(dto.user, dto.content, dto.color, timestamp=dto.timestamp, role=role_name, platform=platform)
emotes_tag = getattr(dto, "emotes_tag", "")
@@ -327,7 +328,6 @@ def _step_ui_render(self, dto: ChatMessageDTO) -> None:
def _handle_bot_response(self, text: str, platform: str = "kick") -> None:
if not text or platform != "twitch":
return
- import datetime
now_str = datetime.datetime.now().strftime("%H:%M:%S")
bot_user = "MiniKick"
if hasattr(self.command_service, "twitch_worker") and self.command_service.twitch_worker:
@@ -344,28 +344,36 @@ def _step_tts(self, dto: ChatMessageDTO) -> None:
if getattr(dto, "is_command", False):
return
settings = self._tts_settings_cache
- if not settings.get("enabled", True) or self.filter_handler.is_bot(dto.user):
+ if not settings.get("enabled", True):
+ return
+ if self.filter_handler.is_bot(dto.user):
+ logger.debug("[TTS] Skipped '%s' from %s: User is marked as bot/ignored", dto.content[:30], dto.user)
return
if not self.voice_handler.is_role_enabled(dto.badges, settings):
+ logger.debug("[TTS] Skipped '%s' from %s: Role not enabled for badges %s", dto.content[:30], dto.user, dto.badges)
return
- msg = dto.content.strip()
if settings.get("use_command", False):
- cmd = settings.get("command", "!tts")
- if not msg.lower().startswith(cmd):
- return
- msg = msg[len(cmd):].strip()
+ logger.debug("[TTS] Skipped '%s' from %s: 'use_command' is active (waiting for %s)", dto.content[:30], dto.user, settings.get("command", "!tts"))
+ return
+ msg = dto.content.strip()
+ if not msg:
+ return
if self.filter_handler.is_message_banned(msg):
+ logger.debug("[TTS] Skipped '%s' from %s: Message contains banned word", msg[:30], dto.user)
return
emotes_tag = getattr(dto, "emotes_tag", "")
cleaned = self.filter_handler.clean_message_for_tts(msg, emotes_tag=emotes_tag)
- if cleaned:
- text = self.i18n.get("chat.status.user_says").replace("{user}", dto.user).replace("{message}", cleaned) if settings.get("read_name", True) else cleaned
- voice_id = self.voice_handler.resolve_voice_for_badges(dto.badges, settings)
- self.service.speak(text, voice_id=voice_id)
+ if not cleaned:
+ logger.debug("[TTS] Skipped '%s' from %s: Cleaned message is empty (only emotes/symbols)", msg[:30], dto.user)
+ return
+
+ text = self.i18n.get("chat.status.user_says").replace("{user}", dto.user).replace("{message}", cleaned) if settings.get("read_name", True) else cleaned
+ voice_id = self.voice_handler.resolve_voice_for_badges(dto.badges, settings)
+ self.service.speak(text, voice_id=voice_id)
@Slot()
def _handle_settings_save(self) -> None:
@@ -397,35 +405,27 @@ def _handle_settings_save(self) -> None:
self._save_timer.start()
new_tts_state = settings["enabled"]
- if hasattr(self, '_tts_enabled') and self._tts_enabled != new_tts_state:
+ if self._tts_enabled != new_tts_state:
self._tts_enabled = new_tts_state
- if self.toast:
- status_title = self.view.i18n.get("chat.status.tts_title")
- status_msg = self.view.i18n.get("chat.status.tts_active") if new_tts_state else self.view.i18n.get("chat.status.tts_muted")
- state_color = "success" if new_tts_state else "warning"
- self.toast.show_toast(
- title=status_title,
- message=status_msg,
- state=state_color
- )
+ self._notify_setting_change("chat.status.tts_title", "chat.status.tts_active", "chat.status.tts_muted", new_tts_state, "tts_enabled")
new_read_name_state = settings["read_name"]
- if hasattr(self, '_read_name_enabled') and self._read_name_enabled != new_read_name_state:
+ if self._read_name_enabled != new_read_name_state:
self._read_name_enabled = new_read_name_state
- if self.toast:
- title = self.i18n.get("chat.status.read_name_title")
- msg = self.i18n.get("chat.status.read_name_active") if new_read_name_state else self.i18n.get("chat.status.read_name_inactive")
- color = "success" if new_read_name_state else "warning"
- self.toast.show_toast(title=title, message=msg, state=color)
+ self._notify_setting_change("chat.status.read_name_title", "chat.status.read_name_active", "chat.status.read_name_inactive", new_read_name_state, "tts_read_name")
new_use_cmd_state = settings["use_command"]
- if hasattr(self, '_use_command_enabled') and self._use_command_enabled != new_use_cmd_state:
+ if self._use_command_enabled != new_use_cmd_state:
self._use_command_enabled = new_use_cmd_state
- if self.toast:
- title = self.i18n.get("chat.status.use_command_title")
- msg = self.i18n.get("chat.status.use_command_active") if new_use_cmd_state else self.i18n.get("chat.status.use_command_inactive")
- color = "success" if new_use_cmd_state else "warning"
- self.toast.show_toast(title=title, message=msg, state=color)
+ self._notify_setting_change("chat.status.use_command_title", "chat.status.use_command_active", "chat.status.use_command_inactive", new_use_cmd_state, "tts_use_command")
+
+ def _notify_setting_change(self, title_key: str, active_key: str, inactive_key: str, is_active: bool, tag: str) -> None:
+ if not self.toast:
+ return
+ title = self.i18n.get(title_key)
+ msg = self.i18n.get(active_key) if is_active else self.i18n.get(inactive_key)
+ color = "success" if is_active else "warning"
+ self.toast.show_toast(title=title, message=msg, state=color, tag=tag)
def _flush_settings_save(self) -> None:
if not self._tts_settings_cache:
@@ -434,7 +434,7 @@ def _flush_settings_save(self) -> None:
self.service.save_settings(settings)
commands = self.command_service.get_all_commands()
- existing = next((c for c in commands if c["response"] == "[PLUGIN_CHAT_TTS]"), None)
+ existing = _find_command_by_response(commands, "[PLUGIN_CHAT_TTS]")
target_trigger = settings.get("command", "!tts").strip()
target_use_cmd = settings.get("use_command", False)
@@ -479,7 +479,7 @@ def _flush_settings_save(self) -> None:
apply_tiktok=True
)
- existing_systts = next((c for c in commands if c["response"] == "[PLUGIN_CHAT_SYSTTS]"), None)
+ existing_systts = _find_command_by_response(commands, "[PLUGIN_CHAT_SYSTTS]")
if not existing_systts:
self.command_service.save_command(
trigger="!systts",
@@ -493,12 +493,11 @@ def _flush_settings_save(self) -> None:
finally:
self.command_service.blockSignals(False)
- from PySide6.QtCore import QTimer
QTimer.singleShot(0, self.command_service.commands_changed.emit)
def _sync_tts_command_from_db(self) -> None:
commands = self.command_service.get_all_commands()
- tts_cmd = next((c for c in commands if c["response"] == "[PLUGIN_CHAT_TTS]"), None)
+ tts_cmd = _find_command_by_response(commands, "[PLUGIN_CHAT_TTS]")
settings = self.service.get_settings()
diff --git a/backend/controllers/command_controller.py b/backend/controllers/command_controller.py
index 23ab838d..d610e80d 100644
--- a/backend/controllers/command_controller.py
+++ b/backend/controllers/command_controller.py
@@ -6,13 +6,20 @@
logger = logging.getLogger("minikick.controllers.commands")
class CommandController(QObject):
- def __init__(self, view, service, toast_manager=None, connected_platforms_provider=None):
+ def __init__(self, view, service, toast_manager=None, connected_platforms_provider=None, i18n=None):
super().__init__()
self.view = view
self.service = service
self.toast = toast_manager
self.connected_platforms_provider = connected_platforms_provider
+ self.i18n = i18n
self._needs_reload = False
+ self._view_connected = False
+ self._is_internal_toggle = False
+
+ if self.service and hasattr(self.service, "commands_changed"):
+ self.service.commands_changed.connect(self._on_commands_changed)
+
if self.view is not None:
self._connect_signals()
@@ -22,22 +29,31 @@ def attach_view(self, view) -> None:
self._connect_signals()
self.load_initial_data(force=True)
+ def _get_i18n(self):
+ if self.i18n:
+ return self.i18n
+ if self.view and hasattr(self.view, "i18n") and self.view.i18n:
+ return self.view.i18n
+ from backend.services.system import TranslationService
+ return TranslationService()
+
def _connect_signals(self):
+ if not self.view or self._view_connected:
+ return
+ self._view_connected = True
self.view.add_requested.connect(self._handle_add)
self.view.edit_requested.connect(self._handle_edit)
self.view.delete_requested.connect(self._handle_delete)
self.view.status_toggled.connect(self._handle_status_change)
- self.view.search_text_changed.connect(self._handle_search)
if hasattr(self.view, "view_shown"):
self.view.view_shown.connect(self._on_view_shown)
- self.service.commands_changed.connect(self._on_commands_changed)
def _on_view_shown(self):
if self._needs_reload:
self.load_initial_data(force=True)
def _on_commands_changed(self):
- if getattr(self, "_is_internal_toggle", False):
+ if self._is_internal_toggle:
return
self.load_initial_data(force=False)
@@ -94,49 +110,46 @@ def _handle_delete(self, trigger: str):
@Slot(str, bool)
def _handle_status_change(self, trigger: str, is_active: bool):
existing = self.service.get_command_by_trigger(trigger)
- if existing:
- logger.info("[User Action] Toggled command status: trigger='%s', is_active=%s", trigger, is_active)
- if self.toast:
- title_key = "command.status.enabled" if is_active else "command.status.disabled"
- state_color = "success" if is_active else "info"
- self.toast.show_toast(
- title=self.view.i18n.get(title_key),
- message=(self.view.i18n.get("command.status.toggled_msg")).replace("{trigger}", trigger),
- state=state_color
- )
-
- self._is_internal_toggle = True
- try:
- self.service.save_command(
- trigger=existing["trigger"],
- response=existing["response"],
- is_active=is_active,
- cooldown=existing["cooldown"],
- aliases=existing["aliases"],
- is_regex=existing["is_regex"],
- permission=existing.get("permission", "everyone"),
- apply_kick=existing.get("apply_kick", True),
- apply_twitch=existing.get("apply_twitch", True),
- apply_youtube=existing.get("apply_youtube", True),
- apply_tiktok=existing.get("apply_tiktok", True)
- )
- finally:
- self._is_internal_toggle = False
-
- @Slot(str)
- def _handle_search(self, text: str):
- logger.debug("[User Action] Filtered commands by search term: '%s'", text)
- if not text.strip():
- self.load_initial_data()
+ if not existing:
return
-
- filtered_commands = self.service.search_commands(text)
- self.view.populate_table(filtered_commands)
+ if existing.get("is_active") == is_active:
+ return
+
+ logger.info("[User Action] Toggled command status: trigger='%s', is_active=%s", trigger, is_active)
+ i18n = self._get_i18n()
+ if self.toast:
+ title_key = "command.status.enabled" if is_active else "command.status.disabled"
+ state_color = "success" if is_active else "info"
+ self.toast.show_toast(
+ title=i18n.get(title_key),
+ message=i18n.get("command.status.toggled_msg").replace("{trigger}", trigger),
+ state=state_color,
+ tag=f"cmd_toggle_{trigger}"
+ )
+
+ self._is_internal_toggle = True
+ try:
+ self.service.save_command(
+ trigger=existing["trigger"],
+ response=existing["response"],
+ is_active=is_active,
+ cooldown=existing["cooldown"],
+ aliases=existing["aliases"],
+ is_regex=existing["is_regex"],
+ permission=existing.get("permission", "everyone"),
+ apply_kick=existing.get("apply_kick", True),
+ apply_twitch=existing.get("apply_twitch", True),
+ apply_youtube=existing.get("apply_youtube", True),
+ apply_tiktok=existing.get("apply_tiktok", True)
+ )
+ finally:
+ self._is_internal_toggle = False
def _show_toast(self, title_key: str, msg_key: str, val: str, state: str):
if self.toast:
+ i18n = self._get_i18n()
self.toast.show_toast(
- title=self.view.i18n.get(title_key),
- message=self.view.i18n.get(msg_key).replace("{trigger}", val),
+ title=i18n.get(title_key),
+ message=i18n.get(msg_key).replace("{trigger}", val),
state=state
)
diff --git a/backend/controllers/dashboard_controller.py b/backend/controllers/dashboard_controller.py
index dd46df09..4716abd6 100644
--- a/backend/controllers/dashboard_controller.py
+++ b/backend/controllers/dashboard_controller.py
@@ -5,6 +5,8 @@
logger = logging.getLogger("minikick.controllers.dashboard")
+SUPPORTED_PLATFORMS: tuple[str, ...] = ("kick", "twitch", "youtube", "tiktok")
+
class DashboardController(QObject):
request_connection = Signal()
twitch_connect_requested = Signal()
@@ -19,18 +21,40 @@ def __init__(self, view, avatar_service, db_manager=None):
super().__init__()
self.view = view
self.avatar_service = avatar_service
- self.db_manager = db_manager or (
- avatar_service.storage.db_manager
- if avatar_service and hasattr(avatar_service, "storage") and avatar_service.storage
- else None
- )
- self._profiles = {"kick": None, "twitch": None}
- self._avatars = {"kick": None, "twitch": None}
+ self.db_manager = db_manager
+ if self.db_manager is None and avatar_service and hasattr(avatar_service, "storage"):
+ self.db_manager = getattr(avatar_service.storage, "db_manager", None)
+
+ self._profiles: dict[str, dict | None] = {plat: None for plat in SUPPORTED_PLATFORMS}
+ self._avatars: dict[str, bytes | None] = {plat: None for plat in SUPPORTED_PLATFORMS}
self._current_tab = "kick"
- self._connect_signals()
+ self._view_connected = False
+ self._service_connected = False
+
+ self._connect_service_signals()
+ if self.view is not None:
+ self._connect_signals()
self._load_cached_profiles_from_db()
+ def attach_view(self, view) -> None:
+ self.view = view
+ if self.view is not None:
+ self._connect_signals()
+ self._sync_view_profile()
+
+ def _connect_service_signals(self):
+ if self._service_connected or not self.avatar_service:
+ return
+ self._service_connected = True
+ if hasattr(self.avatar_service, "avatar_ready"):
+ self.avatar_service.avatar_ready.connect(self._on_avatar_ready)
+ if hasattr(self.avatar_service, "avatar_downloaded"):
+ self.avatar_service.avatar_downloaded.connect(self._on_avatar_downloaded)
+
def _connect_signals(self):
+ if not self.view or self._view_connected:
+ return
+ self._view_connected = True
self.view.connect_requested.connect(self.request_connection.emit)
self.view.twitch_connect_requested.connect(self.twitch_connect_requested.emit)
self.view.youtube_connect_requested.connect(self.youtube_connect_requested.emit)
@@ -43,9 +67,6 @@ def _connect_signals(self):
self.view.reauth_twitch_requested.connect(self.reauth_twitch_requested.emit)
if hasattr(self.view, "channel_tab_changed"):
self.view.channel_tab_changed.connect(self._on_channel_tab_changed)
- if hasattr(self.avatar_service, "avatar_ready"):
- self.avatar_service.avatar_ready.connect(self._on_avatar_ready)
- self.avatar_service.avatar_downloaded.connect(self._on_avatar_downloaded)
def _load_cached_profiles_from_db(self):
if not self.db_manager:
@@ -82,10 +103,14 @@ def set_twitch_status(self, connected: bool = False, channel: str = "", connecti
def set_youtube_status(self, connected: bool = False, channel: str = "", connecting: bool = False, msg_count: int = 0):
if self.view and hasattr(self.view, "set_youtube_status"):
self.view.set_youtube_status(connected=connected, channel=channel, connecting=connecting, msg_count=msg_count)
+ if not connected and not connecting and not self.db_manager:
+ self.clear_channel_profile("youtube")
def set_tiktok_status(self, connected: bool = False, channel: str = "", connecting: bool = False, msg_count: int = 0):
if self.view and hasattr(self.view, "set_tiktok_status"):
self.view.set_tiktok_status(connected=connected, channel=channel, connecting=connecting, msg_count=msg_count)
+ if not connected and not connecting and not self.db_manager:
+ self.clear_channel_profile("tiktok")
def update_platform_messages(self, kick: int, twitch: int, youtube: int, tiktok: int):
if self.view and hasattr(self.view, "update_platform_messages"):
diff --git a/backend/controllers/log_controller.py b/backend/controllers/log_controller.py
index d4877e22..cd5fcb43 100644
--- a/backend/controllers/log_controller.py
+++ b/backend/controllers/log_controller.py
@@ -3,6 +3,7 @@
import os
import re
import logging
+from datetime import datetime, timedelta
from PySide6.QtCore import QObject, Slot, Signal, QUrl
from PySide6.QtGui import QDesktopServices
@@ -22,9 +23,12 @@ def __init__(self, view, service, toast_manager=None):
self._search_term_lower = ""
self._current_filter = self.view.str_all if self.view else "ALL"
self._date_filter = ""
+ self._date_threshold = ""
self._is_historical = False
self._logs_streaming_visible = False
self._historical_logs = []
+ self._view_connected = False
+
if self.view is not None:
self._connect_signals()
self.view.update_display_state(
@@ -43,6 +47,9 @@ def attach_view(self, view) -> None:
)
def _connect_signals(self):
+ if not self.view or self._view_connected:
+ return
+ self._view_connected = True
self.view.search_changed.connect(self.handle_search_changed)
self.view.filter_changed.connect(self.handle_filter_changed)
self.view.date_changed.connect(self.handle_date_changed)
@@ -54,17 +61,21 @@ def _connect_signals(self):
self.view.view_toggle_requested.connect(self.handle_view_toggle_requested)
self.view.view_shown.connect(self.handle_view_shown)
- def _get_date_threshold(self, date_filter: str) -> str:
+ def _compute_date_threshold(self, date_filter: str) -> str:
if not date_filter:
return ""
try:
days = int(date_filter[:-1])
except ValueError:
return ""
- from datetime import datetime, timedelta
dt = datetime.now() - timedelta(days=days)
return dt.strftime('%Y-%m-%d %H:%M:%S')
+ def _get_date_threshold(self, date_filter: str = "") -> str:
+ if not date_filter or date_filter == self._date_filter:
+ return self._date_threshold
+ return self._compute_date_threshold(date_filter)
+
def _matches_search(self, level: str, time_str: str, text: str) -> bool:
if not self._search_term_lower:
return True
@@ -73,23 +84,25 @@ def _matches_search(self, level: str, time_str: str, text: str) -> bool:
self._search_term_lower in text.lower())
def _filter_and_get_logs(self) -> list[tuple[str, str, str]]:
- if self._is_historical:
- filtered = []
- is_all = (self._current_filter == self.view.str_all)
- threshold = self._get_date_threshold(self._date_filter) if self._date_filter else ""
- for lvl, t_str, txt in self._historical_logs:
- if is_all or lvl == self._current_filter:
- if not threshold or t_str >= threshold:
- if not self._search_term_lower or (self._search_term_lower in lvl.lower() or
- self._search_term_lower in t_str.lower() or
- self._search_term_lower in txt.lower()):
- filtered.append((lvl, t_str, txt))
- if len(filtered) > 500:
- filtered = filtered[-500:]
- return filtered
- else:
+ if not self._is_historical:
return self.service.get_filtered_history(self._current_filter, self.view.str_all, self._search_term, self._date_filter)
+ filtered = []
+ is_all = (self._current_filter == self.view.str_all)
+ threshold = self._date_threshold
+ for lvl, t_str, txt in self._historical_logs:
+ if not is_all and lvl != self._current_filter:
+ continue
+ if threshold and t_str < threshold:
+ continue
+ if not self._matches_search(lvl, t_str, txt):
+ continue
+ filtered.append((lvl, t_str, txt))
+
+ if len(filtered) > 500:
+ filtered = filtered[-500:]
+ return filtered
+
def _refresh_view_logs(self):
if self._logs_streaming_visible or self._is_historical:
filtered_logs = self._filter_and_get_logs()
@@ -114,6 +127,7 @@ def handle_filter_changed(self, filter_text: str):
def handle_date_changed(self, date_str: str):
logger.info("[User Action] Filtered logs viewer by date: '%s'", date_str)
self._date_filter = date_str
+ self._date_threshold = self._compute_date_threshold(date_str)
self._refresh_view_logs()
@Slot()
@@ -225,13 +239,20 @@ def process_incoming_log(self, level: str, message: str):
if not self._is_historical and self._logs_streaming_visible:
is_all = (self._current_filter == self.view.str_all)
if (is_all or real_level == self._current_filter) and self._matches_search(real_level, time_str, text_str):
- threshold = self._get_date_threshold(self._date_filter) if self._date_filter else ""
+ threshold = self._date_threshold
if not threshold or time_str >= threshold:
self.view.append_log(is_grouped, real_level, time_str, text_str)
@Slot()
def open_github_issues(self):
- self.view.show_bug_report_dialog()
+ from backend.workers import BugReportWorker
+ initial_contact = ""
+ try:
+ from backend.database import DatabaseManager
+ initial_contact = DatabaseManager().get_primary_identity()
+ except Exception:
+ pass
+ self.view.show_bug_report_dialog(worker_class=BugReportWorker, initial_contact=initial_contact)
@Slot()
def open_log_folder(self):
diff --git a/backend/controllers/music_controller.py b/backend/controllers/music_controller.py
index 186eb570..e0d11292 100644
--- a/backend/controllers/music_controller.py
+++ b/backend/controllers/music_controller.py
@@ -7,6 +7,27 @@
logger = logging.getLogger("minikick.controllers.music")
+_DEFAULT_MUSIC_COMMANDS: dict[str, tuple[str, int, str, bool, str]] = {
+ "!sr": ("[PLUGIN_MUSIC_SR]", 5, "!songrequest", False, "everyone"),
+ "!skip": ("[PLUGIN_MUSIC_SKIP]", 3, "!next", False, "moderator"),
+ "!song": ("[PLUGIN_MUSIC_SONG]", 3, "!current,!np", False, "everyone"),
+ "!pause": ("[PLUGIN_MUSIC_PAUSE]", 3, "", False, "moderator"),
+ "!resume": ("[PLUGIN_MUSIC_RESUME]", 3, "!play", False, "moderator"),
+ "!playlist": ("[PLUGIN_MUSIC_PLAYLIST]", 5, "!queue,!pl", False, "everyone"),
+ "!vol": ("[PLUGIN_MUSIC_VOLUME]", 3, "!volume", False, "moderator"),
+}
+
+_MUSIC_PLUGIN_TAGS = {k: v[0] for k, v in _DEFAULT_MUSIC_COMMANDS.items()}
+
+_ERROR_KEYWORD_MAP = (
+ ("age", "music.youtube.age_restricted"),
+ ("inappropriate", "music.youtube.inappropriate"),
+ ("bot", "music.youtube.bot_blocked"),
+ ("confirm", "music.youtube.bot_blocked"),
+ ("invalid_media", "music.youtube.invalid_media"),
+ ("invalid", "music.youtube.invalid_media"),
+)
+
class MusicController(QObject):
song_changed = Signal(object)
media_keys_state_changed = Signal(bool)
@@ -30,6 +51,7 @@ def __init__(self, view, command_service, toast_manager, i18n, settings_storage=
self._last_song: dict | None = None
self.music_service_enabled = True
self._user_last_request_time: dict[str, float] = {}
+ self._provider_connected = False
self.max_user_songs = 2
self.user_cooldown = 30
@@ -41,14 +63,12 @@ def __init__(self, view, command_service, toast_manager, i18n, settings_storage=
self.polling_timer = QTimer(self)
self.polling_timer.setInterval(5000)
self.polling_timer.timeout.connect(self._poll_now_playing)
- self.command_service.commands_changed.connect(self._sync_switches_from_db)
self._init_youtube_provider()
self._load_initial_state()
if self.view is not None:
self._connect_signals()
- self._load_initial_state()
def load_initial_data(self):
self._load_initial_state()
@@ -58,10 +78,14 @@ def attach_view(self, view) -> None:
if self.view is not None:
self._connect_signals()
self._load_initial_state()
+ self._sync_view_state()
def _connect_signals(self):
if self.view is None:
return
+ if getattr(self, "_signals_connected", False):
+ return
+ self._signals_connected = True
self.view.command_toggled.connect(self.handle_command_toggle)
self.view.volume_changed.connect(self.set_volume)
self.view.remove_queue_item_requested.connect(self.handle_remove_queue_item)
@@ -74,6 +98,7 @@ def _connect_signals(self):
self.view.service_toggled.connect(self.handle_service_toggle)
self.view.move_queue_item_requested.connect(self.handle_move_queue_item)
self.view.view_shown.connect(self._poll_now_playing)
+ self.view.view_shown.connect(self._sync_switches_from_db)
if hasattr(self.view, "max_user_songs_changed"):
self.view.max_user_songs_changed.connect(self.set_max_user_songs)
@@ -105,46 +130,19 @@ def _sync_switches_from_db(self):
def _load_initial_state(self):
commands = self.command_service.get_all_commands()
- if not any(c for c in commands if c["response"] == "[PLUGIN_MUSIC_PAUSE]"):
- self.command_service.save_command(
- trigger="!pause",
- response="[PLUGIN_MUSIC_PAUSE]",
- is_active=True,
- cooldown=3,
- aliases="",
- is_regex=False,
- permission="moderator"
- )
- if not any(c for c in commands if c["response"] == "[PLUGIN_MUSIC_RESUME]"):
- self.command_service.save_command(
- trigger="!resume",
- response="[PLUGIN_MUSIC_RESUME]",
- is_active=True,
- cooldown=3,
- aliases="!play",
- is_regex=False,
- permission="moderator"
- )
- if not any(c for c in commands if c["response"] == "[PLUGIN_MUSIC_PLAYLIST]"):
- self.command_service.save_command(
- trigger="!playlist",
- response="[PLUGIN_MUSIC_PLAYLIST]",
- is_active=True,
- cooldown=5,
- aliases="!queue,!pl",
- is_regex=False,
- permission="everyone"
- )
- if not any(c for c in commands if c["response"] == "[PLUGIN_MUSIC_VOLUME]"):
- self.command_service.save_command(
- trigger="!vol",
- response="[PLUGIN_MUSIC_VOLUME]",
- is_active=True,
- cooldown=3,
- aliases="!volume",
- is_regex=False,
- permission="moderator"
- )
+ existing_responses = {c.get("response") for c in commands if isinstance(c, dict)}
+
+ for trigger, (response, cooldown, aliases, is_regex, permission) in _DEFAULT_MUSIC_COMMANDS.items():
+ if response not in existing_responses:
+ self.command_service.save_command(
+ trigger=trigger,
+ response=response,
+ is_active=True,
+ cooldown=cooldown,
+ aliases=aliases,
+ is_regex=is_regex,
+ permission=permission
+ )
self._sync_switches_from_db()
@@ -176,25 +174,15 @@ def _load_initial_state(self):
)
self.view.blockSignals(False)
- self._init_youtube_provider()
-
- @Slot(bool)
- def handle_service_toggle(self, enabled: bool):
- self.music_service_enabled = enabled
- if self.settings_storage:
- self.settings_storage.save_bool("music_service_enabled", enabled)
-
- status_title = self.i18n.get("music.stats.cmd_title")
- status_msg = self.i18n.get("music.stats.service_active") if enabled else self.i18n.get("music.stats.service_disabled")
- state_color = "success" if enabled else "warning"
- if self.toast:
- self.toast.show_toast(status_title, status_msg, state_color)
-
def _init_youtube_provider(self):
if not self.music_provider:
db_mgr = self.settings_storage.db_manager if self.settings_storage else None
self.music_provider = self.provider_factory["youtube"](db_mgr)
- self.music_provider.resolve_error_occurred.connect(self.handle_resolve_error)
+ if not self._provider_connected:
+ self.music_provider.resolve_error_occurred.connect(self.handle_resolve_error)
+ if hasattr(self.music_provider, "queue_updated"):
+ self.music_provider.queue_updated.connect(self._poll_now_playing)
+ self._provider_connected = True
vol = 100
if self.settings_storage:
@@ -204,16 +192,27 @@ def _init_youtube_provider(self):
vol = 100
self.music_provider.set_volume(vol)
- if self.view is not None:
- self.view.slider_vol.blockSignals(True)
- self.view.slider_vol.setValue(vol)
- self.view.slider_vol.blockSignals(False)
- self.view.lbl_vol_perc.setText(f"{vol}%")
- self.view.set_auth_state(connected=True, label_key="music.status.youtube_active")
-
if not self.polling_timer.isActive():
self.polling_timer.start()
+ self._sync_view_state()
+
+ def _sync_view_state(self):
+ if self.view is None:
+ return
+
+ vol = 100
+ if self.settings_storage:
+ try:
+ vol = int(self.settings_storage.load_string("music_volume", "100"))
+ except ValueError:
+ vol = 100
+
+ self.view.slider_vol.blockSignals(True)
+ self.view.slider_vol.setValue(vol)
+ self.view.slider_vol.blockSignals(False)
+ self.view.lbl_vol_perc.setText(f"{vol}%")
+ self.view.set_auth_state(connected=True, label_key="music.status.youtube_active")
self._poll_now_playing()
def set_volume(self, volume: int):
@@ -252,7 +251,7 @@ def _poll_now_playing(self):
if not self.music_provider:
return
song = self.music_provider.get_current_song()
- if self.view is not None and self.view.isVisible():
+ if self.view is not None:
self.view.update_current_song(song)
if hasattr(self.music_provider, "get_queue"):
queue_items = self.music_provider.get_queue()
@@ -288,7 +287,7 @@ def handle_remove_queue_item(self, index: int):
self._poll_now_playing()
msg = self.i18n.get("music.toast.removed_from_queue")
if self.toast:
- self.toast.show_toast("YouTube", msg, "success")
+ self.toast.show_toast(self.i18n.get("music.header.title"), msg, "success")
@Slot(int, int)
def handle_move_queue_item(self, from_index: int, to_index: int):
@@ -299,24 +298,18 @@ def handle_move_queue_item(self, from_index: int, to_index: int):
self._poll_now_playing()
msg = self.i18n.get("music.toast.moved_in_queue")
if self.toast:
- self.toast.show_toast("YouTube", msg, "info")
+ self.toast.show_toast(self.i18n.get("music.header.title"), msg, "info")
@Slot(str, bool)
def handle_command_toggle(self, trigger: str, is_active: bool):
logger.info("[User Action] Toggled music command: trigger='%s', is_active=%s", trigger, is_active)
- plugin_tags = {
- "!sr": "[PLUGIN_MUSIC_SR]",
- "!skip": "[PLUGIN_MUSIC_SKIP]",
- "!song": "[PLUGIN_MUSIC_SONG]",
- "!pause": "[PLUGIN_MUSIC_PAUSE]",
- "!resume": "[PLUGIN_MUSIC_RESUME]",
- "!playlist": "[PLUGIN_MUSIC_PLAYLIST]",
- "!vol": "[PLUGIN_MUSIC_VOLUME]"
- }
all_cmds = self.command_service.get_all_commands()
existing = next((c for c in all_cmds if c["trigger"] == trigger), None)
- tag = plugin_tags.get(trigger, "[PLUGIN_MUSIC_CUSTOM]")
+ tag = _MUSIC_PLUGIN_TAGS.get(trigger)
+ if not tag:
+ logger.warning("[MusicController] Unknown music command trigger '%s', ignoring toggle", trigger)
+ return
if existing:
self.command_service.save_command(
trigger=trigger,
@@ -332,14 +325,16 @@ def handle_command_toggle(self, trigger: str, is_active: bool):
apply_tiktok=existing.get("apply_tiktok", True)
)
else:
+ def_meta = _DEFAULT_MUSIC_COMMANDS.get(trigger, (tag, 5, "", False, "everyone"))
+ _, def_cd, def_aliases, def_rx, def_perm = def_meta
self.command_service.save_command(
trigger=trigger,
response=tag,
is_active=is_active,
- cooldown=5,
- aliases="",
- is_regex=False,
- permission="everyone",
+ cooldown=def_cd,
+ aliases=def_aliases,
+ is_regex=def_rx,
+ permission=def_perm,
apply_kick=True,
apply_twitch=True,
apply_youtube=True,
@@ -359,36 +354,26 @@ def shutdown(self):
if self.music_provider and hasattr(self.music_provider, "shutdown"):
self.music_provider.shutdown()
- def handle_resolve_error(self, title: str, error_msg: str, requester: str = ""):
- if self.toast:
- clean_msg = error_msg
- if "age" in error_msg.lower():
- clean_msg = self.i18n.get("music.youtube.age_restricted")
- elif "inappropriate" in error_msg.lower():
- clean_msg = self.i18n.get("music.youtube.inappropriate")
- elif "bot" in error_msg.lower() or "confirm" in error_msg.lower():
- clean_msg = self.i18n.get("music.youtube.bot_blocked")
- elif "INVALID_MEDIA" in error_msg or "invalid" in error_msg.lower():
- clean_msg = self.i18n.get("music.youtube.invalid_media")
- else:
- clean_msg = self.i18n.get("music.youtube.generic_error")
+ def handle_resolve_error(self, title: str, error_msg: str, requester: str = "", platform: str = "kick"):
+ clean_msg = self.i18n.get("music.youtube.generic_error")
+ err_lower = error_msg.lower()
+ for keyword, i18n_key in _ERROR_KEYWORD_MAP:
+ if keyword in err_lower:
+ clean_msg = self.i18n.get(i18n_key)
+ break
- title_toast = self.i18n.get("music.youtube.error_title")
- msg_toast = self.i18n.get("music.toast.error_playing").replace("{title}", title).replace("{error}", clean_msg)
+ title_toast = self.i18n.get("music.youtube.error_title")
+ msg_toast = self.i18n.get("music.toast.error_playing").replace("{title}", title).replace("{error}", clean_msg)
- self.toast.show_toast(
- title_toast,
- msg_toast,
- "danger"
- )
+ if self.toast:
+ self.toast.show_toast(title_toast, msg_toast, "danger")
- api_client = getattr(self.command_service, 'api_client', None)
- if api_client:
- if requester:
- chat_text = self.i18n.get("music.toast.chat_error_playing").replace("{user}", requester).replace("{title}", title).replace("{error}", clean_msg)
- else:
- chat_text = self.i18n.get("music.toast.chat_error_playing_no_user").replace("{title}", title).replace("{error}", clean_msg)
- api_client.post_chat_message(content=chat_text, msg_type="bot")
+ if self.command_service:
+ if requester:
+ chat_text = self.i18n.get("music.toast.chat_error_playing").replace("{user}", requester).replace("{title}", title).replace("{error}", clean_msg)
+ else:
+ chat_text = self.i18n.get("music.toast.chat_error_playing_no_user").replace("{title}", title).replace("{error}", clean_msg)
+ self.command_service.send_response(chat_text, platform=platform)
@Slot()
def handle_play_pause(self):
diff --git a/backend/controllers/rewards_controller.py b/backend/controllers/rewards_controller.py
index e85bad42..bdedf6c7 100644
--- a/backend/controllers/rewards_controller.py
+++ b/backend/controllers/rewards_controller.py
@@ -2,20 +2,19 @@
import logging
from PySide6.QtCore import QObject, Slot
-from backend.providers.chat.kick_client import KickAPIClient
-from backend.providers.chat.twitch_client import TwitchAPIClient
-from backend.config.api_keys import TWITCH_CLIENT_ID
+from backend.providers.chat import KickAPIClient, TwitchAPIClient
+from backend.config import TWITCH_CLIENT_ID
from backend.workers import CreateRewardWorker, UpdateRewardWorker
logger = logging.getLogger("minikick.controllers.rewards")
class RewardsController(QObject):
- def __init__(self, view, service, toast_manager=None, auth_manager=None, twitch_auth_manager=None, twitch_api_client=None, twitch_broadcaster_id=""):
+ def __init__(self, view, service, toast_manager=None, kick_auth_manager=None, twitch_auth_manager=None, twitch_api_client=None, twitch_broadcaster_id=""):
super().__init__()
self.view = view
self.service = service
self.toast = toast_manager
- self.auth_manager = auth_manager
+ self.kick_auth_manager = kick_auth_manager
self.twitch_auth_manager = twitch_auth_manager
self.twitch_api_client = twitch_api_client
self.twitch_broadcaster_id = twitch_broadcaster_id
@@ -33,7 +32,7 @@ def set_twitch_context(self, twitch_auth_manager, twitch_api_client: TwitchAPICl
self.twitch_broadcaster_id = broadcaster_id
def _get_connected_platforms(self) -> dict[str, bool]:
- kick_auth = self.auth_manager.is_authenticated() if self.auth_manager else False
+ kick_auth = self.kick_auth_manager.is_authenticated() if self.kick_auth_manager else False
twitch_auth = self.twitch_auth_manager.is_authenticated() if self.twitch_auth_manager else False
return {"kick": kick_auth, "twitch": twitch_auth}
@@ -49,14 +48,103 @@ def _connect_signals(self):
self.view.delete_requested.connect(self._handle_delete)
self.view.preview_requested.connect(self._handle_preview)
- def clear_platform_rewards(self, platform: str):
- self.remote_loaded[platform] = False
+ def _get_placeholder_strings(self) -> set[str]:
+ if not self.view:
+ return {"No Rewards", "No rewards available"}
+ return {
+ self.view.i18n.get("rewards.dialogs.wizard.step1.no_rewards"),
+ self.view.i18n.get("rewards.dialogs.wizard.step1.no_available"),
+ self.view.i18n.get("rewards.dialogs.wizard.step1.loading"),
+ "No Rewards", "No rewards available"
+ }
+
+ def _get_platform_label(self, platform: str) -> str:
+ if self.view and hasattr(self.view, "i18n"):
+ key = f"alerts.platforms.{platform.lower()}"
+ label = self.view.i18n.get(key)
+ if label and not label.startswith("["):
+ return label
+ return "Twitch" if platform.lower() == "twitch" else "Kick"
+
+ def _purge_platform_details(self, platform: str) -> None:
keys_to_remove = [
k for k, v in self.rewards_details_map.items()
if isinstance(v, dict) and v.get("platform", "kick") == platform
]
for k in keys_to_remove:
- del self.rewards_details_map[k]
+ self.rewards_details_map.pop(k, None)
+
+ def _create_api_client(self, platform: str):
+ if platform == "twitch":
+ return self.twitch_api_client or TwitchAPIClient(
+ self.twitch_auth_manager, TWITCH_CLIENT_ID, i18n=self.view.i18n if self.view else None
+ )
+ return KickAPIClient(auth_provider=self.kick_auth_manager)
+
+ def _dispatch_create_reward_worker(self, platform: str, payload: dict, config: dict) -> None:
+ auth_mgr = self.twitch_auth_manager if platform == "twitch" else self.kick_auth_manager
+ if not auth_mgr or not auth_mgr.is_authenticated():
+ if self.toast and self.view:
+ self.toast.show_toast(
+ title=self.view.i18n.get("common.status.error"),
+ message=self.view.i18n.get("main.logs.api_offline"),
+ state="danger"
+ )
+ return
+
+ plat_label = self._get_platform_label(platform)
+ if self.toast and self.view:
+ self.toast.show_toast(
+ title=self.view.i18n.get("rewards.status.created"),
+ message=self.view.i18n.get("rewards.status.creating_api").replace("{platform}", plat_label),
+ state="info"
+ )
+
+ api_client = self._create_api_client(platform)
+ broadcaster_id = self.twitch_broadcaster_id if platform == "twitch" else ""
+ self.create_reward_worker = CreateRewardWorker(
+ api_client=api_client,
+ payload=payload,
+ broadcaster_id=broadcaster_id,
+ platform=platform
+ )
+ self.create_reward_worker.reward_created.connect(
+ lambda res_dict: self._on_reward_created_api(res_dict, config)
+ )
+ self.create_reward_worker.error_occurred.connect(self._on_reward_creation_error)
+ self.create_reward_worker.finished.connect(self.create_reward_worker.deleteLater)
+ self.create_reward_worker.start()
+
+ def _dispatch_update_reward_worker(self, platform: str, reward_id: str, payload: dict, old_reward: str, new_reward: str, updated_config: dict) -> None:
+ plat_label = self._get_platform_label(platform)
+ if self.toast and self.view:
+ self.toast.show_toast(
+ title=self.view.i18n.get("rewards.status.updated"),
+ message=self.view.i18n.get("rewards.status.updating_api").replace("{platform}", plat_label),
+ state="info"
+ )
+
+ api_client = self._create_api_client(platform)
+ broadcaster_id = self.twitch_broadcaster_id if platform == "twitch" else ""
+ self.update_reward_worker = UpdateRewardWorker(
+ api_client=api_client,
+ reward_id=reward_id,
+ payload=payload,
+ broadcaster_id=broadcaster_id,
+ platform=platform
+ )
+ self.update_reward_worker.reward_updated.connect(
+ lambda res_dict, o=old_reward, n=new_reward, c=updated_config: self._on_reward_updated_api(res_dict, o, n, c)
+ )
+ self.update_reward_worker.error_occurred.connect(
+ lambda err_msg, o=old_reward, n=new_reward, c=updated_config, p=platform: self._on_reward_update_error(err_msg, o, n, c, p)
+ )
+ self.update_reward_worker.finished.connect(self.update_reward_worker.deleteLater)
+ self.update_reward_worker.start()
+
+ def clear_platform_rewards(self, platform: str):
+ self.remote_loaded[platform] = False
+ self._purge_platform_details(platform)
self.current_rewards_list = list(self.rewards_details_map.keys())
if self.view:
self.view.update_active_dialog_rewards(self._get_available_rewards(), self.rewards_details_map)
@@ -85,12 +173,7 @@ def load_initial_data(self):
@Slot(object, object)
def update_rewards_list(self, rewards: list, rewards_map: dict = None):
if self.view is not None:
- placeholder_strings = {
- self.view.i18n.get("rewards.dialogs.wizard.step1.no_rewards"),
- self.view.i18n.get("rewards.dialogs.wizard.step1.no_available"),
- self.view.i18n.get("rewards.dialogs.wizard.step1.loading"),
- "No Rewards", "No rewards available"
- }
+ placeholder_strings = self._get_placeholder_strings()
if isinstance(rewards_map, dict) and rewards_map:
target_platform = "kick"
@@ -100,14 +183,7 @@ def update_rewards_list(self, rewards: list, rewards_map: dict = None):
break
self.remote_loaded[target_platform] = True
-
- keys_to_remove = [
- k for k, v in self.rewards_details_map.items()
- if isinstance(v, dict) and v.get("platform", "kick") == target_platform
- ]
- for k in keys_to_remove:
- del self.rewards_details_map[k]
-
+ self._purge_platform_details(target_platform)
self.rewards_details_map.update(rewards_map)
mappings = self.service.get_mappings()
@@ -116,32 +192,19 @@ def update_rewards_list(self, rewards: list, rewards_map: dict = None):
if title in mappings and isinstance(mappings[title], dict):
conf = mappings[title]
if conf.get("platform", "kick") == details.get("platform", "kick"):
- if "id" in details and conf.get("id") != details["id"]:
- conf["id"] = details["id"]
- updated = True
- if "cost" in details and conf.get("cost") != details["cost"]:
- conf["cost"] = details["cost"]
- updated = True
- if "description" in details and conf.get("description") != details["description"]:
- conf["description"] = details["description"]
- updated = True
- if "background_color" in details and conf.get("background_color") != details["background_color"]:
- conf["background_color"] = details["background_color"]
- updated = True
- if "is_user_input_required" in details and conf.get("is_user_input_required") != details["is_user_input_required"]:
- conf["is_user_input_required"] = details["is_user_input_required"]
- updated = True
+ for field in ("id", "cost", "description", "background_color", "is_user_input_required"):
+ if field in details and conf.get(field) != details[field]:
+ conf[field] = details[field]
+ updated = True
if updated:
self.service.save_mappings(mappings)
- self.current_rewards_list = [
- title for title in self.rewards_details_map.keys()
- if title and title not in placeholder_strings
- ]
- if rewards:
- for r in rewards:
- if r and r not in placeholder_strings and r not in self.current_rewards_list:
- self.current_rewards_list.append(r)
+ seen = set(placeholder_strings)
+ self.current_rewards_list = []
+ for r in list(self.rewards_details_map.keys()) + (rewards or []):
+ if r and r not in seen:
+ seen.add(r)
+ self.current_rewards_list.append(r)
self.view.update_active_dialog_rewards(self._get_available_rewards(), self.rewards_details_map)
mappings = self.service.get_mappings()
@@ -155,28 +218,23 @@ def update_rewards_list(self, rewards: list, rewards_map: dict = None):
def _get_available_rewards(self, ignore_reward=None):
mappings = self.service.get_mappings()
used_rewards = set(mappings.keys())
-
- all_rewards = []
- placeholder_strings = {
- self.view.i18n.get("rewards.dialogs.wizard.step1.no_rewards"),
- self.view.i18n.get("rewards.dialogs.wizard.step1.no_available"),
- self.view.i18n.get("rewards.dialogs.wizard.step1.loading"),
- "No Rewards", "No rewards available"
- } if self.view else set()
+ placeholder_strings = self._get_placeholder_strings()
- combined = list(self.rewards_details_map.keys()) + self.current_rewards_list
- for r in combined:
- if r and r not in placeholder_strings and r not in all_rewards:
+ seen = set(placeholder_strings)
+ all_rewards = []
+ for r in list(self.rewards_details_map.keys()) + self.current_rewards_list:
+ if r and r not in seen:
+ seen.add(r)
all_rewards.append(r)
available = [r for r in all_rewards if r not in used_rewards or r == ignore_reward]
- return available if available else [self.view.i18n.get("rewards.dialogs.wizard.step1.no_available")]
+ return available if available else [self.view.i18n.get("rewards.dialogs.wizard.step1.no_available")] if self.view else ["No rewards available"]
@Slot()
def _handle_add(self):
logger.info("[User Action] Opened Add Reward dialog")
available_rewards = self._get_available_rewards()
- kick_auth = self.auth_manager.is_authenticated() if self.auth_manager else False
+ kick_auth = self.kick_auth_manager.is_authenticated() if self.kick_auth_manager else False
twitch_auth = self.twitch_auth_manager.is_authenticated() if self.twitch_auth_manager else False
res = self.view.show_add_dialog(available_rewards, self.rewards_details_map, kick_authenticated=kick_auth, twitch_authenticated=twitch_auth)
if not res:
@@ -190,66 +248,7 @@ def _handle_add(self):
logger.info("[User Action] Added custom reward trigger: name='%s', platform=%s, is_new=%s", reward, target_platform, config.get("is_new_reward"))
if config.get("is_new_reward") and config.get("new_reward_data"):
- if target_platform == "twitch":
- if not self.twitch_auth_manager or not self.twitch_auth_manager.is_authenticated():
- if self.toast:
- self.toast.show_toast(
- title=self.view.i18n.get("common.status.error"),
- message=self.view.i18n.get("main.logs.api_offline"),
- state="danger"
- )
- return
-
- if self.toast:
- self.toast.show_toast(
- title=self.view.i18n.get("rewards.status.created"),
- message=self.view.i18n.get("rewards.status.creating_api").replace("{platform}", "Twitch"),
- state="info"
- )
-
- api_client = self.twitch_api_client or TwitchAPIClient(self.twitch_auth_manager, TWITCH_CLIENT_ID, i18n=self.view.i18n)
- self.create_reward_worker = CreateRewardWorker(
- api_client=api_client,
- payload=config["new_reward_data"],
- broadcaster_id=self.twitch_broadcaster_id,
- platform="twitch"
- )
- self.create_reward_worker.reward_created.connect(
- lambda res_dict: self._on_reward_created_api(res_dict, config)
- )
- self.create_reward_worker.error_occurred.connect(self._on_reward_creation_error)
- self.create_reward_worker.finished.connect(self.create_reward_worker.deleteLater)
- self.create_reward_worker.start()
-
- else:
- if not self.auth_manager or not self.auth_manager.is_authenticated():
- if self.toast:
- self.toast.show_toast(
- title=self.view.i18n.get("common.status.error"),
- message=self.view.i18n.get("main.logs.api_offline"),
- state="danger"
- )
- return
-
- if self.toast:
- self.toast.show_toast(
- title=self.view.i18n.get("rewards.status.created"),
- message=self.view.i18n.get("rewards.status.creating_api").replace("{platform}", "Kick"),
- state="info"
- )
-
- api_client = KickAPIClient(auth_provider=self.auth_manager)
- self.create_reward_worker = CreateRewardWorker(
- api_client=api_client,
- payload=config["new_reward_data"],
- platform="kick"
- )
- self.create_reward_worker.reward_created.connect(
- lambda res_dict: self._on_reward_created_api(res_dict, config)
- )
- self.create_reward_worker.error_occurred.connect(self._on_reward_creation_error)
- self.create_reward_worker.finished.connect(self.create_reward_worker.deleteLater)
- self.create_reward_worker.start()
+ self._dispatch_create_reward_worker(target_platform, config["new_reward_data"], config)
else:
self._save_reward_mapping(reward, config)
@@ -271,7 +270,7 @@ def _on_reward_created_api(self, api_response: dict, config: dict):
self._save_reward_mapping(created_title, config)
if self.toast:
- plat_label = "Twitch" if platform == "twitch" else "Kick"
+ plat_label = self._get_platform_label(platform)
self.toast.show_toast(
title=self.view.i18n.get("rewards.status.created"),
message=self.view.i18n.get("rewards.status.created_api_success").replace("{reward}", created_title).replace("{platform}", plat_label),
@@ -291,8 +290,6 @@ def _on_reward_creation_error(self, err_msg: str):
)
def _save_reward_mapping(self, reward_name: str, config: dict):
- from backend.services.rewards.thumbnail_service import generate_media_thumbnail
- config["thumbnail_bytes"] = generate_media_thumbnail(config["filepath"])
mappings = self.service.get_mappings()
mappings[reward_name] = config
self.service.save_mappings(mappings)
@@ -313,7 +310,7 @@ def _handle_edit(self, reward_name: str):
logger.info("[User Action] Opened Edit Reward dialog: name='%s'", reward_name)
available_rewards = self._get_available_rewards(ignore_reward=reward_name)
- kick_auth = self.auth_manager.is_authenticated() if self.auth_manager else False
+ kick_auth = self.kick_auth_manager.is_authenticated() if self.kick_auth_manager else False
twitch_auth = self.twitch_auth_manager.is_authenticated() if self.twitch_auth_manager else False
res = self.view.show_edit_dialog(available_rewards, mappings[reward_name], reward_name, self.rewards_details_map, kick_authenticated=kick_auth, twitch_authenticated=twitch_auth)
if res:
@@ -330,72 +327,21 @@ def _handle_edit(self, reward_name: str):
target_platform = updated_config.get("platform", mappings.get(reward_name, {}).get("platform", "kick"))
updated_config["platform"] = target_platform
- if target_platform == "twitch" and reward_id and self.twitch_auth_manager and self.twitch_auth_manager.is_authenticated():
- if self.toast:
- self.toast.show_toast(
- title=self.view.i18n.get("rewards.status.updated"),
- message=self.view.i18n.get("rewards.status.updating_api").replace("{platform}", "Twitch"),
- state="info"
- )
-
- payload = {
- "title": new_reward,
- "cost": updated_config.get("cost", 100),
- "description": updated_config.get("description", ""),
- "background_color": updated_config.get("background_color", "#9146FF"),
- "is_user_input_required": updated_config.get("is_user_input_required", False)
- }
-
- api_client = self.twitch_api_client or TwitchAPIClient(self.twitch_auth_manager, TWITCH_CLIENT_ID, i18n=self.view.i18n)
- self.update_reward_worker = UpdateRewardWorker(
- api_client=api_client,
- reward_id=reward_id,
- payload=payload,
- broadcaster_id=self.twitch_broadcaster_id,
- platform="twitch"
- )
- self.update_reward_worker.reward_updated.connect(
- lambda res_dict, o=reward_name, n=new_reward, c=updated_config: self._on_reward_updated_api(res_dict, o, n, c)
- )
- self.update_reward_worker.error_occurred.connect(
- lambda err_msg, o=reward_name, n=new_reward, c=updated_config, p=target_platform: self._on_reward_update_error(err_msg, o, n, c, p)
- )
- self.update_reward_worker.finished.connect(self.update_reward_worker.deleteLater)
- self.update_reward_worker.start()
-
- elif target_platform == "kick" and reward_id and self.auth_manager and self.auth_manager.is_authenticated():
- if self.toast:
- self.toast.show_toast(
- title=self.view.i18n.get("rewards.status.updated"),
- message=self.view.i18n.get("rewards.status.updating_api").replace("{platform}", "Kick"),
- state="info"
- )
-
- payload = {
- "title": new_reward,
- "cost": updated_config.get("cost", 100),
- "description": updated_config.get("description", ""),
- "background_color": updated_config.get("background_color", "#53FC18"),
- "is_user_input_required": updated_config.get("is_user_input_required", False)
- }
-
- api_client = KickAPIClient(auth_provider=self.auth_manager)
- self.update_reward_worker = UpdateRewardWorker(
- api_client=api_client,
- reward_id=reward_id,
- payload=payload,
- platform="kick"
- )
- self.update_reward_worker.reward_updated.connect(
- lambda res_dict, o=reward_name, n=new_reward, c=updated_config: self._on_reward_updated_api(res_dict, o, n, c)
- )
- self.update_reward_worker.error_occurred.connect(
- lambda err_msg, o=reward_name, n=new_reward, c=updated_config, p=target_platform: self._on_reward_update_error(err_msg, o, n, c, p)
- )
- self.update_reward_worker.finished.connect(self.update_reward_worker.deleteLater)
- self.update_reward_worker.start()
- else:
- self._save_edited_mapping(reward_name, new_reward, updated_config)
+ if target_platform in ("twitch", "kick") and reward_id:
+ auth_mgr = self.twitch_auth_manager if target_platform == "twitch" else self.kick_auth_manager
+ if auth_mgr and auth_mgr.is_authenticated():
+ default_bg = "#9146FF" if target_platform == "twitch" else "#53FC18"
+ payload = {
+ "title": new_reward,
+ "cost": updated_config.get("cost", 100),
+ "description": updated_config.get("description", ""),
+ "background_color": updated_config.get("background_color", default_bg),
+ "is_user_input_required": updated_config.get("is_user_input_required", False)
+ }
+ self._dispatch_update_reward_worker(target_platform, reward_id, payload, reward_name, new_reward, updated_config)
+ return
+
+ self._save_edited_mapping(reward_name, new_reward, updated_config)
def _on_reward_updated_api(self, api_response: dict, old_reward: str, new_reward: str, updated_config: dict):
updated_title = api_response.get("title", new_reward)
@@ -426,7 +372,7 @@ def _on_reward_updated_api(self, api_response: dict, old_reward: str, new_reward
self._save_edited_mapping(old_reward, updated_title, updated_config, show_toast=False)
- plat_label = "Twitch" if platform == "twitch" else "Kick"
+ plat_label = self._get_platform_label(platform)
if self.toast:
self.toast.show_toast(
title=self.view.i18n.get("rewards.status.updated"),
@@ -447,7 +393,7 @@ def _on_reward_update_error(self, err_msg: str, old_reward: str = "", new_reward
self._save_edited_mapping(old_reward, target_name, updated_config, show_toast=False)
if self.toast:
- plat_label = "Twitch" if platform == "twitch" else "Kick"
+ plat_label = self._get_platform_label(platform)
if is_404:
self.toast.show_toast(
title=self.view.i18n.get("rewards.status.updated"),
@@ -471,13 +417,13 @@ def _on_reward_update_error(self, err_msg: str, old_reward: str = "", new_reward
def _save_edited_mapping(self, old_reward: str, new_reward: str, updated_config: dict, show_toast: bool = True):
logger.info("[User Action] Saved edited reward trigger mapping: old='%s', new='%s'", old_reward, new_reward)
- from backend.services.rewards.thumbnail_service import generate_media_thumbnail
mappings = self.service.get_mappings()
old_filepath = mappings.get(old_reward, {}).get("filepath", "") if old_reward in mappings else ""
- if updated_config.get("filepath") != old_filepath or "thumbnail_bytes" not in mappings.get(old_reward, {}):
- updated_config["thumbnail_bytes"] = generate_media_thumbnail(updated_config.get("filepath", ""))
- else:
- updated_config["thumbnail_bytes"] = mappings.get(old_reward, {}).get("thumbnail_bytes")
+ if updated_config.get("filepath") != old_filepath:
+ updated_config.pop("thumbnail_bytes", None)
+ elif "thumbnail_bytes" not in updated_config and old_reward in mappings:
+ if "thumbnail_bytes" in mappings[old_reward]:
+ updated_config["thumbnail_bytes"] = mappings[old_reward]["thumbnail_bytes"]
if old_reward in mappings and old_reward != new_reward:
del mappings[old_reward]
diff --git a/backend/controllers/schedule_controller.py b/backend/controllers/schedule_controller.py
index 756fa376..8f7cd27c 100644
--- a/backend/controllers/schedule_controller.py
+++ b/backend/controllers/schedule_controller.py
@@ -3,7 +3,7 @@
import threading
import logging
from PySide6.QtCore import QObject, Signal, Slot
-from backend.services.schedule.schedule_service import ScheduleService
+from backend.services.schedule import ScheduleService
logger = logging.getLogger("minikick.schedule_controller")
@@ -23,6 +23,7 @@ def __init__(self, view=None, service: ScheduleService = None, toast_manager=Non
self.i18n = i18n
self.connected_platforms_provider = connected_platforms_provider
self.is_loading = False
+ self._view_connected = False
self.toast_requested.connect(self._handle_toast_request)
@@ -31,6 +32,9 @@ def __init__(self, view=None, service: ScheduleService = None, toast_manager=Non
def attach_view(self, view) -> None:
self.view = view
+ if not self.view or self._view_connected:
+ return
+ self._view_connected = True
if hasattr(self.view, "refresh_info_requested"):
self.view.refresh_info_requested.connect(self.fetch_current_info)
if hasattr(self.view, "update_stream_requested"):
@@ -52,6 +56,14 @@ def attach_view(self, view) -> None:
self.load_initial_data()
+ def _get_i18n(self):
+ if self.i18n:
+ return self.i18n
+ if self.view and hasattr(self.view, "i18n") and self.view.i18n:
+ return self.view.i18n
+ from backend.services.system import TranslationService
+ return TranslationService()
+
def reload_schedules(self) -> None:
if not self.service:
return
@@ -187,8 +199,9 @@ def _handle_toast_request(self, msg_key: str, state: str) -> None:
self._show_toast(msg_key, state)
def _show_toast(self, msg_key: str, state: str = "success") -> None:
- if not self.toast or not self.i18n:
+ if not self.toast:
return
- title = self.i18n.get("stream_info.header.title")
- msg = self.i18n.get(msg_key)
- self.toast.show_toast(title=title, message=msg, state=state)
+ i18n = self._get_i18n()
+ title = i18n.get("stream_info.header.title")
+ msg = i18n.get(msg_key)
+ self.toast.show_toast(title=title, message=msg, state=state, tag="schedule_action")
diff --git a/backend/controllers/settings_controller.py b/backend/controllers/settings_controller.py
index faf4efb2..2558ca83 100644
--- a/backend/controllers/settings_controller.py
+++ b/backend/controllers/settings_controller.py
@@ -2,6 +2,7 @@
import logging
from PySide6.QtCore import QObject, Signal, Slot
+from backend.workers import BugReportWorker, ReleaseNotesWorker
logger = logging.getLogger("minikick.controllers.settings")
@@ -12,13 +13,15 @@ class SettingsController(QObject):
backup_restored = Signal()
notification_requested = Signal(str, str)
- def __init__(self, view, service, toast_manager=None, music_provider=None, tts_manager=None):
+ def __init__(self, view, service, toast_manager=None, music_provider=None, tts_manager=None, i18n=None):
super().__init__()
self.view = view
self.service = service
self.toast = toast_manager
self.music_provider = music_provider
self.tts_manager = tts_manager
+ self.i18n = i18n
+ self._view_connected = False
if self.view is not None:
self._connect_signals()
self._load_initial_state()
@@ -29,7 +32,18 @@ def attach_view(self, view) -> None:
self._connect_signals()
self._load_initial_state()
+ def _get_i18n(self):
+ if self.i18n:
+ return self.i18n
+ if self.view and hasattr(self.view, "i18n") and self.view.i18n:
+ return self.view.i18n
+ from backend.services.system import TranslationService
+ return TranslationService()
+
def _connect_signals(self):
+ if not self.view or self._view_connected:
+ return
+ self._view_connected = True
self.view.font_size_changed.connect(self.handle_font_size)
self.view.minimize_tray_toggled.connect(self.handle_minimize_tray)
self.view.export_clicked.connect(self.handle_export)
@@ -77,17 +91,21 @@ def handle_tts_audio_device(self, device_id: str):
@Slot(bool)
def handle_minimize_tray(self, enabled: bool):
+ if self.service.is_minimize_tray_enabled() == enabled:
+ return
logger.info("[User Action] Toggled minimize to tray setting: enabled=%s", enabled)
self.service.set_minimize_tray_enabled(enabled)
if self.toast:
+ i18n = self._get_i18n()
title_key = "settings.status.tray_enabled" if enabled else "settings.status.tray_disabled"
msg_key = "settings.status.tray_enabled_msg" if enabled else "settings.status.tray_disabled_msg"
state_color = "success" if enabled else "info"
self.toast.show_toast(
- title=self.view.i18n.get(title_key),
- message=self.view.i18n.get(msg_key),
- state=state_color
+ title=i18n.get(title_key),
+ message=i18n.get(msg_key),
+ state=state_color,
+ tag="minimize_tray"
)
@Slot()
@@ -95,18 +113,19 @@ def handle_export(self):
filepath = self.view.ask_save_path()
if filepath:
logger.info("[User Action] Exported app settings to: '%s'", filepath)
+ i18n = self._get_i18n()
if self.service.export_settings(filepath):
if self.toast:
self.toast.show_toast(
- title=self.view.i18n.get("settings.status.exported"),
- message=self.view.i18n.get("settings.status.exported_msg"),
+ title=i18n.get("settings.status.exported"),
+ message=i18n.get("settings.status.exported_msg"),
state="success"
)
else:
if self.toast:
self.toast.show_toast(
- title=self.view.i18n.get("settings.status.error_title"),
- message=self.view.i18n.get("settings.status.export_error"),
+ title=i18n.get("settings.status.error_title"),
+ message=i18n.get("settings.status.export_error"),
state="danger"
)
@@ -115,60 +134,69 @@ def handle_import(self):
filepath = self.view.ask_open_path()
if filepath:
logger.info("[User Action] Imported app settings from: '%s'", filepath)
+ i18n = self._get_i18n()
if self.service.import_settings(filepath):
self.backup_restored.emit()
if self.toast:
self.toast.show_toast(
- title=self.view.i18n.get("settings.status.imported"),
- message=self.view.i18n.get("settings.status.imported_msg"),
+ title=i18n.get("settings.status.imported"),
+ message=i18n.get("settings.status.imported_msg"),
state="success"
)
else:
if self.toast:
self.toast.show_toast(
- title=self.view.i18n.get("settings.status.error_title"),
- message=self.view.i18n.get("settings.status.import_error"),
+ title=i18n.get("settings.status.error_title"),
+ message=i18n.get("settings.status.import_error"),
state="danger"
)
@Slot(str)
def handle_language_change(self, lang_code: str):
+ if self.service.get_language() == lang_code:
+ return
logger.info("[User Action] Changed app language to: '%s'", lang_code)
self.service.set_language(lang_code)
+ i18n = self._get_i18n()
if self.toast:
self.toast.show_toast(
- title=self.view.i18n.get("settings.status.lang_changed"),
- message=self.view.i18n.get("settings.status.lang_changed_msg"),
+ title=i18n.get("settings.status.lang_changed"),
+ message=i18n.get("settings.status.lang_changed_msg"),
state="info"
)
self.notification_requested.emit(
- self.view.i18n.get("settings.status.lang_changed"),
- self.view.i18n.get("settings.status.lang_changed_msg")
+ i18n.get("settings.status.lang_changed"),
+ i18n.get("settings.status.lang_changed_msg")
)
@Slot(int)
def handle_font_size(self, size: int):
- if size is None:
+ if size is None or size <= 0 or self.service.get_font_size() == size:
return
logger.info("[User Action] Changed UI font size to: %d", size)
self.service.set_font_size(size)
self.style_reload_requested.emit(size)
if self.toast:
- title = self.view.i18n.get("settings.status.font_size_changed")
- msg = self.view.i18n.get("settings.status.font_size_changed_msg").replace("{size}", str(size))
+ i18n = self._get_i18n()
+ title = i18n.get("settings.status.font_size_changed")
+ msg = i18n.get("settings.status.font_size_changed_msg").replace("{size}", str(size))
self.toast.show_toast(title, msg, "success")
@Slot()
def handle_feedback(self):
logger.info("[User Action] Opened Bug Report modal")
- from backend.workers import BugReportWorker
- self.view.show_bug_report_dialog(worker_class=BugReportWorker)
+ initial_contact = ""
+ try:
+ from backend.database import DatabaseManager
+ initial_contact = DatabaseManager().get_primary_identity()
+ except Exception:
+ pass
+ self.view.show_bug_report_dialog(worker_class=BugReportWorker, initial_contact=initial_contact)
@Slot()
def handle_release_notes(self):
logger.info("[User Action] Opened Release Notes modal")
- from backend.workers import ReleaseNotesWorker
self.view.show_release_notes_dialog(worker_class=ReleaseNotesWorker)
diff --git a/backend/controllers/spam_controller.py b/backend/controllers/spam_controller.py
index ac670029..59da8215 100644
--- a/backend/controllers/spam_controller.py
+++ b/backend/controllers/spam_controller.py
@@ -5,13 +5,24 @@
logger = logging.getLogger("minikick.controllers.spam")
+_SPAM_FILTER_I18N_KEYS: dict[str, str] = {
+ "caps_protection": "spam.filters.caps.title",
+ "link_protection": "spam.filters.link.title",
+ "emote_protection": "spam.filters.emote.title",
+ "paragraph_protection": "spam.filters.paragraph.title",
+ "symbol_protection": "spam.filters.symbol.title",
+ "repetition_protection": "spam.filters.repetition.title",
+}
+
class SpamController(QObject):
- def __init__(self, view, service, toast_manager=None, connected_platforms_provider=None):
+ def __init__(self, view, service, toast_manager=None, connected_platforms_provider=None, i18n=None):
super().__init__()
self.view = view
self.service = service
self.toast = toast_manager
self.connected_platforms_provider = connected_platforms_provider
+ self.i18n = i18n
+ self._view_connected = False
if self.view is not None:
self._connect_signals()
self.load_initial_data()
@@ -23,8 +34,19 @@ def attach_view(self, view) -> None:
self.load_initial_data()
def _connect_signals(self):
+ if not self.view or self._view_connected:
+ return
+ self._view_connected = True
self.view.filter_updated.connect(self._handle_filter_update)
+ def _get_i18n(self):
+ if self.i18n:
+ return self.i18n
+ if self.view and hasattr(self.view, "i18n") and self.view.i18n:
+ return self.view.i18n
+ from backend.services.system import TranslationService
+ return TranslationService()
+
def load_initial_data(self):
self.service.reload_filters()
if self.view is not None:
@@ -36,32 +58,30 @@ def load_initial_data(self):
@Slot(str, object)
def _handle_filter_update(self, filter_id: str, config: dict):
previous_config = self.service.filters.get(filter_id, {})
+ if previous_config == config:
+ return
+
was_active = previous_config.get("is_active", False)
is_active = config.get("is_active", False)
logger.info("[User Action] Updated spam filter '%s': is_active=%s, was_active=%s, params=%s",
filter_id, is_active, was_active, {k: v for k, v in config.items() if k != "is_active"})
self.service.save_filter(filter_id, config)
- filter_keys = {
- "caps_protection": "spam.filters.caps.title",
- "link_protection": "spam.filters.link.title",
- "emote_protection": "spam.filters.emote.title",
- "paragraph_protection": "spam.filters.paragraph.title",
- "symbol_protection": "spam.filters.symbol.title",
- "repetition_protection": "spam.filters.repetition.title",
- }
- i18n_key = filter_keys.get(filter_id)
- filter_name = self.view.i18n.get(i18n_key) if i18n_key else filter_id
-
+
if was_active != is_active:
+ i18n = self._get_i18n()
+ i18n_key = _SPAM_FILTER_I18N_KEYS.get(filter_id)
+ filter_name = i18n.get(i18n_key) if i18n_key else filter_id
+
title_key = "spam.status.activated" if is_active else "spam.status.deactivated"
msg_key = "spam.status.activated_msg" if is_active else "spam.status.deactivated_msg"
- title = self.view.i18n.get(title_key)
- message = self.view.i18n.get(msg_key).replace("{filter_name}", filter_name)
+ title = i18n.get(title_key)
+ message = i18n.get(msg_key).replace("{filter_name}", filter_name)
state = "success" if is_active else "info"
if self.toast:
self.toast.show_toast(
title=title,
message=message,
- state=state
+ state=state,
+ tag=f"spam_{filter_id}"
)
diff --git a/backend/controllers/timer_controller.py b/backend/controllers/timer_controller.py
index 21b634e6..b94493ea 100644
--- a/backend/controllers/timer_controller.py
+++ b/backend/controllers/timer_controller.py
@@ -10,13 +10,15 @@ class TimerController(QObject):
metrics_update_requested = Signal()
categories_found = Signal(str, object)
- def __init__(self, view, service, toast_manager=None, schedule_service=None, connected_platforms_provider=None):
+ def __init__(self, view, service, toast_manager=None, schedule_service=None, connected_platforms_provider=None, i18n=None):
super().__init__()
self.view = view
self.service = service
self.toast = toast_manager
self.schedule_service = schedule_service
self.connected_platforms_provider = connected_platforms_provider
+ self.i18n = i18n
+ self._view_connected = False
if self.view is not None:
self._connect_signals()
@@ -26,7 +28,18 @@ def attach_view(self, view) -> None:
self._connect_signals()
self.load_initial_data()
+ def _get_i18n(self):
+ if self.i18n:
+ return self.i18n
+ if self.view and hasattr(self.view, "i18n") and self.view.i18n:
+ return self.view.i18n
+ from backend.services.system import TranslationService
+ return TranslationService()
+
def _connect_signals(self):
+ if not self.view or self._view_connected:
+ return
+ self._view_connected = True
self.view.add_requested.connect(self._handle_add)
self.view.edit_requested.connect(self._handle_edit)
self.view.delete_requested.connect(self._handle_delete)
@@ -117,7 +130,9 @@ def _handle_status_change(self, timer_id: int, is_active: bool):
existing = self.service.get_timer_by_id(timer_id)
if not existing:
return
-
+ if existing.get("is_active") == is_active:
+ return
+
logger.info("[User Action] Toggled timer status: id=%d, name='%s', is_active=%s", timer_id, existing.get("name"), is_active)
self.service.save_timer(
timer_id=timer_id,
@@ -130,14 +145,22 @@ def _handle_status_change(self, timer_id: int, is_active: bool):
keywords=existing["keywords"],
categories=existing["categories"],
apply_kick=existing.get("apply_kick", True),
- apply_twitch=existing.get("apply_twitch", True)
+ apply_twitch=existing.get("apply_twitch", True),
+ apply_youtube=existing.get("apply_youtube", True)
)
self.load_initial_data()
self.metrics_update_requested.emit()
-
- status_text = self.view.i18n.get("timer.status.enabled") if is_active else self.view.i18n.get("timer.status.disabled")
- msg = self.view.i18n.get("timer.status.toggled_msg").replace("{name}", existing['name']).replace("{status}", status_text.lower())
- self._show_toast("timer.status.updated", msg, "", "success")
+
+ i18n = self._get_i18n()
+ status_text = i18n.get("timer.status.enabled") if is_active else i18n.get("timer.status.disabled")
+ msg = i18n.get("timer.status.toggled_msg").replace("{name}", existing['name']).replace("{status}", status_text.lower())
+ if self.toast:
+ self.toast.show_toast(
+ title=i18n.get("timer.status.updated"),
+ message=msg,
+ state="success",
+ tag=f"timer_{timer_id}"
+ )
@Slot(str)
def _handle_search(self, search_term: str):
@@ -148,15 +171,16 @@ def _handle_search(self, search_term: str):
timers = self.service.get_all_timers()
term_lower = search_term.lower()
filtered = [
- t for t in timers
+ t for t in timers
if term_lower in t["name"].lower() or any(term_lower in m.lower() for m in t["messages"])
]
self.view.populate_table(filtered)
def _show_toast(self, title_key: str, msg_key: str, val: str, state: str):
if self.toast:
+ i18n = self._get_i18n()
self.toast.show_toast(
- title=self.view.i18n.get(title_key),
- message=(self.view.i18n.get(msg_key)).replace("{name}", val),
+ title=i18n.get(title_key),
+ message=(i18n.get(msg_key)).replace("{name}", val),
state=state
)
diff --git a/backend/controllers/update_controller.py b/backend/controllers/update_controller.py
index 1a371de9..bdd4cecb 100644
--- a/backend/controllers/update_controller.py
+++ b/backend/controllers/update_controller.py
@@ -2,6 +2,8 @@
import logging
from PySide6.QtCore import QObject, Slot, Signal
+from backend.workers import UpdateCheckWorker, UpdateDownloadWorker
+from frontend.dialogs import UpdateDialog
logger = logging.getLogger("minikick.controllers.update")
@@ -25,7 +27,8 @@ def __init__(self, updater_manager):
self.download_worker = None
def check_updates_silently(self):
- from backend.workers import UpdateCheckWorker
+ if self.bg_update_worker and self.bg_update_worker.isRunning():
+ return
logger.debug("[UpdateController] Starting silent background update check...")
self.bg_update_worker = UpdateCheckWorker(self.updater_manager)
self.bg_update_worker.update_found.connect(self._on_silent_update_found)
@@ -38,7 +41,8 @@ def _on_silent_update_found(self, info):
@Slot()
def start_update_check(self):
- from backend.workers import UpdateCheckWorker
+ if self.check_worker and self.check_worker.isRunning():
+ return
logger.info("[UpdateController] Manual update check initiated.")
self.update_check_started.emit()
self.check_worker = UpdateCheckWorker(self.updater_manager)
@@ -62,7 +66,8 @@ def _on_check_error(self, err_msg: str):
@Slot(str)
def start_download(self, url: str):
- from backend.workers import UpdateDownloadWorker
+ if self.download_worker and self.download_worker.isRunning():
+ return
logger.info("[UpdateController] Starting download from URL: %s", url)
self.download_started.emit()
self.download_worker = UpdateDownloadWorker(self.updater_manager, url)
@@ -91,8 +96,6 @@ def install_update(self):
logger.error("[UpdateController] Failed to launch update installer: %s", e)
def show_update_dialog(self, parent_window, i18n, on_restart_callback=None):
- from frontend.dialogs import UpdateDialog
-
logger.debug("[UpdateController] Presenting UpdateDialog modal to user.")
dialog = UpdateDialog(i18n, parent=parent_window)
update_info = {"url": ""}
@@ -128,13 +131,14 @@ def on_restart_requested():
dialog.restart_requested.connect(on_restart_requested)
self.start_update_check()
- dialog.exec()
-
try:
- self.update_found.disconnect(on_update_found)
- self.no_update.disconnect(dialog.show_no_update)
- self.error.disconnect(dialog.show_error)
- self.download_progress.disconnect(dialog.update_progress)
- self.download_finished.disconnect(on_download_finished)
- except Exception as e:
- logger.debug("[UpdateController] Dialog signals disconnect notice: %s", e)
+ dialog.exec()
+ finally:
+ try:
+ self.update_found.disconnect(on_update_found)
+ self.no_update.disconnect(dialog.show_no_update)
+ self.error.disconnect(dialog.show_error)
+ self.download_progress.disconnect(dialog.update_progress)
+ self.download_finished.disconnect(on_download_finished)
+ except Exception as e:
+ logger.debug("[UpdateController] Dialog signals disconnect notice: %s", e)
diff --git a/backend/controllers/widget_controller.py b/backend/controllers/widget_controller.py
index 2dbe179c..51711e59 100644
--- a/backend/controllers/widget_controller.py
+++ b/backend/controllers/widget_controller.py
@@ -1,13 +1,39 @@
# backend\controllers\widget_controller.py
+import json
import logging
import re
+import threading
import time
from PySide6.QtCore import QObject, Slot, Signal, QTimer
from backend.services import WidgetService, CommandService
logger = logging.getLogger("minikick.controllers.widgets")
+_WIDGET_DEFAULT_ALIASES: dict[str, str] = {
+ "score": "!win, !loss, !lose, !victoria, !derrota",
+ "death": "!muerte, !death, !deaths, !muertes",
+ "shoutout": "!shoutout",
+}
+
+_WIDGET_TITLE_KEYS: dict[str, str] = {
+ "shoutout": "widgets.so.title",
+ "death": "widgets.death.title",
+ "score": "widgets.score.title",
+}
+
+_RESET_COMMANDS: frozenset[str] = frozenset({"reset", "0", "reiniciar", "clear"})
+_SCORE_WIN_WORDS: frozenset[str] = frozenset({"win", "w", "victoria"})
+_SCORE_LOSS_WORDS: frozenset[str] = frozenset({"loss", "lose", "l", "derrota"})
+_DELTA_DECREMENT: frozenset[str] = frozenset({"-1", "-", "sub", "restar"})
+_SCORE_PLUS_WORDS: frozenset[str] = frozenset({"+1", "+", "win", "w", "victoria"})
+_SCORE_MINUS_WORDS: frozenset[str] = frozenset({"-1", "-", "loss", "lose", "l", "derrota"})
+
+_DEATH_SUB_WORDS: frozenset[str] = frozenset({"-", "sub", "restar", "-1"})
+_DEATH_ADD_WORDS: frozenset[str] = frozenset({"+", "add", "sumar", "1", "muerte", "+1", ""})
+_DEATH_CHECK_WORDS: frozenset[str] = frozenset({"check", "status", "ver"})
+
+
class WidgetController(QObject):
death_count_updated = Signal(int)
score_updated = Signal(int, int)
@@ -27,20 +53,21 @@ def __init__(self, view, widget_service: WidgetService, command_service: Command
self.widget_service = widget_service
self.command_service = command_service
self.overlay_server = overlay_server
- from backend.services.system.translation_service import TranslationService
+ from backend.services.system import TranslationService
self.i18n = i18n or TranslationService()
self.toast = toast_manager
self._last_combo_emote = ""
self._last_combo_time = 0.0
self._combo_count = 0
+ self._view_connected = False
self._widget_handlers = {
- self.PLUGIN_TAGS["shoutout"]: lambda user, args, first_word, prefix, platform: self._process_shoutout(user, args, prefix, platform=platform),
- self.PLUGIN_TAGS["death"]: lambda user, args, first_word, prefix, platform: self._process_death(user, args or first_word, platform=platform),
- self.PLUGIN_TAGS["score"]: lambda user, args, first_word, prefix, platform: self._dispatch_score_command(user, args, first_word, prefix, platform=platform),
- self.PLUGIN_TAGS["explosion"]: lambda user, args, first_word, prefix, platform: self._process_explosion_command(user, args, platform=platform),
- self.PLUGIN_TAGS["combo"]: lambda user, args, first_word, prefix, platform: self._process_combo_command(user, args, platform=platform),
+ self.PLUGIN_TAGS["shoutout"]: lambda user, args, action_word, prefix, platform: self._process_shoutout(user, args, prefix, platform=platform),
+ self.PLUGIN_TAGS["death"]: lambda user, args, action_word, prefix, platform: self._process_death(user, args, action_word, platform=platform),
+ self.PLUGIN_TAGS["score"]: lambda user, args, action_word, prefix, platform: self._dispatch_score_command(user, args, action_word, prefix, platform=platform),
+ self.PLUGIN_TAGS["explosion"]: lambda user, args, action_word, prefix, platform: self._process_explosion_command(user, args, platform=platform),
+ self.PLUGIN_TAGS["combo"]: lambda user, args, action_word, prefix, platform: self._process_combo_command(user, args, platform=platform),
}
self._save_timer = QTimer(self)
@@ -67,28 +94,39 @@ def _trigger_deferred_save(self, widget_id: str):
self._save_timer.start()
def _flush_saves(self):
- for w_id in self._pending_saves:
+ saved_ids = list(self._pending_saves)
+ self._pending_saves.clear()
+ for w_id in saved_ids:
w = self.widget_service.get_widget(w_id)
if w:
- self.widget_service.storage.save_widget(w_id, w.get("is_active", True), w.get("command", ""), w.get("cooldown", 3), w.get("permission", "everyone"), w.get("config", {}))
- self._pending_saves.clear()
- self.sync_commands_with_db()
+ self.widget_service.save_widget(
+ widget_id=w_id,
+ is_active=w.get("is_active", True),
+ command=w.get("command", ""),
+ cooldown=w.get("cooldown", 3),
+ permission=w.get("permission", "everyone"),
+ config=w.get("config", {}),
+ defer_disk=False
+ )
+ self._sync_single_widget_command(w_id, w)
def _connect_signals(self):
- if self.view:
- self.view.widget_saved.connect(self.handle_widget_save)
- self.view.death_count_changed.connect(self.handle_death_count_change)
- self.view.score_changed.connect(self.handle_score_change)
- self.death_count_updated.connect(self.view.update_death_count_display)
- if hasattr(self.view, "view_shown"):
- self.view.view_shown.connect(self._on_view_shown)
+ if not self.view or self._view_connected:
+ return
+ self._view_connected = True
+ self.view.widget_saved.connect(self.handle_widget_save)
+ self.view.death_count_changed.connect(self.handle_death_count_change)
+ self.view.score_changed.connect(self.handle_score_change)
+ self.death_count_updated.connect(self.view.update_death_count_display)
+ self.score_updated.connect(self.view.update_score_display)
+ if hasattr(self.view, "view_shown"):
+ self.view.view_shown.connect(self._on_view_shown)
def _on_view_shown(self):
if self._needs_reload:
self._needs_reload = False
if self.view:
self.view.populate_widgets(self.widget_service.get_all_widgets())
- self.score_updated.connect(self.view.update_score_display)
def load_initial_data(self):
widgets = self.widget_service.get_all_widgets()
@@ -160,6 +198,57 @@ def _sync_widgets_from_commands_db(self):
finally:
self._is_syncing_db = False
+ def _sync_single_widget_command(self, w_id: str, data: dict | None = None) -> None:
+ tag = self.PLUGIN_TAGS.get(w_id)
+ if not tag:
+ return
+
+ if data is None:
+ data = self.widget_service.get_widget(w_id)
+ if not data:
+ return
+
+ cmd_name = data.get("command", "").strip()
+ if not cmd_name:
+ return
+
+ if not cmd_name.startswith("!"):
+ cmd_name = "!" + cmd_name
+
+ is_active = data.get("is_active", True)
+ cooldown = data.get("cooldown", 3)
+ perm = data.get("permission", "everyone")
+
+ aliases = _WIDGET_DEFAULT_ALIASES.get(w_id, "")
+
+ existing_cmd = self.command_service.get_command_by_trigger(cmd_name)
+ if existing_cmd:
+ if (existing_cmd.get("response") == tag and
+ existing_cmd.get("is_active") == is_active and
+ existing_cmd.get("cooldown") == cooldown and
+ existing_cmd.get("permission") == perm and
+ existing_cmd.get("aliases") == aliases):
+ return
+
+ apply_k = existing_cmd.get("apply_kick", True) if existing_cmd else True
+ apply_tw = existing_cmd.get("apply_twitch", True) if existing_cmd else True
+ apply_yt = existing_cmd.get("apply_youtube", True) if existing_cmd else True
+ apply_tk = existing_cmd.get("apply_tiktok", True) if existing_cmd else True
+
+ self.command_service.save_command(
+ trigger=cmd_name,
+ response=tag,
+ is_active=is_active,
+ cooldown=cooldown,
+ aliases=aliases,
+ is_regex=False,
+ permission=perm,
+ apply_kick=apply_k,
+ apply_twitch=apply_tw,
+ apply_youtube=apply_yt,
+ apply_tiktok=apply_tk
+ )
+
def sync_commands_with_db(self):
if getattr(self, "_is_syncing_db", False):
return
@@ -167,77 +256,43 @@ def sync_commands_with_db(self):
try:
widgets = self.widget_service.get_all_widgets()
for w_id, data in widgets.items():
- tag = self.PLUGIN_TAGS.get(w_id)
- if not tag:
- continue
-
- cmd_name = data.get("command", "").strip()
- if not cmd_name:
- continue
-
- if not cmd_name.startswith("!"):
- cmd_name = "!" + cmd_name
-
- is_active = data.get("is_active", True)
- cooldown = data.get("cooldown", 3)
- perm = data.get("permission", "everyone")
-
- aliases = ""
- if w_id == "score":
- aliases = "!win, !loss, !lose, !victoria, !derrota"
- elif w_id == "death":
- aliases = "!muerte, !death, !deaths, !muertes"
- elif w_id == "shoutout":
- aliases = "!shoutout"
-
- existing_cmd = self.command_service.get_command_by_trigger(cmd_name)
- apply_k = existing_cmd.get("apply_kick", True) if existing_cmd else True
- apply_tw = existing_cmd.get("apply_twitch", True) if existing_cmd else True
- apply_yt = existing_cmd.get("apply_youtube", True) if existing_cmd else True
- apply_tk = existing_cmd.get("apply_tiktok", True) if existing_cmd else True
-
- self.command_service.save_command(
- trigger=cmd_name,
- response=tag,
- is_active=is_active,
- cooldown=cooldown,
- aliases=aliases,
- is_regex=False,
- permission=perm,
- apply_kick=apply_k,
- apply_twitch=apply_tw,
- apply_youtube=apply_yt,
- apply_tiktok=apply_tk
- )
+ self._sync_single_widget_command(w_id, data)
finally:
self._is_syncing_db = False
@Slot(str, bool, str, int, str, object)
def handle_widget_save(self, widget_id: str, is_active: bool, command: str, cooldown: int, permission: str, config: dict):
- logger.info("[User Action] Updated widget '%s': is_active=%s, command='%s', cooldown=%d, perm='%s'",
- widget_id, is_active, command, cooldown, permission)
previous = self.widget_service.get_widget(widget_id)
was_active = previous.get("is_active", True) if previous else True
+ config_dict = dict(config)
+
+ if previous and (
+ previous.get("is_active") == is_active and
+ previous.get("command") == command and
+ previous.get("cooldown") == cooldown and
+ previous.get("permission") == permission and
+ previous.get("config") == config_dict
+ ):
+ return
- self.widget_service._cache[widget_id] = {
- "widget_id": widget_id,
- "is_active": is_active,
- "command": command,
- "cooldown": cooldown,
- "permission": permission,
- "config": dict(config)
- }
+ logger.info("[User Action] Updated widget '%s': is_active=%s, command='%s', cooldown=%d, perm='%s', config=%s",
+ widget_id, is_active, command, cooldown, permission, config_dict)
+
+ self.widget_service.save_widget(
+ widget_id=widget_id,
+ is_active=is_active,
+ command=command,
+ cooldown=cooldown,
+ permission=permission,
+ config=config_dict,
+ defer_disk=True
+ )
if was_active != is_active:
title_key = "widgets.status.activated" if is_active else "widgets.status.deactivated"
msg_key = "widgets.status.activated_msg" if is_active else "widgets.status.deactivated_msg"
- widget_title_keys = {
- "shoutout": "widgets.so.title",
- "death": "widgets.death.title",
- "score": "widgets.score.title"
- }
- title_k = widget_title_keys.get(widget_id)
+ title_k = _WIDGET_TITLE_KEYS.get(widget_id)
w_name = self.i18n.get(title_k) if title_k else widget_id
title = self.i18n.get(title_key)
@@ -248,15 +303,17 @@ def handle_widget_save(self, widget_id: str, is_active: bool, command: str, cool
self.toast.show_toast(
title=title,
message=message,
- state=state
+ state=state,
+ tag=f"widget_{widget_id}"
)
+ if self.overlay_server:
+ self.overlay_server.trigger_widget_event("widget_toggle", {
+ "widget_id": widget_id,
+ "is_active": is_active
+ })
+
self._trigger_deferred_save(widget_id)
- if self.overlay_server:
- self.overlay_server.trigger_widget_event("widget_toggle", {
- "widget_id": widget_id,
- "is_active": is_active
- })
@Slot(int)
def handle_death_count_change(self, new_val: int):
@@ -289,37 +346,33 @@ def handle_score_change(self, wins: int, losses: int):
"title_text": title_text
})
- def _dispatch_score_command(self, user: str, args: str, first_word: str, prefix: str, platform: str = "kick") -> None:
+ def _dispatch_score_command(self, user: str, args: str, action_word: str, prefix: str, platform: str = "kick") -> None:
arg_clean = args.strip().lower()
- if arg_clean in ("reset", "0", "reiniciar", "clear"):
+ if arg_clean in _RESET_COMMANDS or action_word in _RESET_COMMANDS:
wins, losses = self.widget_service.update_score(reset=True)
msg = self.i18n.get("widgets.score.msg_reset").replace("{user}", user)
self._notify_score_change(wins, losses, msg, platform=platform)
return
- if first_word in ("win", "w", "victoria"):
- if arg_clean in ("-1", "-", "sub", "restar"):
- wins, losses = self.widget_service.update_score(delta_wins=-1)
- else:
- wins, losses = self.widget_service.update_score(delta_wins=1)
+ if action_word in _SCORE_WIN_WORDS or (action_word == "score" and arg_clean in _SCORE_WIN_WORDS):
+ delta = -1 if arg_clean in _DELTA_DECREMENT else 1
+ wins, losses = self.widget_service.update_score(delta_wins=delta)
msg = self.i18n.get("widgets.score.msg_win").replace("{user}", user).replace("{wins}", str(wins)).replace("{losses}", str(losses))
self._notify_score_change(wins, losses, msg, platform=platform)
return
- if first_word in ("loss", "lose", "l", "derrota"):
- if arg_clean in ("-1", "-", "sub", "restar"):
- wins, losses = self.widget_service.update_score(delta_losses=-1)
- else:
- wins, losses = self.widget_service.update_score(delta_losses=1)
+ if action_word in _SCORE_LOSS_WORDS or (action_word == "score" and arg_clean in _SCORE_LOSS_WORDS):
+ delta = -1 if arg_clean in _DELTA_DECREMENT else 1
+ wins, losses = self.widget_service.update_score(delta_losses=delta)
msg = self.i18n.get("widgets.score.msg_loss").replace("{user}", user).replace("{wins}", str(wins)).replace("{losses}", str(losses))
self._notify_score_change(wins, losses, msg, platform=platform)
return
- if arg_clean in ("+1", "+", "win", "w", "victoria"):
+ if arg_clean in _SCORE_PLUS_WORDS or action_word.endswith("+"):
wins, losses = self.widget_service.update_score(delta_wins=1)
msg = self.i18n.get("widgets.score.msg_win").replace("{user}", user).replace("{wins}", str(wins)).replace("{losses}", str(losses))
- elif arg_clean in ("-1", "-", "loss", "lose", "l", "derrota"):
+ elif arg_clean in _SCORE_MINUS_WORDS or action_word.endswith("-"):
wins, losses = self.widget_service.update_score(delta_losses=1)
msg = self.i18n.get("widgets.score.msg_loss").replace("{user}", user).replace("{wins}", str(wins)).replace("{losses}", str(losses))
else:
@@ -344,25 +397,27 @@ def _notify_score_change(self, wins: int, losses: int, msg: str, platform: str =
@Slot(str, str, str, str, str)
def handle_widget_command(self, plugin_tag: str, user: str, content: str, prefix: str, platform: str = "kick"):
parts = content.strip().split()
- first_word = parts[0][len(prefix):].lower() if parts else ""
+ cmd_trigger = prefix.lstrip("!").lower()
+ suffix = parts[0][len(prefix):].lower() if parts else ""
+ action_word = cmd_trigger or suffix
args = " ".join(parts[1:]).strip() if len(parts) > 1 else ""
handler = self._widget_handlers.get(plugin_tag)
if handler:
- handler(user, args, first_word, prefix, platform)
+ handler(user, args, action_word, prefix, platform)
def _process_shoutout(self, user: str, args: str, prefix: str, platform: str = "kick"):
- if not args:
+ arg_words = args.strip().split() if args else []
+ if not arg_words:
err_msg = self.i18n.get("widgets.so.usage_error").replace("{user}", user).replace("{trigger}", prefix)
self.command_service.send_response(err_msg, platform=platform)
return
- target_user = args.split()[0].lstrip("@").strip()
+ target_user = arg_words[0].lstrip("@").strip()
reply = self.widget_service.format_shoutout(target_user)
self.command_service.send_response(reply, platform=platform)
if self.overlay_server:
- import threading
def _fetch_and_trigger():
avatar_url = self.widget_service.fetch_streamer_avatar(target_user)
header_text = self.i18n.get("widgets.so.overlay_header")
@@ -374,30 +429,31 @@ def _fetch_and_trigger():
"header_text": header_text
})
- threading.Thread(target=_fetch_and_trigger, daemon=True).start()
+ threading.Thread(target=_fetch_and_trigger, daemon=True, name=f"ShoutoutAvatar-{target_user}").start()
- def _process_death(self, user: str, args: str, platform: str = "kick"):
+ def _process_death(self, user: str, args: str, action_word: str = "", platform: str = "kick"):
arg_clean = args.strip().lower()
- if arg_clean in ("reset", "0", "reiniciar", "clear"):
+ check_target = arg_clean if arg_clean else action_word
+
+ if check_target in _RESET_COMMANDS or action_word in _RESET_COMMANDS:
new_count = self.widget_service.update_death_count(set_val=0)
msg = self.i18n.get("widgets.death.msg_reset").replace("{user}", user).replace("{count}", str(new_count))
- elif arg_clean in ("-", "sub", "restar", "-1"):
+ elif check_target in _DEATH_SUB_WORDS or action_word.endswith("-") or action_word.endswith("sub"):
new_count = self.widget_service.update_death_count(delta=-1)
msg = self.i18n.get("widgets.death.msg_sub").replace("{user}", user).replace("{count}", str(new_count))
- elif arg_clean in ("+", "add", "sumar", "1", "muerte", "+1", ""):
- new_count = self.widget_service.update_death_count(delta=1)
- msg = self.i18n.get("widgets.death.msg_add").replace("{user}", user).replace("{count}", str(new_count))
- elif arg_clean in ("check", "status", "ver"):
+ elif check_target in _DEATH_CHECK_WORDS or action_word in _DEATH_CHECK_WORDS:
new_count = self.widget_service.get_death_count()
msg = self.i18n.get("widgets.death.msg_check").replace("{user}", user).replace("{count}", str(new_count))
+ elif check_target in _DEATH_ADD_WORDS or action_word.endswith("+") or action_word.endswith("add"):
+ new_count = self.widget_service.update_death_count(delta=1)
+ msg = self.i18n.get("widgets.death.msg_add").replace("{user}", user).replace("{count}", str(new_count))
else:
try:
- val = int(arg_clean)
+ val = int(check_target)
new_count = self.widget_service.update_death_count(set_val=max(0, val))
- msg = self.i18n.get("widgets.death.msg_add").replace("{user}", user).replace("{count}", str(new_count))
except ValueError:
new_count = self.widget_service.update_death_count(delta=1)
- msg = self.i18n.get("widgets.death.msg_add").replace("{user}", user).replace("{count}", str(new_count))
+ msg = self.i18n.get("widgets.death.msg_add").replace("{user}", user).replace("{count}", str(new_count))
self.death_count_updated.emit(new_count)
if self.overlay_server:
@@ -434,7 +490,6 @@ def handle_chat_message(self, user: str, content: str, color: str = "", badges:
if platform in ("youtube", "tiktok") and emotes_tag:
try:
- import json
custom_emotes = json.loads(emotes_tag) if isinstance(emotes_tag, str) and emotes_tag.startswith("[") else []
for em in custom_emotes:
if isinstance(em, dict) and em.get("url"):
@@ -531,4 +586,3 @@ def _process_combo_command(self, user: str, args: str, platform: str = "kick"):
})
msg = self.i18n.get("widgets.combo.msg_combo").replace("{count}", "5").replace("{emote}", emote)
self.command_service.send_response(msg, platform=platform)
-
diff --git a/backend/core/__init__.py b/backend/core/__init__.py
new file mode 100644
index 00000000..21af2bfc
--- /dev/null
+++ b/backend/core/__init__.py
@@ -0,0 +1,19 @@
+# backend\core\__init__.py
+
+from .app_container_core import AppContainerCore
+from .main_window_core import MainWindowCore
+from .app_logger_core import (
+ setup_application_logging,
+ flush_all_logs,
+ get_log_dir,
+ AutoFlushTimedRotatingFileHandler,
+)
+
+__all__ = [
+ "AppContainerCore",
+ "MainWindowCore",
+ "setup_application_logging",
+ "flush_all_logs",
+ "get_log_dir",
+ "AutoFlushTimedRotatingFileHandler",
+]
diff --git a/backend/core/app_container_core.py b/backend/core/app_container_core.py
index cc766c37..c1cd23cf 100644
--- a/backend/core/app_container_core.py
+++ b/backend/core/app_container_core.py
@@ -5,7 +5,7 @@
import logging
try:
- import backend.config.api_keys as _api_keys
+ import backend.config as _api_keys
KICK_CLIENT_ID = getattr(_api_keys, "KICK_CLIENT_ID", "")
KICK_CLIENT_SECRET = getattr(_api_keys, "KICK_CLIENT_SECRET", "")
KICK_REDIRECT_URI = getattr(_api_keys, "KICK_REDIRECT_URI", "http://localhost:8080/auth/callback")
@@ -26,14 +26,15 @@
from backend.database import (
DatabaseManager, SQLiteCommandsStorage, SQLiteTokenStorage, SQLiteSettingsStorage,
SQLiteRewardsStorage, SQLiteSpamStorage, SQLiteTimersStorage, SQLiteWidgetsStorage,
- SQLiteAvatarStorage, SQLiteSystemLogStorage, SQLiteMusicStorage, SQLiteScheduleStorage
+ SQLiteAvatarStorage, SQLiteSystemLogStorage, SQLiteMusicStorage, SQLiteScheduleStorage,
+ SQLiteAlertStorage
)
from backend.services import (
- BackupService, TranslationService, AuthManager, TwitchAuthManager,
+ BackupService, TranslationService, KickAuthManager, TwitchAuthManager,
SettingsService, AvatarService, WidgetService, ScheduleService,
- TTSManager, OverlayServerManager
+ TTSManager, OverlayServerManager, AlertService
)
-from frontend.common.paths import resource_path
+from frontend.common import resource_path
class AppContainerCore:
def __init__(self):
@@ -49,9 +50,9 @@ def __init__(self):
self.widgets_storage = SQLiteWidgetsStorage(self.db_manager)
self.avatar_storage = SQLiteAvatarStorage(self.db_manager)
self.system_log_storage = SQLiteSystemLogStorage(self.db_manager)
- self.log_storage = self.system_log_storage
self.music_storage = SQLiteMusicStorage(self.db_manager)
self.schedule_storage = SQLiteScheduleStorage(self.db_manager)
+ self.alert_storage = SQLiteAlertStorage(self.db_manager)
logger.debug("[AppContainer] Initializing core services (Backup, Settings, Avatar, Widget, Schedule)...")
self.backup_service = BackupService(
@@ -60,7 +61,9 @@ def __init__(self):
commands_storage=self.commands_storage,
spam_storage=self.spam_storage,
timers_storage=self.timers_storage,
- schedule_storage=self.schedule_storage
+ schedule_storage=self.schedule_storage,
+ alert_storage=self.alert_storage,
+ widgets_storage=self.widgets_storage
)
self.settings_service = SettingsService(self.settings_storage, self.backup_service)
self.i18n = self._init_i18n()
@@ -71,7 +74,7 @@ def __init__(self):
auth_html_path = resource_path(os.path.join("assets", "web", "auth.html"))
logger.debug("[AppContainer] Initializing Kick and Twitch OAuth managers...")
- self.auth_manager = AuthManager(
+ self.kick_auth_manager = KickAuthManager(
client_id=KICK_CLIENT_ID,
client_secret=KICK_CLIENT_SECRET,
redirect_uri=KICK_REDIRECT_URI,
@@ -91,6 +94,12 @@ def __init__(self):
self.tts_manager = TTSManager()
self.overlay_server = OverlayServerManager(settings_storage=self.settings_storage)
self.overlay_server.start()
+ self.alert_service = AlertService(
+ storage=self.alert_storage,
+ overlay_server=self.overlay_server,
+ tts_service=self.tts_manager
+ )
+ self.overlay_server.on_alert_finished = self.alert_service.ack_alert
logger.info("[AppContainer] Core dependency container initialized successfully.")
self._music_provider = None
@@ -100,7 +109,7 @@ def music_provider(self):
def get_music_provider(self):
if self._music_provider is None:
- from backend.providers.music.youtube_client import YouTubeMusicProvider
+ from backend.providers.music import YouTubeMusicProvider
self._music_provider = YouTubeMusicProvider(self.i18n, music_storage=self.music_storage, db_manager=self.db_manager)
return self._music_provider
diff --git a/backend/core/app_logger_core.py b/backend/core/app_logger_core.py
index 4a64b92b..ff760aec 100644
--- a/backend/core/app_logger_core.py
+++ b/backend/core/app_logger_core.py
@@ -6,6 +6,7 @@
import sys
import threading
import traceback
+from datetime import datetime
from logging.handlers import TimedRotatingFileHandler
from PySide6.QtCore import qInstallMessageHandler, QtMsgType
from backend.handlers import QLogHandler, StreamToLogger
@@ -37,8 +38,6 @@ def _qt_message_handler(mode: QtMsgType, context, message: str):
logging.getLogger("minikick.qt").log(lvl, "[Qt] %s", message)
-from datetime import datetime
-
def _threading_excepthook(args):
tb_text = "".join(traceback.format_exception(args.exc_type, args.exc_value, args.exc_traceback))
thread_name = getattr(args.thread, 'name', 'UnknownThread')
@@ -78,7 +77,7 @@ def _silence_ffmpeg_native_logging():
pyside_dir = os.path.dirname(PySide6.__file__)
for root, dirs, files in os.walk(pyside_dir):
for f in files:
- if f.startswith('avutil') and f.endswith('.dll'):
+ if 'avutil' in f and (f.endswith('.dll') or f.endswith('.so') or '.so.' in f or f.endswith('.dylib')):
dll_path = os.path.join(root, f)
avutil = ctypes.CDLL(dll_path)
avutil.av_log_set_level(16)
diff --git a/backend/core/main_window_core.py b/backend/core/main_window_core.py
index 8155bba6..5cedc35b 100644
--- a/backend/core/main_window_core.py
+++ b/backend/core/main_window_core.py
@@ -2,16 +2,19 @@
import sys
import html
+import time
import logging
+import warnings
+from collections import deque
from datetime import datetime
from PySide6.QtWidgets import (
QMainWindow, QWidget, QHBoxLayout, QStackedWidget,
QSystemTrayIcon, QApplication
)
-from PySide6.QtCore import Qt, Slot, QEvent
+from PySide6.QtCore import Qt, Slot, QEvent, QTimer
-from backend.core.app_container_core import AppContainerCore
-from backend.core.app_logger_core import setup_application_logging
+from .app_container_core import AppContainerCore
+from .app_logger_core import setup_application_logging
from backend.services import (
ChatMessageDTO, RewardsService, ChatService, CommandService, AvatarService,
LogService, SettingsService, SpamService, TimerService
@@ -20,26 +23,24 @@
RewardsController, ChatController, CommandController, DashboardController,
TimerController, LogController, MusicController, SettingsController,
SpamController, UpdateController, WidgetController,
- ScheduleController
+ ScheduleController, AlertsController
)
from backend.providers import KickAPIClient, TwitchAPIClient
from backend.workers import (
KickAuthWorker, TwitchAuthWorker, KickChatWorker, TwitchChatWorker, YouTubeChatWorker, TikTokChatWorker,
- FetchRewardsWorker, RewardWorker, TwitchRewardWorker, TimerWorker, ScheduleWorker, GlobalMediaWorker
+ FetchRewardsWorker, TwitchRewardWorker, TimerWorker, ScheduleWorker, GlobalMediaWorker
)
-from frontend.common.theme import COLOR_GREEN, get_global_qss
-from frontend.navigation.sidebar_component import Sidebar
-from frontend.navigation.toast_component import ToastManager
-from frontend.navigation.tray_menu_component import SystemTrayManager
+from frontend.common import COLOR_GREEN, get_global_qss
+from frontend.navigation import Sidebar, ToastManager, SystemTrayManager
from frontend.views import (
RewardsView, CommandView, DashboardView, TimersView, ChatView,
LogView, MusicView, SettingsView, SpamView, WidgetsView,
- ScheduleView
+ ScheduleView, AlertsView
)
from frontend.dialogs import ModernConfirmDialog, YouTubeConnectDialog, TikTokConnectDialog
try:
- from backend.config.api_keys import KICK_PUSHER_CLUSTER, KICK_PUSHER_KEY, TWITCH_CLIENT_ID
+ from backend.config import KICK_PUSHER_CLUSTER, KICK_PUSHER_KEY, TWITCH_CLIENT_ID
except ImportError:
KICK_PUSHER_CLUSTER = "us2"
KICK_PUSHER_KEY = "32cbd69e4b950bf97679"
@@ -48,22 +49,24 @@
logger = logging.getLogger("minikick.core")
class MainWindowCore(QMainWindow):
+ _recent_reward_redemptions: deque | None = None
SETTING_MINIMIZE_TRAY = "minimize_to_tray"
SETTING_AUTOSTART = "dashboard_autostart"
_NAV_CONFIG = (
("Dashboard", "dashboard.svg", "top"),
("Chat", "message.svg", "top"),
- ("Stream Info", "calendar.svg", "top"),
- ("Spam Filters", "shield-half.svg", "top"),
+ ("Stream Info", "calendar-duotone.svg", "top"),
+ ("Spam Filters", "shield-duotone.svg", "top"),
("Comandos", "code.svg", "top"),
("Timers", "clock.svg", "top"),
- ("Music", "music.svg", "top"),
- ("Widgets", "apps.svg", "top"),
- ("Triggers", "chart-bubble.svg", "top"),
+ ("Music", "music-notes.svg", "top"),
+ ("Widgets", "widget-add.svg", "top"),
+ ("Triggers", "treasure-chest.svg", "top"),
+ ("Alerts", "megaphone-filled.svg", "top"),
("Settings", "settings.svg", "bottom"),
- ("Developer", "brand-tabler.svg", "bottom"),
+ ("Developer", "file-text-duotone.svg", "bottom"),
)
def __init__(self, updater_manager, app_version: str):
@@ -83,16 +86,16 @@ def __init__(self, updater_manager, app_version: str):
self.timers_storage = self.container.timers_storage
self.backup_service = self.container.backup_service
self.i18n = self.container.i18n
- self.auth_manager = self.container.auth_manager
+ self.kick_auth_manager = self.container.kick_auth_manager
self.tts_manager = self.container.tts_manager
self.overlay_server = self.container.overlay_server
title_template = self.i18n.get("main.window.title")
self.setWindowTitle(title_template.replace("{version}", app_version))
- self.chat_worker = None
- self.reward_worker = None
- self.auth_worker = None
+ self.kick_chat_worker = None
+ self.kick_api_client = None
+ self.kick_auth_worker = None
self.fetch_rewards_worker = None
self.timers_worker = None
self.schedule_worker = None
@@ -105,6 +108,7 @@ def __init__(self, updater_manager, app_version: str):
self.tiktok_chat_worker = None
self._tiktok_connected = False
self._tiktok_channel = ""
+ self._retiring_workers: set = set()
self._cached_total_usages = None
self._cached_active_timers = None
@@ -119,6 +123,7 @@ def __init__(self, updater_manager, app_version: str):
"youtube": 0,
"tiktok": 0
}
+ self._recent_reward_redemptions = deque(maxlen=100)
self.logger, self.q_log_handler = setup_application_logging()
self.logger.info("[MainWindow] Initializing main window components and UI shell...")
@@ -138,6 +143,7 @@ def __init__(self, updater_manager, app_version: str):
self._load_settings_into_ui()
self.setUpdatesEnabled(True)
self.logger.info("[MainWindow] Main window initialization complete.")
+ self._schedule_view_prewarming()
def _setup_ui(self):
self.central_widget = QWidget()
@@ -159,7 +165,7 @@ def _setup_ui(self):
self.command_service = CommandService(self.commands_storage, api_client=None)
self.spam_service = SpamService(self.spam_storage, api_client=None, i18n=self.i18n)
self.timer_service = TimerService(self.timers_storage, api_client=None)
- self.log_service = LogService(log_storage=self.container.log_storage)
+ self.log_service = LogService(log_storage=self.container.system_log_storage)
self.schedule_service = self.container.schedule_service
self.view_dashboard = DashboardView(self.i18n, parent=self)
@@ -173,6 +179,7 @@ def _setup_ui(self):
self.view_timers = None
self.view_settings = None
self.view_logs = None
+ self.view_alerts = None
self._instantiated_views = {"Dashboard": self.view_dashboard}
@@ -211,7 +218,7 @@ def _setup_ui(self):
view=None,
service=self.rewards_service,
toast_manager=self.toast,
- auth_manager=self.auth_manager,
+ kick_auth_manager=self.kick_auth_manager,
twitch_auth_manager=getattr(self.container, "twitch_auth_manager", None)
)
self.command_controller = CommandController(
@@ -252,6 +259,12 @@ def _setup_ui(self):
i18n=self.i18n,
connected_platforms_provider=self.get_connected_platforms
)
+ self.alerts_controller = AlertsController(
+ view=None,
+ service=self.container.alert_service,
+ toast_manager=self.toast,
+ i18n=self.i18n
+ )
self._start_schedule_worker()
self._setup_global_media_keys()
self.session_metrics = {
@@ -329,7 +342,7 @@ def _load_settings_into_ui(self):
self.logger.info("[AutoStart] Autostart configuration: enabled=%s", autostart_enabled)
if autostart_enabled:
- if self.auth_manager.is_authenticated():
+ if self.kick_auth_manager.is_authenticated():
try:
self.logger.info("[AutoStart] Starting Kick integration...")
self._handle_auth_process()
@@ -375,26 +388,31 @@ def _get_or_create_view(self, view_name: str):
view_widget = None
if view_name == "Stream Info":
- self.view_schedule = ScheduleView(self.i18n, parent=self)
+ self.view_schedule = ScheduleView(self.i18n, parent=self.content_stack)
+ self.content_stack.addWidget(self.view_schedule)
self.schedule_controller.attach_view(self.view_schedule)
view_widget = self.view_schedule
elif view_name == "Chat":
- self.view_chat = ChatView(self.i18n, parent=self)
+ self.view_chat = ChatView(self.i18n, parent=self.content_stack)
+ self.content_stack.addWidget(self.view_chat)
self.view_chat.chat_overlay_url = self.overlay_server.get_chat_overlay_url()
self.chat_controller.attach_view(self.view_chat)
view_widget = self.view_chat
elif view_name == "Music":
- self.view_music = MusicView(self.i18n, music_overlay_url=self.overlay_server.get_music_overlay_url(), parent=self)
+ self.view_music = MusicView(self.i18n, music_overlay_url=self.overlay_server.get_music_overlay_url(), parent=self.content_stack)
+ self.content_stack.addWidget(self.view_music)
self.music_controller.attach_view(self.view_music)
view_widget = self.view_music
elif view_name == "Triggers":
- self.view_rewards = RewardsView(self.i18n, overlay_url=self.overlay_server.get_overlay_url(), parent=self)
+ self.view_rewards = RewardsView(self.i18n, overlay_url=self.overlay_server.get_overlay_url(), parent=self.content_stack)
+ self.content_stack.addWidget(self.view_rewards)
self.view_rewards.refresh_rewards_requested.connect(self._fetch_api_rewards)
self.rewards_controller.attach_view(self.view_rewards)
self._fetch_api_rewards()
view_widget = self.view_rewards
elif view_name == "Comandos":
- self.view_commands = CommandView(self.i18n, parent=self)
+ self.view_commands = CommandView(self.i18n, parent=self.content_stack)
+ self.content_stack.addWidget(self.view_commands)
self.command_controller.attach_view(self.view_commands)
view_widget = self.view_commands
elif view_name == "Widgets":
@@ -407,20 +425,24 @@ def _get_or_create_view(self, view_name: str):
combo_overlay_url=self.overlay_server.get_combo_overlay_url(),
poll_overlay_url=self.overlay_server.get_poll_overlay_url(),
pinned_overlay_url=self.overlay_server.get_pinned_overlay_url(),
- parent=self
+ parent=self.content_stack
)
+ self.content_stack.addWidget(self.view_widgets)
self.widget_controller.attach_view(self.view_widgets)
view_widget = self.view_widgets
elif view_name == "Spam Filters":
- self.view_spam = SpamView(self.i18n, parent=self)
+ self.view_spam = SpamView(self.i18n, parent=self.content_stack)
+ self.content_stack.addWidget(self.view_spam)
self.spam_controller.attach_view(self.view_spam)
view_widget = self.view_spam
elif view_name == "Timers":
- self.view_timers = TimersView(self.i18n, parent=self)
+ self.view_timers = TimersView(self.i18n, parent=self.content_stack)
+ self.content_stack.addWidget(self.view_timers)
self.timer_controller.attach_view(self.view_timers)
view_widget = self.view_timers
elif view_name == "Settings":
- self.view_settings = SettingsView(self.i18n, parent=self)
+ self.view_settings = SettingsView(self.i18n, parent=self.content_stack)
+ self.content_stack.addWidget(self.view_settings)
self.view_settings.twitch_integration_clicked.connect(self._on_twitch_integration_button_clicked)
self.view_settings.youtube_integration_clicked.connect(self._on_youtube_integration_button_clicked)
self.view_settings.tiktok_integration_clicked.connect(self._on_tiktok_integration_button_clicked)
@@ -428,16 +450,52 @@ def _get_or_create_view(self, view_name: str):
self._update_integrations_status_ui()
view_widget = self.view_settings
elif view_name == "Developer":
- self.view_logs = LogView(self.i18n, parent=self)
+ self.view_logs = LogView(self.i18n, parent=self.content_stack)
+ self.content_stack.addWidget(self.view_logs)
self.log_controller.attach_view(self.view_logs)
view_widget = self.view_logs
+ elif view_name == "Alerts":
+ self.view_alerts = AlertsView(
+ self.i18n,
+ alerts_overlay_url=self.overlay_server.get_alerts_overlay_url(),
+ parent=self.content_stack
+ )
+ self.view_alerts.set_connected_platforms(self.get_connected_platforms())
+ self.view_alerts.connect_platform_requested.connect(self._handle_alert_platform_connect)
+ self.content_stack.addWidget(self.view_alerts)
+ self.alerts_controller.attach_view(self.view_alerts)
+ view_widget = self.view_alerts
if view_widget:
self._instantiated_views[view_name] = view_widget
- self.content_stack.addWidget(view_widget)
+ if self.content_stack.indexOf(view_widget) == -1:
+ self.content_stack.addWidget(view_widget)
return view_widget
+ def _schedule_view_prewarming(self):
+ views_to_warm = [
+ "Chat", "Alerts", "Widgets", "Settings", "Triggers",
+ "Stream Info", "Comandos", "Timers", "Spam Filters",
+ "Music", "Developer"
+ ]
+ self._prewarm_queue = deque(views_to_warm)
+ QTimer.singleShot(750, self._prewarm_next_view)
+
+ def _prewarm_next_view(self):
+ if not hasattr(self, "_prewarm_queue") or not self._prewarm_queue or self._is_shutting_down:
+ return
+ view_name = self._prewarm_queue.popleft()
+ if view_name not in self._instantiated_views:
+ try:
+ self.logger.debug("[Prewarm] Background warming view: '%s'", view_name)
+ self._get_or_create_view(view_name)
+ except Exception as e:
+ self.logger.warning("[Prewarm] Error pre-warming view '%s': %s", view_name, e)
+
+ if self._prewarm_queue and not self._is_shutting_down:
+ QTimer.singleShot(150, self._prewarm_next_view)
+
@Slot()
def _restore_from_tray(self):
self.logger.info("[User Action] Window restored from system tray")
@@ -541,11 +599,82 @@ def _start_global_media_worker(self):
self.global_media_worker.stop_pressed.connect(self.music_controller.handle_play_pause)
self.global_media_worker.start()
+ def _safe_stop_worker(self, worker_attr_name: str, timeout_ms: int = 1500) -> None:
+ worker = getattr(self, worker_attr_name, None)
+ if not worker:
+ return
+
+ setattr(self, worker_attr_name, None)
+
+ for sig_name in (
+ "connection_success",
+ "connection_lost",
+ "connection_restored",
+ "error_occurred",
+ "message_received",
+ "play_pause_pressed",
+ "skip_pressed",
+ "stop_pressed",
+ ):
+ sig = getattr(worker, sig_name, None)
+ if sig:
+ try:
+ with warnings.catch_warnings():
+ warnings.simplefilter("ignore", category=RuntimeWarning)
+ sig.disconnect()
+ except (RuntimeError, TypeError):
+ pass
+
+ try:
+ if hasattr(worker, 'stop'):
+ worker.stop()
+ if hasattr(worker, 'requestInterruption'):
+ worker.requestInterruption()
+ if hasattr(worker, 'quit'):
+ worker.quit()
+ except RuntimeError:
+ pass
+
+ start_t = time.perf_counter()
+ try:
+ if worker.isRunning():
+ if worker.wait(timeout_ms):
+ elapsed_ms = (time.perf_counter() - start_t) * 1000.0
+ self.logger.debug(
+ "[Worker] Worker '%s' stopped cleanly in %.1f ms",
+ worker_attr_name,
+ elapsed_ms
+ )
+ worker.deleteLater()
+ else:
+ elapsed_ms = (time.perf_counter() - start_t) * 1000.0
+ self.logger.warning(
+ "[Worker] Worker '%s' still active after %.1f ms (timeout: %d ms). Retaining in retirement registry.",
+ worker_attr_name,
+ elapsed_ms,
+ timeout_ms
+ )
+ self._retiring_workers.add(worker)
+ def _on_retired(w=worker):
+ self._retiring_workers.discard(w)
+ try:
+ w.deleteLater()
+ except RuntimeError:
+ pass
+ worker.finished.connect(_on_retired)
+ else:
+ elapsed_ms = (time.perf_counter() - start_t) * 1000.0
+ self.logger.debug(
+ "[Worker] Worker '%s' was not running (shutdown check took %.1f ms)",
+ worker_attr_name,
+ elapsed_ms
+ )
+ worker.deleteLater()
+ except RuntimeError as e:
+ self.logger.debug("[Worker] Notice stopping worker '%s' (%s): %s", worker_attr_name, type(e).__name__, e)
+
def _stop_global_media_worker(self):
- if self.global_media_worker and self.global_media_worker.isRunning():
- self.global_media_worker.stop()
- self.global_media_worker.wait(2000)
- self.global_media_worker = None
+ self._safe_stop_worker("global_media_worker", timeout_ms=1500)
def _on_media_keys_state_changed(self, enabled: bool):
if enabled:
@@ -620,27 +749,37 @@ def _stop_workers_parallel(self, worker_map: list):
stuck_template = self.i18n.get("main.logs.worker_stuck")
stopped_template = self.i18n.get("main.logs.worker_stopped")
for name, instance in active_workers:
+ start_t = time.perf_counter()
try:
if instance.wait(2000):
- self.logger.info(stopped_template.replace("{worker}", name))
+ elapsed_ms = (time.perf_counter() - start_t) * 1000.0
+ msg = stopped_template.replace("{worker}", name)
+ self.logger.info("%s (%.1f ms)", msg, elapsed_ms)
+ instance.deleteLater()
else:
- self.logger.warning("[Shutdown] Worker '%s' wait timed out", name)
- instance.deleteLater()
- except RuntimeError:
- pass
+ elapsed_ms = (time.perf_counter() - start_t) * 1000.0
+ self.logger.warning("[Shutdown] Worker '%s' wait timed out after %.1f ms", name, elapsed_ms)
+ self._retiring_workers.add(instance)
+ def _on_retired(inst=instance):
+ self._retiring_workers.discard(inst)
+ try:
+ inst.deleteLater()
+ except RuntimeError:
+ pass
+ instance.finished.connect(_on_retired)
+ except RuntimeError as e:
+ self.logger.debug("[Shutdown] Notice stopping worker '%s' (%s): %s", name, type(e).__name__, e)
def _stop_kick_connection_workers(self):
worker_map = [
- ("Worker_Chat_Socket", getattr(self, 'chat_worker', None)),
- ("Worker_Reward_Polling", getattr(self, 'reward_worker', None)),
- ("Worker_Auth", getattr(self, 'auth_worker', None)),
+ ("Worker_Kick_Chat_Socket", getattr(self, 'kick_chat_worker', None)),
+ ("Worker_Kick_Auth", getattr(self, 'kick_auth_worker', None)),
("Worker_Fetch_Rewards", getattr(self, 'fetch_rewards_worker', None)),
("Worker_Timers", getattr(self, 'timers_worker', None)),
]
self._stop_workers_parallel(worker_map)
- self.chat_worker = None
- self.reward_worker = None
- self.auth_worker = None
+ self.kick_chat_worker = None
+ self.kick_auth_worker = None
self.fetch_rewards_worker = None
self.timers_worker = None
@@ -659,9 +798,8 @@ def _stop_twitch_connection_workers(self):
def _stop_all_workers(self):
worker_map = [
- ("Worker_Chat_Socket", getattr(self, 'chat_worker', None)),
- ("Worker_Reward_Polling", getattr(self, 'reward_worker', None)),
- ("Worker_Auth", getattr(self, 'auth_worker', None)),
+ ("Worker_Kick_Chat_Socket", getattr(self, 'kick_chat_worker', None)),
+ ("Worker_Kick_Auth", getattr(self, 'kick_auth_worker', None)),
("Worker_Fetch_Rewards", getattr(self, 'fetch_rewards_worker', None)),
("Worker_Timers", getattr(self, 'timers_worker', None)),
("Worker_Twitch_Chat_Socket", getattr(self, 'twitch_chat_worker', None)),
@@ -675,9 +813,8 @@ def _stop_all_workers(self):
]
self._stop_workers_parallel(worker_map)
- self.chat_worker = None
- self.reward_worker = None
- self.auth_worker = None
+ self.kick_chat_worker = None
+ self.kick_auth_worker = None
self.fetch_rewards_worker = None
self.timers_worker = None
self.twitch_chat_worker = None
@@ -693,48 +830,64 @@ def _stop_all_workers(self):
except Exception:
pass
+ @staticmethod
+ def _is_worker_running(worker) -> bool:
+ if worker is None:
+ return False
+ try:
+ return bool(worker.isRunning())
+ except (RuntimeError, AttributeError):
+ return False
+
@Slot()
def _handle_auth_process(self, force: bool = False):
+ if self._is_worker_running(getattr(self, "twitch_auth_worker", None)):
+ self.toast.show_toast(
+ title=self.container.i18n.get("main.toast.auth_in_progress_title"),
+ message=self.container.i18n.get("main.toast.auth_in_progress_msg"),
+ state="warning"
+ )
+ return
+
self._stop_kick_connection_workers()
self.dashboard_controller.handle_connecting_state()
- self.auth_worker = KickAuthWorker(self.i18n, self.auth_manager, force=force)
- self.auth_worker.auth_success.connect(self._on_auth_success)
- self.auth_worker.auth_error.connect(self.dashboard_controller.handle_error_state)
- self.auth_worker.finished.connect(self.auth_worker.deleteLater)
- self.auth_worker.start()
+ self.kick_auth_worker = KickAuthWorker(self.i18n, self.kick_auth_manager, force=force)
+ self.kick_auth_worker.auth_success.connect(self._on_auth_success)
+ self.kick_auth_worker.auth_error.connect(self.dashboard_controller.handle_error_state)
+ self.kick_auth_worker.finished.connect(lambda: setattr(self, 'kick_auth_worker', None))
+ self.kick_auth_worker.finished.connect(self.kick_auth_worker.deleteLater)
+ self.kick_auth_worker.start()
def _on_auth_success(self, tokens):
- api_client = KickAPIClient(auth_provider=self.auth_manager)
+ self.kick_api_client = KickAPIClient(auth_provider=self.kick_auth_manager)
self._evaluate_all_scopes()
- self.command_service.api_client = api_client
- self.spam_service.api_client = api_client
- self.timer_service.api_client = api_client
+ self.command_service.api_client = self.kick_api_client
+ self.spam_service.api_client = self.kick_api_client
+ self.timer_service.api_client = self.kick_api_client
self.command_service.reload_cache()
self.spam_service.reload_filters()
- self.schedule_service.set_kick_client(api_client)
+ self.schedule_service.set_kick_client(self.kick_api_client)
self._start_schedule_worker()
if hasattr(self, "schedule_controller") and self.schedule_controller:
self.schedule_controller.fetch_current_info()
- self.chat_worker = KickChatWorker(self.i18n, api_client, KICK_PUSHER_CLUSTER, KICK_PUSHER_KEY)
- self.chat_worker.connection_success.connect(self._on_web_socket_connected)
- self.chat_worker.message_received.connect(self._route_incoming_message)
- self.chat_worker.poll_updated.connect(self._on_poll_updated)
- self.chat_worker.poll_deleted.connect(self._on_poll_deleted)
- self.chat_worker.pinned_created.connect(self._on_pinned_created)
- self.chat_worker.pinned_deleted.connect(self._on_pinned_deleted)
- self.chat_worker.error_occurred.connect(self.dashboard_controller.handle_error_state)
+ self.kick_chat_worker = KickChatWorker(self.i18n, self.kick_api_client, KICK_PUSHER_CLUSTER, KICK_PUSHER_KEY)
+ self.kick_chat_worker.connection_success.connect(self._on_web_socket_connected)
+ self.kick_chat_worker.message_received.connect(self._route_incoming_message)
+ self.kick_chat_worker.poll_updated.connect(self._on_poll_updated)
+ self.kick_chat_worker.poll_deleted.connect(self._on_poll_deleted)
+ self.kick_chat_worker.pinned_created.connect(self._on_pinned_created)
+ self.kick_chat_worker.pinned_deleted.connect(self._on_pinned_deleted)
+ self.kick_chat_worker.alert_received.connect(self._handle_incoming_alert)
+ self.kick_chat_worker.reward_redeemed.connect(lambda u, r, m: self._on_reward_redeemed(u, r, m, platform="kick"))
+ self.kick_chat_worker.error_occurred.connect(self.dashboard_controller.handle_error_state)
- self.reward_worker = RewardWorker(self.i18n, api_client, poll_interval_seconds=10)
- self.reward_worker.reward_redeemed.connect(lambda u, r, m: self._on_reward_redeemed(u, r, m, platform="kick"))
-
- self.chat_worker.start()
- self.reward_worker.start()
- self.auth_worker = None
+ self.kick_chat_worker.start()
+ self.kick_auth_worker = None
def _on_web_socket_connected(self, user_data):
self.spam_service.broadcaster_id = user_data.get("broadcaster_id", 0)
@@ -760,21 +913,14 @@ def _on_web_socket_connected(self, user_data):
@Slot()
def _fetch_api_rewards(self):
- if self.auth_manager.is_authenticated():
- worker = getattr(self, 'fetch_rewards_worker', None)
- is_running = False
- if worker is not None:
- try:
- is_running = worker.isRunning()
- except RuntimeError:
- self.fetch_rewards_worker = None
-
- if not is_running:
+ if self.kick_auth_manager.is_authenticated():
+ if not self._is_worker_running(getattr(self, 'fetch_rewards_worker', None)):
try:
- api_client = KickAPIClient(auth_provider=self.auth_manager)
+ api_client = KickAPIClient(auth_provider=self.kick_auth_manager)
self.fetch_rewards_worker = FetchRewardsWorker(api_client, platform="kick")
self.fetch_rewards_worker.rewards_fetched.connect(self.rewards_controller.update_rewards_list)
self.fetch_rewards_worker.error_occurred.connect(self._handle_rewards_error)
+ self.fetch_rewards_worker.finished.connect(lambda: setattr(self, 'fetch_rewards_worker', None))
self.fetch_rewards_worker.finished.connect(self.fetch_rewards_worker.deleteLater)
self.fetch_rewards_worker.start()
except Exception as e:
@@ -798,6 +944,14 @@ def _format_reward_message(self, reward_name: str) -> str:
return f'