Release v0.7

CoderLuii · CoderLuii · commit ba851f66d372 · 2025-05-01T14:34:22.000-04:00
diff --git a/README.md b/README.md
@@ -29,6 +29,20 @@
 
 ## 📈 Version History
 
+- **v0.7 (May 01, 2025)** - Notification Enhancements & Bug Fixes
+  - **Apprise Module Improvements**:
+    - 📧 **Enhanced Email Logic** - Improved email configuration with support for custom SMTP servers
+    - 🔗 **Advanced Discord Integration** - Better formatting and reliability for Discord notifications
+    - 🖼️ **UI Enhancements** - Clearer documentation and examples for notification configuration
+    - 🧹 **Removed MQTT** - Streamlined notification options by removing deprecated MQTT support
+  - **Live TV Improvements**:
+    - 🖼️ **Fixed Image Selection** - Corrected case-sensitive bug in channel/program image selection
+    - 📊 **Better UI Documentation** - Added detailed formatting guides for notification services
+  - **Bug Fixes**:
+    - Fixed email formatting issues with various SMTP providers
+    - Improved error handling for notification delivery
+    - Enhanced security for authentication credentials
+
 - **v0.6 (April 26, 2024)** - Project Restructuring, Web UI & Configuration Improvements
   - **Complete Project Restructuring**:
     - Organized codebase with clearer separation of concerns
@@ -382,12 +396,11 @@ Configuration is managed through the web UI at `http://your-server-ip:8501`
 |----------|-------------|---------------|
 | Pushover | Mobile/Desktop notifications | User Key, API Token |
 | Discord | Chat channel notifications | Webhook URL |
-| Telegram | Messaging service | Bot Token, Chat ID |
+| Telegram | Chat messaging | Bot Token/Chat ID |
 | Email | Standard email | SMTP Settings |
-| Slack | Team collaboration | Webhook Tokens |
-| Gotify | Self-hosted notifications | URL, Token |
-| Matrix | Open chat platform | User/Pass, Room |
-| MQTT | IoT messaging protocol | Broker URL |
+| Slack | Chat messaging | Webhook URL (token format) |
+| Gotify | Self-hosted notifications | Server URL & Token |
+| Matrix | Decentralized chat | Room/User credentials |
 | Custom | Any Apprise-supported service | URL |
 
 <p align="right">
diff --git a/SECURITY.md b/SECURITY.md
@@ -6,6 +6,7 @@ ChannelWatch is currently maintained with security updates for the following ver
 
 | Version | Supported          |
 | ------- | ------------------ |
+| 0.7  | :white_check_mark: |
 | 0.6  | :white_check_mark: |
 | 0.5  | :white_check_mark: |
 | 0.4  | :white_check_mark: |
diff --git a/core/alerts/channel_watching.py b/core/alerts/channel_watching.py
@@ -280,10 +280,7 @@ def _process_watching_event(self, event_data: Dict[str, Any], tracking_key: str)
                     channel_info["program_title"] = program_info["title"]
                     
                     if program_info.get("icon_url"):
-                        if self.image_source == "Program":
-                            channel_info["program_icon_url"] = program_info["icon_url"]
-                        elif self.image_source == "Channel":
-                            channel_info["program_icon_url"] = program_info["icon_url"]
+                        channel_info["program_icon_url"] = program_info["icon_url"]
             
             success = self._send_alert(channel_info)
             
@@ -345,7 +342,7 @@ def _send_alert(self, channel_info: Dict[str, Any]) -> bool:
             if program_info and program_info.get("icon_url"):
                 program_image_url = program_info["icon_url"]
             
-            if self.image_source == "Channel":
+            if self.image_source.upper() == "CHANNEL":
                 image_url = channel_logo_url if channel_logo_url else program_image_url
                 log(f"Using channel image: {image_url}", level=LOG_VERBOSE)
             else:
diff --git a/core/docker-entrypoint.sh b/core/docker-entrypoint.sh
@@ -74,7 +74,6 @@ if [ ! -f "$SETTINGS_FILE" ]; then
     \"apprise_slack\": \"\",
     \"apprise_gotify\": \"\",
     \"apprise_matrix\": \"\",
-    \"apprise_mqtt\": \"\",
     \"apprise_custom\": \"\"
 }
 EOF"
