feat: use separate Discord apps for movies and TV shows (#159)

Author: afonsojramos

README.md

@@ -15,10 +15,22 @@ A simple app that acts as a bridge between [Discord](https://discord.com/) and [
 
 <p align="center"><img src="./docs/demo/profile-status.png" width="260px" alt="Profile Status"><p>
 
+<p align="center"><img src="./docs/demo/tray.png" width="260px" alt="Tray"><p>
+
 **Protip**: If you are already using Plex, and would like to link it with Trakt, you can use the [Plex-Trakt-Scrobbler](https://github.com/trakt/Plex-Trakt-Scrobbler) plugin.
 
 If you already know **Trakt** and how awesome it is this is definitely the best option, as it works **more reliably** and with some extra benefits over the other implementations, such as registering your watch status **wherever you are watching** (TV, phone, across the world, etc.), **in whatever app you are watching on** (Netflix, Roku, Plex, HBO Max), as long as you have a single device running **Discord** and **Discrakt**.
 
+## Features
+
+- Separate Discord Rich Presence apps for Movies and TV Shows
+- Movie posters and show artwork displayed via TMDB
+- Direct links to IMDB and Trakt pages
+- Progress bar showing watch percentage
+- System tray integration with pause/resume functionality
+- Start at login option
+- Browser-based setup wizard with OAuth device flow
+
 Plex Rich Presence alternatives:
 
 - [discord-rich-presence-plex](https://github.com/Phineas05/discord-rich-presence-plex)

docs/demo/console.png

@@ -3,7 +3,7 @@ const LAUNCHAGENT_LABEL: &str = "com.afonsojramos.discrakt";
 
 #[cfg(target_os = "macos")]
 mod macos {
-    use super::*;
+    use super::LAUNCHAGENT_LABEL;
     use std::fs;
     use std::path::PathBuf;
     use std::process::Command;
@@ -13,7 +13,7 @@ mod macos {
     }
 
     fn plist_path() -> Option<PathBuf> {
-        launch_agents_dir().map(|d| d.join(format!("{}.plist", LAUNCHAGENT_LABEL)))
+        launch_agents_dir().map(|d| d.join(format!("{LAUNCHAGENT_LABEL}.plist")))
     }
 
     fn app_path() -> Option<PathBuf> {
@@ -35,7 +35,7 @@ mod macos {
     }
 
     pub fn is_enabled() -> bool {
-        plist_path().map(|p| p.exists()).unwrap_or(false)
+        plist_path().is_some_and(|p| p.exists())
     }
 
     pub fn enable() -> Result<(), String> {
@@ -45,24 +45,23 @@ mod macos {
         // Ensure LaunchAgents directory exists
         if let Some(dir) = plist_path.parent() {
             fs::create_dir_all(dir)
-                .map_err(|e| format!("Failed to create LaunchAgents dir: {}", e))?;
+                .map_err(|e| format!("Failed to create LaunchAgents dir: {e}"))?;
         }
 
         // Determine if we're launching an app bundle or binary
-        let (program_path, program_args) =
-            if app_path.extension().map(|e| e == "app").unwrap_or(false) {
-                // App bundle - use open command
-                (
-                    "/usr/bin/open".to_string(),
-                    format!(
-                        "<string>-a</string>\n      <string>{}</string>",
-                        app_path.display()
-                    ),
-                )
-            } else {
-                // Direct binary
-                (app_path.display().to_string(), String::new())
-            };
+        let (program_path, program_args) = if app_path.extension().is_some_and(|e| e == "app") {
+            // App bundle - use open command
+            (
+                "/usr/bin/open".to_string(),
+                format!(
+                    "<string>-a</string>\n      <string>{}</string>",
+                    app_path.display()
+                ),
+            )
+        } else {
+            // Direct binary
+            (app_path.display().to_string(), String::new())
+        };
 
         let plist_content = if program_args.is_empty() {
             format!(
@@ -71,10 +70,10 @@ mod macos {
 <plist version="1.0">
 <dict>
     <key>Label</key>
-    <string>{}</string>
+    <string>{LAUNCHAGENT_LABEL}</string>
     <key>ProgramArguments</key>
     <array>
-      <string>{}</string>
+      <string>{program_path}</string>
     </array>
     <key>RunAtLoad</key>
     <true/>
@@ -84,8 +83,7 @@ mod macos {
     <string>Interactive</string>
 </dict>
 </plist>
-"#,
-                LAUNCHAGENT_LABEL, program_path
+"#
             )
         } else {
             format!(
@@ -94,11 +92,11 @@ mod macos {
 <plist version="1.0">
 <dict>
     <key>Label</key>
-    <string>{}</string>
+    <string>{LAUNCHAGENT_LABEL}</string>
     <key>ProgramArguments</key>
     <array>
-      <string>{}</string>
-      {}
+      <string>{program_path}</string>
+      {program_args}
     </array>
     <key>RunAtLoad</key>
     <true/>
@@ -108,13 +106,11 @@ mod macos {
     <string>Interactive</string>
 </dict>
 </plist>
-"#,
-                LAUNCHAGENT_LABEL, program_path, program_args
+"#
             )
         };
 
-        fs::write(&plist_path, plist_content)
-            .map_err(|e| format!("Failed to write plist: {}", e))?;
+        fs::write(&plist_path, plist_content).map_err(|e| format!("Failed to write plist: {e}"))?;
 
         // Load the launch agent
         let plist_path_str = plist_path
@@ -139,7 +135,7 @@ mod macos {
                     .output();
             }
 
-            fs::remove_file(&plist_path).map_err(|e| format!("Failed to remove plist: {}", e))?;
+            fs::remove_file(&plist_path).map_err(|e| format!("Failed to remove plist: {e}"))?;
 
             tracing::info!("Autostart disabled");
         }

docs/demo/discrakt.png

@@ -6,11 +6,14 @@ use std::{thread::sleep, time::Duration};
 
 use crate::{
     trakt::{Trakt, TraktWatchingResponse},
-    utils::{get_watch_stats, MediaType},
+    utils::{
+        get_watch_stats, MediaType, DEFAULT_DISCORD_APP_ID_MOVIE, DEFAULT_DISCORD_APP_ID_SHOW,
+    },
 };
 
 pub struct Discord {
     client: DiscordIpcClient,
+    current_app_id: String,
 }
 
 #[derive(Default)]
@@ -30,17 +33,50 @@ impl Discord {
             tracing::error!("Couldn't create Discord client: {e}");
             e
         })?;
-        Ok(Discord { client })
+        Ok(Discord {
+            client,
+            current_app_id: discord_client_id,
+        })
+    }
+
+    /// Switch to a different Discord application ID if needed.
+    /// Returns true if a switch occurred.
+    fn switch_app_id(&mut self, new_app_id: &str) -> bool {
+        if self.current_app_id == new_app_id {
+            return false;
+        }
+
+        tracing::info!(
+            "Switching Discord app ID from {} to {}",
+            self.current_app_id,
+            new_app_id
+        );
+
+        // Close existing connection
+        let _ = self.client.close();
+
+        // Create new client with new app ID
+        match DiscordIpcClient::new(new_app_id) {
+            Ok(new_client) => {
+                self.client = new_client;
+                self.current_app_id = new_app_id.to_string();
+                self.connect();
+                true
+            }
+            Err(e) => {
+                tracing::error!("Failed to create Discord client with new app ID: {e}");
+                false
+            }
+        }
     }
 
     pub fn connect(&mut self) {
         loop {
             if self.client.connect().is_ok() {
                 break;
-            } else {
-                tracing::warn!("Failed to connect to Discord, retrying in 15 seconds");
-                sleep(Duration::from_secs(15));
             }
+            tracing::warn!("Failed to connect to Discord, retrying in 15 seconds");
+            sleep(Duration::from_secs(15));
         }
     }
 
@@ -56,6 +92,13 @@ impl Discord {
     ) {
         let mut payload_data = Payload::default();
 
+        // Switch to appropriate Discord app ID based on media type
+        let target_app_id = match trakt_response.r#type.as_str() {
+            "episode" => DEFAULT_DISCORD_APP_ID_SHOW,
+            _ => DEFAULT_DISCORD_APP_ID_MOVIE, // Default to movie for unknown types (including "movie")
+        };
+        self.switch_app_id(target_app_id);
+
         let img_url = match trakt_response.r#type.as_str() {
             "movie" => {
                 let movie = trakt_response.movie.as_ref().unwrap();

docs/demo/discrakt.psd

@@ -9,7 +9,7 @@ use discrakt::{
     state::AppState,
     trakt::Trakt,
     tray::{Tray, TrayCommand},
-    utils::{get_watch_stats, load_config},
+    utils::{get_watch_stats, load_config, DEFAULT_DISCORD_APP_ID},
 };
 use std::{
     sync::{
@@ -114,15 +114,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let app_state_clone = Arc::clone(&app_state);
     let should_quit_clone = Arc::clone(&should_quit);
 
-    let discord_client_id = cfg.discord_client_id.clone();
     let trakt_client_id = cfg.trakt_client_id.clone();
     let trakt_username = cfg.trakt_username.clone();
     let trakt_access_token = cfg.trakt_access_token.clone();
     let tmdb_token = cfg.tmdb_token.clone();
 
     // Spawn background polling thread
     let polling_handle = thread::spawn(move || {
-        let mut discord = match Discord::new(discord_client_id) {
+        let mut discord = match Discord::new(DEFAULT_DISCORD_APP_ID.to_string()) {
             Ok(d) => d,
             Err(e) => {
                 tracing::error!("Failed to create Discord client: {e}");