diff --git a/README.md b/README.md index 7d94af6..33cdbfb 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ ## 💬 Discord Server -**Before anything else, I invite you to join my Discord server for faster help, discussions, and important information such as an organizd list of known bugs that are currently being tracker or planned features scheduled for future releases!** +**Before anything else, I invite you to join my Discord server for faster assistance, discussions, and important information such as an organized list of known bugs that are currently being tracked or planned features scheduled for future releases!** ##### This helps avoid duplicate requests and keeps everyone informed about what's coming next! @@ -34,14 +34,14 @@ I also have a dedicated channel on the [r/JellyfinCommunity](https://discord.gg/ - **🔍 Media Search**: Search for movies and TV shows with `/search` command - you can then request it later within the message embed - **đŸ”„ Trending Content**: Browse weekly trending movies and TV shows with `/trending` command - **đŸ“€ One-Click Requests**: Directly request media to Jellyseerr with `/request` command -- **đŸ“ș Smart TV Handling**: Choose specific seasons when searching for TV series using `/search`, or request all the seasons at once with `/request` +- **đŸ“ș Smart TV Handling**: Choose specific seasons when searching for TV series using `/search`, or request all seasons at once with `/request` - **đŸŽšïž Server and Quality**: Choose which Radarr or Sonarr instance to request to, and which quality profile -- **đŸš« Duplicate Detection**: Automatically checks if content already exists in Jellyseerr before allowing requests +- **đŸš« Duplicate Detection**: Automatically check if content already exists in Jellyseerr before allowing requests - **đŸ·ïž Tag Selection**: Select Radarr/Sonarr tags when requesting media for better organization and categorization - **📬 Jellyfin Notifications**: Automatic Discord notifications when new media is added to your library -- **📚 Library Filtering and Mapping**: Choose which Jellyfin libraries send Discord notifications and on what channel +- **📚 Library Filtering and Mapping**: Choose which Jellyfin libraries send notifications and to which Discord channel - **đŸ‘€ User Mapping**: Map Discord users to Jellyseerr accounts so requests appear from the correct user -- **🔐 Role-Based Permissions**: Control who can use bot commands through Discord roles (allowlist/blocklist) +- **🔐 Role-Based Permissions**: Control which users can use bot commands via Discord roles (allowlist/blocklist) - **🔔 Private Notifications**: Optional PM when your requested content becomes available on Jellyfin - **đŸ‘» Ephemeral Mode**: Make bot responses visible only to the command user - **🌍 Multi-Language Support**: Fully translated interface with automatic language detection diff --git a/anchorr.xml b/anchorr.xml new file mode 100644 index 0000000..14f9e11 --- /dev/null +++ b/anchorr.xml @@ -0,0 +1,26 @@ + + + Anchorr + nairdah/anchorr:latest + https://hub.docker.com/r/nairdah/anchorr/ + bridge + + sh + false + https://forums.unraid.net/topic/196118-support-anchorr-discord-bot-for-requesting-moviestv-and-receiving-notifications-when-items-are-added-to-your-media-server/ + https://github.com/nairdahh/Anchorr + Discord bot for requesting movies/TV and receiving notifications when items are added to your Jellyfin server. + Tools: + http://[IP]:8282 + + https://raw.githubusercontent.com/nairdahh/Anchorr/refs/heads/main/assets/logo.png + + + + + + + /mnt/user/appdata/anchorr + 8282 + + \ No newline at end of file diff --git a/jellyfinWebhook.js b/jellyfinWebhook.js index 0f6138d..1a1f742 100644 --- a/jellyfinWebhook.js +++ b/jellyfinWebhook.js @@ -11,6 +11,15 @@ import logger from "./utils/logger.js"; import { fetchOMDbData } from "./api/omdb.js"; import { findBestBackdrop } from "./api/tmdb.js"; +function isValidUrl(string) { + try { + new URL(string); + return true; + } catch (_) { + return false; + } +} + const debouncedSenders = new Map(); const sentNotifications = new Map(); const episodeMessages = new Map(); // Track Discord messages for editing: SeriesId -> { messageId, channelId } @@ -411,7 +420,7 @@ async function processAndSendNotification( "web/index.html", `!/details?id=${ItemId}&serverId=${ServerId}` ); - if (jellyfinUrl && (jellyfinUrl.startsWith("http://") || jellyfinUrl.startsWith("https://"))) { + if (isValidUrl(jellyfinUrl)) { embed.setURL(jellyfinUrl); } @@ -515,37 +524,46 @@ async function processAndSendNotification( if (imdbId) { if (showButtonLetterboxd) { - buttonComponents.push( - new ButtonBuilder() - .setStyle(ButtonStyle.Link) - .setLabel("Letterboxd") - .setURL(`https://letterboxd.com/imdb/${imdbId}`) - ); + const letterboxdUrl = `https://letterboxd.com/imdb/${imdbId}`; + if (isValidUrl(letterboxdUrl)) { + buttonComponents.push( + new ButtonBuilder() + .setStyle(ButtonStyle.Link) + .setLabel("Letterboxd") + .setURL(letterboxdUrl) + ); + } } if (showButtonImdb) { - buttonComponents.push( - new ButtonBuilder() - .setStyle(ButtonStyle.Link) - .setLabel("IMDb") - .setURL(`https://www.imdb.com/title/${imdbId}/`) - ); + const imdbUrl = `https://www.imdb.com/title/${imdbId}/`; + if (isValidUrl(imdbUrl)) { + buttonComponents.push( + new ButtonBuilder() + .setStyle(ButtonStyle.Link) + .setLabel("IMDb") + .setURL(imdbUrl) + ); + } } } if (showButtonWatch) { - buttonComponents.push( - new ButtonBuilder() - .setStyle(ButtonStyle.Link) - .setLabel("▶ Watch Now!") - .setURL( - buildJellyfinUrl( - ServerUrl, - "web/index.html", - `!/details?id=${ItemId}&serverId=${ServerId}` - ) - ) + const watchUrl = buildJellyfinUrl( + ServerUrl, + "web/index.html", + `!/details?id=${ItemId}&serverId=${ServerId}` ); + if (isValidUrl(watchUrl)) { + buttonComponents.push( + new ButtonBuilder() + .setStyle(ButtonStyle.Link) + .setLabel("▶ Watch Now!") + .setURL(watchUrl) + ); + } else { + logger.warn(`Invalid watch URL generated: ${watchUrl}. Skipping watch button.`); + } } const buttons = buttonComponents.length > 0 ? new ActionRowBuilder().addComponents(buttonComponents) : null; @@ -675,14 +693,17 @@ async function processAndSendNotification( const user = await client.users.fetch(userId); const dmEmbed = new EmbedBuilder() .setAuthor({ name: "✅ Your request is now available!" }) - .setTitle(embedTitle) - .setURL( - buildJellyfinUrl( - ServerUrl, - "web/index.html", - `!/details?id=${ItemId}&serverId=${ServerId}` - ) - ) + .setTitle(embedTitle); + + const dmJellyfinUrl = buildJellyfinUrl( + ServerUrl, + "web/index.html", + `!/details?id=${ItemId}&serverId=${ServerId}` + ); + if (isValidUrl(dmJellyfinUrl)) { + dmEmbed.setURL(dmJellyfinUrl); + } + dmEmbed .setColor(process.env.EMBED_COLOR_SUCCESS || "#a6e3a1") .setDescription( `${ @@ -700,20 +721,18 @@ async function processAndSendNotification( dmEmbed.setImage(backdropUrl); } - const dmButtons = new ActionRowBuilder().addComponents( + const dmButtons = isValidUrl(dmJellyfinUrl) ? new ActionRowBuilder().addComponents( new ButtonBuilder() .setStyle(ButtonStyle.Link) .setLabel("▶ Watch Now!") - .setURL( - buildJellyfinUrl( - ServerUrl, - "web/index.html", - `!/details?id=${ItemId}&serverId=${ServerId}` - ) - ) - ); + .setURL(dmJellyfinUrl) + ) : null; - await user.send({ embeds: [dmEmbed], components: [dmButtons] }); + const messageOptions = { embeds: [dmEmbed] }; + if (dmButtons) { + messageOptions.components = [dmButtons]; + } + await user.send(messageOptions); logger.info(`Sent DM notification to user ${userId} for ${embedTitle}`); } catch (err) { logger.error( diff --git a/locales/de.json b/locales/de.json index 4e3416c..c029c2e 100644 --- a/locales/de.json +++ b/locales/de.json @@ -265,12 +265,12 @@ "title": "Über Anchorr", "description": "Anchorr ist eine selbst gehostete, leichtgewichtige BrĂŒcke, die deinen Jellyfin-Medienserver mit Discord verbindet. Sie benachrichtigt dich in einem dedizierten Kanal, wenn neue Medien zu deiner Bibliothek hinzugefĂŒgt werden, und mit Jellyseerr-Integration kannst du Filme und Serien direkt von Discord aus suchen und anfordern.", "features_title": "Funktionen", - "feature_search": "/search Suche nach einem Film oder einer Serie mit automatischen VorschlĂ€gen. Ein Embed mit detaillierten Informationen wird angezeigt, ĂŒber das du die Medien anfordern kannst. Bei TV-Serien hast du die Option, die gewĂŒnschten Staffeln fĂŒr die Anfrage auszuwĂ€hlen.", - "feature_request": "/request <title> Sende sofort eine Anfrage fĂŒr deinen gewĂ€hlten Film oder deine Serie direkt an Jellyseerr. Bei TV-Serien werden automatisch alle Staffeln angefragt.", - "feature_notifications": "Erhalte schön formatierte Benachrichtigungen auf deinem ausgewĂ€hlten Discord-Kanal, wann immer neue Medien zu deiner Jellyfin-Bibliothek hinzugefĂŒgt werden.", - "feature_databases": "Mit den TMDB- und OMDb-Datenbanken erhalten Discord-Nachrichten ein schönes und gut strukturiertes Aussehen mit wichtigen Informationen ĂŒber die angeforderten oder hinzugefĂŒgten Medieninhalte.", - "feature_permissions": "Kontrolliere Berechtigungen mit rollenbasiertem Zugang (Erlaubnis-/Sperrliste), leite Benachrichtigungen an verschiedene KanĂ€le nach Jellyfin-Bibliothek weiter und verknĂŒpfe Benutzer mit Jellyseerr-Konten fĂŒr genaue Anfragenverfolgung.", - "feature_direct_messages": "Erhalte direkte Nachrichten auf Discord, wenn angefragter Inhalt in deiner Bibliothek verfĂŒgbar wird. Verpasse nie, wenn deine Anfragen bereit sind!", + "feature_search": "<code>/search <title></code> Suche nach einem Film oder einer Serie mit automatischen VorschlĂ€gen. Ein Embed mit detaillierten Informationen wird angezeigt, ĂŒber das du die Medien anfordern kannst. Bei <strong style=\"color: var(--blue);\">TV-Serien</strong> hast du die Option, die gewĂŒnschten Staffeln fĂŒr die Anfrage auszuwĂ€hlen.", + "feature_request": "<code>/request <title></code> Sende sofort eine Anfrage fĂŒr deinen gewĂ€hlten Film oder deine Serie direkt an <strong style=\"color: var(--blue);\">Jellyseerr</strong>. Bei <strong style=\"color: var(--blue);\">TV-Serien</strong> werden automatisch alle Staffeln angefragt.", + "feature_notifications": "Erhalte schön formatierte Benachrichtigungen auf deinem ausgewĂ€hlten <strong style=\"color: var(--blue);\">Discord</strong>-Kanal, wann immer neue Medien zu deiner <strong style=\"color: var(--blue);\">Jellyfin</strong>-Bibliothek hinzugefĂŒgt werden.", + "feature_databases": "Mit den <strong style=\"color: var(--blue);\">TMDB</strong>- und <strong style=\"color: var(--blue);\">OMDb</strong>-Datenbanken erhalten <strong style=\"color: var(--blue);\">Discord</strong>-Nachrichten ein schönes und gut strukturiertes Aussehen mit wichtigen Informationen ĂŒber die angeforderten oder hinzugefĂŒgten Medieninhalte.", + "feature_permissions": "Kontrolliere Berechtigungen mit <strong style=\"color: var(--blue);\">rollenbasierendem Zugang</strong> (Erlaubnis-/Sperrliste), leite Benachrichtigungen an verschiedene KanĂ€le nach <strong style=\"color: var(--blue);\">Jellyfin-Bibliothek</strong> weiter und verknĂŒpfe Benutzer mit <strong style=\"color: var(--blue);\">Jellyseerr</strong>-Konten fĂŒr genaue Anfragenverfolgung.", + "feature_direct_messages": "Erhalte <strong style=\"color: var(--blue);\">direkte Nachrichten</strong> auf <strong style=\"color: var(--blue);\">Discord</strong>, wenn angefragter Inhalt in deiner Bibliothek verfĂŒgbar wird. Verpasse nie, wenn deine Anfragen bereit sind!", "support_title": "Projekt unterstĂŒtzen", "support_description": "Wenn du Anchorr nĂŒtzlich findest, erwĂ€ge, seine Entwicklung zu unterstĂŒtzen. Jeder Kaffee hilft, nĂ€chtliche Coding-Sessions anzutreiben!", "contribute_title": "Mitwirken", diff --git a/locales/en.json b/locales/en.json index 95027da..af6a79d 100644 --- a/locales/en.json +++ b/locales/en.json @@ -215,12 +215,12 @@ "title": "About Anchorr", "description": "Anchorr is a self-hosted, lightweight bridge that connects your Jellyfin media server with Discord. It notifies you on a dedicated channel when new media is added to your library, and with Jellyseerr integration, you can search and request movies and shows directly from Discord.", "features_title": "Features", - "feature_search": "/search <title> Search for a movie or show with auto-suggestions. An embed with detailed information is shown, from which you can request the media. For TV shows, you have the option to select the desired seasons for the request.", - "feature_request": "/request <title> Instantly send a request for your chosen movie or show directly to Jellyseerr. For TV shows, this automatically requests all seasons.", - "feature_notifications": "Receive beautifully formatted notifications on your selected Discord channel whenever new media is added to your Jellyfin library.", - "feature_databases": "Using the TMDB and OMDb databases, Discord messages get a beautiful and well-structured look, with essential information about the requested or added media content.", - "feature_permissions": "Control permissions with role-based access (allowlist/blocklist), route notifications to different channels by Jellyfin library, and link users to Jellyseerr accounts for accurate request tracking.", - "feature_direct_messages": "Get direct messages on Discord when requested content becomes available in your library. Never miss when your requests are ready!", + "feature_search": "<code>/search <title></code> Search for a movie or show with auto-suggestions. An embed with detailed information is shown, from which you can request the media. For <strong style=\"color: var(--blue);\">TV shows</strong>, you have the option to select the desired seasons for the request.", + "feature_request": "<code>/request <title></code> Instantly send a request for your chosen movie or show directly to <strong style=\"color: var(--blue);\">Jellyseerr</strong>. For <strong style=\"color: var(--blue);\">TV shows</strong>, this automatically requests all seasons.", + "feature_notifications": "Receive beautifully formatted notifications on your selected <strong style=\"color: var(--blue);\">Discord</strong> channel whenever new media is added to your <strong style=\"color: var(--blue);\">Jellyfin</strong> library.", + "feature_databases": "Using the <strong style=\"color: var(--blue);\">TMDB</strong> and <strong style=\"color: var(--blue);\">OMDb</strong> databases, <strong style=\"color: var(--blue);\">Discord</strong> messages get a beautiful and well-structured look, with essential information about the requested or added media content.", + "feature_permissions": "Control permissions with <strong style=\"color: var(--blue);\">role-based access</strong> (allowlist/blocklist), route notifications to different channels by <strong style=\"color: var(--blue);\">Jellyfin library</strong>, and link users to <strong style=\"color: var(--blue);\">Jellyseerr</strong> accounts for accurate request tracking.", + "feature_direct_messages": "Get <strong style=\"color: var(--blue);\">direct messages</strong> on <strong style=\"color: var(--blue);\">Discord</strong> when requested content becomes available in your library. Never miss when your requests are ready!", "support_title": "Support the Project", "support_description": "If you find Anchorr useful, consider supporting its development. Every coffee helps fuel late-night coding sessions!", "contribute_title": "Contribute", diff --git a/locales/sv.json b/locales/sv.json index 79caee3..e6613c5 100644 --- a/locales/sv.json +++ b/locales/sv.json @@ -193,12 +193,12 @@ "title": "Om Anchorr", "description": "Anchorr Ă€r en sjĂ€lvhostad, lĂ€ttviktig brygga som kopplar din Jellyfin-mediaserver med Discord. Den meddelar dig pĂ„ en dedikerad kanal nĂ€r nya media lĂ€ggs till i ditt bibliotek, och med Jellyseerr-integration kan du söka efter och begĂ€ra filmer och serier direkt frĂ„n Discord.", "features_title": "Funktioner", - "feature_search": "/search <titel> Sök efter en film eller serie med automatiska förslag. En embed med detaljerad information visas, frĂ„n vilken du kan begĂ€ra media. För TV-serier har du möjlighet att vĂ€lja önskade sĂ€songer för begĂ€ran.", - "feature_request": "/request <titel> Skicka omedelbart en begĂ€ran om din valda film eller serie direkt till Jellyseerr. För TV-serier begĂ€r detta automatiskt alla sĂ€songer.", - "feature_notifications": "Ta emot vackert formaterade notifieringar pĂ„ din valda Discord-kanal nĂ€r nya media lĂ€ggs till i ditt Jellyfin-bibliotek.", - "feature_databases": "Med hjĂ€lp av TMDB- och OMDb-databaserna fĂ„r Discord-meddelanden ett vackert och vĂ€lstrukturerat utseende med viktig information om begĂ€rt eller tillagt mediainnehĂ„ll.", - "feature_permissions": "Kontrollera behörigheter med rollbaserad Ă„tkomst (tillĂ„t-/blockeringslista), dirigera notifieringar till olika kanaler per Jellyfin-bibliotek och lĂ€nka anvĂ€ndare till Jellyseerr-konton för korrekt spĂ„rning av begĂ€randen.", - "feature_direct_messages": "FĂ„ direktmeddelanden pĂ„ Discord nĂ€r begĂ€rt innehĂ„ll blir tillgĂ€ngligt i ditt bibliotek. Missa aldrig nĂ€r dina begĂ€randen Ă€r klara!", + "feature_search": "<code>/search <titel></code> Sök efter en film eller serie med automatiska förslag. En embed med detaljerad information visas, frĂ„n vilken du kan begĂ€ra media. För <strong style=\"color: var(--blue);\">TV-serier</strong> har du möjlighet att vĂ€lja önskade sĂ€songer för begĂ€ran.", + "feature_request": "<code>/request <titel></code> Skicka omedelbart en begĂ€ran om din valda film eller serie direkt till <strong style=\"color: var(--blue);\">Jellyseerr</strong>. För <strong style=\"color: var(--blue);\">TV-serier</strong> begĂ€r detta automatiskt alla sĂ€songer.", + "feature_notifications": "Ta emot vackert formaterade notifieringar pĂ„ din valda <strong style=\"color: var(--blue);\">Discord</strong>-kanal nĂ€r nya media lĂ€ggs till i ditt <strong style=\"color: var(--blue);\">Jellyfin</strong>-bibliotek.", + "feature_databases": "Med hjĂ€lp av <strong style=\"color: var(--blue);\">TMDB</strong>- och <strong style=\"color: var(--blue);\">OMDb</strong>-databaserna fĂ„r <strong style=\"color: var(--blue);\">Discord</strong>-meddelanden ett vackert och vĂ€lstrukturerat utseende med viktig information om begĂ€rt eller tillagt mediainnehĂ„ll.", + "feature_permissions": "Kontrollera behörigheter med <strong style=\"color: var(--blue);\">rollbaserad Ă„tkomst</strong> (tillĂ„t-/blockeringslista), dirigera notifieringar till olika kanaler per <strong style=\"color: var(--blue);\">Jellyfin-bibliotek</strong> och lĂ€nka anvĂ€ndare till <strong style=\"color: var(--blue);\">Jellyseerr</strong>-konton för korrekt spĂ„rning av begĂ€randen.", + "feature_direct_messages": "FĂ„ <strong style=\"color: var(--blue);\">direktmeddelanden</strong> pĂ„ <strong style=\"color: var(--blue);\">Discord</strong> nĂ€r begĂ€rt innehĂ„ll blir tillgĂ€ngligt i ditt bibliotek. Missa aldrig nĂ€r dina begĂ€randen Ă€r klara!", "support_title": "Stöd projektet", "support_description": "Om du tycker att Anchorr Ă€r anvĂ€ndbart, övervĂ€g att stödja dess utveckling. Varje kaffe hjĂ€lper till att driva sena nĂ€tters kodningssessioner!", "contribute_title": "Bidra", diff --git a/web/index.html b/web/index.html index 0d78814..bd1b92d 100644 --- a/web/index.html +++ b/web/index.html @@ -1029,7 +1029,7 @@ <h3 data-i18n="about.contribute_title">Contribute</h3> </div> <div class="version-footer"> - <p>Anchorr <span class="version-number">v1.3.4</span></p> + <p>Anchorr <span class="version-number">v1.3.5</span></p> </div> </div>