Merge branch 'develop'

Author: sct

.all-contributorsrc

@@ -364,7 +364,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/77843475?v=4",
       "profile": "https://github.com/HubDuck",
       "contributions": [
-        "translation"
+        "translation",
+        "doc"
       ]
     },
     {
@@ -376,6 +377,60 @@
         "doc",
         "translation"
       ]
+    },
+    {
+      "login": "Shjosan",
+      "name": "Shjosan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20847626?v=4",
+      "profile": "https://github.com/Shjosan",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "kobaubarr",
+      "name": "kobaubarr",
+      "avatar_url": "https://avatars.githubusercontent.com/u/28481522?v=4",
+      "profile": "https://github.com/kobaubarr",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "notorius28",
+      "name": "Ricardo González",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1621513?v=4",
+      "profile": "https://github.com/notorius28",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "Torkiliuz",
+      "name": "Torkil",
+      "avatar_url": "https://avatars.githubusercontent.com/u/460764?v=4",
+      "profile": "http://torkili.uz",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "JagandeepBrar",
+      "name": "Jagandeep Brar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3048295?v=4",
+      "profile": "https://www.jagandeepbrar.io",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "dtalens",
+      "name": "dtalens",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6631832?v=4",
+      "profile": "http://dtalens.com",
+      "contributions": [
+        "translation"
+      ]
     }
   ],
   "badgeTemplate": "<a href=\"#contributors-\"><img alt=\"All Contributors\" src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg\"/></a>",

.dockerignore

@@ -8,16 +8,20 @@
 .git
 .gitbook.yaml
 .gitconfig
-.gitignore
 .github
+.gitignore
 .next
 .prettierignore