diff --git a/core/helpers/config.py b/core/helpers/config.py
@@ -88,7 +88,6 @@ class CoreSettings:
     apprise_slack: Optional[str] = ""
     apprise_gotify: Optional[str] = ""
     apprise_matrix: Optional[str] = ""
-    apprise_mqtt: Optional[str] = ""
     apprise_custom: Optional[str] = ""
 
     # Singleton
diff --git a/core/helpers/initialize.py b/core/helpers/initialize.py
@@ -50,7 +50,7 @@ def initialize_notifications(settings: CoreSettings, test_mode=False) -> Optiona
         settings.apprise_discord, settings.apprise_email, 
         settings.apprise_telegram, settings.apprise_slack,
         settings.apprise_gotify, settings.apprise_matrix,
-        settings.apprise_mqtt, settings.apprise_custom
+        settings.apprise_custom
     ])
 
     if apprise_configured:
diff --git a/core/notifications/providers/apprise.py b/core/notifications/providers/apprise.py
@@ -23,7 +23,6 @@ class AppriseProvider(NotificationProvider):
         "apprise_slack": "slack://{}",
         "apprise_gotify": "gotify://{}",
         "apprise_matrix": "matrix://{}",
-        "apprise_mqtt": "mqtt://{}",
         "apprise_custom": "{}"
     }
     
@@ -47,28 +46,28 @@ def initialize(self, settings: CoreSettings, **kwargs) -> bool:
             for url in self.urls:
                 add_result = self.apprise.add(url)
                 if not add_result:
-                     log(f"Failed to add Apprise URL: {url}", LOG_STANDARD)
+                     log(f"Failed to add notification URL: {url}", LOG_STANDARD)
                 else:
                      service_type = url.split('://')[0] if '://' in url else 'custom'
-                     log(f"Added {service_type} notification service", LOG_VERBOSE)
+                     log(f"Added {service_type} service", LOG_VERBOSE)
             
             if self.is_configured():
                 services = [url.split('://')[0] for url in self.urls if '://' in url]
                 service_counts = {}
                 for service in services:
                     service_counts[service] = service_counts.get(service, 0) + 1
                 service_summary = ', '.join([f"{count} {name}" for name, count in service_counts.items()])
-                log(f"Apprise ready with {len(self.urls)} service(s): {service_summary}", LOG_VERBOSE)
+                log(f"Notification services ready: {service_summary}", LOG_VERBOSE)
                 return True
             
-            log("Apprise initialized but no valid service URLs were configured.", LOG_STANDARD)
+            log("No valid notification services configured", LOG_STANDARD)
             return False
             
         except ImportError:
             log("Apprise package not installed. Run: pip install apprise")
             return False
         except Exception as e:
-            log(f"Error initializing Apprise: {e}")
+            log(f"Error initializing notification services: {e}")
             return False
     
     def _collect_urls_from_settings(self) -> List[str]:
@@ -82,18 +81,54 @@ def _collect_urls_from_settings(self) -> List[str]:
         for setting_attr, url_template in self.SERVICE_MAP.items():
             value = getattr(settings, setting_attr, "")
             if value and isinstance(value, str):
-                if setting_attr == "apprise_custom" and "://" in value:
+                if setting_attr == "apprise_email" and "=" in value and "://" not in value and (
+                    value.strip().startswith(("user=", "pass=", "smtp=", "port=")) or 
+                    any(param in value for param in ["user=", "pass=", "smtp=", "port="])
+                ):
+
+                    if "from=" not in value:
+                        url = f"mailtos://_?{value}&from=ChannelWatch"
+                    else:
+                        url = f"mailtos://_?{value}"
+
+                elif setting_attr == "apprise_discord" and ("discord.com/api/webhooks/" in value or "discordapp.com/api/webhooks/" in value):
+
+                    try:
+                        parts = value.split("/api/webhooks/")
+                        if len(parts) == 2 and "/" in parts[1]:
+                            webhook_parts = parts[1].split("/", 1)
+                            if len(webhook_parts) >= 2:
+                                webhook_id, webhook_token = webhook_parts[0], webhook_parts[1]
+
+                                if "?" in webhook_token:
+                                    webhook_token = webhook_token.split("?", 1)[0]
+                                
+                                url = f"discord://{webhook_id}/{webhook_token}"
+                            else:
+                                url = url_template.format(value)
+                                log(f"Could not extract token from Discord webhook URL", LOG_STANDARD)
+                        else:
+                            url = url_template.format(value)
+                            log(f"Invalid Discord webhook URL format", LOG_STANDARD)
+                    except Exception as e:
+                        log(f"Error parsing Discord webhook URL: {e}", LOG_STANDARD)
+                        url = url_template.format(value)
+                elif setting_attr == "apprise_custom" and "://" in value:
                     url = value
                 else:
                     url = url_template.format(value)
+                    if setting_attr == "apprise_email" and "from=" not in url:
+                        separator = '&' if '?' in url else '?'
+                        url = f"{url}{separator}from=ChannelWatch"
+                        log(f"Added ChannelWatch as sender name for email", LOG_VERBOSE)
                 urls.append(url)
         
         email_to = settings.apprise_email_to
         if email_to:
             updated_urls = []
             found_mailto = False
             for url in urls:
-                if url.startswith("mailto://"):
+                if url.startswith(("mailto://", "mailtos://")):
                     separator = '&' if '?' in url else '?'
                     updated_urls.append(f"{url}{separator}to={email_to}")
                     found_mailto = True
@@ -102,7 +137,7 @@ def _collect_urls_from_settings(self) -> List[str]:
             if found_mailto:
                  urls = updated_urls
             else:
-                 log("APPRISE_EMAIL_TO provided, but no APPRISE_EMAIL configured.", LOG_STANDARD)
+                 pass
 
         return urls
     
@@ -113,51 +148,121 @@ def is_configured(self) -> bool:
     # NOTIFICATION DELIVERY
     
     def send_notification(self, title: str, message: str, **kwargs) -> bool:
-        """Delivers notification to all configured Apprise services with optional image attachment and timeout."""
-        log(f"AP: Entering send_notification (Title: {title})", level=LOG_VERBOSE)
+        """Delivers notification to all configured services."""
+        log(f"Sending notification: {title}", level=LOG_VERBOSE)
         if not self.is_configured():
-            log("AP: Apprise not configured or no services enabled.", level=LOG_VERBOSE)
+            log("No notification services configured", level=LOG_VERBOSE)
             return False
         
         success = False 
         try:
             image_url = kwargs.get('image_url')
-            attach = [image_url] if image_url else None
-            log(f"AP: Image URL: {image_url}, Attach: {attach}", level=LOG_VERBOSE)
+            discord_urls = []
+            other_urls = []
+            
+            for url in self.urls:
+                if url.startswith('discord://'):
+                    discord_urls.append(url)
+                else:
+                    other_urls.append(url)
+            
+            apprise_module = importlib.import_module('apprise')
+            if discord_urls:
+                try:
+                    discord_success = False
+                    try:
+                        import requests
+                        
+                        for discord_url in discord_urls:
+                            if discord_url.startswith('discord://') and '/' in discord_url[10:]:
+                                parts = discord_url[10:].split('/', 1)
+                                if len(parts) == 2:
+                                    webhook_id, webhook_token = parts
+                                    webhook_url = f"https://discord.com/api/webhooks/{webhook_id}/{webhook_token}"
+                                    embed = {
+                                        "title": title,
+                                        "description": message,
+                                        "color": 3447003,
+                                    }
+                                    if image_url:
+                                        embed["image"] = {"url": image_url}
+                                    
+                                    payload = {
+                                        "username": "ChannelWatch Bot",
+                                        "content": "",
+                                        "embeds": [embed]
+                                    }
+                                    
+                                    log(f"Sending Discord notification", level=LOG_VERBOSE)
+                                    response = requests.post(webhook_url, json=payload)
+                                    
+                                    if response.status_code == 204:
+                                        discord_success = True
+                                        log(f"Discord notification sent successfully", level=LOG_VERBOSE)
+                                    else:
+                                        log(f"Discord notification failed: {response.status_code} {response.text}", level=LOG_STANDARD)
+                    except ImportError:
+                        log("Requests library not available, using Apprise fallback for Discord", level=LOG_STANDARD)
+                        discord_message = message
+                        discord_apprise = apprise_module.Apprise()
+                        for url in discord_urls:
+                            discord_apprise.add(url)
+                        
+                        try:
+                            body_format = apprise_module.NotifyFormat.TEXT if hasattr(apprise_module, 'NotifyFormat') else None
+                        except (ImportError, AttributeError):
+                            body_format = None
+                        discord_success = discord_apprise.notify(
+                            title=title,
+                            body=discord_message,
+                            body_format=body_format,
+                            attach=[image_url] if image_url else None
+                        )
+                        if discord_success:
+                            log("Discord notification sent via Apprise fallback", level=LOG_VERBOSE)
+                    except Exception as e:
+                        log(f"Error sending Discord notification: {e}", level=LOG_STANDARD)
+                except Exception as e:
+                    log(f"Discord notification error: {e}", level=LOG_STANDARD)
+                    discord_success = False
+            else:
+                discord_success = True
+            if other_urls:
+                try:
+                    try:
+                        body_format = apprise_module.NotifyFormat.HTML if 'NotifyFormat' in dir(apprise_module) else None
+                        html_message = message.replace("\n", "<br />")
+                    except (ImportError, AttributeError):
+                        body_format = None
+                        html_message = message
+                    other_apprise = apprise_module.Apprise()
+                    for url in other_urls:
+                        other_apprise.add(url)
+                    attach = [image_url] if image_url else None
+                    other_success = other_apprise.notify(
+                        title=title,
+                        body=html_message,
+                        attach=attach,
+                        body_format=body_format
+                    )
+                    if other_success:
+                        log("Other notification services: delivery successful", level=LOG_VERBOSE)
+                    else:
+                        log("Other notification services: delivery failed", level=LOG_STANDARD)
+                except Exception as e:
+                    log(f"Error with other notification services: {e}", level=LOG_STANDARD)
+                    other_success = False
+            else:
+                other_success = True
+            success = (discord_success or other_success)
             