-config/db/db.sqlite3
-config/db/logs/overseerr.log
+config/db/*
+config/logs/*
+config/*.json
+dist
 Dockerfile*
 docker-compose.yml
 docs
 LICENSE
 node_modules
+public/os_logo_square.png
+public/preview.jpg
 snap
 stylelint.config.js

.eslintrc.js

@@ -4,12 +4,10 @@ module.exports = {
   extends: [
     'eslint:recommended',
     'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
-    'prettier/@typescript-eslint', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
-    'plugin:prettier/recommended', // Enables eslint-plugin-prettier and displays prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array.
     'plugin:jsx-a11y/recommended',
     'plugin:react/recommended',
     'plugin:react-hooks/recommended',
-    'prettier/react',
+    'prettier',
   ],
   parserOptions: {
     ecmaVersion: 6,

.gitignore

@@ -32,7 +32,7 @@ yarn-error.log*
 .vercel
 
 # database
-config/db/*.sqlite3
+config/db/*.sqlite3*
 config/settings.json
 
 # logs

.vscode/settings.json

@@ -14,5 +14,9 @@
       "name": "Local SQLite",
       "database": "./config/db/db.sqlite3"
     }
-  ]
+  ],
+  "editor.codeActionsOnSave": {
+    "source.organizeImports": true
+  },
+  "editor.formatOnSave": true
 }

README.md

@@ -12,7 +12,7 @@
 <a href="https://lgtm.com/projects/g/sct/overseerr/context:javascript"><img alt="Language grade: JavaScript" src="https://img.shields.io/lgtm/grade/javascript/g/sct/overseerr.svg?logo=lgtm&logoWidth=18"/></a>
 <a href="https://github.com/sct/overseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/sct/overseerr"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-40-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-46-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 </p>
 
@@ -148,8 +148,16 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/JonnyWong16"><img src="https://avatars.githubusercontent.com/u/9099342?v=4?s=100" width="100px;" alt=""/><br /><sub><b>JonnyWong16</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=JonnyWong16" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/Roxedus"><img src="https://avatars.githubusercontent.com/u/7110194?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roxedus</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=Roxedus" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/WoisWoi"><img src="https://avatars.githubusercontent.com/u/75491231?v=4?s=100" width="100px;" alt=""/><br /><sub><b>WoisWoi</b></sub></a><br /><a href="#translation-WoisWoi" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/HubDuck"><img src="https://avatars.githubusercontent.com/u/77843475?v=4?s=100" width="100px;" alt=""/><br /><sub><b>HubDuck</b></sub></a><br /><a href="#translation-HubDuck" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/HubDuck"><img src="https://avatars.githubusercontent.com/u/77843475?v=4?s=100" width="100px;" alt=""/><br /><sub><b>HubDuck</b></sub></a><br /><a href="#translation-HubDuck" title="Translation">🌍</a> <a href="https://github.com/sct/overseerr/commits?author=HubDuck" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/costaht"><img src="https://avatars.githubusercontent.com/u/50637431?v=4?s=100" width="100px;" alt=""/><br /><sub><b>costaht</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=costaht" title="Documentation">📖</a> <a href="#translation-costaht" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/Shjosan"><img src="https://avatars.githubusercontent.com/u/20847626?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shjosan</b></sub></a><br /><a href="#translation-Shjosan" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/kobaubarr"><img src="https://avatars.githubusercontent.com/u/28481522?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kobaubarr</b></sub></a><br /><a href="#translation-kobaubarr" title="Translation">🌍</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/notorius28"><img src="https://avatars.githubusercontent.com/u/1621513?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ricardo González</b></sub></a><br /><a href="#translation-notorius28" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://torkili.uz"><img src="https://avatars.githubusercontent.com/u/460764?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Torkil</b></sub></a><br /><a href="#translation-Torkiliuz" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://www.jagandeepbrar.io"><img src="https://avatars.githubusercontent.com/u/3048295?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jagandeep Brar</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=JagandeepBrar" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://dtalens.com"><img src="https://avatars.githubusercontent.com/u/6631832?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dtalens</b></sub></a><br /><a href="#translation-dtalens" title="Translation">🌍</a></td>
   </tr>
 </table>
 

docs/SUMMARY.md

@@ -8,8 +8,11 @@
 
 ## Using Overseerr
 
+- [Settings](using-overseerr/settings/README.md)
 - [Notifications](using-overseerr/notifications/README.md)
-  - [Custom Webhooks](using-overseerr/notifications/webhooks.md)
+  - [Email](using-overseerr/notifications/email.md)
+  - [Discord](using-overseerr/notifications/discord.md)
+  - [Webhooks](using-overseerr/notifications/webhooks.md)
 
 ## Support
 

docs/support/faq.md

@@ -90,6 +90,10 @@ You can also perform the following to verify the media item has a GUID Overseerr
 
 **A:** See "[Some media is missing from Overseerr that I know is in Plex!](./faq.md#some-media-is-missing-from-overseerr-that-i-know-is-in-plex)" for troubleshooting steps.
 
+### Approved series requests keep failing!
+
+**A:** If you configured a base URL in Sonarr, make sure you have set the base URL option appropriately in Overseerr. Also, check that you are using Sonarr v3 and have configured a default language profile in Overseerr.
+
 ## Notifications
 
 ### I am getting "Username and Password not accepted" when attempting to send email notifications via Gmail!

docs/using-overseerr/notifications/README.md

@@ -2,10 +2,10 @@
 
 Overseerr already supports a good number of notification agents, such as **Discord**, **Slack** and **Pushover**. New agents are always considered for development, if there is enough demand for it.
 
-## Currently Supported Notification Agents
+## Supported Notification Agents
 
-- Discord
-- Email
+- [Email](./email.md)
+- [Discord](./discord.md)
 - Pushbullet
 - Pushover
 - Slack
@@ -14,15 +14,11 @@ Overseerr already supports a good number of notification agents, such as **Disco
 
 ## Setting Up Notifications
 
-Configuring your notifications is _very simple_. First, you will need to visit the **Settings** page and click **Notifications** in the menu. This will present you with all of the currently available notification agents. Click on each one individually to configure them.
+Configuring your notifications is quite simple. First, you will need to visit the **Settings** page and click **Notifications** in the menu. This will present you with all of the currently available notification agents. Click on each one individually to configure them.
 
 You must configure which type of notifications you want to send _per agent_. If no types are selected, you will not receive notifications!
 
-Some agents may have specific configuration "gotchas" covered in their documentation pages.
-
-{% hint style="danger" %}
-You will **not receive notifications** for any automatically approved requests unless the "Enable Notifications for Automatic Approvals" setting is enabled.
-{% endhint %}
+Note that some notifications are intended for the user who submitted the relevant request, while others are for administrators. For details, please see the documentation for the specific agent you would like to use.
 
 ## Requesting New Notification Agents
 

docs/using-overseerr/notifications/discord.md

@@ -0,0 +1,21 @@
+# Discord
+
+## Configuration
+
+{% hint style="info" %}
+In order to configure Discord notifications, you first need to [create a webhook](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks).
+
+In order for users to be mentioned in Discord notifications, they must have their [Discord user ID](https://support.discord.com/hc/en-us/articles/206346498-Where-can-I-find-my-User-Server-Message-ID-) configured in their user settings.
+{% endhint %}
+
+### Bot Username (optional)
+
+If you would like to override the name you configured for your bot in Discord, you may set this value to whatever you like!
+
+### Bot Avatar URL (optional)
+
+Similar to the bot username, you can override the avatar for your bot.
+
+### Webhook URL
+
+You can find the webhook URL in the Discord application, at **Server Settings → Integrations → Webhooks**.