-            try:
-                 apprise_module = importlib.import_module('apprise')
-                 body_format = apprise_module.NotifyFormat.HTML
-                 html_message = message.replace("\n", "<br />")
-                 log(f"AP: Body format set to HTML.", level=LOG_VERBOSE)
-            except (ImportError, AttributeError):
-                 body_format = None
-                 html_message = message
-                 log("AP: Could not set HTML format for Apprise, using default.", level=LOG_VERBOSE)
-
-            apprise = cast_optional(self.apprise)
-            if not apprise:
-                log("AP: Apprise object not initialized.", level=LOG_STANDARD)
-                return False
-            log(f"AP: Apprise object obtained. Preparing to call apprise.notify.", level=LOG_VERBOSE)
-
-            log(f"AP: Calling apprise.notify (Title: {title})", level=LOG_STANDARD)
-            success = apprise.notify(
-                title=title,
-                body=html_message,
-                attach=attach,
-                body_format=body_format
-            )
-            log(f"AP: Returned from apprise.notify (Result: {success})", level=LOG_STANDARD)
-
             if success:
-                log("AP: Apprise library reported success.", level=LOG_VERBOSE)
+                log("Notification sent successfully", level=LOG_VERBOSE)
             else:
-                log("AP: Apprise library reported failure. Check Apprise logs if enabled.", level=LOG_STANDARD)
+                log("All notification services failed", level=LOG_STANDARD)
                 
         except Exception as e:
-            log(f"AP: Exception occurred during Apprise notification: {e}", level=LOG_STANDARD)
+            log(f"Notification error: {e}", level=LOG_STANDARD)
             success = False
         
-        log(f"AP: Exiting send_notification (Result: {success})", level=LOG_VERBOSE)
         return success
diff --git a/ui/backend/schemas.py b/ui/backend/schemas.py
@@ -83,7 +83,6 @@ def check_image_source(cls, v):
     apprise_slack: Optional[str] = StrEmpty()
     apprise_gotify: Optional[str] = StrEmpty()
     apprise_matrix: Optional[str] = StrEmpty()
-    apprise_mqtt: Optional[str] = StrEmpty()
     apprise_custom: Optional[str] = StrEmpty()
     
     model_config = {
diff --git a/ui/components/settings-form.tsx b/ui/components/settings-form.tsx
diff --git a/ui/lib/types.ts b/ui/lib/types.ts

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,6 @@ if [ ! -f "$SETTINGS_FILE" ]; then`
`74`	`74`	`\"apprise_slack\": \"\",`
`75`	`75`	`\"apprise_gotify\": \"\",`
`76`	`76`	`\"apprise_matrix\": \"\",`
`77`		`- \"apprise_mqtt\": \"\",`
`78`	`77`	`\"apprise_custom\": \"\"`
`79`	`78`	`}`
`80`	`79`	`EOF"`