Compare commits
1 Commits
preview-pr
...
preview-fi
| Author | SHA1 | Date | |
|---|---|---|---|
|
cb25ad8457 |
@@ -403,51 +403,6 @@
|
|||||||
"contributions": [
|
"contributions": [
|
||||||
"doc"
|
"doc"
|
||||||
]
|
]
|
||||||
},
|
|
||||||
{
|
|
||||||
"login": "mobihen",
|
|
||||||
"name": "Nir Israel Hen",
|
|
||||||
"avatar_url": "https://avatars.githubusercontent.com/u/35529491?v=4",
|
|
||||||
"profile": "https://mobihen.com",
|
|
||||||
"contributions": [
|
|
||||||
"translation"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"login": "XDark187",
|
|
||||||
"name": "Baraa",
|
|
||||||
"avatar_url": "https://avatars.githubusercontent.com/u/39034192?v=4",
|
|
||||||
"profile": "https://github.com/XDark187",
|
|
||||||
"contributions": [
|
|
||||||
"code"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"login": "franciscofsales",
|
|
||||||
"name": "Francisco Sales",
|
|
||||||
"avatar_url": "https://avatars.githubusercontent.com/u/7977645?v=4",
|
|
||||||
"profile": "https://github.com/franciscofsales",
|
|
||||||
"contributions": [
|
|
||||||
"code"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"login": "myselfolli",
|
|
||||||
"name": "Oliver Laing",
|
|
||||||
"avatar_url": "https://avatars.githubusercontent.com/u/37535998?v=4",
|
|
||||||
"profile": "https://github.com/myselfolli",
|
|
||||||
"contributions": [
|
|
||||||
"code"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"login": "M0NsTeRRR",
|
|
||||||
"name": "Ludovic Ortega",
|
|
||||||
"avatar_url": "https://avatars.githubusercontent.com/u/37785089?v=4",
|
|
||||||
"profile": "https://github.com/M0NsTeRRR",
|
|
||||||
"contributions": [
|
|
||||||
"security"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
2
.github/CODEOWNERS
vendored
2
.github/CODEOWNERS
vendored
@@ -1,2 +1,2 @@
|
|||||||
# Global code ownership
|
# Global code ownership
|
||||||
* @Fallenbagel @gauthier-th
|
* @Fallenbagel
|
||||||
|
|||||||
2
.github/ISSUE_TEMPLATE/bug.yml
vendored
2
.github/ISSUE_TEMPLATE/bug.yml
vendored
@@ -1,6 +1,6 @@
|
|||||||
name: 🐛 Bug Report
|
name: 🐛 Bug Report
|
||||||
description: Report a problem
|
description: Report a problem
|
||||||
labels: ['bug', 'awaiting triage']
|
labels: ['type:bug', 'awaiting-triage']
|
||||||
body:
|
body:
|
||||||
- type: markdown
|
- type: markdown
|
||||||
attributes:
|
attributes:
|
||||||
|
|||||||
2
.github/ISSUE_TEMPLATE/enhancement.yml
vendored
2
.github/ISSUE_TEMPLATE/enhancement.yml
vendored
@@ -1,6 +1,6 @@
|
|||||||
name: ✨ Feature Request
|
name: ✨ Feature Request
|
||||||
description: Suggest an idea
|
description: Suggest an idea
|
||||||
labels: ['enhancement', 'awaiting triage']
|
labels: ['type:enhancement', 'awaiting-triage']
|
||||||
body:
|
body:
|
||||||
- type: markdown
|
- type: markdown
|
||||||
attributes:
|
attributes:
|
||||||
|
|||||||
@@ -8,4 +8,3 @@ pnpm-lock.yaml
|
|||||||
# assets
|
# assets
|
||||||
src/assets/
|
src/assets/
|
||||||
public/
|
public/
|
||||||
docs/
|
|
||||||
|
|||||||
@@ -3,12 +3,6 @@ module.exports = {
|
|||||||
singleQuote: true,
|
singleQuote: true,
|
||||||
trailingComma: 'es5',
|
trailingComma: 'es5',
|
||||||
overrides: [
|
overrides: [
|
||||||
{
|
|
||||||
files: 'pnpm-lock.yaml',
|
|
||||||
options: {
|
|
||||||
rangeEnd: 0, // default: Infinity
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
files: 'gen-docs/pnpm-lock.yaml',
|
files: 'gen-docs/pnpm-lock.yaml',
|
||||||
options: {
|
options: {
|
||||||
|
|||||||
14
README.md
14
README.md
@@ -8,10 +8,10 @@
|
|||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://discord.gg/ckbvBtDJgC"><img src="https://img.shields.io/discord/952656177924300932" alt="Discord"></a>
|
<a href="https://discord.gg/ckbvBtDJgC"><img src="https://img.shields.io/discord/952656177924300932" alt="Discord"></a>
|
||||||
<a href="https://hub.docker.com/r/fallenbagel/jellyseerr"><img src="https://img.shields.io/docker/pulls/fallenbagel/jellyseerr" alt="Docker pulls"></a>
|
<a href="https://hub.docker.com/r/fallenbagel/jellyseerr"><img src="https://img.shields.io/docker/pulls/fallenbagel/jellyseerr" alt="Docker pulls"></a>
|
||||||
<a href="http://translate.jellyseerr.dev/engage/jellyseerr/"><img src="http://translate.jellyseerr.dev/widget/jellyseerr/jellyseerr-frontend/svg-badge.svg" alt="Translation status" /></a>
|
<a href="http://jellyseerr.borgcube.de/engage/jellyseerr/"><img src="http://jellyseerr.borgcube.de/widget/jellyseerr/jellyseerr-frontend/svg-badge.svg" alt="Translation status" /></a>
|
||||||
<a href="https://github.com/fallenbagel/jellyseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/fallenbagel/jellyseerr"></a>
|
<a href="https://github.com/fallenbagel/jellyseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/fallenbagel/jellyseerr"></a>
|
||||||
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
|
<!-- 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-48-orange.svg"/></a>
|
<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-40-orange.svg"/></a>
|
||||||
<!-- ALL-CONTRIBUTORS-BADGE:END -->
|
<!-- ALL-CONTRIBUTORS-BADGE:END -->
|
||||||
|
|
||||||
**Jellyseerr** is a free and open source software application for managing requests for your media library.
|
**Jellyseerr** is a free and open source software application for managing requests for your media library.
|
||||||
@@ -137,16 +137,6 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
|
|||||||
<td align="center" valign="top" width="14.28%"><a href="https://joaquinolivero.com"><img src="https://avatars.githubusercontent.com/u/66050823?v=4?s=100" width="100px;" alt="Joaquin Olivero"/><br /><sub><b>Joaquin Olivero</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=JoaquinOlivero" title="Code">💻</a></td>
|
<td align="center" valign="top" width="14.28%"><a href="https://joaquinolivero.com"><img src="https://avatars.githubusercontent.com/u/66050823?v=4?s=100" width="100px;" alt="Joaquin Olivero"/><br /><sub><b>Joaquin Olivero</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=JoaquinOlivero" title="Code">💻</a></td>
|
||||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Bretterteig"><img src="https://avatars.githubusercontent.com/u/47298401?v=4?s=100" width="100px;" alt="Julian Behr"/><br /><sub><b>Julian Behr</b></sub></a><br /><a href="#translation-Bretterteig" title="Translation">🌍</a></td>
|
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Bretterteig"><img src="https://avatars.githubusercontent.com/u/47298401?v=4?s=100" width="100px;" alt="Julian Behr"/><br /><sub><b>Julian Behr</b></sub></a><br /><a href="#translation-Bretterteig" title="Translation">🌍</a></td>
|
||||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ThowZzy"><img src="https://avatars.githubusercontent.com/u/61882536?v=4?s=100" width="100px;" alt="ThowZzy"/><br /><sub><b>ThowZzy</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=ThowZzy" title="Code">💻</a></td>
|
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ThowZzy"><img src="https://avatars.githubusercontent.com/u/61882536?v=4?s=100" width="100px;" alt="ThowZzy"/><br /><sub><b>ThowZzy</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=ThowZzy" title="Code">💻</a></td>
|
||||||
<td align="center" valign="top" width="14.28%"><a href="http://josephrisk.com"><img src="https://avatars.githubusercontent.com/u/18372584?v=4?s=100" width="100px;" alt="Joseph Risk"/><br /><sub><b>Joseph Risk</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=j0srisk" title="Code">💻</a></td>
|
|
||||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Loetwiek"><img src="https://avatars.githubusercontent.com/u/79059734?v=4?s=100" width="100px;" alt="Loetwiek"/><br /><sub><b>Loetwiek</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=Loetwiek" title="Code">💻</a></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Fuochi"><img src="https://avatars.githubusercontent.com/u/4720478?v=4?s=100" width="100px;" alt="Fuochi"/><br /><sub><b>Fuochi</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=Fuochi" title="Documentation">📖</a></td>
|
|
||||||
<td align="center" valign="top" width="14.28%"><a href="https://mobihen.com"><img src="https://avatars.githubusercontent.com/u/35529491?v=4?s=100" width="100px;" alt="Nir Israel Hen"/><br /><sub><b>Nir Israel Hen</b></sub></a><br /><a href="#translation-mobihen" title="Translation">🌍</a></td>
|
|
||||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/XDark187"><img src="https://avatars.githubusercontent.com/u/39034192?v=4?s=100" width="100px;" alt="Baraa"/><br /><sub><b>Baraa</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=XDark187" title="Code">💻</a></td>
|
|
||||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/franciscofsales"><img src="https://avatars.githubusercontent.com/u/7977645?v=4?s=100" width="100px;" alt="Francisco Sales"/><br /><sub><b>Francisco Sales</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=franciscofsales" title="Code">💻</a></td>
|
|
||||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/myselfolli"><img src="https://avatars.githubusercontent.com/u/37535998?v=4?s=100" width="100px;" alt="Oliver Laing"/><br /><sub><b>Oliver Laing</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=myselfolli" title="Code">💻</a></td>
|
|
||||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/M0NsTeRRR"><img src="https://avatars.githubusercontent.com/u/37785089?v=4?s=100" width="100px;" alt="Ludovic Ortega"/><br /><sub><b>Ludovic Ortega</b></sub></a><br /><a href="#security-M0NsTeRRR" title="Security">🛡️</a></td>
|
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
const testUser = {
|
const testUser = {
|
||||||
username: 'Test User',
|
displayName: 'Test User',
|
||||||
emailAddress: 'test@seeerr.dev',
|
emailAddress: 'test@seeerr.dev',
|
||||||
password: 'test1234',
|
password: 'test1234',
|
||||||
};
|
};
|
||||||
@@ -32,7 +32,7 @@ describe('User List', () => {
|
|||||||
|
|
||||||
cy.get('[data-testid=modal-title]').should('contain', 'Create Local User');
|
cy.get('[data-testid=modal-title]').should('contain', 'Create Local User');
|
||||||
|
|
||||||
cy.get('#username').type(testUser.username);
|
cy.get('#displayName').type(testUser.displayName);
|
||||||
cy.get('#email').type(testUser.emailAddress);
|
cy.get('#email').type(testUser.emailAddress);
|
||||||
cy.get('#password').type(testUser.password);
|
cy.get('#password').type(testUser.password);
|
||||||
|
|
||||||
|
|||||||
@@ -12,12 +12,49 @@ import Tabs from '@theme/Tabs';
|
|||||||
import TabItem from '@theme/TabItem';
|
import TabItem from '@theme/TabItem';
|
||||||
|
|
||||||
### Prerequisites
|
### Prerequisites
|
||||||
|
<Tabs groupId="versions" queryString>
|
||||||
|
<TabItem value="latest" label="Latest">
|
||||||
|
- [Node.js 18.x](https://nodejs.org/en/download/)
|
||||||
|
- [Yarn 1.x](https://classic.yarnpkg.com/lang/en/docs/install)
|
||||||
|
- [Git](https://git-scm.com/downloads)
|
||||||
|
</TabItem>
|
||||||
|
|
||||||
|
<TabItem value="develop" label="Develop">
|
||||||
- [Node.js 20.x](https://nodejs.org/en/download/)
|
- [Node.js 20.x](https://nodejs.org/en/download/)
|
||||||
- [Pnpm 9.x](https://pnpm.io/installation)
|
- [Pnpm 9.x](https://pnpm.io/installation)
|
||||||
- [Git](https://git-scm.com/downloads)
|
- [Git](https://git-scm.com/downloads)
|
||||||
|
</TabItem>
|
||||||
|
</Tabs>
|
||||||
|
|
||||||
|
|
||||||
## Unix (Linux, macOS)
|
## Unix (Linux, macOS)
|
||||||
### Installation
|
### Installation
|
||||||
|
<Tabs groupId="versions" queryString>
|
||||||
|
<TabItem value="latest" label="latest">
|
||||||
|
1. Assuming you want the working directory to be `/opt/jellyseerr`, create the directory and navigate to it:
|
||||||
|
```bash
|
||||||
|
sudo mkdir -p /opt/jellyseerr && cd /opt/jellyseerr
|
||||||
|
```
|
||||||
|
2. Clone the Jellyseerr repository and checkout the latest release:
|
||||||
|
```bash
|
||||||
|
git clone https://github.com/Fallenbagel/jellyseerr.git
|
||||||
|
cd jellyseerr
|
||||||
|
git checkout main
|
||||||
|
```
|
||||||
|
3. Install the dependencies:
|
||||||
|
```bash
|
||||||
|
CYPRESS_INSTALL_BINARY=0 yarn install --frozen-lockfile --network-timeout 1000000
|
||||||
|
```
|
||||||
|
4. Build the project:
|
||||||
|
```bash
|
||||||
|
yarn build
|
||||||
|
```
|
||||||
|
5. Start Jellyseerr:
|
||||||
|
```bash
|
||||||
|
yarn start
|
||||||
|
```
|
||||||
|
</TabItem>
|
||||||
|
<TabItem value="develop" label="develop">
|
||||||
1. Assuming you want the working directory to be `/opt/jellyseerr`, create the directory and navigate to it:
|
1. Assuming you want the working directory to be `/opt/jellyseerr`, create the directory and navigate to it:
|
||||||
```bash
|
```bash
|
||||||
sudo mkdir -p /opt/jellyseerr && cd /opt/jellyseerr
|
sudo mkdir -p /opt/jellyseerr && cd /opt/jellyseerr
|
||||||
@@ -40,6 +77,8 @@ pnpm build
|
|||||||
```bash
|
```bash
|
||||||
pnpm start
|
pnpm start
|
||||||
```
|
```
|
||||||
|
</TabItem>
|
||||||
|
</Tabs>
|
||||||
|
|
||||||
:::info
|
:::info
|
||||||
You can now access Jellyseerr by visiting `http://localhost:5055` in your web browser.
|
You can now access Jellyseerr by visiting `http://localhost:5055` in your web browser.
|
||||||
@@ -60,9 +99,6 @@ PORT=5055
|
|||||||
|
|
||||||
## Uncomment if your media server is emby instead of jellyfin.
|
## Uncomment if your media server is emby instead of jellyfin.
|
||||||
# JELLYFIN_TYPE=emby
|
# JELLYFIN_TYPE=emby
|
||||||
|
|
||||||
## Uncomment if you want to force Node.js to resolve IPv4 before IPv6 (advanced users only)
|
|
||||||
# FORCE_IPV4_FIRST=true
|
|
||||||
```
|
```
|
||||||
2. Then run the following commands:
|
2. Then run the following commands:
|
||||||
```bash
|
```bash
|
||||||
@@ -195,6 +231,32 @@ pm2 status jellyseerr
|
|||||||
|
|
||||||
## Windows
|
## Windows
|
||||||
### Installation
|
### Installation
|
||||||
|
<Tabs groupId="versions" queryString>
|
||||||
|
<TabItem value="latest" label="latest">
|
||||||
|
1. Assuming you want the working directory to be `C:\jellyseerr`, create the directory and navigate to it:
|
||||||
|
```powershell
|
||||||
|
mkdir C:\jellyseerr
|
||||||
|
cd C:\jellyseerr
|
||||||
|
```
|
||||||
|
2. Clone the Jellyseerr repository and checkout the latest release:
|
||||||
|
```powershell
|
||||||
|
git clone https://github.com/Fallenbagel/jellyseerr.git .
|
||||||
|
git checkout main
|
||||||
|
```
|
||||||
|
3. Install the dependencies:
|
||||||
|
```powershell
|
||||||
|
set CYPRESS_INSTALL_BINARY=0 && yarn install --frozen-lockfile --network-timeout 1000000
|
||||||
|
```
|
||||||
|
4. Build the project:
|
||||||
|
```powershell
|
||||||
|
yarn build
|
||||||
|
```
|
||||||
|
5. Start Jellyseerr:
|
||||||
|
```powershell
|
||||||
|
yarn start
|
||||||
|
```
|
||||||
|
</TabItem>
|
||||||
|
<TabItem value="develop" label="develop">
|
||||||
1. Assuming you want the working directory to be `C:\jellyseerr`, create the directory and navigate to it:
|
1. Assuming you want the working directory to be `C:\jellyseerr`, create the directory and navigate to it:
|
||||||
```powershell
|
```powershell
|
||||||
mkdir C:\jellyseerr
|
mkdir C:\jellyseerr
|
||||||
@@ -207,7 +269,6 @@ git checkout develop # by default, you are on the develop branch so this step is
|
|||||||
```
|
```
|
||||||
3. Install the dependencies:
|
3. Install the dependencies:
|
||||||
```powershell
|
```powershell
|
||||||
npm install -g win-node-env
|
|
||||||
set CYPRESS_INSTALL_BINARY=0 && pnpm install --frozen-lockfile
|
set CYPRESS_INSTALL_BINARY=0 && pnpm install --frozen-lockfile
|
||||||
```
|
```
|
||||||
4. Build the project:
|
4. Build the project:
|
||||||
@@ -218,6 +279,8 @@ pnpm build
|
|||||||
```powershell
|
```powershell
|
||||||
pnpm start
|
pnpm start
|
||||||
```
|
```
|
||||||
|
</TabItem>
|
||||||
|
</Tabs>
|
||||||
|
|
||||||
:::tip
|
:::tip
|
||||||
You can add the environment variables to a `.env` file in the Jellyseerr directory.
|
You can add the environment variables to a `.env` file in the Jellyseerr directory.
|
||||||
@@ -245,7 +308,6 @@ node dist/index.js
|
|||||||
- Set the trigger to "When the computer starts"
|
- Set the trigger to "When the computer starts"
|
||||||
- Set the action to "Start a program"
|
- Set the action to "Start a program"
|
||||||
- Set the program/script to the path of the `start-jellyseerr.bat` file
|
- Set the program/script to the path of the `start-jellyseerr.bat` file
|
||||||
- Set the "Start in" to the jellyseerr directory.
|
|
||||||
- Click "Finish"
|
- Click "Finish"
|
||||||
|
|
||||||
Now, Jellyseerr will start when the computer boots up in the background.
|
Now, Jellyseerr will start when the computer boots up in the background.
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ export const VersionMismatchWarning = () => {
|
|||||||
<>
|
<>
|
||||||
{!isUpToDate ? (
|
{!isUpToDate ? (
|
||||||
<Admonition type="warning">
|
<Admonition type="warning">
|
||||||
The <a href="https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/servers/jellyseerr/default.nix#L14">upstream Jellyseerr Nix Package (v{nixpkgVersion})</a> is not <b>up-to-date</b>. If you want to use <b>Jellyseerr v{jellyseerrVersion}</b>, you will need to <a href="#overriding-the-package-derivation">override the package derivation</a>.
|
The <a href="https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/servers/jellyseerr/default.nix#L14">upstream Jellyseerr Nix Package (v{nixpkgVersion})</a> is not <b>up-to-date</b>. If you want to use <b>Jellyseerr v{jellyseerrVersion}</b>, you will need to <a href="#overriding-the-package">override the package derivation</a>.
|
||||||
</Admonition>
|
</Admonition>
|
||||||
) : (
|
) : (
|
||||||
<Admonition type="success">
|
<Admonition type="success">
|
||||||
|
|||||||
@@ -12,8 +12,6 @@ This is your Jellyseerr API key, which can be used to integrate Jellyseerr with
|
|||||||
|
|
||||||
If you need to generate a new API key for any reason, simply click the button to the right of the text box.
|
If you need to generate a new API key for any reason, simply click the button to the right of the text box.
|
||||||
|
|
||||||
If you want to set the API key, rather than letting it be randomly generated, you can use the API_KEY environment variable. Whatever that variable is set to will be your API key.
|
|
||||||
|
|
||||||
## Application Title
|
## Application Title
|
||||||
|
|
||||||
If you aren't a huge fan of the name "Jellyseerr" and would like to display something different to your users, you can customize the application title!
|
If you aren't a huge fan of the name "Jellyseerr" and would like to display something different to your users, you can customize the application title!
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ Users can override the [global display language](/using-jellyseerr/settings/gene
|
|||||||
|
|
||||||
### Discover Region & Discover Language
|
### Discover Region & Discover Language
|
||||||
|
|
||||||
Users can override the [global filter settings](/using-jellyseerr/settings/general#discover-region--discover-language) to suit their own preferences.
|
Users can override the [global filter settings](/using-jellyseerr/settings/general#discover-region-and-discover-language) to suit their own preferences.
|
||||||
|
|
||||||
### Movie Request Limit & Series Request Limit
|
### Movie Request Limit & Series Request Limit
|
||||||
|
|
||||||
|
|||||||
@@ -4,12 +4,16 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
env: {
|
env: {
|
||||||
commitTag: process.env.COMMIT_TAG || 'local',
|
commitTag: process.env.COMMIT_TAG || 'local',
|
||||||
forceIpv4First: process.env.FORCE_IPV4_FIRST === 'true' ? 'true' : 'false',
|
},
|
||||||
|
publicRuntimeConfig: {
|
||||||
|
// Will be available on both server and client
|
||||||
|
JELLYFIN_TYPE: process.env.JELLYFIN_TYPE,
|
||||||
},
|
},
|
||||||
images: {
|
images: {
|
||||||
remotePatterns: [
|
remotePatterns: [
|
||||||
{ hostname: 'gravatar.com' },
|
{ hostname: 'gravatar.com' },
|
||||||
{ hostname: 'image.tmdb.org' },
|
{ hostname: 'image.tmdb.org' },
|
||||||
|
{ hostname: '*', protocol: 'https' },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
webpack(config) {
|
webpack(config) {
|
||||||
|
|||||||
@@ -38,8 +38,6 @@ tags:
|
|||||||
description: Endpoints related to getting service (Radarr/Sonarr) details.
|
description: Endpoints related to getting service (Radarr/Sonarr) details.
|
||||||
- name: watchlist
|
- name: watchlist
|
||||||
description: Collection of media to watch later
|
description: Collection of media to watch later
|
||||||
- name: blacklist
|
|
||||||
description: Blacklisted media from discovery page.
|
|
||||||
servers:
|
servers:
|
||||||
- url: '{server}/api/v1'
|
- url: '{server}/api/v1'
|
||||||
variables:
|
variables:
|
||||||
@@ -48,19 +46,6 @@ servers:
|
|||||||
|
|
||||||
components:
|
components:
|
||||||
schemas:
|
schemas:
|
||||||
Blacklist:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
tmdbId:
|
|
||||||
type: number
|
|
||||||
example: 1
|
|
||||||
title:
|
|
||||||
type: string
|
|
||||||
media:
|
|
||||||
$ref: '#/components/schemas/MediaInfo'
|
|
||||||
userId:
|
|
||||||
type: number
|
|
||||||
example: 1
|
|
||||||
Watchlist:
|
Watchlist:
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
@@ -2790,15 +2775,6 @@ paths:
|
|||||||
imageCount:
|
imageCount:
|
||||||
type: number
|
type: number
|
||||||
example: 123
|
example: 123
|
||||||
avatar:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
size:
|
|
||||||
type: number
|
|
||||||
example: 123456
|
|
||||||
imageCount:
|
|
||||||
type: number
|
|
||||||
example: 123
|
|
||||||
apiCaches:
|
apiCaches:
|
||||||
type: array
|
type: array
|
||||||
items:
|
items:
|
||||||
@@ -3610,8 +3586,6 @@ paths:
|
|||||||
type: string
|
type: string
|
||||||
email:
|
email:
|
||||||
type: string
|
type: string
|
||||||
serverType:
|
|
||||||
type: number
|
|
||||||
required:
|
required:
|
||||||
- username
|
- username
|
||||||
- password
|
- password
|
||||||
@@ -4066,94 +4040,6 @@ paths:
|
|||||||
restricted:
|
restricted:
|
||||||
type: boolean
|
type: boolean
|
||||||
example: false
|
example: false
|
||||||
/blacklist:
|
|
||||||
get:
|
|
||||||
summary: Returns blacklisted items
|
|
||||||
description: Returns list of all blacklisted media
|
|
||||||
tags:
|
|
||||||
- settings
|
|
||||||
parameters:
|
|
||||||
- in: query
|
|
||||||
name: take
|
|
||||||
schema:
|
|
||||||
type: number
|
|
||||||
nullable: true
|
|
||||||
example: 25
|
|
||||||
- in: query
|
|
||||||
name: skip
|
|
||||||
schema:
|
|
||||||
type: number
|
|
||||||
nullable: true
|
|
||||||
example: 0
|
|
||||||
- in: query
|
|
||||||
name: search
|
|
||||||
schema:
|
|
||||||
type: string
|
|
||||||
nullable: true
|
|
||||||
example: dune
|
|
||||||
responses:
|
|
||||||
'200':
|
|
||||||
description: Blacklisted items returned
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
pageInfo:
|
|
||||||
$ref: '#/components/schemas/PageInfo'
|
|
||||||
results:
|
|
||||||
type: array
|
|
||||||
items:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
user:
|
|
||||||
$ref: '#/components/schemas/User'
|
|
||||||
createdAt:
|
|
||||||
type: string
|
|
||||||
example: 2024-04-21T01:55:44.000Z
|
|
||||||
id:
|
|
||||||
type: number
|
|
||||||
example: 1
|
|
||||||
mediaType:
|
|
||||||
type: string
|
|
||||||
example: movie
|
|
||||||
title:
|
|
||||||
type: string
|
|
||||||
example: Dune
|
|
||||||
tmdbId:
|
|
||||||
type: number
|
|
||||||
example: 438631
|
|
||||||
post:
|
|
||||||
summary: Add media to blacklist
|
|
||||||
tags:
|
|
||||||
- blacklist
|
|
||||||
requestBody:
|
|
||||||
required: true
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: '#/components/schemas/Blacklist'
|
|
||||||
responses:
|
|
||||||
'201':
|
|
||||||
description: Item succesfully blacklisted
|
|
||||||
'412':
|
|
||||||
description: Item has already been blacklisted
|
|
||||||
/blacklist/{tmdbId}:
|
|
||||||
delete:
|
|
||||||
summary: Remove media from blacklist
|
|
||||||
tags:
|
|
||||||
- blacklist
|
|
||||||
parameters:
|
|
||||||
- in: path
|
|
||||||
name: tmdbId
|
|
||||||
description: tmdbId ID
|
|
||||||
required: true
|
|
||||||
example: '1'
|
|
||||||
schema:
|
|
||||||
type: string
|
|
||||||
responses:
|
|
||||||
'204':
|
|
||||||
description: Succesfully removed media item
|
|
||||||
/watchlist:
|
/watchlist:
|
||||||
post:
|
post:
|
||||||
summary: Add media to watchlist
|
summary: Add media to watchlist
|
||||||
@@ -4976,11 +4862,6 @@ paths:
|
|||||||
schema:
|
schema:
|
||||||
type: string
|
type: string
|
||||||
example: 8|9
|
example: 8|9
|
||||||
- in: query
|
|
||||||
name: status
|
|
||||||
schema:
|
|
||||||
type: string
|
|
||||||
example: 3|4
|
|
||||||
responses:
|
responses:
|
||||||
'200':
|
'200':
|
||||||
description: Results
|
description: Results
|
||||||
|
|||||||
@@ -43,6 +43,8 @@
|
|||||||
"@svgr/webpack": "6.5.1",
|
"@svgr/webpack": "6.5.1",
|
||||||
"@tanem/react-nprogress": "5.0.30",
|
"@tanem/react-nprogress": "5.0.30",
|
||||||
"ace-builds": "1.15.2",
|
"ace-builds": "1.15.2",
|
||||||
|
"axios": "1.3.4",
|
||||||
|
"axios-rate-limit": "1.3.0",
|
||||||
"bcrypt": "5.1.0",
|
"bcrypt": "5.1.0",
|
||||||
"bowser": "2.11.0",
|
"bowser": "2.11.0",
|
||||||
"connect-typeorm": "1.1.4",
|
"connect-typeorm": "1.1.4",
|
||||||
@@ -62,7 +64,6 @@
|
|||||||
"formik": "^2.4.6",
|
"formik": "^2.4.6",
|
||||||
"gravatar-url": "3.1.0",
|
"gravatar-url": "3.1.0",
|
||||||
"lodash": "4.17.21",
|
"lodash": "4.17.21",
|
||||||
"mime": "3",
|
|
||||||
"next": "^14.2.4",
|
"next": "^14.2.4",
|
||||||
"node-cache": "5.1.2",
|
"node-cache": "5.1.2",
|
||||||
"node-gyp": "9.3.1",
|
"node-gyp": "9.3.1",
|
||||||
@@ -93,8 +94,7 @@
|
|||||||
"sqlite3": "5.1.4",
|
"sqlite3": "5.1.4",
|
||||||
"swagger-ui-express": "4.6.2",
|
"swagger-ui-express": "4.6.2",
|
||||||
"swr": "2.2.5",
|
"swr": "2.2.5",
|
||||||
"typeorm": "0.3.11",
|
"typeorm": "0.3.12",
|
||||||
"undici": "^6.20.1",
|
|
||||||
"web-push": "3.5.0",
|
"web-push": "3.5.0",
|
||||||
"winston": "3.8.2",
|
"winston": "3.8.2",
|
||||||
"winston-daily-rotate-file": "4.7.1",
|
"winston-daily-rotate-file": "4.7.1",
|
||||||
@@ -121,8 +121,7 @@
|
|||||||
"@types/express": "4.17.17",
|
"@types/express": "4.17.17",
|
||||||
"@types/express-session": "1.17.6",
|
"@types/express-session": "1.17.6",
|
||||||
"@types/lodash": "4.14.191",
|
"@types/lodash": "4.14.191",
|
||||||
"@types/mime": "3",
|
"@types/node": "17.0.36",
|
||||||
"@types/node": "20.14.8",
|
|
||||||
"@types/node-schedule": "2.1.0",
|
"@types/node-schedule": "2.1.0",
|
||||||
"@types/nodemailer": "6.4.7",
|
"@types/nodemailer": "6.4.7",
|
||||||
"@types/react": "^18.3.3",
|
"@types/react": "^18.3.3",
|
||||||
|
|||||||
10675
pnpm-lock.yaml
generated
10675
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -1,8 +1,7 @@
|
|||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
import fs, { promises as fsp } from 'node:fs';
|
import axios from 'axios';
|
||||||
import path from 'node:path';
|
import fs, { promises as fsp } from 'fs';
|
||||||
import { Readable } from 'node:stream';
|
import path from 'path';
|
||||||
import type { ReadableStream } from 'node:stream/web';
|
|
||||||
import xml2js from 'xml2js';
|
import xml2js from 'xml2js';
|
||||||
|
|
||||||
const UPDATE_INTERVAL_MSEC = 24 * 3600 * 1000; // how often to download new mapping in milliseconds
|
const UPDATE_INTERVAL_MSEC = 24 * 3600 * 1000; // how often to download new mapping in milliseconds
|
||||||
@@ -162,18 +161,13 @@ class AnimeListMapping {
|
|||||||
label: 'Anime-List Sync',
|
label: 'Anime-List Sync',
|
||||||
});
|
});
|
||||||
try {
|
try {
|
||||||
const response = await fetch(MAPPING_URL);
|
const response = await axios.get(MAPPING_URL, {
|
||||||
if (!response.ok) {
|
responseType: 'stream',
|
||||||
throw new Error(`Failed to fetch: ${response.statusText}`);
|
});
|
||||||
}
|
await new Promise<void>((resolve) => {
|
||||||
await new Promise<void>((resolve, reject) => {
|
|
||||||
const writer = fs.createWriteStream(LOCAL_PATH);
|
const writer = fs.createWriteStream(LOCAL_PATH);
|
||||||
writer.on('finish', resolve);
|
writer.on('finish', resolve);
|
||||||
writer.on('error', reject);
|
response.data.pipe(writer);
|
||||||
if (!response.body) return reject();
|
|
||||||
Readable.fromWeb(response.body as ReadableStream<Uint8Array>).pipe(
|
|
||||||
writer
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw new Error(`Failed to download Anime-List mapping: ${e.message}`);
|
throw new Error(`Failed to download Anime-List mapping: ${e.message}`);
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import type { RateLimitOptions } from '@server/utils/rateLimit';
|
import type { AxiosInstance, AxiosRequestConfig } from 'axios';
|
||||||
import rateLimit from '@server/utils/rateLimit';
|
import axios from 'axios';
|
||||||
|
import rateLimit from 'axios-rate-limit';
|
||||||
import type NodeCache from 'node-cache';
|
import type NodeCache from 'node-cache';
|
||||||
|
|
||||||
// 5 minute default TTL (in seconds)
|
// 5 minute default TTL (in seconds)
|
||||||
@@ -11,131 +12,71 @@ const DEFAULT_ROLLING_BUFFER = 10000;
|
|||||||
interface ExternalAPIOptions {
|
interface ExternalAPIOptions {
|
||||||
nodeCache?: NodeCache;
|
nodeCache?: NodeCache;
|
||||||
headers?: Record<string, unknown>;
|
headers?: Record<string, unknown>;
|
||||||
rateLimit?: RateLimitOptions;
|
rateLimit?: {
|
||||||
|
maxRPS: number;
|
||||||
|
maxRequests: number;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
class ExternalAPI {
|
class ExternalAPI {
|
||||||
protected fetch: typeof fetch;
|
protected axios: AxiosInstance;
|
||||||
protected params: Record<string, string>;
|
|
||||||
protected defaultHeaders: { [key: string]: string };
|
|
||||||
private baseUrl: string;
|
private baseUrl: string;
|
||||||
private cache?: NodeCache;
|
private cache?: NodeCache;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
baseUrl: string,
|
baseUrl: string,
|
||||||
params: Record<string, string> = {},
|
params: Record<string, unknown>,
|
||||||
options: ExternalAPIOptions = {}
|
options: ExternalAPIOptions = {}
|
||||||
) {
|
) {
|
||||||
if (options.rateLimit) {
|
this.axios = axios.create({
|
||||||
this.fetch = rateLimit(fetch, options.rateLimit);
|
baseURL: baseUrl,
|
||||||
} else {
|
params,
|
||||||
this.fetch = fetch;
|
headers: {
|
||||||
}
|
|
||||||
|
|
||||||
this.baseUrl = baseUrl;
|
|
||||||
this.params = params;
|
|
||||||
this.defaultHeaders = {
|
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
Accept: 'application/json',
|
Accept: 'application/json',
|
||||||
...options.headers,
|
...options.headers,
|
||||||
};
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
if (options.rateLimit) {
|
||||||
|
this.axios = rateLimit(this.axios, {
|
||||||
|
maxRequests: options.rateLimit.maxRequests,
|
||||||
|
maxRPS: options.rateLimit.maxRPS,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
this.baseUrl = baseUrl;
|
||||||
this.cache = options.nodeCache;
|
this.cache = options.nodeCache;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected async get<T>(
|
protected async get<T>(
|
||||||
endpoint: string,
|
endpoint: string,
|
||||||
params?: Record<string, string>,
|
config?: AxiosRequestConfig,
|
||||||
ttl?: number,
|
ttl?: number
|
||||||
config?: RequestInit
|
|
||||||
): Promise<T> {
|
): Promise<T> {
|
||||||
const cacheKey = this.serializeCacheKey(endpoint, {
|
const cacheKey = this.serializeCacheKey(endpoint, config?.params);
|
||||||
...this.params,
|
|
||||||
...params,
|
|
||||||
});
|
|
||||||
const cachedItem = this.cache?.get<T>(cacheKey);
|
const cachedItem = this.cache?.get<T>(cacheKey);
|
||||||
if (cachedItem) {
|
if (cachedItem) {
|
||||||
return cachedItem;
|
return cachedItem;
|
||||||
}
|
}
|
||||||
|
|
||||||
const url = this.formatUrl(endpoint, params);
|
const response = await this.axios.get<T>(endpoint, config);
|
||||||
const response = await this.fetch(url, {
|
|
||||||
...config,
|
|
||||||
headers: {
|
|
||||||
...this.defaultHeaders,
|
|
||||||
...config?.headers,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
const text = await response.text();
|
|
||||||
throw new Error(
|
|
||||||
`${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
|
|
||||||
{
|
|
||||||
cause: response,
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
const data = await this.getDataFromResponse(response);
|
|
||||||
|
|
||||||
if (this.cache && ttl !== 0) {
|
if (this.cache) {
|
||||||
this.cache.set(cacheKey, data, ttl ?? DEFAULT_TTL);
|
this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
|
||||||
}
|
}
|
||||||
|
|
||||||
return data;
|
return response.data;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected async post<T>(
|
protected async post<T>(
|
||||||
endpoint: string,
|
|
||||||
data?: Record<string, unknown>,
|
|
||||||
params?: Record<string, string>,
|
|
||||||
ttl?: number,
|
|
||||||
config?: RequestInit
|
|
||||||
): Promise<T> {
|
|
||||||
const cacheKey = this.serializeCacheKey(endpoint, {
|
|
||||||
config: { ...this.params, ...params },
|
|
||||||
data,
|
|
||||||
});
|
|
||||||
const cachedItem = this.cache?.get<T>(cacheKey);
|
|
||||||
if (cachedItem) {
|
|
||||||
return cachedItem;
|
|
||||||
}
|
|
||||||
|
|
||||||
const url = this.formatUrl(endpoint, params);
|
|
||||||
const response = await this.fetch(url, {
|
|
||||||
method: 'POST',
|
|
||||||
...config,
|
|
||||||
headers: {
|
|
||||||
...this.defaultHeaders,
|
|
||||||
...config?.headers,
|
|
||||||
},
|
|
||||||
body: data ? JSON.stringify(data) : undefined,
|
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
const text = await response.text();
|
|
||||||
throw new Error(
|
|
||||||
`${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
|
|
||||||
{
|
|
||||||
cause: response,
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
const resData = await this.getDataFromResponse(response);
|
|
||||||
|
|
||||||
if (this.cache && ttl !== 0) {
|
|
||||||
this.cache.set(cacheKey, resData, ttl ?? DEFAULT_TTL);
|
|
||||||
}
|
|
||||||
|
|
||||||
return resData;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected async put<T>(
|
|
||||||
endpoint: string,
|
endpoint: string,
|
||||||
data: Record<string, unknown>,
|
data: Record<string, unknown>,
|
||||||
params?: Record<string, string>,
|
config?: AxiosRequestConfig,
|
||||||
ttl?: number,
|
ttl?: number
|
||||||
config?: RequestInit
|
|
||||||
): Promise<T> {
|
): Promise<T> {
|
||||||
const cacheKey = this.serializeCacheKey(endpoint, {
|
const cacheKey = this.serializeCacheKey(endpoint, {
|
||||||
config: { ...this.params, ...params },
|
config: config?.params,
|
||||||
data,
|
data,
|
||||||
});
|
});
|
||||||
const cachedItem = this.cache?.get<T>(cacheKey);
|
const cachedItem = this.cache?.get<T>(cacheKey);
|
||||||
@@ -143,73 +84,21 @@ class ExternalAPI {
|
|||||||
return cachedItem;
|
return cachedItem;
|
||||||
}
|
}
|
||||||
|
|
||||||
const url = this.formatUrl(endpoint, params);
|
const response = await this.axios.post<T>(endpoint, data, config);
|
||||||
const response = await this.fetch(url, {
|
|
||||||
method: 'PUT',
|
|
||||||
...config,
|
|
||||||
headers: {
|
|
||||||
...this.defaultHeaders,
|
|
||||||
...config?.headers,
|
|
||||||
},
|
|
||||||
body: JSON.stringify(data),
|
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
const text = await response.text();
|
|
||||||
throw new Error(
|
|
||||||
`${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
|
|
||||||
{
|
|
||||||
cause: response,
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
const resData = await this.getDataFromResponse(response);
|
|
||||||
|
|
||||||
if (this.cache && ttl !== 0) {
|
if (this.cache) {
|
||||||
this.cache.set(cacheKey, resData, ttl ?? DEFAULT_TTL);
|
this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
|
||||||
}
|
}
|
||||||
|
|
||||||
return resData;
|
return response.data;
|
||||||
}
|
|
||||||
|
|
||||||
protected async delete<T>(
|
|
||||||
endpoint: string,
|
|
||||||
params?: Record<string, string>,
|
|
||||||
config?: RequestInit
|
|
||||||
): Promise<T> {
|
|
||||||
const url = this.formatUrl(endpoint, params);
|
|
||||||
const response = await this.fetch(url, {
|
|
||||||
method: 'DELETE',
|
|
||||||
...config,
|
|
||||||
headers: {
|
|
||||||
...this.defaultHeaders,
|
|
||||||
...config?.headers,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
const text = await response.text();
|
|
||||||
throw new Error(
|
|
||||||
`${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
|
|
||||||
{
|
|
||||||
cause: response,
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
const data = await this.getDataFromResponse(response);
|
|
||||||
|
|
||||||
return data;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected async getRolling<T>(
|
protected async getRolling<T>(
|
||||||
endpoint: string,
|
endpoint: string,
|
||||||
params?: Record<string, string>,
|
config?: AxiosRequestConfig,
|
||||||
ttl?: number,
|
ttl?: number
|
||||||
config?: RequestInit,
|
|
||||||
overwriteBaseUrl?: string
|
|
||||||
): Promise<T> {
|
): Promise<T> {
|
||||||
const cacheKey = this.serializeCacheKey(endpoint, {
|
const cacheKey = this.serializeCacheKey(endpoint, config?.params);
|
||||||
...this.params,
|
|
||||||
...params,
|
|
||||||
});
|
|
||||||
const cachedItem = this.cache?.get<T>(cacheKey);
|
const cachedItem = this.cache?.get<T>(cacheKey);
|
||||||
|
|
||||||
if (cachedItem) {
|
if (cachedItem) {
|
||||||
@@ -220,78 +109,20 @@ class ExternalAPI {
|
|||||||
keyTtl - (ttl ?? DEFAULT_TTL) * 1000 <
|
keyTtl - (ttl ?? DEFAULT_TTL) * 1000 <
|
||||||
Date.now() - DEFAULT_ROLLING_BUFFER
|
Date.now() - DEFAULT_ROLLING_BUFFER
|
||||||
) {
|
) {
|
||||||
const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
|
this.axios.get<T>(endpoint, config).then((response) => {
|
||||||
this.fetch(url, {
|
this.cache?.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
|
||||||
...config,
|
|
||||||
headers: {
|
|
||||||
...this.defaultHeaders,
|
|
||||||
...config?.headers,
|
|
||||||
},
|
|
||||||
}).then(async (response) => {
|
|
||||||
if (!response.ok) {
|
|
||||||
const text = await response.text();
|
|
||||||
throw new Error(
|
|
||||||
`${response.status} ${response.statusText}${
|
|
||||||
text ? ': ' + text : ''
|
|
||||||
}`,
|
|
||||||
{
|
|
||||||
cause: response,
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
const data = await this.getDataFromResponse(response);
|
|
||||||
this.cache?.set(cacheKey, data, ttl ?? DEFAULT_TTL);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return cachedItem;
|
return cachedItem;
|
||||||
}
|
}
|
||||||
|
|
||||||
const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
|
const response = await this.axios.get<T>(endpoint, config);
|
||||||
const response = await this.fetch(url, {
|
|
||||||
...config,
|
|
||||||
headers: {
|
|
||||||
...this.defaultHeaders,
|
|
||||||
...config?.headers,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
const text = await response.text();
|
|
||||||
throw new Error(
|
|
||||||
`${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
|
|
||||||
{
|
|
||||||
cause: response,
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
const data = await this.getDataFromResponse(response);
|
|
||||||
|
|
||||||
if (this.cache) {
|
if (this.cache) {
|
||||||
this.cache.set(cacheKey, data, ttl ?? DEFAULT_TTL);
|
this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
|
||||||
}
|
}
|
||||||
|
|
||||||
return data;
|
return response.data;
|
||||||
}
|
|
||||||
|
|
||||||
private formatUrl(
|
|
||||||
endpoint: string,
|
|
||||||
params?: Record<string, string>,
|
|
||||||
overwriteBaseUrl?: string
|
|
||||||
): string {
|
|
||||||
const baseUrl = overwriteBaseUrl || this.baseUrl;
|
|
||||||
const href =
|
|
||||||
baseUrl +
|
|
||||||
(baseUrl.endsWith('/') ? '' : '/') +
|
|
||||||
(endpoint.startsWith('/') ? endpoint.slice(1) : endpoint);
|
|
||||||
const searchParams = new URLSearchParams({
|
|
||||||
...this.params,
|
|
||||||
...params,
|
|
||||||
});
|
|
||||||
return (
|
|
||||||
href +
|
|
||||||
(searchParams.toString().length
|
|
||||||
? '?' + searchParams.toString()
|
|
||||||
: searchParams.toString())
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private serializeCacheKey(
|
private serializeCacheKey(
|
||||||
@@ -304,29 +135,6 @@ class ExternalAPI {
|
|||||||
|
|
||||||
return `${this.baseUrl}${endpoint}${JSON.stringify(params)}`;
|
return `${this.baseUrl}${endpoint}${JSON.stringify(params)}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async getDataFromResponse(response: Response) {
|
|
||||||
const contentType = response.headers.get('Content-Type');
|
|
||||||
if (contentType?.includes('application/json')) {
|
|
||||||
return await response.json();
|
|
||||||
} else if (
|
|
||||||
contentType?.includes('application/xml') ||
|
|
||||||
contentType?.includes('text/html') ||
|
|
||||||
contentType?.includes('text/plain')
|
|
||||||
) {
|
|
||||||
return await response.text();
|
|
||||||
} else {
|
|
||||||
try {
|
|
||||||
return await response.json();
|
|
||||||
} catch {
|
|
||||||
try {
|
|
||||||
return await response.blob();
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default ExternalAPI;
|
export default ExternalAPI;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import ExternalAPI from '@server/api/externalapi';
|
|
||||||
import cacheManager from '@server/lib/cache';
|
import cacheManager from '@server/lib/cache';
|
||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
|
import ExternalAPI from './externalapi';
|
||||||
|
|
||||||
interface GitHubRelease {
|
interface GitHubRelease {
|
||||||
url: string;
|
url: string;
|
||||||
@@ -67,6 +67,10 @@ class GithubAPI extends ExternalAPI {
|
|||||||
'https://api.github.com',
|
'https://api.github.com',
|
||||||
{},
|
{},
|
||||||
{
|
{
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
Accept: 'application/json',
|
||||||
|
},
|
||||||
nodeCache: cacheManager.getCache('github').data,
|
nodeCache: cacheManager.getCache('github').data,
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@@ -81,7 +85,9 @@ class GithubAPI extends ExternalAPI {
|
|||||||
const data = await this.get<GitHubRelease[]>(
|
const data = await this.get<GitHubRelease[]>(
|
||||||
'/repos/fallenbagel/jellyseerr/releases',
|
'/repos/fallenbagel/jellyseerr/releases',
|
||||||
{
|
{
|
||||||
per_page: take.toString(),
|
params: {
|
||||||
|
per_page: take,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -106,8 +112,10 @@ class GithubAPI extends ExternalAPI {
|
|||||||
const data = await this.get<GithubCommit[]>(
|
const data = await this.get<GithubCommit[]>(
|
||||||
'/repos/fallenbagel/jellyseerr/commits',
|
'/repos/fallenbagel/jellyseerr/commits',
|
||||||
{
|
{
|
||||||
per_page: take.toString(),
|
params: {
|
||||||
|
per_page: take,
|
||||||
branch,
|
branch,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -93,7 +93,9 @@ export interface JellyfinLibraryItemExtended extends JellyfinLibraryItem {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class JellyfinAPI extends ExternalAPI {
|
class JellyfinAPI extends ExternalAPI {
|
||||||
|
private authToken?: string;
|
||||||
private userId?: string;
|
private userId?: string;
|
||||||
|
private jellyfinHost: string;
|
||||||
|
|
||||||
constructor(jellyfinHost: string, authToken?: string, deviceId?: string) {
|
constructor(jellyfinHost: string, authToken?: string, deviceId?: string) {
|
||||||
let authHeaderVal: string;
|
let authHeaderVal: string;
|
||||||
@@ -109,9 +111,14 @@ class JellyfinAPI extends ExternalAPI {
|
|||||||
{
|
{
|
||||||
headers: {
|
headers: {
|
||||||
'X-Emby-Authorization': authHeaderVal,
|
'X-Emby-Authorization': authHeaderVal,
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
Accept: 'application/json',
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
this.jellyfinHost = jellyfinHost;
|
||||||
|
this.authToken = authToken;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async login(
|
public async login(
|
||||||
@@ -120,7 +127,7 @@ class JellyfinAPI extends ExternalAPI {
|
|||||||
ClientIP?: string
|
ClientIP?: string
|
||||||
): Promise<JellyfinLoginResponse> {
|
): Promise<JellyfinLoginResponse> {
|
||||||
const authenticate = async (useHeaders: boolean) => {
|
const authenticate = async (useHeaders: boolean) => {
|
||||||
const headers: { [key: string]: string } =
|
const headers =
|
||||||
useHeaders && ClientIP ? { 'X-Forwarded-For': ClientIP } : {};
|
useHeaders && ClientIP ? { 'X-Forwarded-For': ClientIP } : {};
|
||||||
|
|
||||||
return this.post<JellyfinLoginResponse>(
|
return this.post<JellyfinLoginResponse>(
|
||||||
@@ -129,8 +136,6 @@ class JellyfinAPI extends ExternalAPI {
|
|||||||
Username,
|
Username,
|
||||||
Pw: Password,
|
Pw: Password,
|
||||||
},
|
},
|
||||||
{},
|
|
||||||
undefined,
|
|
||||||
{ headers }
|
{ headers }
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -147,7 +152,7 @@ class JellyfinAPI extends ExternalAPI {
|
|||||||
try {
|
try {
|
||||||
return await authenticate(false);
|
return await authenticate(false);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
const status = e.cause?.status;
|
const status = e.response?.status;
|
||||||
|
|
||||||
const networkErrorCodes = new Set([
|
const networkErrorCodes = new Set([
|
||||||
'ECONNREFUSED',
|
'ECONNREFUSED',
|
||||||
@@ -185,7 +190,7 @@ class JellyfinAPI extends ExternalAPI {
|
|||||||
|
|
||||||
return systemInfoResponse;
|
return systemInfoResponse;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
|
throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -202,7 +207,7 @@ class JellyfinAPI extends ExternalAPI {
|
|||||||
{ label: 'Jellyfin API' }
|
{ label: 'Jellyfin API' }
|
||||||
);
|
);
|
||||||
|
|
||||||
throw new ApiError(e.cause?.status, ApiErrorCode.Unknown);
|
throw new ApiError(e.response?.status, ApiErrorCode.Unknown);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -217,7 +222,7 @@ class JellyfinAPI extends ExternalAPI {
|
|||||||
{ label: 'Jellyfin API' }
|
{ label: 'Jellyfin API' }
|
||||||
);
|
);
|
||||||
|
|
||||||
throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
|
throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -233,7 +238,7 @@ class JellyfinAPI extends ExternalAPI {
|
|||||||
{ label: 'Jellyfin API' }
|
{ label: 'Jellyfin API' }
|
||||||
);
|
);
|
||||||
|
|
||||||
throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
|
throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -291,16 +296,7 @@ class JellyfinAPI extends ExternalAPI {
|
|||||||
public async getLibraryContents(id: string): Promise<JellyfinLibraryItem[]> {
|
public async getLibraryContents(id: string): Promise<JellyfinLibraryItem[]> {
|
||||||
try {
|
try {
|
||||||
const libraryItemsResponse = await this.get<any>(
|
const libraryItemsResponse = await this.get<any>(
|
||||||
`/Users/${this.userId}/Items`,
|
`/Users/${this.userId}/Items?SortBy=SortName&SortOrder=Ascending&IncludeItemTypes=Series,Movie,Others&Recursive=true&StartIndex=0&ParentId=${id}&collapseBoxSetItems=false`
|
||||||
{
|
|
||||||
SortBy: 'SortName',
|
|
||||||
SortOrder: 'Ascending',
|
|
||||||
IncludeItemTypes: 'Series,Movie,Others',
|
|
||||||
Recursive: 'true',
|
|
||||||
StartIndex: '0',
|
|
||||||
ParentId: id,
|
|
||||||
collapseBoxSetItems: 'false',
|
|
||||||
}
|
|
||||||
);
|
);
|
||||||
|
|
||||||
return libraryItemsResponse.Items.filter(
|
return libraryItemsResponse.Items.filter(
|
||||||
@@ -312,18 +308,14 @@ class JellyfinAPI extends ExternalAPI {
|
|||||||
{ label: 'Jellyfin API' }
|
{ label: 'Jellyfin API' }
|
||||||
);
|
);
|
||||||
|
|
||||||
throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
|
throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getRecentlyAdded(id: string): Promise<JellyfinLibraryItem[]> {
|
public async getRecentlyAdded(id: string): Promise<JellyfinLibraryItem[]> {
|
||||||
try {
|
try {
|
||||||
const itemResponse = await this.get<any>(
|
const itemResponse = await this.get<any>(
|
||||||
`/Users/${this.userId}/Items/Latest`,
|
`/Users/${this.userId}/Items/Latest?Limit=12&ParentId=${id}`
|
||||||
{
|
|
||||||
Limit: '12',
|
|
||||||
ParentId: id,
|
|
||||||
}
|
|
||||||
);
|
);
|
||||||
|
|
||||||
return itemResponse;
|
return itemResponse;
|
||||||
@@ -333,7 +325,7 @@ class JellyfinAPI extends ExternalAPI {
|
|||||||
{ label: 'Jellyfin API' }
|
{ label: 'Jellyfin API' }
|
||||||
);
|
);
|
||||||
|
|
||||||
throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
|
throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -348,7 +340,7 @@ class JellyfinAPI extends ExternalAPI {
|
|||||||
return itemResponse;
|
return itemResponse;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (availabilitySync.running) {
|
if (availabilitySync.running) {
|
||||||
if (e.cause?.status === 500) {
|
if (e.response && e.response.status === 500) {
|
||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -357,7 +349,7 @@ class JellyfinAPI extends ExternalAPI {
|
|||||||
`Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
|
`Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
|
||||||
{ label: 'Jellyfin API' }
|
{ label: 'Jellyfin API' }
|
||||||
);
|
);
|
||||||
throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
|
throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -372,7 +364,7 @@ class JellyfinAPI extends ExternalAPI {
|
|||||||
{ label: 'Jellyfin API' }
|
{ label: 'Jellyfin API' }
|
||||||
);
|
);
|
||||||
|
|
||||||
throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
|
throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -382,10 +374,7 @@ class JellyfinAPI extends ExternalAPI {
|
|||||||
): Promise<JellyfinLibraryItem[]> {
|
): Promise<JellyfinLibraryItem[]> {
|
||||||
try {
|
try {
|
||||||
const episodeResponse = await this.get<any>(
|
const episodeResponse = await this.get<any>(
|
||||||
`/Shows/${seriesID}/Episodes`,
|
`/Shows/${seriesID}/Episodes?seasonId=${seasonID}`
|
||||||
{
|
|
||||||
seasonId: seasonID,
|
|
||||||
}
|
|
||||||
);
|
);
|
||||||
|
|
||||||
return episodeResponse.Items.filter(
|
return episodeResponse.Items.filter(
|
||||||
@@ -397,23 +386,6 @@ class JellyfinAPI extends ExternalAPI {
|
|||||||
{ label: 'Jellyfin API' }
|
{ label: 'Jellyfin API' }
|
||||||
);
|
);
|
||||||
|
|
||||||
throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async createApiToken(appName: string): Promise<string> {
|
|
||||||
try {
|
|
||||||
await this.post(`/Auth/Keys?App=${appName}`);
|
|
||||||
const apiKeys = await this.get<any>(`/Auth/Keys`);
|
|
||||||
return apiKeys.Items.reverse().find(
|
|
||||||
(item: any) => item.AppName === appName
|
|
||||||
).AccessToken;
|
|
||||||
} catch (e) {
|
|
||||||
logger.error(
|
|
||||||
`Something went wrong while creating an API key the Jellyfin server: ${e.message}`,
|
|
||||||
{ label: 'Jellyfin API' }
|
|
||||||
);
|
|
||||||
|
|
||||||
throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
|
throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
import ExternalAPI from '@server/api/externalapi';
|
|
||||||
import type { PlexDevice } from '@server/interfaces/api/plexInterfaces';
|
import type { PlexDevice } from '@server/interfaces/api/plexInterfaces';
|
||||||
import cacheManager from '@server/lib/cache';
|
import cacheManager from '@server/lib/cache';
|
||||||
import { getSettings } from '@server/lib/settings';
|
import { getSettings } from '@server/lib/settings';
|
||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
import xml2js from 'xml2js';
|
import xml2js from 'xml2js';
|
||||||
|
import ExternalAPI from './externalapi';
|
||||||
|
|
||||||
interface PlexAccountResponse {
|
interface PlexAccountResponse {
|
||||||
user: PlexUser;
|
user: PlexUser;
|
||||||
@@ -137,6 +137,8 @@ class PlexTvAPI extends ExternalAPI {
|
|||||||
{
|
{
|
||||||
headers: {
|
headers: {
|
||||||
'X-Plex-Token': authToken,
|
'X-Plex-Token': authToken,
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
Accept: 'application/json',
|
||||||
},
|
},
|
||||||
nodeCache: cacheManager.getCache('plextv').data,
|
nodeCache: cacheManager.getCache('plextv').data,
|
||||||
}
|
}
|
||||||
@@ -147,11 +149,15 @@ class PlexTvAPI extends ExternalAPI {
|
|||||||
|
|
||||||
public async getDevices(): Promise<PlexDevice[]> {
|
public async getDevices(): Promise<PlexDevice[]> {
|
||||||
try {
|
try {
|
||||||
const devicesResp = await this.get('/api/resources', {
|
const devicesResp = await this.axios.get(
|
||||||
includeHttps: '1',
|
'/api/resources?includeHttps=1',
|
||||||
});
|
{
|
||||||
|
transformResponse: [],
|
||||||
|
responseType: 'text',
|
||||||
|
}
|
||||||
|
);
|
||||||
const parsedXml = await xml2js.parseStringPromise(
|
const parsedXml = await xml2js.parseStringPromise(
|
||||||
devicesResp as DeviceResponse
|
devicesResp.data as DeviceResponse
|
||||||
);
|
);
|
||||||
return parsedXml?.MediaContainer?.Device?.map((pxml: DeviceResponse) => ({
|
return parsedXml?.MediaContainer?.Device?.map((pxml: DeviceResponse) => ({
|
||||||
name: pxml.$.name,
|
name: pxml.$.name,
|
||||||
@@ -199,11 +205,11 @@ class PlexTvAPI extends ExternalAPI {
|
|||||||
|
|
||||||
public async getUser(): Promise<PlexUser> {
|
public async getUser(): Promise<PlexUser> {
|
||||||
try {
|
try {
|
||||||
const account = await this.get<PlexAccountResponse>(
|
const account = await this.axios.get<PlexAccountResponse>(
|
||||||
'/users/account.json'
|
'/users/account.json'
|
||||||
);
|
);
|
||||||
|
|
||||||
return account.user;
|
return account.data.user;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.error(
|
logger.error(
|
||||||
`Something went wrong while getting the account from plex.tv: ${e.message}`,
|
`Something went wrong while getting the account from plex.tv: ${e.message}`,
|
||||||
@@ -243,10 +249,13 @@ class PlexTvAPI extends ExternalAPI {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public async getUsers(): Promise<UsersResponse> {
|
public async getUsers(): Promise<UsersResponse> {
|
||||||
const data = await this.get('/api/users');
|
const response = await this.axios.get('/api/users', {
|
||||||
|
transformResponse: [],
|
||||||
|
responseType: 'text',
|
||||||
|
});
|
||||||
|
|
||||||
const parsedXml = (await xml2js.parseStringPromise(
|
const parsedXml = (await xml2js.parseStringPromise(
|
||||||
data as string
|
response.data
|
||||||
)) as UsersResponse;
|
)) as UsersResponse;
|
||||||
return parsedXml;
|
return parsedXml;
|
||||||
}
|
}
|
||||||
@@ -261,26 +270,25 @@ class PlexTvAPI extends ExternalAPI {
|
|||||||
items: PlexWatchlistItem[];
|
items: PlexWatchlistItem[];
|
||||||
}> {
|
}> {
|
||||||
try {
|
try {
|
||||||
const params = new URLSearchParams({
|
const response = await this.axios.get<WatchlistResponse>(
|
||||||
'X-Plex-Container-Start': offset.toString(),
|
'/library/sections/watchlist/all',
|
||||||
'X-Plex-Container-Size': size.toString(),
|
|
||||||
});
|
|
||||||
const response = await this.fetch(
|
|
||||||
`https://metadata.provider.plex.tv/library/sections/watchlist/all?${params.toString()}`,
|
|
||||||
{
|
{
|
||||||
headers: this.defaultHeaders,
|
params: {
|
||||||
|
'X-Plex-Container-Start': offset,
|
||||||
|
'X-Plex-Container-Size': size,
|
||||||
|
},
|
||||||
|
baseURL: 'https://metadata.provider.plex.tv',
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
const data = (await response.json()) as WatchlistResponse;
|
|
||||||
|
|
||||||
const watchlistDetails = await Promise.all(
|
const watchlistDetails = await Promise.all(
|
||||||
(data.MediaContainer.Metadata ?? []).map(async (watchlistItem) => {
|
(response.data.MediaContainer.Metadata ?? []).map(
|
||||||
|
async (watchlistItem) => {
|
||||||
const detailedResponse = await this.getRolling<MetadataResponse>(
|
const detailedResponse = await this.getRolling<MetadataResponse>(
|
||||||
`/library/metadata/${watchlistItem.ratingKey}`,
|
`/library/metadata/${watchlistItem.ratingKey}`,
|
||||||
{},
|
{
|
||||||
undefined,
|
baseURL: 'https://metadata.provider.plex.tv',
|
||||||
{},
|
}
|
||||||
'https://metadata.provider.plex.tv'
|
|
||||||
);
|
);
|
||||||
|
|
||||||
const metadata = detailedResponse.MediaContainer.Metadata[0];
|
const metadata = detailedResponse.MediaContainer.Metadata[0];
|
||||||
@@ -303,7 +311,8 @@ class PlexTvAPI extends ExternalAPI {
|
|||||||
title: metadata.title,
|
title: metadata.title,
|
||||||
type: metadata.type,
|
type: metadata.type,
|
||||||
};
|
};
|
||||||
})
|
}
|
||||||
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
const filteredList = watchlistDetails.filter((detail) => detail.tmdbId);
|
const filteredList = watchlistDetails.filter((detail) => detail.tmdbId);
|
||||||
@@ -311,7 +320,7 @@ class PlexTvAPI extends ExternalAPI {
|
|||||||
return {
|
return {
|
||||||
offset,
|
offset,
|
||||||
size,
|
size,
|
||||||
totalSize: data.MediaContainer.totalSize,
|
totalSize: response.data.MediaContainer.totalSize,
|
||||||
items: filteredList,
|
items: filteredList,
|
||||||
};
|
};
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import ExternalAPI from '@server/api/externalapi';
|
import ExternalAPI from './externalapi';
|
||||||
|
|
||||||
interface PushoverSoundsResponse {
|
interface PushoverSoundsResponse {
|
||||||
sounds: {
|
sounds: {
|
||||||
@@ -26,13 +26,24 @@ export const mapSounds = (sounds: {
|
|||||||
|
|
||||||
class PushoverAPI extends ExternalAPI {
|
class PushoverAPI extends ExternalAPI {
|
||||||
constructor() {
|
constructor() {
|
||||||
super('https://api.pushover.net/1');
|
super(
|
||||||
|
'https://api.pushover.net/1',
|
||||||
|
{},
|
||||||
|
{
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
Accept: 'application/json',
|
||||||
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getSounds(appToken: string): Promise<PushoverSound[]> {
|
public async getSounds(appToken: string): Promise<PushoverSound[]> {
|
||||||
try {
|
try {
|
||||||
const data = await this.get<PushoverSoundsResponse>('/sounds.json', {
|
const data = await this.get<PushoverSoundsResponse>('/sounds.json', {
|
||||||
|
params: {
|
||||||
token: appToken,
|
token: appToken,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
return mapSounds(data.sounds);
|
return mapSounds(data.sounds);
|
||||||
|
|||||||
@@ -155,13 +155,13 @@ export interface IMDBRating {
|
|||||||
*/
|
*/
|
||||||
class IMDBRadarrProxy extends ExternalAPI {
|
class IMDBRadarrProxy extends ExternalAPI {
|
||||||
constructor() {
|
constructor() {
|
||||||
super(
|
super('https://api.radarr.video/v1', {
|
||||||
'https://api.radarr.video/v1',
|
headers: {
|
||||||
{},
|
'Content-Type': 'application/json',
|
||||||
{
|
Accept: 'application/json',
|
||||||
|
},
|
||||||
nodeCache: cacheManager.getCache('imdb').data,
|
nodeCache: cacheManager.getCache('imdb').data,
|
||||||
}
|
});
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -175,11 +175,7 @@ class IMDBRadarrProxy extends ExternalAPI {
|
|||||||
`/movie/imdb/${IMDBid}`
|
`/movie/imdb/${IMDBid}`
|
||||||
);
|
);
|
||||||
|
|
||||||
if (
|
if (!data?.length || data[0].ImdbId !== IMDBid) {
|
||||||
!data?.length ||
|
|
||||||
data[0].ImdbId !== IMDBid ||
|
|
||||||
!data[0].MovieRatings.Imdb
|
|
||||||
) {
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -63,12 +63,15 @@ class RottenTomatoes extends ExternalAPI {
|
|||||||
super(
|
super(
|
||||||
'https://79frdp12pn-dsn.algolia.net/1/indexes/*',
|
'https://79frdp12pn-dsn.algolia.net/1/indexes/*',
|
||||||
{
|
{
|
||||||
'x-algolia-agent': 'Algolia for JavaScript (4.14.3); Browser (lite)',
|
'x-algolia-agent':
|
||||||
|
'Algolia%20for%20JavaScript%20(4.14.3)%3B%20Browser%20(lite)',
|
||||||
'x-algolia-api-key': '175588f6e5f8319b27702e4cc4013561',
|
'x-algolia-api-key': '175588f6e5f8319b27702e4cc4013561',
|
||||||
'x-algolia-application-id': '79FRDP12PN',
|
'x-algolia-application-id': '79FRDP12PN',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
headers: {
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
Accept: 'application/json',
|
||||||
'x-algolia-usertoken': settings.clientId,
|
'x-algolia-usertoken': settings.clientId,
|
||||||
},
|
},
|
||||||
nodeCache: cacheManager.getCache('rt').data,
|
nodeCache: cacheManager.getCache('rt').data,
|
||||||
@@ -182,7 +185,7 @@ class RottenTomatoes extends ExternalAPI {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!tvshow || !tvshow.rottenTomatoes) {
|
if (!tvshow) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -113,9 +113,9 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
|
|||||||
|
|
||||||
public getSystemStatus = async (): Promise<SystemStatus> => {
|
public getSystemStatus = async (): Promise<SystemStatus> => {
|
||||||
try {
|
try {
|
||||||
const data = await this.get<SystemStatus>('/system/status');
|
const response = await this.axios.get<SystemStatus>('/system/status');
|
||||||
|
|
||||||
return data;
|
return response.data;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`[${this.apiName}] Failed to retrieve system status: ${e.message}`
|
`[${this.apiName}] Failed to retrieve system status: ${e.message}`
|
||||||
@@ -157,15 +157,16 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
|
|||||||
|
|
||||||
public getQueue = async (): Promise<(QueueItem & QueueItemAppendT)[]> => {
|
public getQueue = async (): Promise<(QueueItem & QueueItemAppendT)[]> => {
|
||||||
try {
|
try {
|
||||||
const data = await this.get<QueueResponse<QueueItemAppendT>>(
|
const response = await this.axios.get<QueueResponse<QueueItemAppendT>>(
|
||||||
`/queue`,
|
`/queue`,
|
||||||
{
|
{
|
||||||
includeEpisode: 'true',
|
params: {
|
||||||
|
includeEpisode: true,
|
||||||
},
|
},
|
||||||
0
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
return data.records;
|
return response.data.records;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`[${this.apiName}] Failed to retrieve queue: ${e.message}`
|
`[${this.apiName}] Failed to retrieve queue: ${e.message}`
|
||||||
@@ -175,9 +176,9 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
|
|||||||
|
|
||||||
public getTags = async (): Promise<Tag[]> => {
|
public getTags = async (): Promise<Tag[]> => {
|
||||||
try {
|
try {
|
||||||
const data = await this.get<Tag[]>(`/tag`);
|
const response = await this.axios.get<Tag[]>(`/tag`);
|
||||||
|
|
||||||
return data;
|
return response.data;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`[${this.apiName}] Failed to retrieve tags: ${e.message}`
|
`[${this.apiName}] Failed to retrieve tags: ${e.message}`
|
||||||
@@ -187,34 +188,25 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
|
|||||||
|
|
||||||
public createTag = async ({ label }: { label: string }): Promise<Tag> => {
|
public createTag = async ({ label }: { label: string }): Promise<Tag> => {
|
||||||
try {
|
try {
|
||||||
const data = await this.post<Tag>(`/tag`, {
|
const response = await this.axios.post<Tag>(`/tag`, {
|
||||||
label,
|
label,
|
||||||
});
|
});
|
||||||
|
|
||||||
return data;
|
return response.data;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw new Error(`[${this.apiName}] Failed to create tag: ${e.message}`);
|
throw new Error(`[${this.apiName}] Failed to create tag: ${e.message}`);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
async refreshMonitoredDownloads(): Promise<void> {
|
|
||||||
await this.runCommand('RefreshMonitoredDownloads', {});
|
|
||||||
}
|
|
||||||
|
|
||||||
protected async runCommand(
|
protected async runCommand(
|
||||||
commandName: string,
|
commandName: string,
|
||||||
options: Record<string, unknown>
|
options: Record<string, unknown>
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
try {
|
try {
|
||||||
await this.post(
|
await this.axios.post(`/command`, {
|
||||||
`/command`,
|
|
||||||
{
|
|
||||||
name: commandName,
|
name: commandName,
|
||||||
...options,
|
...options,
|
||||||
},
|
});
|
||||||
{},
|
|
||||||
0
|
|
||||||
);
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw new Error(`[${this.apiName}] Failed to run command: ${e.message}`);
|
throw new Error(`[${this.apiName}] Failed to run command: ${e.message}`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,9 +37,9 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
|
|||||||
|
|
||||||
public getMovies = async (): Promise<RadarrMovie[]> => {
|
public getMovies = async (): Promise<RadarrMovie[]> => {
|
||||||
try {
|
try {
|
||||||
const data = await this.get<RadarrMovie[]>('/movie');
|
const response = await this.axios.get<RadarrMovie[]>('/movie');
|
||||||
|
|
||||||
return data;
|
return response.data;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw new Error(`[Radarr] Failed to retrieve movies: ${e.message}`);
|
throw new Error(`[Radarr] Failed to retrieve movies: ${e.message}`);
|
||||||
}
|
}
|
||||||
@@ -47,9 +47,9 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
|
|||||||
|
|
||||||
public getMovie = async ({ id }: { id: number }): Promise<RadarrMovie> => {
|
public getMovie = async ({ id }: { id: number }): Promise<RadarrMovie> => {
|
||||||
try {
|
try {
|
||||||
const data = await this.get<RadarrMovie>(`/movie/${id}`);
|
const response = await this.axios.get<RadarrMovie>(`/movie/${id}`);
|
||||||
|
|
||||||
return data;
|
return response.data;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw new Error(`[Radarr] Failed to retrieve movie: ${e.message}`);
|
throw new Error(`[Radarr] Failed to retrieve movie: ${e.message}`);
|
||||||
}
|
}
|
||||||
@@ -57,15 +57,17 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
|
|||||||
|
|
||||||
public async getMovieByTmdbId(id: number): Promise<RadarrMovie> {
|
public async getMovieByTmdbId(id: number): Promise<RadarrMovie> {
|
||||||
try {
|
try {
|
||||||
const data = await this.get<RadarrMovie[]>('/movie/lookup', {
|
const response = await this.axios.get<RadarrMovie[]>('/movie/lookup', {
|
||||||
|
params: {
|
||||||
term: `tmdb:${id}`,
|
term: `tmdb:${id}`,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!data[0]) {
|
if (!response.data[0]) {
|
||||||
throw new Error('Movie not found');
|
throw new Error('Movie not found');
|
||||||
}
|
}
|
||||||
|
|
||||||
return data[0];
|
return response.data[0];
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.error('Error retrieving movie by TMDB ID', {
|
logger.error('Error retrieving movie by TMDB ID', {
|
||||||
label: 'Radarr API',
|
label: 'Radarr API',
|
||||||
@@ -95,7 +97,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
|
|||||||
|
|
||||||
// movie exists in Radarr but is neither downloaded nor monitored
|
// movie exists in Radarr but is neither downloaded nor monitored
|
||||||
if (movie.id && !movie.monitored) {
|
if (movie.id && !movie.monitored) {
|
||||||
const data = await this.put<RadarrMovie>(`/movie`, {
|
const response = await this.axios.put<RadarrMovie>(`/movie`, {
|
||||||
...movie,
|
...movie,
|
||||||
title: options.title,
|
title: options.title,
|
||||||
qualityProfileId: options.qualityProfileId,
|
qualityProfileId: options.qualityProfileId,
|
||||||
@@ -112,25 +114,25 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
if (data.monitored) {
|
if (response.data.monitored) {
|
||||||
logger.info(
|
logger.info(
|
||||||
'Found existing title in Radarr and set it to monitored.',
|
'Found existing title in Radarr and set it to monitored.',
|
||||||
{
|
{
|
||||||
label: 'Radarr',
|
label: 'Radarr',
|
||||||
movieId: data.id,
|
movieId: response.data.id,
|
||||||
movieTitle: data.title,
|
movieTitle: response.data.title,
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
logger.debug('Radarr update details', {
|
logger.debug('Radarr update details', {
|
||||||
label: 'Radarr',
|
label: 'Radarr',
|
||||||
movie: data,
|
movie: response.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (options.searchNow) {
|
if (options.searchNow) {
|
||||||
this.searchMovie(data.id);
|
this.searchMovie(response.data.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
return data;
|
return response.data;
|
||||||
} else {
|
} else {
|
||||||
logger.error('Failed to update existing movie in Radarr.', {
|
logger.error('Failed to update existing movie in Radarr.', {
|
||||||
label: 'Radarr',
|
label: 'Radarr',
|
||||||
@@ -148,7 +150,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
|
|||||||
return movie;
|
return movie;
|
||||||
}
|
}
|
||||||
|
|
||||||
const data = await this.post<RadarrMovie>(`/movie`, {
|
const response = await this.axios.post<RadarrMovie>(`/movie`, {
|
||||||
title: options.title,
|
title: options.title,
|
||||||
qualityProfileId: options.qualityProfileId,
|
qualityProfileId: options.qualityProfileId,
|
||||||
profileId: options.profileId,
|
profileId: options.profileId,
|
||||||
@@ -164,11 +166,11 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
if (data.id) {
|
if (response.data.id) {
|
||||||
logger.info('Radarr accepted request', { label: 'Radarr' });
|
logger.info('Radarr accepted request', { label: 'Radarr' });
|
||||||
logger.debug('Radarr add details', {
|
logger.debug('Radarr add details', {
|
||||||
label: 'Radarr',
|
label: 'Radarr',
|
||||||
movie: data,
|
movie: response.data,
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
logger.error('Failed to add movie to Radarr', {
|
logger.error('Failed to add movie to Radarr', {
|
||||||
@@ -177,22 +179,15 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
|
|||||||
});
|
});
|
||||||
throw new Error('Failed to add movie to Radarr');
|
throw new Error('Failed to add movie to Radarr');
|
||||||
}
|
}
|
||||||
return data;
|
return response.data;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = await e.cause?.text();
|
|
||||||
errorData = JSON.parse(errorData);
|
|
||||||
} catch {
|
|
||||||
/* empty */
|
|
||||||
}
|
|
||||||
logger.error(
|
logger.error(
|
||||||
'Failed to add movie to Radarr. This might happen if the movie already exists, in which case you can safely ignore this error.',
|
'Failed to add movie to Radarr. This might happen if the movie already exists, in which case you can safely ignore this error.',
|
||||||
{
|
{
|
||||||
label: 'Radarr',
|
label: 'Radarr',
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
options,
|
options,
|
||||||
response: errorData,
|
response: e?.response?.data,
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
throw new Error('Failed to add movie to Radarr');
|
throw new Error('Failed to add movie to Radarr');
|
||||||
@@ -221,9 +216,11 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
|
|||||||
public removeMovie = async (movieId: number): Promise<void> => {
|
public removeMovie = async (movieId: number): Promise<void> => {
|
||||||
try {
|
try {
|
||||||
const { id, title } = await this.getMovieByTmdbId(movieId);
|
const { id, title } = await this.getMovieByTmdbId(movieId);
|
||||||
await this.delete(`/movie/${id}`, {
|
await this.axios.delete(`/movie/${id}`, {
|
||||||
deleteFiles: 'true',
|
params: {
|
||||||
addImportExclusion: 'false',
|
deleteFiles: true,
|
||||||
|
addImportExclusion: false,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
logger.info(`[Radarr] Removed movie ${title}`);
|
logger.info(`[Radarr] Removed movie ${title}`);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|||||||
@@ -117,9 +117,9 @@ class SonarrAPI extends ServarrBase<{
|
|||||||
|
|
||||||
public async getSeries(): Promise<SonarrSeries[]> {
|
public async getSeries(): Promise<SonarrSeries[]> {
|
||||||
try {
|
try {
|
||||||
const data = await this.get<SonarrSeries[]>('/series');
|
const response = await this.axios.get<SonarrSeries[]>('/series');
|
||||||
|
|
||||||
return data;
|
return response.data;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw new Error(`[Sonarr] Failed to retrieve series: ${e.message}`);
|
throw new Error(`[Sonarr] Failed to retrieve series: ${e.message}`);
|
||||||
}
|
}
|
||||||
@@ -127,9 +127,9 @@ class SonarrAPI extends ServarrBase<{
|
|||||||
|
|
||||||
public async getSeriesById(id: number): Promise<SonarrSeries> {
|
public async getSeriesById(id: number): Promise<SonarrSeries> {
|
||||||
try {
|
try {
|
||||||
const data = await this.get<SonarrSeries>(`/series/${id}`);
|
const response = await this.axios.get<SonarrSeries>(`/series/${id}`);
|
||||||
|
|
||||||
return data;
|
return response.data;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw new Error(`[Sonarr] Failed to retrieve series by ID: ${e.message}`);
|
throw new Error(`[Sonarr] Failed to retrieve series by ID: ${e.message}`);
|
||||||
}
|
}
|
||||||
@@ -137,15 +137,17 @@ class SonarrAPI extends ServarrBase<{
|
|||||||
|
|
||||||
public async getSeriesByTitle(title: string): Promise<SonarrSeries[]> {
|
public async getSeriesByTitle(title: string): Promise<SonarrSeries[]> {
|
||||||
try {
|
try {
|
||||||
const data = await this.get<SonarrSeries[]>('/series/lookup', {
|
const response = await this.axios.get<SonarrSeries[]>('/series/lookup', {
|
||||||
|
params: {
|
||||||
term: title,
|
term: title,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!data[0]) {
|
if (!response.data[0]) {
|
||||||
throw new Error('No series found');
|
throw new Error('No series found');
|
||||||
}
|
}
|
||||||
|
|
||||||
return data;
|
return response.data;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.error('Error retrieving series by series title', {
|
logger.error('Error retrieving series by series title', {
|
||||||
label: 'Sonarr API',
|
label: 'Sonarr API',
|
||||||
@@ -158,15 +160,17 @@ class SonarrAPI extends ServarrBase<{
|
|||||||
|
|
||||||
public async getSeriesByTvdbId(id: number): Promise<SonarrSeries> {
|
public async getSeriesByTvdbId(id: number): Promise<SonarrSeries> {
|
||||||
try {
|
try {
|
||||||
const data = await this.get<SonarrSeries[]>('/series/lookup', {
|
const response = await this.axios.get<SonarrSeries[]>('/series/lookup', {
|
||||||
|
params: {
|
||||||
term: `tvdb:${id}`,
|
term: `tvdb:${id}`,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!data[0]) {
|
if (!response.data[0]) {
|
||||||
throw new Error('Series not found');
|
throw new Error('Series not found');
|
||||||
}
|
}
|
||||||
|
|
||||||
return data[0];
|
return response.data[0];
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.error('Error retrieving series by tvdb ID', {
|
logger.error('Error retrieving series by tvdb ID', {
|
||||||
label: 'Sonarr API',
|
label: 'Sonarr API',
|
||||||
@@ -187,27 +191,27 @@ class SonarrAPI extends ServarrBase<{
|
|||||||
series.tags = options.tags ?? series.tags;
|
series.tags = options.tags ?? series.tags;
|
||||||
series.seasons = this.buildSeasonList(options.seasons, series.seasons);
|
series.seasons = this.buildSeasonList(options.seasons, series.seasons);
|
||||||
|
|
||||||
const newSeriesData = await this.put<SonarrSeries>(
|
const newSeriesResponse = await this.axios.put<SonarrSeries>(
|
||||||
'/series',
|
'/series',
|
||||||
series as any
|
series
|
||||||
);
|
);
|
||||||
|
|
||||||
if (newSeriesData.id) {
|
if (newSeriesResponse.data.id) {
|
||||||
logger.info('Updated existing series in Sonarr.', {
|
logger.info('Updated existing series in Sonarr.', {
|
||||||
label: 'Sonarr',
|
label: 'Sonarr',
|
||||||
seriesId: newSeriesData.id,
|
seriesId: newSeriesResponse.data.id,
|
||||||
seriesTitle: newSeriesData.title,
|
seriesTitle: newSeriesResponse.data.title,
|
||||||
});
|
});
|
||||||
logger.debug('Sonarr update details', {
|
logger.debug('Sonarr update details', {
|
||||||
label: 'Sonarr',
|
label: 'Sonarr',
|
||||||
movie: newSeriesData,
|
movie: newSeriesResponse.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (options.searchNow) {
|
if (options.searchNow) {
|
||||||
this.searchSeries(newSeriesData.id);
|
this.searchSeries(newSeriesResponse.data.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
return newSeriesData;
|
return newSeriesResponse.data;
|
||||||
} else {
|
} else {
|
||||||
logger.error('Failed to update series in Sonarr', {
|
logger.error('Failed to update series in Sonarr', {
|
||||||
label: 'Sonarr',
|
label: 'Sonarr',
|
||||||
@@ -217,7 +221,9 @@ class SonarrAPI extends ServarrBase<{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const createdSeriesData = await this.post<SonarrSeries>('/series', {
|
const createdSeriesResponse = await this.axios.post<SonarrSeries>(
|
||||||
|
'/series',
|
||||||
|
{
|
||||||
tvdbId: options.tvdbid,
|
tvdbId: options.tvdbid,
|
||||||
title: options.title,
|
title: options.title,
|
||||||
qualityProfileId: options.profileId,
|
qualityProfileId: options.profileId,
|
||||||
@@ -239,13 +245,14 @@ class SonarrAPI extends ServarrBase<{
|
|||||||
ignoreEpisodesWithFiles: true,
|
ignoreEpisodesWithFiles: true,
|
||||||
searchForMissingEpisodes: options.searchNow,
|
searchForMissingEpisodes: options.searchNow,
|
||||||
},
|
},
|
||||||
} as Partial<SonarrSeries>);
|
} as Partial<SonarrSeries>
|
||||||
|
);
|
||||||
|
|
||||||
if (createdSeriesData.id) {
|
if (createdSeriesResponse.data.id) {
|
||||||
logger.info('Sonarr accepted request', { label: 'Sonarr' });
|
logger.info('Sonarr accepted request', { label: 'Sonarr' });
|
||||||
logger.debug('Sonarr add details', {
|
logger.debug('Sonarr add details', {
|
||||||
label: 'Sonarr',
|
label: 'Sonarr',
|
||||||
movie: createdSeriesData,
|
movie: createdSeriesResponse.data,
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
logger.error('Failed to add movie to Sonarr', {
|
logger.error('Failed to add movie to Sonarr', {
|
||||||
@@ -255,20 +262,13 @@ class SonarrAPI extends ServarrBase<{
|
|||||||
throw new Error('Failed to add series to Sonarr');
|
throw new Error('Failed to add series to Sonarr');
|
||||||
}
|
}
|
||||||
|
|
||||||
return createdSeriesData;
|
return createdSeriesResponse.data;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = await e.cause?.text();
|
|
||||||
errorData = JSON.parse(errorData);
|
|
||||||
} catch {
|
|
||||||
/* empty */
|
|
||||||
}
|
|
||||||
logger.error('Something went wrong while adding a series to Sonarr.', {
|
logger.error('Something went wrong while adding a series to Sonarr.', {
|
||||||
label: 'Sonarr API',
|
label: 'Sonarr API',
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
options,
|
options,
|
||||||
response: errorData,
|
response: e?.response?.data,
|
||||||
});
|
});
|
||||||
throw new Error('Failed to add series');
|
throw new Error('Failed to add series');
|
||||||
}
|
}
|
||||||
@@ -303,10 +303,10 @@ class SonarrAPI extends ServarrBase<{
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await this.runCommand('MissingEpisodeSearch', { seriesId });
|
await this.runCommand('SeriesSearch', { seriesId });
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.error(
|
logger.error(
|
||||||
'Something went wrong while executing Sonarr missing episode search.',
|
'Something went wrong while executing Sonarr series search.',
|
||||||
{
|
{
|
||||||
label: 'Sonarr API',
|
label: 'Sonarr API',
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
@@ -340,13 +340,14 @@ class SonarrAPI extends ServarrBase<{
|
|||||||
|
|
||||||
return newSeasons;
|
return newSeasons;
|
||||||
}
|
}
|
||||||
|
|
||||||
public removeSerie = async (serieId: number): Promise<void> => {
|
public removeSerie = async (serieId: number): Promise<void> => {
|
||||||
try {
|
try {
|
||||||
const { id, title } = await this.getSeriesByTvdbId(serieId);
|
const { id, title } = await this.getSeriesByTvdbId(serieId);
|
||||||
await this.delete(`/series/${id}`, {
|
await this.axios.delete(`/series/${id}`, {
|
||||||
deleteFiles: 'true',
|
params: {
|
||||||
addImportExclusion: 'false',
|
deleteFiles: true,
|
||||||
|
addImportExclusion: false,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
logger.info(`[Radarr] Removed serie ${title}`);
|
logger.info(`[Radarr] Removed serie ${title}`);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import ExternalAPI from '@server/api/externalapi';
|
|
||||||
import type { User } from '@server/entity/User';
|
import type { User } from '@server/entity/User';
|
||||||
import type { TautulliSettings } from '@server/lib/settings';
|
import type { TautulliSettings } from '@server/lib/settings';
|
||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
|
import type { AxiosInstance } from 'axios';
|
||||||
|
import axios from 'axios';
|
||||||
import { uniqWith } from 'lodash';
|
import { uniqWith } from 'lodash';
|
||||||
|
|
||||||
export interface TautulliHistoryRecord {
|
export interface TautulliHistoryRecord {
|
||||||
@@ -112,25 +113,25 @@ interface TautulliInfoResponse {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
class TautulliAPI extends ExternalAPI {
|
class TautulliAPI {
|
||||||
|
private axios: AxiosInstance;
|
||||||
|
|
||||||
constructor(settings: TautulliSettings) {
|
constructor(settings: TautulliSettings) {
|
||||||
super(
|
this.axios = axios.create({
|
||||||
`${settings.useSsl ? 'https' : 'http'}://${settings.hostname}:${
|
baseURL: `${settings.useSsl ? 'https' : 'http'}://${settings.hostname}:${
|
||||||
settings.port
|
settings.port
|
||||||
}${settings.urlBase ?? ''}`,
|
}${settings.urlBase ?? ''}`,
|
||||||
{
|
params: { apikey: settings.apiKey },
|
||||||
apikey: settings.apiKey || '',
|
});
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getInfo(): Promise<TautulliInfo> {
|
public async getInfo(): Promise<TautulliInfo> {
|
||||||
try {
|
try {
|
||||||
return (
|
return (
|
||||||
await this.get<TautulliInfoResponse>('/api/v2', {
|
await this.axios.get<TautulliInfoResponse>('/api/v2', {
|
||||||
cmd: 'get_tautulli_info',
|
params: { cmd: 'get_tautulli_info' },
|
||||||
})
|
})
|
||||||
).response.data;
|
).data.response.data;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.error('Something went wrong fetching Tautulli server info', {
|
logger.error('Something went wrong fetching Tautulli server info', {
|
||||||
label: 'Tautulli API',
|
label: 'Tautulli API',
|
||||||
@@ -147,12 +148,14 @@ class TautulliAPI extends ExternalAPI {
|
|||||||
): Promise<TautulliWatchStats[]> {
|
): Promise<TautulliWatchStats[]> {
|
||||||
try {
|
try {
|
||||||
return (
|
return (
|
||||||
await this.get<TautulliWatchStatsResponse>('/api/v2', {
|
await this.axios.get<TautulliWatchStatsResponse>('/api/v2', {
|
||||||
|
params: {
|
||||||
cmd: 'get_item_watch_time_stats',
|
cmd: 'get_item_watch_time_stats',
|
||||||
rating_key: ratingKey,
|
rating_key: ratingKey,
|
||||||
grouping: '1',
|
grouping: 1,
|
||||||
|
},
|
||||||
})
|
})
|
||||||
).response.data;
|
).data.response.data;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.error(
|
logger.error(
|
||||||
'Something went wrong fetching media watch stats from Tautulli',
|
'Something went wrong fetching media watch stats from Tautulli',
|
||||||
@@ -173,12 +176,14 @@ class TautulliAPI extends ExternalAPI {
|
|||||||
): Promise<TautulliWatchUser[]> {
|
): Promise<TautulliWatchUser[]> {
|
||||||
try {
|
try {
|
||||||
return (
|
return (
|
||||||
await this.get<TautulliWatchUsersResponse>('/api/v2', {
|
await this.axios.get<TautulliWatchUsersResponse>('/api/v2', {
|
||||||
|
params: {
|
||||||
cmd: 'get_item_user_stats',
|
cmd: 'get_item_user_stats',
|
||||||
rating_key: ratingKey,
|
rating_key: ratingKey,
|
||||||
grouping: '1',
|
grouping: 1,
|
||||||
|
},
|
||||||
})
|
})
|
||||||
).response.data;
|
).data.response.data;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.error(
|
logger.error(
|
||||||
'Something went wrong fetching media watch users from Tautulli',
|
'Something went wrong fetching media watch users from Tautulli',
|
||||||
@@ -201,13 +206,15 @@ class TautulliAPI extends ExternalAPI {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
await this.get<TautulliWatchStatsResponse>('/api/v2', {
|
await this.axios.get<TautulliWatchStatsResponse>('/api/v2', {
|
||||||
|
params: {
|
||||||
cmd: 'get_user_watch_time_stats',
|
cmd: 'get_user_watch_time_stats',
|
||||||
user_id: user.plexId.toString(),
|
user_id: user.plexId,
|
||||||
query_days: '0',
|
query_days: 0,
|
||||||
grouping: '1',
|
grouping: 1,
|
||||||
|
},
|
||||||
})
|
})
|
||||||
).response.data[0];
|
).data.response.data[0];
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.error(
|
logger.error(
|
||||||
'Something went wrong fetching user watch stats from Tautulli',
|
'Something went wrong fetching user watch stats from Tautulli',
|
||||||
@@ -238,17 +245,19 @@ class TautulliAPI extends ExternalAPI {
|
|||||||
|
|
||||||
while (results.length < 20) {
|
while (results.length < 20) {
|
||||||
const tautulliData = (
|
const tautulliData = (
|
||||||
await this.get<TautulliHistoryResponse>('/api/v2', {
|
await this.axios.get<TautulliHistoryResponse>('/api/v2', {
|
||||||
|
params: {
|
||||||
cmd: 'get_history',
|
cmd: 'get_history',
|
||||||
grouping: '1',
|
grouping: 1,
|
||||||
order_column: 'date',
|
order_column: 'date',
|
||||||
order_dir: 'desc',
|
order_dir: 'desc',
|
||||||
user_id: user.plexId.toString(),
|
user_id: user.plexId,
|
||||||
media_type: 'movie,episode',
|
media_type: 'movie,episode',
|
||||||
length: take.toString(),
|
length: take,
|
||||||
start: start.toString(),
|
start,
|
||||||
|
},
|
||||||
})
|
})
|
||||||
).response.data.data;
|
).data.response.data.data;
|
||||||
|
|
||||||
if (!tautulliData.length) {
|
if (!tautulliData.length) {
|
||||||
return results;
|
return results;
|
||||||
|
|||||||
@@ -95,7 +95,6 @@ interface DiscoverTvOptions {
|
|||||||
sortBy?: SortOptions;
|
sortBy?: SortOptions;
|
||||||
watchRegion?: string;
|
watchRegion?: string;
|
||||||
watchProviders?: string;
|
watchProviders?: string;
|
||||||
withStatus?: string; // Returning Series: 0 Planned: 1 In Production: 2 Ended: 3 Cancelled: 4 Pilot: 5
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class TheMovieDb extends ExternalAPI {
|
class TheMovieDb extends ExternalAPI {
|
||||||
@@ -113,8 +112,8 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
{
|
{
|
||||||
nodeCache: cacheManager.getCache('tmdb').data,
|
nodeCache: cacheManager.getCache('tmdb').data,
|
||||||
rateLimit: {
|
rateLimit: {
|
||||||
|
maxRequests: 20,
|
||||||
maxRPS: 50,
|
maxRPS: 50,
|
||||||
id: 'tmdb',
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@@ -130,10 +129,7 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
}: SearchOptions): Promise<TmdbSearchMultiResponse> => {
|
}: SearchOptions): Promise<TmdbSearchMultiResponse> => {
|
||||||
try {
|
try {
|
||||||
const data = await this.get<TmdbSearchMultiResponse>('/search/multi', {
|
const data = await this.get<TmdbSearchMultiResponse>('/search/multi', {
|
||||||
query,
|
params: { query, page, include_adult: includeAdult, language },
|
||||||
page: page.toString(),
|
|
||||||
include_adult: includeAdult ? 'true' : 'false',
|
|
||||||
language,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
@@ -156,11 +152,13 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
}: SingleSearchOptions): Promise<TmdbSearchMovieResponse> => {
|
}: SingleSearchOptions): Promise<TmdbSearchMovieResponse> => {
|
||||||
try {
|
try {
|
||||||
const data = await this.get<TmdbSearchMovieResponse>('/search/movie', {
|
const data = await this.get<TmdbSearchMovieResponse>('/search/movie', {
|
||||||
|
params: {
|
||||||
query,
|
query,
|
||||||
page: page.toString(),
|
page,
|
||||||
include_adult: includeAdult ? 'true' : 'false',
|
include_adult: includeAdult,
|
||||||
language,
|
language,
|
||||||
primary_release_year: year?.toString() || '',
|
primary_release_year: year,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
@@ -183,11 +181,13 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
}: SingleSearchOptions): Promise<TmdbSearchTvResponse> => {
|
}: SingleSearchOptions): Promise<TmdbSearchTvResponse> => {
|
||||||
try {
|
try {
|
||||||
const data = await this.get<TmdbSearchTvResponse>('/search/tv', {
|
const data = await this.get<TmdbSearchTvResponse>('/search/tv', {
|
||||||
|
params: {
|
||||||
query,
|
query,
|
||||||
page: page.toString(),
|
page,
|
||||||
include_adult: includeAdult ? 'true' : 'false',
|
include_adult: includeAdult,
|
||||||
language,
|
language,
|
||||||
first_air_date_year: year?.toString() || '',
|
first_air_date_year: year,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
@@ -210,7 +210,7 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
}): Promise<TmdbPersonDetails> => {
|
}): Promise<TmdbPersonDetails> => {
|
||||||
try {
|
try {
|
||||||
const data = await this.get<TmdbPersonDetails>(`/person/${personId}`, {
|
const data = await this.get<TmdbPersonDetails>(`/person/${personId}`, {
|
||||||
language,
|
params: { language },
|
||||||
});
|
});
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
@@ -230,7 +230,7 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbPersonCombinedCredits>(
|
const data = await this.get<TmdbPersonCombinedCredits>(
|
||||||
`/person/${personId}/combined_credits`,
|
`/person/${personId}/combined_credits`,
|
||||||
{
|
{
|
||||||
language,
|
params: { language },
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -253,10 +253,12 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbMovieDetails>(
|
const data = await this.get<TmdbMovieDetails>(
|
||||||
`/movie/${movieId}`,
|
`/movie/${movieId}`,
|
||||||
{
|
{
|
||||||
|
params: {
|
||||||
language,
|
language,
|
||||||
append_to_response:
|
append_to_response:
|
||||||
'credits,external_ids,videos,keywords,release_dates,watch/providers',
|
'credits,external_ids,videos,keywords,release_dates,watch/providers',
|
||||||
},
|
},
|
||||||
|
},
|
||||||
43200
|
43200
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -277,10 +279,12 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbTvDetails>(
|
const data = await this.get<TmdbTvDetails>(
|
||||||
`/tv/${tvId}`,
|
`/tv/${tvId}`,
|
||||||
{
|
{
|
||||||
|
params: {
|
||||||
language,
|
language,
|
||||||
append_to_response:
|
append_to_response:
|
||||||
'aggregate_credits,credits,external_ids,keywords,videos,content_ratings,watch/providers',
|
'aggregate_credits,credits,external_ids,keywords,videos,content_ratings,watch/providers',
|
||||||
},
|
},
|
||||||
|
},
|
||||||
43200
|
43200
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -303,8 +307,10 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbSeasonWithEpisodes>(
|
const data = await this.get<TmdbSeasonWithEpisodes>(
|
||||||
`/tv/${tvId}/season/${seasonNumber}`,
|
`/tv/${tvId}/season/${seasonNumber}`,
|
||||||
{
|
{
|
||||||
language: language || '',
|
params: {
|
||||||
|
language,
|
||||||
append_to_response: 'external_ids',
|
append_to_response: 'external_ids',
|
||||||
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -327,8 +333,10 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbSearchMovieResponse>(
|
const data = await this.get<TmdbSearchMovieResponse>(
|
||||||
`/movie/${movieId}/recommendations`,
|
`/movie/${movieId}/recommendations`,
|
||||||
{
|
{
|
||||||
page: page.toString(),
|
params: {
|
||||||
|
page,
|
||||||
language,
|
language,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -351,8 +359,10 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbSearchMovieResponse>(
|
const data = await this.get<TmdbSearchMovieResponse>(
|
||||||
`/movie/${movieId}/similar`,
|
`/movie/${movieId}/similar`,
|
||||||
{
|
{
|
||||||
page: page.toString(),
|
params: {
|
||||||
|
page,
|
||||||
language,
|
language,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -375,8 +385,10 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbSearchMovieResponse>(
|
const data = await this.get<TmdbSearchMovieResponse>(
|
||||||
`/keyword/${keywordId}/movies`,
|
`/keyword/${keywordId}/movies`,
|
||||||
{
|
{
|
||||||
page: page.toString(),
|
params: {
|
||||||
|
page,
|
||||||
language,
|
language,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -399,8 +411,10 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbSearchTvResponse>(
|
const data = await this.get<TmdbSearchTvResponse>(
|
||||||
`/tv/${tvId}/recommendations`,
|
`/tv/${tvId}/recommendations`,
|
||||||
{
|
{
|
||||||
page: page.toString(),
|
params: {
|
||||||
|
page,
|
||||||
language,
|
language,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -423,8 +437,10 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
}): Promise<TmdbSearchTvResponse> {
|
}): Promise<TmdbSearchTvResponse> {
|
||||||
try {
|
try {
|
||||||
const data = await this.get<TmdbSearchTvResponse>(`/tv/${tvId}/similar`, {
|
const data = await this.get<TmdbSearchTvResponse>(`/tv/${tvId}/similar`, {
|
||||||
page: page.toString(),
|
params: {
|
||||||
|
page,
|
||||||
language,
|
language,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
@@ -465,38 +481,40 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
.split('T')[0];
|
.split('T')[0];
|
||||||
|
|
||||||
const data = await this.get<TmdbSearchMovieResponse>('/discover/movie', {
|
const data = await this.get<TmdbSearchMovieResponse>('/discover/movie', {
|
||||||
|
params: {
|
||||||
sort_by: sortBy,
|
sort_by: sortBy,
|
||||||
page: page.toString(),
|
page,
|
||||||
include_adult: includeAdult ? 'true' : 'false',
|
include_adult: includeAdult,
|
||||||
language,
|
language,
|
||||||
region: this.region || '',
|
region: this.region,
|
||||||
with_original_language:
|
with_original_language:
|
||||||
originalLanguage && originalLanguage !== 'all'
|
originalLanguage && originalLanguage !== 'all'
|
||||||
? originalLanguage
|
? originalLanguage
|
||||||
: originalLanguage === 'all'
|
: originalLanguage === 'all'
|
||||||
? ''
|
? undefined
|
||||||
: this.originalLanguage || '',
|
: this.originalLanguage,
|
||||||
// Set our release date values, but check if one is set and not the other,
|
// Set our release date values, but check if one is set and not the other,
|
||||||
// so we can force a past date or a future date. TMDB Requires both values if one is set!
|
// so we can force a past date or a future date. TMDB Requires both values if one is set!
|
||||||
'primary_release_date.gte':
|
'primary_release_date.gte':
|
||||||
!primaryReleaseDateGte && primaryReleaseDateLte
|
!primaryReleaseDateGte && primaryReleaseDateLte
|
||||||
? defaultPastDate
|
? defaultPastDate
|
||||||
: primaryReleaseDateGte || '',
|
: primaryReleaseDateGte,
|
||||||
'primary_release_date.lte':
|
'primary_release_date.lte':
|
||||||
!primaryReleaseDateLte && primaryReleaseDateGte
|
!primaryReleaseDateLte && primaryReleaseDateGte
|
||||||
? defaultFutureDate
|
? defaultFutureDate
|
||||||
: primaryReleaseDateLte || '',
|
: primaryReleaseDateLte,
|
||||||
with_genres: genre || '',
|
with_genres: genre,
|
||||||
with_companies: studio || '',
|
with_companies: studio,
|
||||||
with_keywords: keywords || '',
|
with_keywords: keywords,
|
||||||
'with_runtime.gte': withRuntimeGte || '',
|
'with_runtime.gte': withRuntimeGte,
|
||||||
'with_runtime.lte': withRuntimeLte || '',
|
'with_runtime.lte': withRuntimeLte,
|
||||||
'vote_average.gte': voteAverageGte || '',
|
'vote_average.gte': voteAverageGte,
|
||||||
'vote_average.lte': voteAverageLte || '',
|
'vote_average.lte': voteAverageLte,
|
||||||
'vote_count.gte': voteCountGte || '',
|
'vote_count.gte': voteCountGte,
|
||||||
'vote_count.lte': voteCountLte || '',
|
'vote_count.lte': voteCountLte,
|
||||||
watch_region: watchRegion || '',
|
watch_region: watchRegion,
|
||||||
with_watch_providers: watchProviders || '',
|
with_watch_providers: watchProviders,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
@@ -524,7 +542,6 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
voteCountLte,
|
voteCountLte,
|
||||||
watchProviders,
|
watchProviders,
|
||||||
watchRegion,
|
watchRegion,
|
||||||
withStatus,
|
|
||||||
}: DiscoverTvOptions = {}): Promise<TmdbSearchTvResponse> => {
|
}: DiscoverTvOptions = {}): Promise<TmdbSearchTvResponse> => {
|
||||||
try {
|
try {
|
||||||
const defaultFutureDate = new Date(
|
const defaultFutureDate = new Date(
|
||||||
@@ -538,41 +555,40 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
.split('T')[0];
|
.split('T')[0];
|
||||||
|
|
||||||
const data = await this.get<TmdbSearchTvResponse>('/discover/tv', {
|
const data = await this.get<TmdbSearchTvResponse>('/discover/tv', {
|
||||||
|
params: {
|
||||||
sort_by: sortBy,
|
sort_by: sortBy,
|
||||||
page: page.toString(),
|
page,
|
||||||
language,
|
language,
|
||||||
region: this.region || '',
|
region: this.region,
|
||||||
// Set our release date values, but check if one is set and not the other,
|
// Set our release date values, but check if one is set and not the other,
|
||||||
// so we can force a past date or a future date. TMDB Requires both values if one is set!
|
// so we can force a past date or a future date. TMDB Requires both values if one is set!
|
||||||
'first_air_date.gte':
|
'first_air_date.gte':
|
||||||
!firstAirDateGte && firstAirDateLte
|
!firstAirDateGte && firstAirDateLte
|
||||||
? defaultPastDate
|
? defaultPastDate
|
||||||
: firstAirDateGte || '',
|
: firstAirDateGte,
|
||||||
'first_air_date.lte':
|
'first_air_date.lte':
|
||||||
!firstAirDateLte && firstAirDateGte
|
!firstAirDateLte && firstAirDateGte
|
||||||
? defaultFutureDate
|
? defaultFutureDate
|
||||||
: firstAirDateLte || '',
|
: firstAirDateLte,
|
||||||
with_original_language:
|
with_original_language:
|
||||||
originalLanguage && originalLanguage !== 'all'
|
originalLanguage && originalLanguage !== 'all'
|
||||||
? originalLanguage
|
? originalLanguage
|
||||||
: originalLanguage === 'all'
|
: originalLanguage === 'all'
|
||||||
? ''
|
? undefined
|
||||||
: this.originalLanguage || '',
|
: this.originalLanguage,
|
||||||
include_null_first_air_dates: includeEmptyReleaseDate
|
include_null_first_air_dates: includeEmptyReleaseDate,
|
||||||
? 'true'
|
with_genres: genre,
|
||||||
: 'false',
|
with_networks: network,
|
||||||
with_genres: genre || '',
|
with_keywords: keywords,
|
||||||
with_networks: network?.toString() || '',
|
'with_runtime.gte': withRuntimeGte,
|
||||||
with_keywords: keywords || '',
|
'with_runtime.lte': withRuntimeLte,
|
||||||
'with_runtime.gte': withRuntimeGte || '',
|
'vote_average.gte': voteAverageGte,
|
||||||
'with_runtime.lte': withRuntimeLte || '',
|
'vote_average.lte': voteAverageLte,
|
||||||
'vote_average.gte': voteAverageGte || '',
|
'vote_count.gte': voteCountGte,
|
||||||
'vote_average.lte': voteAverageLte || '',
|
'vote_count.lte': voteCountLte,
|
||||||
'vote_count.gte': voteCountGte || '',
|
with_watch_providers: watchProviders,
|
||||||
'vote_count.lte': voteCountLte || '',
|
watch_region: watchRegion,
|
||||||
with_watch_providers: watchProviders || '',
|
},
|
||||||
watch_region: watchRegion || '',
|
|
||||||
with_status: withStatus || '',
|
|
||||||
});
|
});
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
@@ -592,10 +608,12 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbUpcomingMoviesResponse>(
|
const data = await this.get<TmdbUpcomingMoviesResponse>(
|
||||||
'/movie/upcoming',
|
'/movie/upcoming',
|
||||||
{
|
{
|
||||||
page: page.toString(),
|
params: {
|
||||||
|
page,
|
||||||
language,
|
language,
|
||||||
region: this.region || '',
|
region: this.region,
|
||||||
originalLanguage: this.originalLanguage || '',
|
originalLanguage: this.originalLanguage,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -618,9 +636,11 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbSearchMultiResponse>(
|
const data = await this.get<TmdbSearchMultiResponse>(
|
||||||
`/trending/all/${timeWindow}`,
|
`/trending/all/${timeWindow}`,
|
||||||
{
|
{
|
||||||
page: page.toString(),
|
params: {
|
||||||
|
page,
|
||||||
language,
|
language,
|
||||||
region: this.region || '',
|
region: this.region,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -641,7 +661,9 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbSearchMovieResponse>(
|
const data = await this.get<TmdbSearchMovieResponse>(
|
||||||
`/trending/movie/${timeWindow}`,
|
`/trending/movie/${timeWindow}`,
|
||||||
{
|
{
|
||||||
page: page.toString(),
|
params: {
|
||||||
|
page,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -662,7 +684,9 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbSearchTvResponse>(
|
const data = await this.get<TmdbSearchTvResponse>(
|
||||||
`/trending/tv/${timeWindow}`,
|
`/trending/tv/${timeWindow}`,
|
||||||
{
|
{
|
||||||
page: page.toString(),
|
params: {
|
||||||
|
page,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -691,8 +715,10 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbExternalIdResponse>(
|
const data = await this.get<TmdbExternalIdResponse>(
|
||||||
`/find/${externalId}`,
|
`/find/${externalId}`,
|
||||||
{
|
{
|
||||||
|
params: {
|
||||||
external_source: type === 'imdb' ? 'imdb_id' : 'tvdb_id',
|
external_source: type === 'imdb' ? 'imdb_id' : 'tvdb_id',
|
||||||
language,
|
language,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -782,7 +808,9 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbCollection>(
|
const data = await this.get<TmdbCollection>(
|
||||||
`/collection/${collectionId}`,
|
`/collection/${collectionId}`,
|
||||||
{
|
{
|
||||||
|
params: {
|
||||||
language,
|
language,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -855,8 +883,10 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbGenresResult>(
|
const data = await this.get<TmdbGenresResult>(
|
||||||
'/genre/movie/list',
|
'/genre/movie/list',
|
||||||
{
|
{
|
||||||
|
params: {
|
||||||
language,
|
language,
|
||||||
},
|
},
|
||||||
|
},
|
||||||
86400 // 24 hours
|
86400 // 24 hours
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -867,8 +897,10 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const englishData = await this.get<TmdbGenresResult>(
|
const englishData = await this.get<TmdbGenresResult>(
|
||||||
'/genre/movie/list',
|
'/genre/movie/list',
|
||||||
{
|
{
|
||||||
|
params: {
|
||||||
language: 'en',
|
language: 'en',
|
||||||
},
|
},
|
||||||
|
},
|
||||||
86400 // 24 hours
|
86400 // 24 hours
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -902,8 +934,10 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbGenresResult>(
|
const data = await this.get<TmdbGenresResult>(
|
||||||
'/genre/tv/list',
|
'/genre/tv/list',
|
||||||
{
|
{
|
||||||
|
params: {
|
||||||
language,
|
language,
|
||||||
},
|
},
|
||||||
|
},
|
||||||
86400 // 24 hours
|
86400 // 24 hours
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -914,8 +948,10 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const englishData = await this.get<TmdbGenresResult>(
|
const englishData = await this.get<TmdbGenresResult>(
|
||||||
'/genre/tv/list',
|
'/genre/tv/list',
|
||||||
{
|
{
|
||||||
|
params: {
|
||||||
language: 'en',
|
language: 'en',
|
||||||
},
|
},
|
||||||
|
},
|
||||||
86400 // 24 hours
|
86400 // 24 hours
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -969,8 +1005,10 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbKeywordSearchResponse>(
|
const data = await this.get<TmdbKeywordSearchResponse>(
|
||||||
'/search/keyword',
|
'/search/keyword',
|
||||||
{
|
{
|
||||||
|
params: {
|
||||||
query,
|
query,
|
||||||
page: page.toString(),
|
page,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
86400 // 24 hours
|
86400 // 24 hours
|
||||||
);
|
);
|
||||||
@@ -992,8 +1030,10 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<TmdbCompanySearchResponse>(
|
const data = await this.get<TmdbCompanySearchResponse>(
|
||||||
'/search/company',
|
'/search/company',
|
||||||
{
|
{
|
||||||
|
params: {
|
||||||
query,
|
query,
|
||||||
page: page.toString(),
|
page,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
86400 // 24 hours
|
86400 // 24 hours
|
||||||
);
|
);
|
||||||
@@ -1013,7 +1053,9 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<{ results: TmdbWatchProviderRegion[] }>(
|
const data = await this.get<{ results: TmdbWatchProviderRegion[] }>(
|
||||||
'/watch/providers/regions',
|
'/watch/providers/regions',
|
||||||
{
|
{
|
||||||
language: language ? this.originalLanguage || '' : '',
|
params: {
|
||||||
|
language: language ?? this.originalLanguage,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
86400 // 24 hours
|
86400 // 24 hours
|
||||||
);
|
);
|
||||||
@@ -1037,9 +1079,11 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
|
const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
|
||||||
'/watch/providers/movie',
|
'/watch/providers/movie',
|
||||||
{
|
{
|
||||||
language: language ? this.originalLanguage || '' : '',
|
params: {
|
||||||
|
language: language ?? this.originalLanguage,
|
||||||
watch_region: watchRegion,
|
watch_region: watchRegion,
|
||||||
},
|
},
|
||||||
|
},
|
||||||
86400 // 24 hours
|
86400 // 24 hours
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -1062,9 +1106,11 @@ class TheMovieDb extends ExternalAPI {
|
|||||||
const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
|
const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
|
||||||
'/watch/providers/tv',
|
'/watch/providers/tv',
|
||||||
{
|
{
|
||||||
language: language ? this.originalLanguage || '' : '',
|
params: {
|
||||||
|
language: language ?? this.originalLanguage,
|
||||||
watch_region: watchRegion,
|
watch_region: watchRegion,
|
||||||
},
|
},
|
||||||
|
},
|
||||||
86400 // 24 hours
|
86400 // 24 hours
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ export enum ApiErrorCode {
|
|||||||
InvalidUrl = 'INVALID_URL',
|
InvalidUrl = 'INVALID_URL',
|
||||||
InvalidCredentials = 'INVALID_CREDENTIALS',
|
InvalidCredentials = 'INVALID_CREDENTIALS',
|
||||||
InvalidAuthToken = 'INVALID_AUTH_TOKEN',
|
InvalidAuthToken = 'INVALID_AUTH_TOKEN',
|
||||||
InvalidEmail = 'INVALID_EMAIL',
|
|
||||||
NotAdmin = 'NOT_ADMIN',
|
NotAdmin = 'NOT_ADMIN',
|
||||||
SyncErrorGroupedFolders = 'SYNC_ERROR_GROUPED_FOLDERS',
|
SyncErrorGroupedFolders = 'SYNC_ERROR_GROUPED_FOLDERS',
|
||||||
SyncErrorNoLibraries = 'SYNC_ERROR_NO_LIBRARIES',
|
SyncErrorNoLibraries = 'SYNC_ERROR_NO_LIBRARIES',
|
||||||
|
|||||||
@@ -16,5 +16,4 @@ export enum MediaStatus {
|
|||||||
PROCESSING,
|
PROCESSING,
|
||||||
PARTIALLY_AVAILABLE,
|
PARTIALLY_AVAILABLE,
|
||||||
AVAILABLE,
|
AVAILABLE,
|
||||||
BLACKLISTED,
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,8 +4,3 @@ export enum MediaServerType {
|
|||||||
EMBY,
|
EMBY,
|
||||||
NOT_CONFIGURED,
|
NOT_CONFIGURED,
|
||||||
}
|
}
|
||||||
|
|
||||||
export enum ServerType {
|
|
||||||
JELLYFIN = 'Jellyfin',
|
|
||||||
EMBY = 'Emby',
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -2,5 +2,4 @@ export enum UserType {
|
|||||||
PLEX = 1,
|
PLEX = 1,
|
||||||
LOCAL = 2,
|
LOCAL = 2,
|
||||||
JELLYFIN = 3,
|
JELLYFIN = 3,
|
||||||
EMBY = 4,
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,95 +0,0 @@
|
|||||||
import { MediaStatus, type MediaType } from '@server/constants/media';
|
|
||||||
import { getRepository } from '@server/datasource';
|
|
||||||
import Media from '@server/entity/Media';
|
|
||||||
import { User } from '@server/entity/User';
|
|
||||||
import type { BlacklistItem } from '@server/interfaces/api/blacklistInterfaces';
|
|
||||||
import {
|
|
||||||
Column,
|
|
||||||
CreateDateColumn,
|
|
||||||
Entity,
|
|
||||||
Index,
|
|
||||||
JoinColumn,
|
|
||||||
ManyToOne,
|
|
||||||
OneToOne,
|
|
||||||
PrimaryGeneratedColumn,
|
|
||||||
Unique,
|
|
||||||
} from 'typeorm';
|
|
||||||
import type { ZodNumber, ZodOptional, ZodString } from 'zod';
|
|
||||||
|
|
||||||
@Entity()
|
|
||||||
@Unique(['tmdbId'])
|
|
||||||
export class Blacklist implements BlacklistItem {
|
|
||||||
@PrimaryGeneratedColumn()
|
|
||||||
public id: number;
|
|
||||||
|
|
||||||
@Column({ type: 'varchar' })
|
|
||||||
public mediaType: MediaType;
|
|
||||||
|
|
||||||
@Column({ nullable: true, type: 'varchar' })
|
|
||||||
title?: string;
|
|
||||||
|
|
||||||
@Column()
|
|
||||||
@Index()
|
|
||||||
public tmdbId: number;
|
|
||||||
|
|
||||||
@ManyToOne(() => User, (user) => user.id, {
|
|
||||||
eager: true,
|
|
||||||
})
|
|
||||||
user: User;
|
|
||||||
|
|
||||||
@OneToOne(() => Media, (media) => media.blacklist, {
|
|
||||||
onDelete: 'CASCADE',
|
|
||||||
})
|
|
||||||
@JoinColumn()
|
|
||||||
public media: Media;
|
|
||||||
|
|
||||||
@CreateDateColumn()
|
|
||||||
public createdAt: Date;
|
|
||||||
|
|
||||||
constructor(init?: Partial<Blacklist>) {
|
|
||||||
Object.assign(this, init);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static async addToBlacklist({
|
|
||||||
blacklistRequest,
|
|
||||||
}: {
|
|
||||||
blacklistRequest: {
|
|
||||||
mediaType: MediaType;
|
|
||||||
title?: ZodOptional<ZodString>['_output'];
|
|
||||||
tmdbId: ZodNumber['_output'];
|
|
||||||
};
|
|
||||||
}): Promise<void> {
|
|
||||||
const blacklist = new this({
|
|
||||||
...blacklistRequest,
|
|
||||||
});
|
|
||||||
|
|
||||||
const mediaRepository = getRepository(Media);
|
|
||||||
let media = await mediaRepository.findOne({
|
|
||||||
where: {
|
|
||||||
tmdbId: blacklistRequest.tmdbId,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const blacklistRepository = getRepository(this);
|
|
||||||
|
|
||||||
await blacklistRepository.save(blacklist);
|
|
||||||
|
|
||||||
if (!media) {
|
|
||||||
media = new Media({
|
|
||||||
tmdbId: blacklistRequest.tmdbId,
|
|
||||||
status: MediaStatus.BLACKLISTED,
|
|
||||||
status4k: MediaStatus.BLACKLISTED,
|
|
||||||
mediaType: blacklistRequest.mediaType,
|
|
||||||
blacklist: blacklist,
|
|
||||||
});
|
|
||||||
|
|
||||||
await mediaRepository.save(media);
|
|
||||||
} else {
|
|
||||||
media.blacklist = blacklist;
|
|
||||||
media.status = MediaStatus.BLACKLISTED;
|
|
||||||
media.status4k = MediaStatus.BLACKLISTED;
|
|
||||||
|
|
||||||
await mediaRepository.save(media);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -3,7 +3,6 @@ import SonarrAPI from '@server/api/servarr/sonarr';
|
|||||||
import { MediaStatus, MediaType } from '@server/constants/media';
|
import { MediaStatus, MediaType } from '@server/constants/media';
|
||||||
import { MediaServerType } from '@server/constants/server';
|
import { MediaServerType } from '@server/constants/server';
|
||||||
import { getRepository } from '@server/datasource';
|
import { getRepository } from '@server/datasource';
|
||||||
import { Blacklist } from '@server/entity/Blacklist';
|
|
||||||
import type { User } from '@server/entity/User';
|
import type { User } from '@server/entity/User';
|
||||||
import { Watchlist } from '@server/entity/Watchlist';
|
import { Watchlist } from '@server/entity/Watchlist';
|
||||||
import type { DownloadingItem } from '@server/lib/downloadtracker';
|
import type { DownloadingItem } from '@server/lib/downloadtracker';
|
||||||
@@ -18,7 +17,6 @@ import {
|
|||||||
Entity,
|
Entity,
|
||||||
Index,
|
Index,
|
||||||
OneToMany,
|
OneToMany,
|
||||||
OneToOne,
|
|
||||||
PrimaryGeneratedColumn,
|
PrimaryGeneratedColumn,
|
||||||
UpdateDateColumn,
|
UpdateDateColumn,
|
||||||
} from 'typeorm';
|
} from 'typeorm';
|
||||||
@@ -68,7 +66,7 @@ class Media {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const media = await mediaRepository.findOne({
|
const media = await mediaRepository.findOne({
|
||||||
where: { tmdbId: id, mediaType: mediaType },
|
where: { tmdbId: id, mediaType },
|
||||||
relations: { requests: true, issues: true },
|
relations: { requests: true, issues: true },
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -118,11 +116,6 @@ class Media {
|
|||||||
@OneToMany(() => Issue, (issue) => issue.media, { cascade: true })
|
@OneToMany(() => Issue, (issue) => issue.media, { cascade: true })
|
||||||
public issues: Issue[];
|
public issues: Issue[];
|
||||||
|
|
||||||
@OneToOne(() => Blacklist, (blacklist) => blacklist.media, {
|
|
||||||
eager: true,
|
|
||||||
})
|
|
||||||
public blacklist: Blacklist;
|
|
||||||
|
|
||||||
@CreateDateColumn()
|
@CreateDateColumn()
|
||||||
public createdAt: Date;
|
public createdAt: Date;
|
||||||
|
|
||||||
@@ -218,10 +211,9 @@ class Media {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
const pageName =
|
const pageName =
|
||||||
getSettings().main.mediaServerType == MediaServerType.EMBY
|
process.env.JELLYFIN_TYPE === 'emby' ? 'item' : 'details';
|
||||||
? 'item'
|
|
||||||
: 'details';
|
|
||||||
const { serverId, externalHostname } = getSettings().jellyfin;
|
const { serverId, externalHostname } = getSettings().jellyfin;
|
||||||
|
|
||||||
const jellyfinHost =
|
const jellyfinHost =
|
||||||
externalHostname && externalHostname.length > 0
|
externalHostname && externalHostname.length > 0
|
||||||
? externalHostname
|
? externalHostname
|
||||||
@@ -231,7 +223,7 @@ class Media {
|
|||||||
this.mediaUrl = `${jellyfinHost}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId}&context=home&serverId=${serverId}`;
|
this.mediaUrl = `${jellyfinHost}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId}&context=home&serverId=${serverId}`;
|
||||||
}
|
}
|
||||||
if (this.jellyfinMediaId4k) {
|
if (this.jellyfinMediaId4k) {
|
||||||
this.mediaUrl4k = `${jellyfinHost}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId4k}&context=home&serverId=${serverId}`;
|
this.mediaUrl4k = `${jellyfinHost}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId}&context=home&serverId=${serverId}`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,6 @@ export class RequestPermissionError extends Error {}
|
|||||||
export class QuotaRestrictedError extends Error {}
|
export class QuotaRestrictedError extends Error {}
|
||||||
export class DuplicateMediaRequestError extends Error {}
|
export class DuplicateMediaRequestError extends Error {}
|
||||||
export class NoSeasonsAvailableError extends Error {}
|
export class NoSeasonsAvailableError extends Error {}
|
||||||
export class BlacklistedMediaError extends Error {}
|
|
||||||
|
|
||||||
type MediaRequestOptions = {
|
type MediaRequestOptions = {
|
||||||
isAutoRequest?: boolean;
|
isAutoRequest?: boolean;
|
||||||
@@ -144,16 +143,6 @@ export class MediaRequest {
|
|||||||
mediaType: requestBody.mediaType,
|
mediaType: requestBody.mediaType,
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
if (media.status === MediaStatus.BLACKLISTED) {
|
|
||||||
logger.warn('Request for media blocked due to being blacklisted', {
|
|
||||||
tmdbId: tmdbMedia.id,
|
|
||||||
mediaType: requestBody.mediaType,
|
|
||||||
label: 'Media Request',
|
|
||||||
});
|
|
||||||
|
|
||||||
throw new BlacklistedMediaError('This media is blacklisted.');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (media.status === MediaStatus.UNKNOWN && !requestBody.is4k) {
|
if (media.status === MediaStatus.UNKNOWN && !requestBody.is4k) {
|
||||||
media.status = MediaStatus.PENDING;
|
media.status = MediaStatus.PENDING;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ import { getSettings } from '@server/lib/settings';
|
|||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
import clearCookies from '@server/middleware/clearcookies';
|
import clearCookies from '@server/middleware/clearcookies';
|
||||||
import routes from '@server/routes';
|
import routes from '@server/routes';
|
||||||
import avatarproxy from '@server/routes/avatarproxy';
|
|
||||||
import imageproxy from '@server/routes/imageproxy';
|
import imageproxy from '@server/routes/imageproxy';
|
||||||
import { getAppVersion } from '@server/utils/appVersion';
|
import { getAppVersion } from '@server/utils/appVersion';
|
||||||
import restartFlag from '@server/utils/restartFlag';
|
import restartFlag from '@server/utils/restartFlag';
|
||||||
@@ -33,18 +32,10 @@ import * as OpenApiValidator from 'express-openapi-validator';
|
|||||||
import type { Store } from 'express-session';
|
import type { Store } from 'express-session';
|
||||||
import session from 'express-session';
|
import session from 'express-session';
|
||||||
import next from 'next';
|
import next from 'next';
|
||||||
import dns from 'node:dns';
|
|
||||||
import net from 'node:net';
|
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import swaggerUi from 'swagger-ui-express';
|
import swaggerUi from 'swagger-ui-express';
|
||||||
import { ProxyAgent, setGlobalDispatcher } from 'undici';
|
|
||||||
import YAML from 'yamljs';
|
import YAML from 'yamljs';
|
||||||
|
|
||||||
if (process.env.forceIpv4First === 'true') {
|
|
||||||
dns.setDefaultResultOrder('ipv4first');
|
|
||||||
net.setDefaultAutoSelectFamily(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
const API_SPEC_PATH = path.join(__dirname, '../overseerr-api.yml');
|
const API_SPEC_PATH = path.join(__dirname, '../overseerr-api.yml');
|
||||||
|
|
||||||
logger.info(`Starting Overseerr version ${getAppVersion()}`);
|
logger.info(`Starting Overseerr version ${getAppVersion()}`);
|
||||||
@@ -65,14 +56,9 @@ app
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Load Settings
|
// Load Settings
|
||||||
const settings = await getSettings().load();
|
const settings = getSettings().load();
|
||||||
restartFlag.initializeSettings(settings.main);
|
restartFlag.initializeSettings(settings.main);
|
||||||
|
|
||||||
// Register HTTP proxy
|
|
||||||
if (settings.main.httpProxy) {
|
|
||||||
setGlobalDispatcher(new ProxyAgent(settings.main.httpProxy));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Migrate library types
|
// Migrate library types
|
||||||
if (
|
if (
|
||||||
settings.plex.libraries.length > 1 &&
|
settings.plex.libraries.length > 1 &&
|
||||||
@@ -181,7 +167,7 @@ app
|
|||||||
},
|
},
|
||||||
store: new TypeormStore({
|
store: new TypeormStore({
|
||||||
cleanupLimit: 2,
|
cleanupLimit: 2,
|
||||||
ttl: 60 * 60 * 24 * 30,
|
ttl: 1000 * 60 * 60 * 24 * 30,
|
||||||
}).connect(sessionRespository) as Store,
|
}).connect(sessionRespository) as Store,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
@@ -209,7 +195,6 @@ app
|
|||||||
|
|
||||||
// Do not set cookies so CDNs can cache them
|
// Do not set cookies so CDNs can cache them
|
||||||
server.use('/imageproxy', clearCookies, imageproxy);
|
server.use('/imageproxy', clearCookies, imageproxy);
|
||||||
server.use('/avatarproxy', clearCookies, avatarproxy);
|
|
||||||
|
|
||||||
server.get('*', (req, res) => handle(req, res));
|
server.get('*', (req, res) => handle(req, res));
|
||||||
server.use(
|
server.use(
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
import type { User } from '@server/entity/User';
|
|
||||||
import type { PaginatedResponse } from '@server/interfaces/api/common';
|
|
||||||
|
|
||||||
export interface BlacklistItem {
|
|
||||||
tmdbId: number;
|
|
||||||
mediaType: 'movie' | 'tv';
|
|
||||||
title?: string;
|
|
||||||
createdAt?: Date;
|
|
||||||
user: User;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface BlacklistResultsResponse extends PaginatedResponse {
|
|
||||||
results: BlacklistItem[];
|
|
||||||
}
|
|
||||||
@@ -8,16 +8,3 @@ interface PageInfo {
|
|||||||
export interface PaginatedResponse {
|
export interface PaginatedResponse {
|
||||||
pageInfo: PageInfo;
|
pageInfo: PageInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the keys of an object that are not functions
|
|
||||||
*/
|
|
||||||
type NonFunctionPropertyNames<T> = {
|
|
||||||
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
||||||
[K in keyof T]: T[K] extends Function ? never : K;
|
|
||||||
}[keyof T];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the properties of an object that are not functions
|
|
||||||
*/
|
|
||||||
export type NonFunctionProperties<T> = Pick<T, NonFunctionPropertyNames<T>>;
|
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
import type { MediaType } from '@server/constants/media';
|
import type { MediaType } from '@server/constants/media';
|
||||||
import type { MediaRequest } from '@server/entity/MediaRequest';
|
import type { MediaRequest } from '@server/entity/MediaRequest';
|
||||||
import type { NonFunctionProperties, PaginatedResponse } from './common';
|
import type { PaginatedResponse } from './common';
|
||||||
|
|
||||||
export interface RequestResultsResponse extends PaginatedResponse {
|
export interface RequestResultsResponse extends PaginatedResponse {
|
||||||
results: NonFunctionProperties<MediaRequest>[];
|
results: MediaRequest[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export type MediaRequestBody = {
|
export type MediaRequestBody = {
|
||||||
@@ -14,7 +14,6 @@ export type MediaRequestBody = {
|
|||||||
is4k?: boolean;
|
is4k?: boolean;
|
||||||
serverId?: number;
|
serverId?: number;
|
||||||
profileId?: number;
|
profileId?: number;
|
||||||
profileName?: string;
|
|
||||||
rootFolder?: string;
|
rootFolder?: string;
|
||||||
languageProfileId?: number;
|
languageProfileId?: number;
|
||||||
userId?: number;
|
userId?: number;
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ export interface CacheItem {
|
|||||||
|
|
||||||
export interface CacheResponse {
|
export interface CacheResponse {
|
||||||
apiCaches: CacheItem[];
|
apiCaches: CacheItem[];
|
||||||
imageCache: Record<'tmdb' | 'avatar', { size: number; imageCount: number }>;
|
imageCache: Record<'tmdb', { size: number; imageCount: number }>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface StatusResponse {
|
export interface StatusResponse {
|
||||||
|
|||||||
@@ -227,9 +227,6 @@ export const startJobs = (): void => {
|
|||||||
});
|
});
|
||||||
// Clean TMDB image cache
|
// Clean TMDB image cache
|
||||||
ImageProxy.clearCache('tmdb');
|
ImageProxy.clearCache('tmdb');
|
||||||
|
|
||||||
// Clean users avatar image cache
|
|
||||||
ImageProxy.clearCache('avatar');
|
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -63,7 +63,12 @@ class AvailabilitySync {
|
|||||||
) {
|
) {
|
||||||
admin = await userRepository.findOne({
|
admin = await userRepository.findOne({
|
||||||
where: { id: 1 },
|
where: { id: 1 },
|
||||||
select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
|
select: [
|
||||||
|
'id',
|
||||||
|
'jellyfinAuthToken',
|
||||||
|
'jellyfinUserId',
|
||||||
|
'jellyfinDeviceId',
|
||||||
|
],
|
||||||
order: { id: 'ASC' },
|
order: { id: 'ASC' },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -81,7 +86,7 @@ class AvailabilitySync {
|
|||||||
if (admin) {
|
if (admin) {
|
||||||
this.jellyfinClient = new JellyfinAPI(
|
this.jellyfinClient = new JellyfinAPI(
|
||||||
getHostname(),
|
getHostname(),
|
||||||
settings.jellyfin.apiKey,
|
admin.jellyfinAuthToken,
|
||||||
admin.jellyfinDeviceId
|
admin.jellyfinDeviceId
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ export interface DownloadingItem {
|
|||||||
timeLeft: string;
|
timeLeft: string;
|
||||||
estimatedCompletionTime: Date;
|
estimatedCompletionTime: Date;
|
||||||
title: string;
|
title: string;
|
||||||
downloadId: string;
|
|
||||||
episode?: EpisodeNumberResult;
|
episode?: EpisodeNumberResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,7 +84,6 @@ class DownloadTracker {
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await radarr.refreshMonitoredDownloads();
|
|
||||||
const queueItems = await radarr.getQueue();
|
const queueItems = await radarr.getQueue();
|
||||||
|
|
||||||
this.radarrServers[server.id] = queueItems.map((item) => ({
|
this.radarrServers[server.id] = queueItems.map((item) => ({
|
||||||
@@ -97,7 +95,6 @@ class DownloadTracker {
|
|||||||
status: item.status,
|
status: item.status,
|
||||||
timeLeft: item.timeleft,
|
timeLeft: item.timeleft,
|
||||||
title: item.title,
|
title: item.title,
|
||||||
downloadId: item.downloadId,
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
if (queueItems.length > 0) {
|
if (queueItems.length > 0) {
|
||||||
@@ -163,7 +160,6 @@ class DownloadTracker {
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await sonarr.refreshMonitoredDownloads();
|
|
||||||
const queueItems = await sonarr.getQueue();
|
const queueItems = await sonarr.getQueue();
|
||||||
|
|
||||||
this.sonarrServers[server.id] = queueItems.map((item) => ({
|
this.sonarrServers[server.id] = queueItems.map((item) => ({
|
||||||
@@ -176,7 +172,6 @@ class DownloadTracker {
|
|||||||
timeLeft: item.timeleft,
|
timeLeft: item.timeleft,
|
||||||
title: item.title,
|
title: item.title,
|
||||||
episode: item.episode,
|
episode: item.episode,
|
||||||
downloadId: item.downloadId,
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
if (queueItems.length > 0) {
|
if (queueItems.length > 0) {
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
import type { RateLimitOptions } from '@server/utils/rateLimit';
|
import axios from 'axios';
|
||||||
import rateLimit from '@server/utils/rateLimit';
|
import rateLimit, { type rateLimitOptions } from 'axios-rate-limit';
|
||||||
import { createHash } from 'crypto';
|
import { createHash } from 'crypto';
|
||||||
import { promises } from 'fs';
|
import { promises } from 'fs';
|
||||||
import mime from 'mime/lite';
|
|
||||||
import path, { join } from 'path';
|
import path, { join } from 'path';
|
||||||
|
|
||||||
type ImageResponse = {
|
type ImageResponse = {
|
||||||
@@ -12,7 +11,7 @@ type ImageResponse = {
|
|||||||
curRevalidate: number;
|
curRevalidate: number;
|
||||||
isStale: boolean;
|
isStale: boolean;
|
||||||
etag: string;
|
etag: string;
|
||||||
extension: string | null;
|
extension: string;
|
||||||
cacheKey: string;
|
cacheKey: string;
|
||||||
cacheMiss: boolean;
|
cacheMiss: boolean;
|
||||||
};
|
};
|
||||||
@@ -28,7 +27,6 @@ class ImageProxy {
|
|||||||
let deletedImages = 0;
|
let deletedImages = 0;
|
||||||
const cacheDirectory = path.join(baseCacheDirectory, key);
|
const cacheDirectory = path.join(baseCacheDirectory, key);
|
||||||
|
|
||||||
try {
|
|
||||||
const files = await promises.readdir(cacheDirectory);
|
const files = await promises.readdir(cacheDirectory);
|
||||||
|
|
||||||
for (const file of files) {
|
for (const file of files) {
|
||||||
@@ -44,29 +42,14 @@ class ImageProxy {
|
|||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
|
|
||||||
if (now > expireAt) {
|
if (now > expireAt) {
|
||||||
await promises.rm(path.join(filePath), {
|
await promises.rm(path.join(filePath, imageFile));
|
||||||
recursive: true,
|
|
||||||
});
|
|
||||||
deletedImages += 1;
|
deletedImages += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (e) {
|
|
||||||
if (e.code === 'ENOENT') {
|
|
||||||
logger.error('Directory not found', {
|
|
||||||
label: 'Image Cache',
|
|
||||||
message: e.message,
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
logger.error('Failed to read directory', {
|
|
||||||
label: 'Image Cache',
|
|
||||||
message: e.message,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info(`Cleared ${deletedImages} stale image(s) from cache '${key}'`, {
|
logger.info(`Cleared ${deletedImages} stale image(s) from cache`, {
|
||||||
label: 'Image Cache',
|
label: 'Image Cache',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -86,7 +69,6 @@ class ImageProxy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static async getDirectorySize(dir: string): Promise<number> {
|
private static async getDirectorySize(dir: string): Promise<number> {
|
||||||
try {
|
|
||||||
const files = await promises.readdir(dir, {
|
const files = await promises.readdir(dir, {
|
||||||
withFileTypes: true,
|
withFileTypes: true,
|
||||||
});
|
});
|
||||||
@@ -108,52 +90,34 @@ class ImageProxy {
|
|||||||
return (await Promise.all(paths))
|
return (await Promise.all(paths))
|
||||||
.flat(Infinity)
|
.flat(Infinity)
|
||||||
.reduce((i, size) => i + size, 0);
|
.reduce((i, size) => i + size, 0);
|
||||||
} catch (e) {
|
|
||||||
if (e.code === 'ENOENT') {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static async getImageCount(dir: string) {
|
private static async getImageCount(dir: string) {
|
||||||
try {
|
|
||||||
const files = await promises.readdir(dir);
|
const files = await promises.readdir(dir);
|
||||||
|
|
||||||
return files.length;
|
return files.length;
|
||||||
} catch (e) {
|
|
||||||
if (e.code === 'ENOENT') {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
private axios;
|
||||||
}
|
|
||||||
|
|
||||||
private fetch: typeof fetch;
|
|
||||||
private cacheVersion;
|
private cacheVersion;
|
||||||
private key;
|
private key;
|
||||||
private baseUrl;
|
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
key: string,
|
key: string,
|
||||||
baseUrl: string,
|
baseUrl: string,
|
||||||
options: {
|
options: {
|
||||||
cacheVersion?: number;
|
cacheVersion?: number;
|
||||||
rateLimitOptions?: RateLimitOptions;
|
rateLimitOptions?: rateLimitOptions;
|
||||||
} = {}
|
} = {}
|
||||||
) {
|
) {
|
||||||
this.cacheVersion = options.cacheVersion ?? 1;
|
this.cacheVersion = options.cacheVersion ?? 1;
|
||||||
this.baseUrl = baseUrl;
|
|
||||||
this.key = key;
|
this.key = key;
|
||||||
|
this.axios = axios.create({
|
||||||
|
baseURL: baseUrl,
|
||||||
|
});
|
||||||
|
|
||||||
if (options.rateLimitOptions) {
|
if (options.rateLimitOptions) {
|
||||||
this.fetch = rateLimit(fetch, {
|
this.axios = rateLimit(this.axios, options.rateLimitOptions);
|
||||||
...options.rateLimitOptions,
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
this.fetch = fetch;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -180,27 +144,6 @@ class ImageProxy {
|
|||||||
return imageResponse;
|
return imageResponse;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async clearCachedImage(path: string) {
|
|
||||||
// find cacheKey
|
|
||||||
const cacheKey = this.getCacheKey(path);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const directory = join(this.getCacheDirectory(), cacheKey);
|
|
||||||
const files = await promises.readdir(directory);
|
|
||||||
|
|
||||||
await promises.rm(directory, { recursive: true });
|
|
||||||
|
|
||||||
logger.info(`Cleared ${files[0]} from cache 'avatar'`, {
|
|
||||||
label: 'Image Cache',
|
|
||||||
});
|
|
||||||
} catch (e) {
|
|
||||||
logger.error('Failed to clear cached image', {
|
|
||||||
label: 'Image Cache',
|
|
||||||
message: e.message,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async get(cacheKey: string): Promise<ImageResponse | null> {
|
private async get(cacheKey: string): Promise<ImageResponse | null> {
|
||||||
try {
|
try {
|
||||||
const directory = join(this.getCacheDirectory(), cacheKey);
|
const directory = join(this.getCacheDirectory(), cacheKey);
|
||||||
@@ -239,29 +182,17 @@ class ImageProxy {
|
|||||||
): Promise<ImageResponse | null> {
|
): Promise<ImageResponse | null> {
|
||||||
try {
|
try {
|
||||||
const directory = join(this.getCacheDirectory(), cacheKey);
|
const directory = join(this.getCacheDirectory(), cacheKey);
|
||||||
const href =
|
const response = await this.axios.get(path, {
|
||||||
this.baseUrl +
|
responseType: 'arraybuffer',
|
||||||
(this.baseUrl.length > 0
|
});
|
||||||
? this.baseUrl.endsWith('/')
|
|
||||||
? ''
|
|
||||||
: '/'
|
|
||||||
: '') +
|
|
||||||
(path.startsWith('/') ? path.slice(1) : path);
|
|
||||||
const response = await this.fetch(href);
|
|
||||||
const arrayBuffer = await response.arrayBuffer();
|
|
||||||
const buffer = Buffer.from(arrayBuffer);
|
|
||||||
|
|
||||||
const extension = mime.getExtension(
|
const buffer = Buffer.from(response.data, 'binary');
|
||||||
response.headers.get('content-type') ?? ''
|
const extension = path.split('.').pop() ?? '';
|
||||||
|
const maxAge = Number(
|
||||||
|
(response.headers['cache-control'] ?? '0').split('=')[1]
|
||||||
);
|
);
|
||||||
|
|
||||||
let maxAge = Number(
|
|
||||||
(response.headers.get('cache-control') ?? '0').split('=')[1]
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!maxAge) maxAge = 86400;
|
|
||||||
const expireAt = Date.now() + maxAge * 1000;
|
const expireAt = Date.now() + maxAge * 1000;
|
||||||
const etag = (response.headers.get('etag') ?? '').replace(/"/g, '');
|
const etag = (response.headers.etag ?? '').replace(/"/g, '');
|
||||||
|
|
||||||
await this.writeToCacheDir(
|
await this.writeToCacheDir(
|
||||||
directory,
|
directory,
|
||||||
@@ -295,7 +226,7 @@ class ImageProxy {
|
|||||||
|
|
||||||
private async writeToCacheDir(
|
private async writeToCacheDir(
|
||||||
dir: string,
|
dir: string,
|
||||||
extension: string | null,
|
extension: string,
|
||||||
maxAge: number,
|
maxAge: number,
|
||||||
expireAt: number,
|
expireAt: number,
|
||||||
buffer: Buffer,
|
buffer: Buffer,
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { User } from '@server/entity/User';
|
|||||||
import type { NotificationAgentDiscord } from '@server/lib/settings';
|
import type { NotificationAgentDiscord } from '@server/lib/settings';
|
||||||
import { getSettings, NotificationAgentKey } from '@server/lib/settings';
|
import { getSettings, NotificationAgentKey } from '@server/lib/settings';
|
||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
|
import axios from 'axios';
|
||||||
import {
|
import {
|
||||||
hasNotificationType,
|
hasNotificationType,
|
||||||
Notification,
|
Notification,
|
||||||
@@ -291,39 +292,23 @@ class DiscordAgent
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const response = await fetch(settings.options.webhookUrl, {
|
await axios.post(settings.options.webhookUrl, {
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify({
|
|
||||||
username: settings.options.botUsername
|
username: settings.options.botUsername
|
||||||
? settings.options.botUsername
|
? settings.options.botUsername
|
||||||
: getSettings().main.applicationTitle,
|
: getSettings().main.applicationTitle,
|
||||||
avatar_url: settings.options.botAvatarUrl,
|
avatar_url: settings.options.botAvatarUrl,
|
||||||
embeds: [this.buildEmbed(type, payload)],
|
embeds: [this.buildEmbed(type, payload)],
|
||||||
content: userMentions.join(' '),
|
content: userMentions.join(' '),
|
||||||
} as DiscordWebhookPayload),
|
} as DiscordWebhookPayload);
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(response.statusText, { cause: response });
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = await e.cause?.text();
|
|
||||||
errorData = JSON.parse(errorData);
|
|
||||||
} catch {
|
|
||||||
/* empty */
|
|
||||||
}
|
|
||||||
logger.error('Error sending Discord notification', {
|
logger.error('Error sending Discord notification', {
|
||||||
label: 'Notifications',
|
label: 'Notifications',
|
||||||
type: Notification[type],
|
type: Notification[type],
|
||||||
subject: payload.subject,
|
subject: payload.subject,
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
response: errorData,
|
response: e.response?.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { IssueStatus, IssueTypeName } from '@server/constants/issue';
|
|||||||
import type { NotificationAgentGotify } from '@server/lib/settings';
|
import type { NotificationAgentGotify } from '@server/lib/settings';
|
||||||
import { getSettings } from '@server/lib/settings';
|
import { getSettings } from '@server/lib/settings';
|
||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
|
import axios from 'axios';
|
||||||
import { hasNotificationType, Notification } from '..';
|
import { hasNotificationType, Notification } from '..';
|
||||||
import type { NotificationAgent, NotificationPayload } from './agent';
|
import type { NotificationAgent, NotificationPayload } from './agent';
|
||||||
import { BaseAgent } from './agent';
|
import { BaseAgent } from './agent';
|
||||||
@@ -132,32 +133,16 @@ class GotifyAgent
|
|||||||
const endpoint = `${settings.options.url}/message?token=${settings.options.token}`;
|
const endpoint = `${settings.options.url}/message?token=${settings.options.token}`;
|
||||||
const notificationPayload = this.getNotificationPayload(type, payload);
|
const notificationPayload = this.getNotificationPayload(type, payload);
|
||||||
|
|
||||||
const response = await fetch(endpoint, {
|
await axios.post(endpoint, notificationPayload);
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify(notificationPayload),
|
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(response.statusText, { cause: response });
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = await e.cause?.text();
|
|
||||||
errorData = JSON.parse(errorData);
|
|
||||||
} catch {
|
|
||||||
/* empty */
|
|
||||||
}
|
|
||||||
logger.error('Error sending Gotify notification', {
|
logger.error('Error sending Gotify notification', {
|
||||||
label: 'Notifications',
|
label: 'Notifications',
|
||||||
type: Notification[type],
|
type: Notification[type],
|
||||||
subject: payload.subject,
|
subject: payload.subject,
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
response: errorData,
|
response: e.response?.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { MediaStatus } from '@server/constants/media';
|
|||||||
import type { NotificationAgentLunaSea } from '@server/lib/settings';
|
import type { NotificationAgentLunaSea } from '@server/lib/settings';
|
||||||
import { getSettings } from '@server/lib/settings';
|
import { getSettings } from '@server/lib/settings';
|
||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
|
import axios from 'axios';
|
||||||
import { hasNotificationType, Notification } from '..';
|
import { hasNotificationType, Notification } from '..';
|
||||||
import type { NotificationAgent, NotificationPayload } from './agent';
|
import type { NotificationAgent, NotificationPayload } from './agent';
|
||||||
import { BaseAgent } from './agent';
|
import { BaseAgent } from './agent';
|
||||||
@@ -100,39 +101,28 @@ class LunaSeaAgent
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(settings.options.webhookUrl, {
|
await axios.post(
|
||||||
method: 'POST',
|
settings.options.webhookUrl,
|
||||||
headers: settings.options.profileName
|
this.buildPayload(type, payload),
|
||||||
|
settings.options.profileName
|
||||||
? {
|
? {
|
||||||
'Content-Type': 'application/json',
|
headers: {
|
||||||
}
|
|
||||||
: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
Authorization: `Basic ${Buffer.from(
|
Authorization: `Basic ${Buffer.from(
|
||||||
`${settings.options.profileName}:`
|
`${settings.options.profileName}:`
|
||||||
).toString('base64')}`,
|
).toString('base64')}`,
|
||||||
},
|
},
|
||||||
body: JSON.stringify(this.buildPayload(type, payload)),
|
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(response.statusText, { cause: response });
|
|
||||||
}
|
}
|
||||||
|
: undefined
|
||||||
|
);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = await e.cause?.text();
|
|
||||||
errorData = JSON.parse(errorData);
|
|
||||||
} catch {
|
|
||||||
/* empty */
|
|
||||||
}
|
|
||||||
logger.error('Error sending LunaSea notification', {
|
logger.error('Error sending LunaSea notification', {
|
||||||
label: 'Notifications',
|
label: 'Notifications',
|
||||||
type: Notification[type],
|
type: Notification[type],
|
||||||
subject: payload.subject,
|
subject: payload.subject,
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
response: errorData,
|
response: e.response?.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { User } from '@server/entity/User';
|
|||||||
import type { NotificationAgentPushbullet } from '@server/lib/settings';
|
import type { NotificationAgentPushbullet } from '@server/lib/settings';
|
||||||
import { getSettings, NotificationAgentKey } from '@server/lib/settings';
|
import { getSettings, NotificationAgentKey } from '@server/lib/settings';
|
||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
|
import axios from 'axios';
|
||||||
import {
|
import {
|
||||||
hasNotificationType,
|
hasNotificationType,
|
||||||
Notification,
|
Notification,
|
||||||
@@ -122,34 +123,22 @@ class PushbulletAgent
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(endpoint, {
|
await axios.post(
|
||||||
method: 'POST',
|
endpoint,
|
||||||
|
{ ...notificationPayload, channel_tag: settings.options.channelTag },
|
||||||
|
{
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
|
||||||
'Access-Token': settings.options.accessToken,
|
'Access-Token': settings.options.accessToken,
|
||||||
},
|
},
|
||||||
body: JSON.stringify({
|
|
||||||
...notificationPayload,
|
|
||||||
channel_tag: settings.options.channelTag,
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(response.statusText, { cause: response });
|
|
||||||
}
|
}
|
||||||
|
);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = await e.cause?.text();
|
|
||||||
errorData = JSON.parse(errorData);
|
|
||||||
} catch {
|
|
||||||
/* empty */
|
|
||||||
}
|
|
||||||
logger.error('Error sending Pushbullet notification', {
|
logger.error('Error sending Pushbullet notification', {
|
||||||
label: 'Notifications',
|
label: 'Notifications',
|
||||||
type: Notification[type],
|
type: Notification[type],
|
||||||
subject: payload.subject,
|
subject: payload.subject,
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
response: errorData,
|
response: e.response?.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@@ -174,32 +163,19 @@ class PushbulletAgent
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(endpoint, {
|
await axios.post(endpoint, notificationPayload, {
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
|
||||||
'Access-Token': payload.notifyUser.settings.pushbulletAccessToken,
|
'Access-Token': payload.notifyUser.settings.pushbulletAccessToken,
|
||||||
},
|
},
|
||||||
body: JSON.stringify(notificationPayload),
|
|
||||||
});
|
});
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(response.statusText, { cause: response });
|
|
||||||
}
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = await e.cause?.text();
|
|
||||||
errorData = JSON.parse(errorData);
|
|
||||||
} catch {
|
|
||||||
/* empty */
|
|
||||||
}
|
|
||||||
logger.error('Error sending Pushbullet notification', {
|
logger.error('Error sending Pushbullet notification', {
|
||||||
label: 'Notifications',
|
label: 'Notifications',
|
||||||
recipient: payload.notifyUser.displayName,
|
recipient: payload.notifyUser.displayName,
|
||||||
type: Notification[type],
|
type: Notification[type],
|
||||||
subject: payload.subject,
|
subject: payload.subject,
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
response: errorData,
|
response: e.response?.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@@ -235,32 +211,19 @@ class PushbulletAgent
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(endpoint, {
|
await axios.post(endpoint, notificationPayload, {
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
|
||||||
'Access-Token': user.settings.pushbulletAccessToken,
|
'Access-Token': user.settings.pushbulletAccessToken,
|
||||||
},
|
},
|
||||||
body: JSON.stringify(notificationPayload),
|
|
||||||
});
|
});
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(response.statusText, { cause: response });
|
|
||||||
}
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = await e.cause?.text();
|
|
||||||
errorData = JSON.parse(errorData);
|
|
||||||
} catch {
|
|
||||||
/* empty */
|
|
||||||
}
|
|
||||||
logger.error('Error sending Pushbullet notification', {
|
logger.error('Error sending Pushbullet notification', {
|
||||||
label: 'Notifications',
|
label: 'Notifications',
|
||||||
recipient: user.displayName,
|
recipient: user.displayName,
|
||||||
type: Notification[type],
|
type: Notification[type],
|
||||||
subject: payload.subject,
|
subject: payload.subject,
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
response: errorData,
|
response: e.response?.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { User } from '@server/entity/User';
|
|||||||
import type { NotificationAgentPushover } from '@server/lib/settings';
|
import type { NotificationAgentPushover } from '@server/lib/settings';
|
||||||
import { getSettings, NotificationAgentKey } from '@server/lib/settings';
|
import { getSettings, NotificationAgentKey } from '@server/lib/settings';
|
||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
|
import axios from 'axios';
|
||||||
import {
|
import {
|
||||||
hasNotificationType,
|
hasNotificationType,
|
||||||
Notification,
|
Notification,
|
||||||
@@ -51,15 +52,12 @@ class PushoverAgent
|
|||||||
imageUrl: string
|
imageUrl: string
|
||||||
): Promise<Partial<PushoverImagePayload>> {
|
): Promise<Partial<PushoverImagePayload>> {
|
||||||
try {
|
try {
|
||||||
const response = await fetch(imageUrl);
|
const response = await axios.get(imageUrl, {
|
||||||
if (!response.ok) {
|
responseType: 'arraybuffer',
|
||||||
throw new Error(response.statusText, { cause: response });
|
});
|
||||||
}
|
const base64 = Buffer.from(response.data, 'binary').toString('base64');
|
||||||
const arrayBuffer = await response.arrayBuffer();
|
|
||||||
const base64 = Buffer.from(arrayBuffer).toString('base64');
|
|
||||||
const contentType = (
|
const contentType = (
|
||||||
response.headers.get('Content-Type') ||
|
response.headers['Content-Type'] || response.headers['content-type']
|
||||||
response.headers.get('content-type')
|
|
||||||
)?.toString();
|
)?.toString();
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -67,17 +65,10 @@ class PushoverAgent
|
|||||||
attachment_type: contentType,
|
attachment_type: contentType,
|
||||||
};
|
};
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = await e.cause?.text();
|
|
||||||
errorData = JSON.parse(errorData);
|
|
||||||
} catch {
|
|
||||||
/* empty */
|
|
||||||
}
|
|
||||||
logger.error('Error getting image payload', {
|
logger.error('Error getting image payload', {
|
||||||
label: 'Notifications',
|
label: 'Notifications',
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
response: errorData,
|
response: e.response?.data,
|
||||||
});
|
});
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
@@ -210,35 +201,19 @@ class PushoverAgent
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(endpoint, {
|
await axios.post(endpoint, {
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify({
|
|
||||||
...notificationPayload,
|
...notificationPayload,
|
||||||
token: settings.options.accessToken,
|
token: settings.options.accessToken,
|
||||||
user: settings.options.userToken,
|
user: settings.options.userToken,
|
||||||
sound: settings.options.sound,
|
sound: settings.options.sound,
|
||||||
} as PushoverPayload),
|
} as PushoverPayload);
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(response.statusText, { cause: response });
|
|
||||||
}
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = await e.cause?.text();
|
|
||||||
errorData = JSON.parse(errorData);
|
|
||||||
} catch {
|
|
||||||
/* empty */
|
|
||||||
}
|
|
||||||
logger.error('Error sending Pushover notification', {
|
logger.error('Error sending Pushover notification', {
|
||||||
label: 'Notifications',
|
label: 'Notifications',
|
||||||
type: Notification[type],
|
type: Notification[type],
|
||||||
subject: payload.subject,
|
subject: payload.subject,
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
response: errorData,
|
response: e.response?.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@@ -266,36 +241,20 @@ class PushoverAgent
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(endpoint, {
|
await axios.post(endpoint, {
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify({
|
|
||||||
...notificationPayload,
|
...notificationPayload,
|
||||||
token: payload.notifyUser.settings.pushoverApplicationToken,
|
token: payload.notifyUser.settings.pushoverApplicationToken,
|
||||||
user: payload.notifyUser.settings.pushoverUserKey,
|
user: payload.notifyUser.settings.pushoverUserKey,
|
||||||
sound: payload.notifyUser.settings.pushoverSound,
|
sound: payload.notifyUser.settings.pushoverSound,
|
||||||
} as PushoverPayload),
|
} as PushoverPayload);
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(response.statusText, { cause: response });
|
|
||||||
}
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = await e.cause?.text();
|
|
||||||
errorData = JSON.parse(errorData);
|
|
||||||
} catch {
|
|
||||||
/* empty */
|
|
||||||
}
|
|
||||||
logger.error('Error sending Pushover notification', {
|
logger.error('Error sending Pushover notification', {
|
||||||
label: 'Notifications',
|
label: 'Notifications',
|
||||||
recipient: payload.notifyUser.displayName,
|
recipient: payload.notifyUser.displayName,
|
||||||
type: Notification[type],
|
type: Notification[type],
|
||||||
subject: payload.subject,
|
subject: payload.subject,
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
response: errorData,
|
response: e.response?.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@@ -332,35 +291,19 @@ class PushoverAgent
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(endpoint, {
|
await axios.post(endpoint, {
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify({
|
|
||||||
...notificationPayload,
|
...notificationPayload,
|
||||||
token: user.settings.pushoverApplicationToken,
|
token: user.settings.pushoverApplicationToken,
|
||||||
user: user.settings.pushoverUserKey,
|
user: user.settings.pushoverUserKey,
|
||||||
} as PushoverPayload),
|
} as PushoverPayload);
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(response.statusText, { cause: response });
|
|
||||||
}
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = await e.cause?.text();
|
|
||||||
errorData = JSON.parse(errorData);
|
|
||||||
} catch {
|
|
||||||
/* empty */
|
|
||||||
}
|
|
||||||
logger.error('Error sending Pushover notification', {
|
logger.error('Error sending Pushover notification', {
|
||||||
label: 'Notifications',
|
label: 'Notifications',
|
||||||
recipient: user.displayName,
|
recipient: user.displayName,
|
||||||
type: Notification[type],
|
type: Notification[type],
|
||||||
subject: payload.subject,
|
subject: payload.subject,
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
response: errorData,
|
response: e.response?.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { IssueStatus, IssueTypeName } from '@server/constants/issue';
|
|||||||
import type { NotificationAgentSlack } from '@server/lib/settings';
|
import type { NotificationAgentSlack } from '@server/lib/settings';
|
||||||
import { getSettings } from '@server/lib/settings';
|
import { getSettings } from '@server/lib/settings';
|
||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
|
import axios from 'axios';
|
||||||
import { hasNotificationType, Notification } from '..';
|
import { hasNotificationType, Notification } from '..';
|
||||||
import type { NotificationAgent, NotificationPayload } from './agent';
|
import type { NotificationAgent, NotificationPayload } from './agent';
|
||||||
import { BaseAgent } from './agent';
|
import { BaseAgent } from './agent';
|
||||||
@@ -237,32 +238,19 @@ class SlackAgent
|
|||||||
subject: payload.subject,
|
subject: payload.subject,
|
||||||
});
|
});
|
||||||
try {
|
try {
|
||||||
const response = await fetch(settings.options.webhookUrl, {
|
await axios.post(
|
||||||
method: 'POST',
|
settings.options.webhookUrl,
|
||||||
headers: {
|
this.buildEmbed(type, payload)
|
||||||
'Content-Type': 'application/json',
|
);
|
||||||
},
|
|
||||||
body: JSON.stringify(this.buildEmbed(type, payload)),
|
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(response.statusText, { cause: response });
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = await e.cause?.text();
|
|
||||||
errorData = JSON.parse(errorData);
|
|
||||||
} catch {
|
|
||||||
/* empty */
|
|
||||||
}
|
|
||||||
logger.error('Error sending Slack notification', {
|
logger.error('Error sending Slack notification', {
|
||||||
label: 'Notifications',
|
label: 'Notifications',
|
||||||
type: Notification[type],
|
type: Notification[type],
|
||||||
subject: payload.subject,
|
subject: payload.subject,
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
response: errorData,
|
response: e.response?.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { User } from '@server/entity/User';
|
|||||||
import type { NotificationAgentTelegram } from '@server/lib/settings';
|
import type { NotificationAgentTelegram } from '@server/lib/settings';
|
||||||
import { getSettings, NotificationAgentKey } from '@server/lib/settings';
|
import { getSettings, NotificationAgentKey } from '@server/lib/settings';
|
||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
|
import axios from 'axios';
|
||||||
import {
|
import {
|
||||||
hasNotificationType,
|
hasNotificationType,
|
||||||
Notification,
|
Notification,
|
||||||
@@ -174,34 +175,18 @@ class TelegramAgent
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(endpoint, {
|
await axios.post(endpoint, {
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify({
|
|
||||||
...notificationPayload,
|
...notificationPayload,
|
||||||
chat_id: settings.options.chatId,
|
chat_id: settings.options.chatId,
|
||||||
disable_notification: !!settings.options.sendSilently,
|
disable_notification: !!settings.options.sendSilently,
|
||||||
} as TelegramMessagePayload | TelegramPhotoPayload),
|
} as TelegramMessagePayload | TelegramPhotoPayload);
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(response.statusText, { cause: response });
|
|
||||||
}
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = await e.cause?.text();
|
|
||||||
errorData = JSON.parse(errorData);
|
|
||||||
} catch {
|
|
||||||
/* empty */
|
|
||||||
}
|
|
||||||
logger.error('Error sending Telegram notification', {
|
logger.error('Error sending Telegram notification', {
|
||||||
label: 'Notifications',
|
label: 'Notifications',
|
||||||
type: Notification[type],
|
type: Notification[type],
|
||||||
subject: payload.subject,
|
subject: payload.subject,
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
response: errorData,
|
response: e.response?.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@@ -225,36 +210,20 @@ class TelegramAgent
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(endpoint, {
|
await axios.post(endpoint, {
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify({
|
|
||||||
...notificationPayload,
|
...notificationPayload,
|
||||||
chat_id: payload.notifyUser.settings.telegramChatId,
|
chat_id: payload.notifyUser.settings.telegramChatId,
|
||||||
disable_notification:
|
disable_notification:
|
||||||
!!payload.notifyUser.settings.telegramSendSilently,
|
!!payload.notifyUser.settings.telegramSendSilently,
|
||||||
} as TelegramMessagePayload | TelegramPhotoPayload),
|
} as TelegramMessagePayload | TelegramPhotoPayload);
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(response.statusText, { cause: response });
|
|
||||||
}
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = await e.cause?.text();
|
|
||||||
errorData = JSON.parse(errorData);
|
|
||||||
} catch {
|
|
||||||
/* empty */
|
|
||||||
}
|
|
||||||
logger.error('Error sending Telegram notification', {
|
logger.error('Error sending Telegram notification', {
|
||||||
label: 'Notifications',
|
label: 'Notifications',
|
||||||
recipient: payload.notifyUser.displayName,
|
recipient: payload.notifyUser.displayName,
|
||||||
type: Notification[type],
|
type: Notification[type],
|
||||||
subject: payload.subject,
|
subject: payload.subject,
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
response: errorData,
|
response: e.response?.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@@ -288,35 +257,19 @@ class TelegramAgent
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(endpoint, {
|
await axios.post(endpoint, {
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify({
|
|
||||||
...notificationPayload,
|
...notificationPayload,
|
||||||
chat_id: user.settings.telegramChatId,
|
chat_id: user.settings.telegramChatId,
|
||||||
disable_notification: !!user.settings?.telegramSendSilently,
|
disable_notification: !!user.settings?.telegramSendSilently,
|
||||||
} as TelegramMessagePayload | TelegramPhotoPayload),
|
} as TelegramMessagePayload | TelegramPhotoPayload);
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(response.statusText, { cause: response });
|
|
||||||
}
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = await e.cause?.text();
|
|
||||||
errorData = JSON.parse(errorData);
|
|
||||||
} catch {
|
|
||||||
/* empty */
|
|
||||||
}
|
|
||||||
logger.error('Error sending Telegram notification', {
|
logger.error('Error sending Telegram notification', {
|
||||||
label: 'Notifications',
|
label: 'Notifications',
|
||||||
recipient: user.displayName,
|
recipient: user.displayName,
|
||||||
type: Notification[type],
|
type: Notification[type],
|
||||||
subject: payload.subject,
|
subject: payload.subject,
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
response: errorData,
|
response: e.response?.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { MediaStatus } from '@server/constants/media';
|
|||||||
import type { NotificationAgentWebhook } from '@server/lib/settings';
|
import type { NotificationAgentWebhook } from '@server/lib/settings';
|
||||||
import { getSettings } from '@server/lib/settings';
|
import { getSettings } from '@server/lib/settings';
|
||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
|
import axios from 'axios';
|
||||||
import { get } from 'lodash';
|
import { get } from 'lodash';
|
||||||
import { hasNotificationType, Notification } from '..';
|
import { hasNotificationType, Notification } from '..';
|
||||||
import type { NotificationAgent, NotificationPayload } from './agent';
|
import type { NotificationAgent, NotificationPayload } from './agent';
|
||||||
@@ -177,35 +178,26 @@ class WebhookAgent
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(settings.options.webhookUrl, {
|
await axios.post(
|
||||||
method: 'POST',
|
settings.options.webhookUrl,
|
||||||
|
this.buildPayload(type, payload),
|
||||||
|
settings.options.authHeader
|
||||||
|
? {
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
Authorization: settings.options.authHeader,
|
||||||
...(settings.options.authHeader
|
|
||||||
? { Authorization: settings.options.authHeader }
|
|
||||||
: {}),
|
|
||||||
},
|
},
|
||||||
body: JSON.stringify(this.buildPayload(type, payload)),
|
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(response.statusText, { cause: response });
|
|
||||||
}
|
}
|
||||||
|
: undefined
|
||||||
|
);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = await e.cause?.text();
|
|
||||||
errorData = JSON.parse(errorData);
|
|
||||||
} catch {
|
|
||||||
/* empty */
|
|
||||||
}
|
|
||||||
logger.error('Error sending webhook notification', {
|
logger.error('Error sending webhook notification', {
|
||||||
label: 'Notifications',
|
label: 'Notifications',
|
||||||
type: Notification[type],
|
type: Notification[type],
|
||||||
subject: payload.subject,
|
subject: payload.subject,
|
||||||
errorMessage: e.message,
|
errorMessage: e.message,
|
||||||
response: errorData,
|
response: e.response?.data,
|
||||||
});
|
});
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -27,8 +27,6 @@ export enum Permission {
|
|||||||
AUTO_REQUEST_TV = 33554432,
|
AUTO_REQUEST_TV = 33554432,
|
||||||
RECENT_VIEW = 67108864,
|
RECENT_VIEW = 67108864,
|
||||||
WATCHLIST_VIEW = 134217728,
|
WATCHLIST_VIEW = 134217728,
|
||||||
MANAGE_BLACKLIST = 268435456,
|
|
||||||
VIEW_BLACKLIST = 1073741824,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface PermissionCheckOptions {
|
export interface PermissionCheckOptions {
|
||||||
|
|||||||
@@ -567,10 +567,7 @@ class JellyfinScanner {
|
|||||||
public async run(): Promise<void> {
|
public async run(): Promise<void> {
|
||||||
const settings = getSettings();
|
const settings = getSettings();
|
||||||
|
|
||||||
if (
|
if (settings.main.mediaServerType != MediaServerType.JELLYFIN) {
|
||||||
settings.main.mediaServerType != MediaServerType.JELLYFIN &&
|
|
||||||
settings.main.mediaServerType != MediaServerType.EMBY
|
|
||||||
) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -585,7 +582,12 @@ class JellyfinScanner {
|
|||||||
const userRepository = getRepository(User);
|
const userRepository = getRepository(User);
|
||||||
const admin = await userRepository.findOne({
|
const admin = await userRepository.findOne({
|
||||||
where: { id: 1 },
|
where: { id: 1 },
|
||||||
select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
|
select: [
|
||||||
|
'id',
|
||||||
|
'jellyfinAuthToken',
|
||||||
|
'jellyfinUserId',
|
||||||
|
'jellyfinDeviceId',
|
||||||
|
],
|
||||||
order: { id: 'ASC' },
|
order: { id: 'ASC' },
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -593,9 +595,11 @@ class JellyfinScanner {
|
|||||||
return this.log('No admin configured. Jellyfin sync skipped.', 'warn');
|
return this.log('No admin configured. Jellyfin sync skipped.', 'warn');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const hostname = getHostname();
|
||||||
|
|
||||||
this.jfClient = new JellyfinAPI(
|
this.jfClient = new JellyfinAPI(
|
||||||
getHostname(),
|
hostname,
|
||||||
settings.jellyfin.apiKey,
|
admin.jellyfinAuthToken,
|
||||||
admin.jellyfinDeviceId
|
admin.jellyfinDeviceId
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -47,7 +47,6 @@ export interface JellyfinSettings {
|
|||||||
jellyfinForgotPasswordUrl?: string;
|
jellyfinForgotPasswordUrl?: string;
|
||||||
libraries: Library[];
|
libraries: Library[];
|
||||||
serverId: string;
|
serverId: string;
|
||||||
apiKey: string;
|
|
||||||
}
|
}
|
||||||
export interface TautulliSettings {
|
export interface TautulliSettings {
|
||||||
hostname?: string;
|
hostname?: string;
|
||||||
@@ -119,7 +118,6 @@ export interface MainSettings {
|
|||||||
mediaServerType: number;
|
mediaServerType: number;
|
||||||
partialRequestsEnabled: boolean;
|
partialRequestsEnabled: boolean;
|
||||||
locale: string;
|
locale: string;
|
||||||
httpProxy: string;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
interface PublicSettings {
|
interface PublicSettings {
|
||||||
@@ -326,7 +324,6 @@ class Settings {
|
|||||||
mediaServerType: MediaServerType.NOT_CONFIGURED,
|
mediaServerType: MediaServerType.NOT_CONFIGURED,
|
||||||
partialRequestsEnabled: true,
|
partialRequestsEnabled: true,
|
||||||
locale: 'en',
|
locale: 'en',
|
||||||
httpProxy: '',
|
|
||||||
},
|
},
|
||||||
plex: {
|
plex: {
|
||||||
name: '',
|
name: '',
|
||||||
@@ -345,7 +342,6 @@ class Settings {
|
|||||||
jellyfinForgotPasswordUrl: '',
|
jellyfinForgotPasswordUrl: '',
|
||||||
libraries: [],
|
libraries: [],
|
||||||
serverId: '',
|
serverId: '',
|
||||||
apiKey: '',
|
|
||||||
},
|
},
|
||||||
tautulli: {},
|
tautulli: {},
|
||||||
radarr: [],
|
radarr: [],
|
||||||
@@ -613,12 +609,8 @@ class Settings {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private generateApiKey(): string {
|
private generateApiKey(): string {
|
||||||
if (process.env.API_KEY) {
|
|
||||||
return process.env.API_KEY;
|
|
||||||
} else {
|
|
||||||
return Buffer.from(`${Date.now()}${randomUUID()}`).toString('base64');
|
return Buffer.from(`${Date.now()}${randomUUID()}`).toString('base64');
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private generateVapidKeys(force = false): void {
|
private generateVapidKeys(force = false): void {
|
||||||
if (!this.data.vapidPublic || !this.data.vapidPrivate || force) {
|
if (!this.data.vapidPublic || !this.data.vapidPrivate || force) {
|
||||||
@@ -637,7 +629,7 @@ class Settings {
|
|||||||
* @param overrideSettings If passed in, will override all existing settings with these
|
* @param overrideSettings If passed in, will override all existing settings with these
|
||||||
* values
|
* values
|
||||||
*/
|
*/
|
||||||
public async load(overrideSettings?: AllSettings): Promise<Settings> {
|
public load(overrideSettings?: AllSettings): Settings {
|
||||||
if (overrideSettings) {
|
if (overrideSettings) {
|
||||||
this.data = overrideSettings;
|
this.data = overrideSettings;
|
||||||
return this;
|
return this;
|
||||||
@@ -650,16 +642,10 @@ class Settings {
|
|||||||
|
|
||||||
if (data) {
|
if (data) {
|
||||||
const parsedJson = JSON.parse(data);
|
const parsedJson = JSON.parse(data);
|
||||||
this.data = await runMigrations(parsedJson, SETTINGS_PATH);
|
this.data = runMigrations(parsedJson);
|
||||||
|
|
||||||
this.data = merge(this.data, parsedJson);
|
this.data = merge(this.data, parsedJson);
|
||||||
|
|
||||||
if (process.env.API_KEY) {
|
|
||||||
if (this.main.apiKey != process.env.API_KEY) {
|
|
||||||
this.main.apiKey = process.env.API_KEY;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this.save();
|
this.save();
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
import JellyfinAPI from '@server/api/jellyfin';
|
|
||||||
import { MediaServerType } from '@server/constants/server';
|
|
||||||
import { getRepository } from '@server/datasource';
|
|
||||||
import { User } from '@server/entity/User';
|
|
||||||
import type { AllSettings } from '@server/lib/settings';
|
|
||||||
import { getHostname } from '@server/utils/getHostname';
|
|
||||||
|
|
||||||
const migrateApiTokens = async (settings: any): Promise<AllSettings> => {
|
|
||||||
const mediaServerType = settings.main.mediaServerType;
|
|
||||||
if (
|
|
||||||
!settings.jellyfin.apiKey &&
|
|
||||||
(mediaServerType === MediaServerType.JELLYFIN ||
|
|
||||||
mediaServerType === MediaServerType.EMBY)
|
|
||||||
) {
|
|
||||||
const userRepository = getRepository(User);
|
|
||||||
const admin = await userRepository.findOne({
|
|
||||||
where: { id: 1 },
|
|
||||||
select: ['id', 'jellyfinAuthToken', 'jellyfinUserId', 'jellyfinDeviceId'],
|
|
||||||
order: { id: 'ASC' },
|
|
||||||
});
|
|
||||||
if (!admin) {
|
|
||||||
return settings;
|
|
||||||
}
|
|
||||||
const jellyfinClient = new JellyfinAPI(
|
|
||||||
getHostname(settings.jellyfin),
|
|
||||||
admin.jellyfinAuthToken,
|
|
||||||
admin.jellyfinDeviceId
|
|
||||||
);
|
|
||||||
jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
|
|
||||||
const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
|
|
||||||
settings.jellyfin.apiKey = apiKey;
|
|
||||||
}
|
|
||||||
return settings;
|
|
||||||
};
|
|
||||||
|
|
||||||
export default migrateApiTokens;
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
import { MediaServerType } from '@server/constants/server';
|
|
||||||
import type { AllSettings } from '@server/lib/settings';
|
|
||||||
|
|
||||||
const migrateHostname = (settings: any): AllSettings => {
|
|
||||||
const oldMediaServerType = settings.main.mediaServerType;
|
|
||||||
if (
|
|
||||||
oldMediaServerType === MediaServerType.JELLYFIN &&
|
|
||||||
process.env.JELLYFIN_TYPE === 'emby'
|
|
||||||
) {
|
|
||||||
settings.main.mediaServerType = MediaServerType.EMBY;
|
|
||||||
}
|
|
||||||
|
|
||||||
return settings;
|
|
||||||
};
|
|
||||||
|
|
||||||
export default migrateHostname;
|
|
||||||
@@ -1,15 +1,10 @@
|
|||||||
/* eslint-disable no-console */
|
|
||||||
import type { AllSettings } from '@server/lib/settings';
|
import type { AllSettings } from '@server/lib/settings';
|
||||||
import logger from '@server/logger';
|
|
||||||
import fs from 'fs';
|
import fs from 'fs';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
|
|
||||||
const migrationsDir = path.join(__dirname, 'migrations');
|
const migrationsDir = path.join(__dirname, 'migrations');
|
||||||
|
|
||||||
export const runMigrations = async (
|
export const runMigrations = (settings: AllSettings): AllSettings => {
|
||||||
settings: AllSettings,
|
|
||||||
SETTINGS_PATH: string
|
|
||||||
): Promise<AllSettings> => {
|
|
||||||
const migrations = fs
|
const migrations = fs
|
||||||
.readdirSync(migrationsDir)
|
.readdirSync(migrationsDir)
|
||||||
.filter((file) => file.endsWith('.js') || file.endsWith('.ts'))
|
.filter((file) => file.endsWith('.js') || file.endsWith('.ts'))
|
||||||
@@ -18,44 +13,8 @@ export const runMigrations = async (
|
|||||||
|
|
||||||
let migrated = settings;
|
let migrated = settings;
|
||||||
|
|
||||||
try {
|
|
||||||
const settingsBefore = JSON.stringify(migrated);
|
|
||||||
|
|
||||||
for (const migration of migrations) {
|
for (const migration of migrations) {
|
||||||
migrated = await migration(migrated);
|
migrated = migration(migrated);
|
||||||
}
|
|
||||||
|
|
||||||
const settingsAfter = JSON.stringify(migrated);
|
|
||||||
|
|
||||||
if (settingsBefore !== settingsAfter) {
|
|
||||||
// a migration occured
|
|
||||||
// we check that the new config will be saved
|
|
||||||
fs.writeFileSync(SETTINGS_PATH, JSON.stringify(migrated, undefined, ' '));
|
|
||||||
const fileSaved = JSON.parse(fs.readFileSync(SETTINGS_PATH, 'utf-8'));
|
|
||||||
if (JSON.stringify(fileSaved) !== settingsAfter) {
|
|
||||||
// something went wrong while saving file
|
|
||||||
throw new Error('Unable to save settings after migration.');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
logger.error(
|
|
||||||
`Something went wrong while running settings migrations: ${e.message}`,
|
|
||||||
{ label: 'Settings Migrator' }
|
|
||||||
);
|
|
||||||
// we stop jellyseerr if the migration failed
|
|
||||||
console.log(
|
|
||||||
'===================================================================='
|
|
||||||
);
|
|
||||||
console.log(
|
|
||||||
' SOMETHING WENT WRONG WHILE RUNNING SETTINGS MIGRATIONS '
|
|
||||||
);
|
|
||||||
console.log(
|
|
||||||
' Please check that your configuration folder is properly set up '
|
|
||||||
);
|
|
||||||
console.log(
|
|
||||||
'===================================================================='
|
|
||||||
);
|
|
||||||
process.exit();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return migrated;
|
return migrated;
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
import type { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddBlacklist1699901142442 implements MigrationInterface {
|
|
||||||
name = 'AddBlacklist1699901142442';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TABLE "blacklist" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "title" varchar, "tmdbId" integer NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')),"userId" integer, "mediaId" integer,CONSTRAINT "UQ_6bbafa28411e6046421991ea21c" UNIQUE ("tmdbId", "userId"))`
|
|
||||||
);
|
|
||||||
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(`DROP TABLE "blacklist"`);
|
|
||||||
await queryRunner.query(`DROP INDEX "IDX_6bbafa28411e6046421991ea21"`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -85,7 +85,6 @@ export interface MovieDetails {
|
|||||||
mediaUrl?: string;
|
mediaUrl?: string;
|
||||||
watchProviders?: WatchProviders[];
|
watchProviders?: WatchProviders[];
|
||||||
keywords: Keyword[];
|
keywords: Keyword[];
|
||||||
onUserWatchlist?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const mapProductionCompany = (
|
export const mapProductionCompany = (
|
||||||
@@ -102,8 +101,7 @@ export const mapProductionCompany = (
|
|||||||
|
|
||||||
export const mapMovieDetails = (
|
export const mapMovieDetails = (
|
||||||
movie: TmdbMovieDetails,
|
movie: TmdbMovieDetails,
|
||||||
media?: Media,
|
media?: Media
|
||||||
userWatchlist?: boolean
|
|
||||||
): MovieDetails => ({
|
): MovieDetails => ({
|
||||||
id: movie.id,
|
id: movie.id,
|
||||||
adult: movie.adult,
|
adult: movie.adult,
|
||||||
@@ -150,5 +148,4 @@ export const mapMovieDetails = (
|
|||||||
id: keyword.id,
|
id: keyword.id,
|
||||||
name: keyword.name,
|
name: keyword.name,
|
||||||
})),
|
})),
|
||||||
onUserWatchlist: userWatchlist,
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -111,7 +111,6 @@ export interface TvDetails {
|
|||||||
keywords: Keyword[];
|
keywords: Keyword[];
|
||||||
mediaInfo?: Media;
|
mediaInfo?: Media;
|
||||||
watchProviders?: WatchProviders[];
|
watchProviders?: WatchProviders[];
|
||||||
onUserWatchlist?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const mapEpisodeResult = (episode: TmdbTvEpisodeResult): Episode => ({
|
const mapEpisodeResult = (episode: TmdbTvEpisodeResult): Episode => ({
|
||||||
@@ -162,8 +161,7 @@ export const mapNetwork = (network: TmdbNetwork): TvNetwork => ({
|
|||||||
|
|
||||||
export const mapTvDetails = (
|
export const mapTvDetails = (
|
||||||
show: TmdbTvDetails,
|
show: TmdbTvDetails,
|
||||||
media?: Media,
|
media?: Media
|
||||||
userWatchlist?: boolean
|
|
||||||
): TvDetails => ({
|
): TvDetails => ({
|
||||||
createdBy: show.created_by,
|
createdBy: show.created_by,
|
||||||
episodeRunTime: show.episode_run_time,
|
episodeRunTime: show.episode_run_time,
|
||||||
@@ -225,5 +223,4 @@ export const mapTvDetails = (
|
|||||||
})),
|
})),
|
||||||
mediaInfo: media,
|
mediaInfo: media,
|
||||||
watchProviders: mapWatchProviders(show['watch/providers']?.results ?? {}),
|
watchProviders: mapWatchProviders(show['watch/providers']?.results ?? {}),
|
||||||
onUserWatchlist: userWatchlist,
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,12 +1,11 @@
|
|||||||
import JellyfinAPI from '@server/api/jellyfin';
|
import JellyfinAPI from '@server/api/jellyfin';
|
||||||
import PlexTvAPI from '@server/api/plextv';
|
import PlexTvAPI from '@server/api/plextv';
|
||||||
import { ApiErrorCode } from '@server/constants/error';
|
import { ApiErrorCode } from '@server/constants/error';
|
||||||
import { MediaServerType, ServerType } from '@server/constants/server';
|
import { MediaServerType } from '@server/constants/server';
|
||||||
import { UserType } from '@server/constants/user';
|
import { UserType } from '@server/constants/user';
|
||||||
import { getRepository } from '@server/datasource';
|
import { getRepository } from '@server/datasource';
|
||||||
import { User } from '@server/entity/User';
|
import { User } from '@server/entity/User';
|
||||||
import { startJobs } from '@server/job/schedule';
|
import { startJobs } from '@server/job/schedule';
|
||||||
import ImageProxy from '@server/lib/imageproxy';
|
|
||||||
import { Permission } from '@server/lib/permissions';
|
import { Permission } from '@server/lib/permissions';
|
||||||
import { getSettings } from '@server/lib/settings';
|
import { getSettings } from '@server/lib/settings';
|
||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
@@ -228,20 +227,15 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
|
|||||||
urlBase?: string;
|
urlBase?: string;
|
||||||
useSsl?: boolean;
|
useSsl?: boolean;
|
||||||
email?: string;
|
email?: string;
|
||||||
serverType?: number;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
//Make sure jellyfin login is enabled, but only if jellyfin && Emby is not already configured
|
//Make sure jellyfin login is enabled, but only if jellyfin is not already configured
|
||||||
if (
|
if (
|
||||||
settings.main.mediaServerType !== MediaServerType.JELLYFIN &&
|
settings.main.mediaServerType !== MediaServerType.JELLYFIN &&
|
||||||
settings.main.mediaServerType !== MediaServerType.EMBY &&
|
settings.main.mediaServerType != MediaServerType.NOT_CONFIGURED
|
||||||
settings.main.mediaServerType != MediaServerType.NOT_CONFIGURED &&
|
|
||||||
settings.jellyfin.ip !== ''
|
|
||||||
) {
|
) {
|
||||||
return res.status(500).json({ error: 'Jellyfin login is disabled' });
|
return res.status(500).json({ error: 'Jellyfin login is disabled' });
|
||||||
}
|
} else if (!body.username) {
|
||||||
|
|
||||||
if (!body.username) {
|
|
||||||
return res.status(500).json({ error: 'You must provide an username' });
|
return res.status(500).json({ error: 'You must provide an username' });
|
||||||
} else if (settings.jellyfin.ip !== '' && body.hostname) {
|
} else if (settings.jellyfin.ip !== '' && body.hostname) {
|
||||||
return res
|
return res
|
||||||
@@ -262,6 +256,8 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
|
|||||||
urlBase: body.urlBase,
|
urlBase: body.urlBase,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const { externalHostname } = getSettings().jellyfin;
|
||||||
|
|
||||||
// Try to find deviceId that corresponds to jellyfin user, else generate a new one
|
// Try to find deviceId that corresponds to jellyfin user, else generate a new one
|
||||||
let user = await userRepository.findOne({
|
let user = await userRepository.findOne({
|
||||||
where: { jellyfinUsername: body.username },
|
where: { jellyfinUsername: body.username },
|
||||||
@@ -277,7 +273,11 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// First we need to attempt to log the user in to jellyfin
|
// First we need to attempt to log the user in to jellyfin
|
||||||
const jellyfinserver = new JellyfinAPI(hostname ?? '', undefined, deviceId);
|
const jellyfinserver = new JellyfinAPI(hostname, undefined, deviceId);
|
||||||
|
const jellyfinHost =
|
||||||
|
externalHostname && externalHostname.length > 0
|
||||||
|
? externalHostname
|
||||||
|
: hostname;
|
||||||
|
|
||||||
const ip = req.ip;
|
const ip = req.ip;
|
||||||
let clientIp;
|
let clientIp;
|
||||||
@@ -317,58 +317,21 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
// User doesn't exist, and there are no users in the database, we'll create the user
|
// User doesn't exist, and there are no users in the database, we'll create the user
|
||||||
// with admin permissions
|
// with admin permission
|
||||||
switch (body.serverType) {
|
|
||||||
case MediaServerType.EMBY:
|
|
||||||
settings.main.mediaServerType = MediaServerType.EMBY;
|
|
||||||
user = new User({
|
|
||||||
email: body.email || account.User.Name,
|
|
||||||
jellyfinUsername: account.User.Name,
|
|
||||||
jellyfinUserId: account.User.Id,
|
|
||||||
jellyfinDeviceId: deviceId,
|
|
||||||
jellyfinAuthToken: account.AccessToken,
|
|
||||||
permissions: Permission.ADMIN,
|
|
||||||
avatar: account.User.PrimaryImageTag
|
|
||||||
? `/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
|
|
||||||
: gravatarUrl(body.email || account.User.Name, {
|
|
||||||
default: 'mm',
|
|
||||||
size: 200,
|
|
||||||
}),
|
|
||||||
userType: UserType.EMBY,
|
|
||||||
});
|
|
||||||
|
|
||||||
break;
|
|
||||||
case MediaServerType.JELLYFIN:
|
|
||||||
settings.main.mediaServerType = MediaServerType.JELLYFIN;
|
settings.main.mediaServerType = MediaServerType.JELLYFIN;
|
||||||
user = new User({
|
user = new User({
|
||||||
email: body.email || account.User.Name,
|
email: body.email,
|
||||||
jellyfinUsername: account.User.Name,
|
jellyfinUsername: account.User.Name,
|
||||||
jellyfinUserId: account.User.Id,
|
jellyfinUserId: account.User.Id,
|
||||||
jellyfinDeviceId: deviceId,
|
jellyfinDeviceId: deviceId,
|
||||||
jellyfinAuthToken: account.AccessToken,
|
jellyfinAuthToken: account.AccessToken,
|
||||||
permissions: Permission.ADMIN,
|
permissions: Permission.ADMIN,
|
||||||
avatar: account.User.PrimaryImageTag
|
avatar: account.User.PrimaryImageTag
|
||||||
? `/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
|
? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
|
||||||
: gravatarUrl(body.email || account.User.Name, {
|
: gravatarUrl(body.email ?? '', { default: 'mm', size: 200 }),
|
||||||
default: 'mm',
|
|
||||||
size: 200,
|
|
||||||
}),
|
|
||||||
userType: UserType.JELLYFIN,
|
userType: UserType.JELLYFIN,
|
||||||
});
|
});
|
||||||
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
throw new Error('select_server_type');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create an API key on Jellyfin from this admin user
|
|
||||||
const jellyfinClient = new JellyfinAPI(
|
|
||||||
hostname,
|
|
||||||
account.AccessToken,
|
|
||||||
deviceId
|
|
||||||
);
|
|
||||||
const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
|
|
||||||
|
|
||||||
const serverName = await jellyfinserver.getServerName();
|
const serverName = await jellyfinserver.getServerName();
|
||||||
|
|
||||||
settings.jellyfin.name = serverName;
|
settings.jellyfin.name = serverName;
|
||||||
@@ -377,7 +340,6 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
|
|||||||
settings.jellyfin.port = body.port ?? 8096;
|
settings.jellyfin.port = body.port ?? 8096;
|
||||||
settings.jellyfin.urlBase = body.urlBase ?? '';
|
settings.jellyfin.urlBase = body.urlBase ?? '';
|
||||||
settings.jellyfin.useSsl = body.useSsl ?? false;
|
settings.jellyfin.useSsl = body.useSsl ?? false;
|
||||||
settings.jellyfin.apiKey = apiKey;
|
|
||||||
settings.save();
|
settings.save();
|
||||||
startJobs();
|
startJobs();
|
||||||
|
|
||||||
@@ -388,12 +350,12 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
|
|||||||
logger.info(
|
logger.info(
|
||||||
`Found matching ${
|
`Found matching ${
|
||||||
settings.main.mediaServerType === MediaServerType.JELLYFIN
|
settings.main.mediaServerType === MediaServerType.JELLYFIN
|
||||||
? ServerType.JELLYFIN
|
? 'Jellyfin'
|
||||||
: ServerType.EMBY
|
: 'Emby'
|
||||||
} user; updating user with ${
|
} user; updating user with ${
|
||||||
settings.main.mediaServerType === MediaServerType.JELLYFIN
|
settings.main.mediaServerType === MediaServerType.JELLYFIN
|
||||||
? ServerType.JELLYFIN
|
? 'Jellyfin'
|
||||||
: ServerType.EMBY
|
: 'Emby'
|
||||||
}`,
|
}`,
|
||||||
{
|
{
|
||||||
label: 'API',
|
label: 'API',
|
||||||
@@ -401,26 +363,18 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
|
|||||||
jellyfinUsername: account.User.Name,
|
jellyfinUsername: account.User.Name,
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
// Let's check if their authtoken is up to date
|
||||||
|
if (user.jellyfinAuthToken !== account.AccessToken) {
|
||||||
|
user.jellyfinAuthToken = account.AccessToken;
|
||||||
|
}
|
||||||
// Update the users avatar with their jellyfin profile pic (incase it changed)
|
// Update the users avatar with their jellyfin profile pic (incase it changed)
|
||||||
if (account.User.PrimaryImageTag) {
|
if (account.User.PrimaryImageTag) {
|
||||||
const avatar = `/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`;
|
user.avatar = `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`;
|
||||||
if (avatar !== user.avatar) {
|
|
||||||
const avatarProxy = new ImageProxy('avatar', '');
|
|
||||||
avatarProxy.clearCachedImage(user.avatar);
|
|
||||||
}
|
|
||||||
user.avatar = avatar;
|
|
||||||
} else {
|
} else {
|
||||||
const avatar = gravatarUrl(user.email || account.User.Name, {
|
user.avatar = gravatarUrl(user.email, {
|
||||||
default: 'mm',
|
default: 'mm',
|
||||||
size: 200,
|
size: 200,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (avatar !== user.avatar) {
|
|
||||||
const avatarProxy = new ImageProxy('avatar', '');
|
|
||||||
avatarProxy.clearCachedImage(user.avatar);
|
|
||||||
}
|
|
||||||
|
|
||||||
user.avatar = avatar;
|
|
||||||
}
|
}
|
||||||
user.jellyfinUsername = account.User.Name;
|
user.jellyfinUsername = account.User.Name;
|
||||||
|
|
||||||
@@ -428,6 +382,12 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
|
|||||||
user.username = '';
|
user.username = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: If JELLYFIN_TYPE is set to 'emby' then set mediaServerType to EMBY
|
||||||
|
// if (process.env.JELLYFIN_TYPE === 'emby') {
|
||||||
|
// settings.main.mediaServerType = MediaServerType.EMBY;
|
||||||
|
// settings.save();
|
||||||
|
// }
|
||||||
|
|
||||||
await userRepository.save(user);
|
await userRepository.save(user);
|
||||||
} else if (!settings.main.newPlexLogin) {
|
} else if (!settings.main.newPlexLogin) {
|
||||||
logger.warn(
|
logger.warn(
|
||||||
@@ -453,24 +413,22 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (!body.email) {
|
||||||
|
throw new Error('add_email');
|
||||||
|
}
|
||||||
|
|
||||||
user = new User({
|
user = new User({
|
||||||
email: body.email,
|
email: body.email,
|
||||||
jellyfinUsername: account.User.Name,
|
jellyfinUsername: account.User.Name,
|
||||||
jellyfinUserId: account.User.Id,
|
jellyfinUserId: account.User.Id,
|
||||||
jellyfinDeviceId: deviceId,
|
jellyfinDeviceId: deviceId,
|
||||||
|
jellyfinAuthToken: account.AccessToken,
|
||||||
permissions: settings.main.defaultPermissions,
|
permissions: settings.main.defaultPermissions,
|
||||||
avatar: account.User.PrimaryImageTag
|
avatar: account.User.PrimaryImageTag
|
||||||
? `/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
|
? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
|
||||||
: gravatarUrl(body.email || account.User.Name, {
|
: gravatarUrl(body.email, { default: 'mm', size: 200 }),
|
||||||
default: 'mm',
|
userType: UserType.JELLYFIN,
|
||||||
size: 200,
|
|
||||||
}),
|
|
||||||
userType:
|
|
||||||
settings.main.mediaServerType === MediaServerType.JELLYFIN
|
|
||||||
? UserType.JELLYFIN
|
|
||||||
: UserType.EMBY,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
//initialize Jellyfin/Emby users with local login
|
//initialize Jellyfin/Emby users with local login
|
||||||
const passedExplicitPassword = body.password && body.password.length > 0;
|
const passedExplicitPassword = body.password && body.password.length > 0;
|
||||||
if (passedExplicitPassword) {
|
if (passedExplicitPassword) {
|
||||||
@@ -772,7 +730,6 @@ authRoutes.post('/reset-password/:guid', async (req, res, next) => {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
user.recoveryLinkExpirationDate = null;
|
user.recoveryLinkExpirationDate = null;
|
||||||
await user.setPassword(req.body.password);
|
|
||||||
userRepository.save(user);
|
userRepository.save(user);
|
||||||
logger.info('Successfully reset password', {
|
logger.info('Successfully reset password', {
|
||||||
label: 'API',
|
label: 'API',
|
||||||
|
|||||||
@@ -1,51 +0,0 @@
|
|||||||
import { MediaServerType } from '@server/constants/server';
|
|
||||||
import ImageProxy from '@server/lib/imageproxy';
|
|
||||||
import { getSettings } from '@server/lib/settings';
|
|
||||||
import logger from '@server/logger';
|
|
||||||
import { getHostname } from '@server/utils/getHostname';
|
|
||||||
import { Router } from 'express';
|
|
||||||
|
|
||||||
const router = Router();
|
|
||||||
|
|
||||||
const avatarImageProxy = new ImageProxy('avatar', '');
|
|
||||||
// Proxy avatar images
|
|
||||||
router.get('/*', async (req, res) => {
|
|
||||||
let imagePath = '';
|
|
||||||
try {
|
|
||||||
const jellyfinAvatar = req.url.match(
|
|
||||||
/(\/Users\/\w+\/Images\/Primary\/?\?tag=\w+&quality=90)$/
|
|
||||||
)?.[1];
|
|
||||||
if (!jellyfinAvatar) {
|
|
||||||
const mediaServerType = getSettings().main.mediaServerType;
|
|
||||||
throw new Error(
|
|
||||||
`Provided URL is not ${
|
|
||||||
mediaServerType === MediaServerType.JELLYFIN
|
|
||||||
? 'a Jellyfin'
|
|
||||||
: 'an Emby'
|
|
||||||
} avatar.`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const imageUrl = new URL(jellyfinAvatar, getHostname());
|
|
||||||
imagePath = imageUrl.toString();
|
|
||||||
|
|
||||||
const imageData = await avatarImageProxy.getImage(imagePath);
|
|
||||||
|
|
||||||
res.writeHead(200, {
|
|
||||||
'Content-Type': `image/${imageData.meta.extension}`,
|
|
||||||
'Content-Length': imageData.imageBuffer.length,
|
|
||||||
'Cache-Control': `public, max-age=${imageData.meta.curRevalidate}`,
|
|
||||||
'OS-Cache-Key': imageData.meta.cacheKey,
|
|
||||||
'OS-Cache-Status': imageData.meta.cacheMiss ? 'MISS' : 'HIT',
|
|
||||||
});
|
|
||||||
|
|
||||||
res.end(imageData.imageBuffer);
|
|
||||||
} catch (e) {
|
|
||||||
logger.error('Failed to proxy avatar image', {
|
|
||||||
imagePath,
|
|
||||||
errorMessage: e.message,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
export default router;
|
|
||||||
@@ -1,148 +0,0 @@
|
|||||||
import { MediaType } from '@server/constants/media';
|
|
||||||
import { getRepository } from '@server/datasource';
|
|
||||||
import { Blacklist } from '@server/entity/Blacklist';
|
|
||||||
import Media from '@server/entity/Media';
|
|
||||||
import { NotFoundError } from '@server/entity/Watchlist';
|
|
||||||
import type { BlacklistResultsResponse } from '@server/interfaces/api/blacklistInterfaces';
|
|
||||||
import { Permission } from '@server/lib/permissions';
|
|
||||||
import logger from '@server/logger';
|
|
||||||
import { isAuthenticated } from '@server/middleware/auth';
|
|
||||||
import { Router } from 'express';
|
|
||||||
import rateLimit from 'express-rate-limit';
|
|
||||||
import { QueryFailedError } from 'typeorm';
|
|
||||||
import { z } from 'zod';
|
|
||||||
|
|
||||||
const blacklistRoutes = Router();
|
|
||||||
|
|
||||||
export const blacklistAdd = z.object({
|
|
||||||
tmdbId: z.coerce.number(),
|
|
||||||
mediaType: z.nativeEnum(MediaType),
|
|
||||||
title: z.coerce.string().optional(),
|
|
||||||
user: z.coerce.number(),
|
|
||||||
});
|
|
||||||
|
|
||||||
blacklistRoutes.get(
|
|
||||||
'/',
|
|
||||||
isAuthenticated([Permission.MANAGE_BLACKLIST, Permission.VIEW_BLACKLIST], {
|
|
||||||
type: 'or',
|
|
||||||
}),
|
|
||||||
rateLimit({ windowMs: 60 * 1000, max: 50 }),
|
|
||||||
async (req, res, next) => {
|
|
||||||
const pageSize = req.query.take ? Number(req.query.take) : 25;
|
|
||||||
const skip = req.query.skip ? Number(req.query.skip) : 0;
|
|
||||||
const search = (req.query.search as string) ?? '';
|
|
||||||
|
|
||||||
try {
|
|
||||||
let query = getRepository(Blacklist)
|
|
||||||
.createQueryBuilder('blacklist')
|
|
||||||
.leftJoinAndSelect('blacklist.user', 'user');
|
|
||||||
|
|
||||||
if (search.length > 0) {
|
|
||||||
query = query.where('blacklist.title like :title', {
|
|
||||||
title: `%${search}%`,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const [blacklistedItems, itemsCount] = await query
|
|
||||||
.orderBy('blacklist.createdAt', 'DESC')
|
|
||||||
.take(pageSize)
|
|
||||||
.skip(skip)
|
|
||||||
.getManyAndCount();
|
|
||||||
|
|
||||||
return res.status(200).json({
|
|
||||||
pageInfo: {
|
|
||||||
pages: Math.ceil(itemsCount / pageSize),
|
|
||||||
pageSize,
|
|
||||||
results: itemsCount,
|
|
||||||
page: Math.ceil(skip / pageSize) + 1,
|
|
||||||
},
|
|
||||||
results: blacklistedItems,
|
|
||||||
} as BlacklistResultsResponse);
|
|
||||||
} catch (error) {
|
|
||||||
logger.error('Something went wrong while retrieving blacklisted items', {
|
|
||||||
label: 'Blacklist',
|
|
||||||
errorMessage: error.message,
|
|
||||||
});
|
|
||||||
return next({
|
|
||||||
status: 500,
|
|
||||||
message: 'Unable to retrieve blacklisted items.',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
blacklistRoutes.post(
|
|
||||||
'/',
|
|
||||||
isAuthenticated([Permission.MANAGE_BLACKLIST], {
|
|
||||||
type: 'or',
|
|
||||||
}),
|
|
||||||
async (req, res, next) => {
|
|
||||||
try {
|
|
||||||
const values = blacklistAdd.parse(req.body);
|
|
||||||
|
|
||||||
await Blacklist.addToBlacklist({
|
|
||||||
blacklistRequest: values,
|
|
||||||
});
|
|
||||||
|
|
||||||
return res.status(201).send();
|
|
||||||
} catch (error) {
|
|
||||||
if (!(error instanceof Error)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (error instanceof QueryFailedError) {
|
|
||||||
switch (error.driverError.errno) {
|
|
||||||
case 19:
|
|
||||||
return next({ status: 412, message: 'Item already blacklisted' });
|
|
||||||
default:
|
|
||||||
logger.warn('Something wrong with data blacklist', {
|
|
||||||
tmdbId: req.body.tmdbId,
|
|
||||||
mediaType: req.body.mediaType,
|
|
||||||
label: 'Blacklist',
|
|
||||||
});
|
|
||||||
return next({ status: 409, message: 'Something wrong' });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return next({ status: 500, message: error.message });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
blacklistRoutes.delete(
|
|
||||||
'/:id',
|
|
||||||
isAuthenticated([Permission.MANAGE_BLACKLIST], {
|
|
||||||
type: 'or',
|
|
||||||
}),
|
|
||||||
async (req, res, next) => {
|
|
||||||
try {
|
|
||||||
const blacklisteRepository = getRepository(Blacklist);
|
|
||||||
|
|
||||||
const blacklistItem = await blacklisteRepository.findOneOrFail({
|
|
||||||
where: { tmdbId: Number(req.params.id) },
|
|
||||||
});
|
|
||||||
|
|
||||||
await blacklisteRepository.remove(blacklistItem);
|
|
||||||
|
|
||||||
const mediaRepository = getRepository(Media);
|
|
||||||
|
|
||||||
const mediaItem = await mediaRepository.findOneOrFail({
|
|
||||||
where: { tmdbId: Number(req.params.id) },
|
|
||||||
});
|
|
||||||
|
|
||||||
await mediaRepository.remove(mediaItem);
|
|
||||||
|
|
||||||
return res.status(204).send();
|
|
||||||
} catch (e) {
|
|
||||||
if (e instanceof NotFoundError) {
|
|
||||||
return next({
|
|
||||||
status: 401,
|
|
||||||
message: e.message,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return next({ status: 500, message: e.message });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
export default blacklistRoutes;
|
|
||||||
@@ -71,7 +71,6 @@ const QueryFilterOptions = z.object({
|
|||||||
network: z.coerce.string().optional(),
|
network: z.coerce.string().optional(),
|
||||||
watchProviders: z.coerce.string().optional(),
|
watchProviders: z.coerce.string().optional(),
|
||||||
watchRegion: z.coerce.string().optional(),
|
watchRegion: z.coerce.string().optional(),
|
||||||
status: z.coerce.string().optional(),
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export type FilterOptions = z.infer<typeof QueryFilterOptions>;
|
export type FilterOptions = z.infer<typeof QueryFilterOptions>;
|
||||||
@@ -386,7 +385,6 @@ discoverRoutes.get('/tv', async (req, res, next) => {
|
|||||||
voteCountLte: query.voteCountLte,
|
voteCountLte: query.voteCountLte,
|
||||||
watchProviders: query.watchProviders,
|
watchProviders: query.watchProviders,
|
||||||
watchRegion: query.watchRegion,
|
watchRegion: query.watchRegion,
|
||||||
withStatus: query.status,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const media = await Media.getRelatedMedia(
|
const media = await Media.getRelatedMedia(
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { Router } from 'express';
|
|||||||
const router = Router();
|
const router = Router();
|
||||||
const tmdbImageProxy = new ImageProxy('tmdb', 'https://image.tmdb.org', {
|
const tmdbImageProxy = new ImageProxy('tmdb', 'https://image.tmdb.org', {
|
||||||
rateLimitOptions: {
|
rateLimitOptions: {
|
||||||
|
maxRequests: 20,
|
||||||
maxRPS: 50,
|
maxRPS: 50,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ import restartFlag from '@server/utils/restartFlag';
|
|||||||
import { isPerson } from '@server/utils/typeHelpers';
|
import { isPerson } from '@server/utils/typeHelpers';
|
||||||
import { Router } from 'express';
|
import { Router } from 'express';
|
||||||
import authRoutes from './auth';
|
import authRoutes from './auth';
|
||||||
import blacklistRoutes from './blacklist';
|
|
||||||
import collectionRoutes from './collection';
|
import collectionRoutes from './collection';
|
||||||
import discoverRoutes, { createTmdbWithRegionLanguage } from './discover';
|
import discoverRoutes, { createTmdbWithRegionLanguage } from './discover';
|
||||||
import issueRoutes from './issue';
|
import issueRoutes from './issue';
|
||||||
@@ -145,7 +144,6 @@ router.use('/search', isAuthenticated(), searchRoutes);
|
|||||||
router.use('/discover', isAuthenticated(), discoverRoutes);
|
router.use('/discover', isAuthenticated(), discoverRoutes);
|
||||||
router.use('/request', isAuthenticated(), requestRoutes);
|
router.use('/request', isAuthenticated(), requestRoutes);
|
||||||
router.use('/watchlist', isAuthenticated(), watchlistRoutes);
|
router.use('/watchlist', isAuthenticated(), watchlistRoutes);
|
||||||
router.use('/blacklist', isAuthenticated(), blacklistRoutes);
|
|
||||||
router.use('/movie', isAuthenticated(), movieRoutes);
|
router.use('/movie', isAuthenticated(), movieRoutes);
|
||||||
router.use('/tv', isAuthenticated(), tvRoutes);
|
router.use('/tv', isAuthenticated(), tvRoutes);
|
||||||
router.use('/media', isAuthenticated(), mediaRoutes);
|
router.use('/media', isAuthenticated(), mediaRoutes);
|
||||||
|
|||||||
@@ -3,9 +3,7 @@ import RottenTomatoes from '@server/api/rating/rottentomatoes';
|
|||||||
import { type RatingResponse } from '@server/api/ratings';
|
import { type RatingResponse } from '@server/api/ratings';
|
||||||
import TheMovieDb from '@server/api/themoviedb';
|
import TheMovieDb from '@server/api/themoviedb';
|
||||||
import { MediaType } from '@server/constants/media';
|
import { MediaType } from '@server/constants/media';
|
||||||
import { getRepository } from '@server/datasource';
|
|
||||||
import Media from '@server/entity/Media';
|
import Media from '@server/entity/Media';
|
||||||
import { Watchlist } from '@server/entity/Watchlist';
|
|
||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
import { mapMovieDetails } from '@server/models/Movie';
|
import { mapMovieDetails } from '@server/models/Movie';
|
||||||
import { mapMovieResult } from '@server/models/Search';
|
import { mapMovieResult } from '@server/models/Search';
|
||||||
@@ -24,24 +22,7 @@ movieRoutes.get('/:id', async (req, res, next) => {
|
|||||||
|
|
||||||
const media = await Media.getMedia(tmdbMovie.id, MediaType.MOVIE);
|
const media = await Media.getMedia(tmdbMovie.id, MediaType.MOVIE);
|
||||||
|
|
||||||
const onUserWatchlist = await getRepository(Watchlist).exist({
|
return res.status(200).json(mapMovieDetails(tmdbMovie, media));
|
||||||
where: {
|
|
||||||
tmdbId: Number(req.params.id),
|
|
||||||
requestedBy: {
|
|
||||||
id: req.user?.id,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const data = mapMovieDetails(tmdbMovie, media, onUserWatchlist);
|
|
||||||
|
|
||||||
// TMDB issue where it doesnt fallback to English when no overview is available in requested locale.
|
|
||||||
if (!data.overview) {
|
|
||||||
const tvEnglish = await tmdb.getMovie({ movieId: Number(req.params.id) });
|
|
||||||
data.overview = tvEnglish.overview;
|
|
||||||
}
|
|
||||||
|
|
||||||
return res.status(200).json(data);
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.debug('Something went wrong retrieving movie', {
|
logger.debug('Something went wrong retrieving movie', {
|
||||||
label: 'API',
|
label: 'API',
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
import RadarrAPI from '@server/api/servarr/radarr';
|
|
||||||
import SonarrAPI from '@server/api/servarr/sonarr';
|
|
||||||
import {
|
import {
|
||||||
MediaRequestStatus,
|
MediaRequestStatus,
|
||||||
MediaStatus,
|
MediaStatus,
|
||||||
@@ -8,7 +6,6 @@ import {
|
|||||||
import { getRepository } from '@server/datasource';
|
import { getRepository } from '@server/datasource';
|
||||||
import Media from '@server/entity/Media';
|
import Media from '@server/entity/Media';
|
||||||
import {
|
import {
|
||||||
BlacklistedMediaError,
|
|
||||||
DuplicateMediaRequestError,
|
DuplicateMediaRequestError,
|
||||||
MediaRequest,
|
MediaRequest,
|
||||||
NoSeasonsAvailableError,
|
NoSeasonsAvailableError,
|
||||||
@@ -22,7 +19,6 @@ import type {
|
|||||||
RequestResultsResponse,
|
RequestResultsResponse,
|
||||||
} from '@server/interfaces/api/requestInterfaces';
|
} from '@server/interfaces/api/requestInterfaces';
|
||||||
import { Permission } from '@server/lib/permissions';
|
import { Permission } from '@server/lib/permissions';
|
||||||
import { getSettings } from '@server/lib/settings';
|
|
||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
import { isAuthenticated } from '@server/middleware/auth';
|
import { isAuthenticated } from '@server/middleware/auth';
|
||||||
import { Router } from 'express';
|
import { Router } from 'express';
|
||||||
@@ -147,62 +143,6 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
|
|||||||
.skip(skip)
|
.skip(skip)
|
||||||
.getManyAndCount();
|
.getManyAndCount();
|
||||||
|
|
||||||
const settings = getSettings();
|
|
||||||
|
|
||||||
// get all quality profiles for every configured sonarr server
|
|
||||||
const sonarrServers = await Promise.all(
|
|
||||||
settings.sonarr.map(async (sonarrSetting) => {
|
|
||||||
const sonarr = new SonarrAPI({
|
|
||||||
apiKey: sonarrSetting.apiKey,
|
|
||||||
url: SonarrAPI.buildUrl(sonarrSetting, '/api/v3'),
|
|
||||||
});
|
|
||||||
|
|
||||||
return {
|
|
||||||
id: sonarrSetting.id,
|
|
||||||
profiles: await sonarr.getProfiles(),
|
|
||||||
};
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
// get all quality profiles for every configured radarr server
|
|
||||||
const radarrServers = await Promise.all(
|
|
||||||
settings.radarr.map(async (radarrSetting) => {
|
|
||||||
const radarr = new RadarrAPI({
|
|
||||||
apiKey: radarrSetting.apiKey,
|
|
||||||
url: RadarrAPI.buildUrl(radarrSetting, '/api/v3'),
|
|
||||||
});
|
|
||||||
|
|
||||||
return {
|
|
||||||
id: radarrSetting.id,
|
|
||||||
profiles: await radarr.getProfiles(),
|
|
||||||
};
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
// add profile names to the media requests, with undefined if not found
|
|
||||||
const requestsWithProfileNames = requests.map((r) => {
|
|
||||||
switch (r.type) {
|
|
||||||
case MediaType.MOVIE: {
|
|
||||||
const profileName = radarrServers
|
|
||||||
.find((serverr) => serverr.id === r.serverId)
|
|
||||||
?.profiles.find((profile) => profile.id === r.profileId)?.name;
|
|
||||||
|
|
||||||
return {
|
|
||||||
...r,
|
|
||||||
profileName,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
case MediaType.TV: {
|
|
||||||
return {
|
|
||||||
...r,
|
|
||||||
profileName: sonarrServers
|
|
||||||
.find((serverr) => serverr.id === r.serverId)
|
|
||||||
?.profiles.find((profile) => profile.id === r.profileId)?.name,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return res.status(200).json({
|
return res.status(200).json({
|
||||||
pageInfo: {
|
pageInfo: {
|
||||||
pages: Math.ceil(requestCount / pageSize),
|
pages: Math.ceil(requestCount / pageSize),
|
||||||
@@ -210,7 +150,7 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
|
|||||||
results: requestCount,
|
results: requestCount,
|
||||||
page: Math.ceil(skip / pageSize) + 1,
|
page: Math.ceil(skip / pageSize) + 1,
|
||||||
},
|
},
|
||||||
results: requestsWithProfileNames,
|
results: requests,
|
||||||
});
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
next({ status: 500, message: e.message });
|
next({ status: 500, message: e.message });
|
||||||
@@ -244,8 +184,6 @@ requestRoutes.post<never, MediaRequest, MediaRequestBody>(
|
|||||||
return next({ status: 409, message: error.message });
|
return next({ status: 409, message: error.message });
|
||||||
case NoSeasonsAvailableError:
|
case NoSeasonsAvailableError:
|
||||||
return next({ status: 202, message: error.message });
|
return next({ status: 202, message: error.message });
|
||||||
case BlacklistedMediaError:
|
|
||||||
return next({ status: 403, message: error.message });
|
|
||||||
default:
|
default:
|
||||||
return next({ status: 500, message: error.message });
|
return next({ status: 500, message: error.message });
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -262,7 +262,7 @@ settingsRoutes.post('/jellyfin', async (req, res, next) => {
|
|||||||
try {
|
try {
|
||||||
const admin = await userRepository.findOneOrFail({
|
const admin = await userRepository.findOneOrFail({
|
||||||
where: { id: 1 },
|
where: { id: 1 },
|
||||||
select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
|
select: ['id', 'jellyfinAuthToken', 'jellyfinUserId', 'jellyfinDeviceId'],
|
||||||
order: { id: 'ASC' },
|
order: { id: 'ASC' },
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -270,7 +270,7 @@ settingsRoutes.post('/jellyfin', async (req, res, next) => {
|
|||||||
|
|
||||||
const jellyfinClient = new JellyfinAPI(
|
const jellyfinClient = new JellyfinAPI(
|
||||||
getHostname(tempJellyfinSettings),
|
getHostname(tempJellyfinSettings),
|
||||||
tempJellyfinSettings.apiKey,
|
admin.jellyfinAuthToken ?? '',
|
||||||
admin.jellyfinDeviceId ?? ''
|
admin.jellyfinDeviceId ?? ''
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -318,13 +318,13 @@ settingsRoutes.get('/jellyfin/library', async (req, res, next) => {
|
|||||||
if (req.query.sync) {
|
if (req.query.sync) {
|
||||||
const userRepository = getRepository(User);
|
const userRepository = getRepository(User);
|
||||||
const admin = await userRepository.findOneOrFail({
|
const admin = await userRepository.findOneOrFail({
|
||||||
select: ['id', 'jellyfinDeviceId', 'jellyfinUserId'],
|
select: ['id', 'jellyfinAuthToken', 'jellyfinDeviceId', 'jellyfinUserId'],
|
||||||
where: { id: 1 },
|
where: { id: 1 },
|
||||||
order: { id: 'ASC' },
|
order: { id: 'ASC' },
|
||||||
});
|
});
|
||||||
const jellyfinClient = new JellyfinAPI(
|
const jellyfinClient = new JellyfinAPI(
|
||||||
getHostname(),
|
getHostname(),
|
||||||
settings.jellyfin.apiKey,
|
admin.jellyfinAuthToken ?? '',
|
||||||
admin.jellyfinDeviceId ?? ''
|
admin.jellyfinDeviceId ?? ''
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -376,17 +376,20 @@ settingsRoutes.get('/jellyfin/library', async (req, res, next) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
settingsRoutes.get('/jellyfin/users', async (req, res) => {
|
settingsRoutes.get('/jellyfin/users', async (req, res) => {
|
||||||
const settings = getSettings();
|
const { externalHostname } = getSettings().jellyfin;
|
||||||
|
const jellyfinHost =
|
||||||
|
externalHostname && externalHostname.length > 0
|
||||||
|
? externalHostname
|
||||||
|
: getHostname();
|
||||||
|
|
||||||
const userRepository = getRepository(User);
|
const userRepository = getRepository(User);
|
||||||
const admin = await userRepository.findOneOrFail({
|
const admin = await userRepository.findOneOrFail({
|
||||||
select: ['id', 'jellyfinDeviceId', 'jellyfinUserId'],
|
select: ['id', 'jellyfinAuthToken', 'jellyfinDeviceId', 'jellyfinUserId'],
|
||||||
where: { id: 1 },
|
where: { id: 1 },
|
||||||
order: { id: 'ASC' },
|
order: { id: 'ASC' },
|
||||||
});
|
});
|
||||||
const jellyfinClient = new JellyfinAPI(
|
const jellyfinClient = new JellyfinAPI(
|
||||||
getHostname(),
|
admin.jellyfinAuthToken ?? '',
|
||||||
settings.jellyfin.apiKey,
|
|
||||||
admin.jellyfinDeviceId ?? ''
|
admin.jellyfinDeviceId ?? ''
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -396,7 +399,7 @@ settingsRoutes.get('/jellyfin/users', async (req, res) => {
|
|||||||
username: user.Name,
|
username: user.Name,
|
||||||
id: user.Id,
|
id: user.Id,
|
||||||
thumb: user.PrimaryImageTag
|
thumb: user.PrimaryImageTag
|
||||||
? `/Users/${user.Id}/Images/Primary/?tag=${user.PrimaryImageTag}&quality=90`
|
? `${jellyfinHost}/Users/${user.Id}/Images/Primary/?tag=${user.PrimaryImageTag}&quality=90`
|
||||||
: gravatarUrl(user.Name, { default: 'mm', size: 200 }),
|
: gravatarUrl(user.Name, { default: 'mm', size: 200 }),
|
||||||
email: user.Name,
|
email: user.Name,
|
||||||
}));
|
}));
|
||||||
@@ -741,13 +744,11 @@ settingsRoutes.get('/cache', async (_req, res) => {
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
const tmdbImageCache = await ImageProxy.getImageStats('tmdb');
|
const tmdbImageCache = await ImageProxy.getImageStats('tmdb');
|
||||||
const avatarImageCache = await ImageProxy.getImageStats('avatar');
|
|
||||||
|
|
||||||
return res.status(200).json({
|
return res.status(200).json({
|
||||||
apiCaches,
|
apiCaches,
|
||||||
imageCache: {
|
imageCache: {
|
||||||
tmdb: tmdbImageCache,
|
tmdb: tmdbImageCache,
|
||||||
avatar: avatarImageCache,
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
import RottenTomatoes from '@server/api/rating/rottentomatoes';
|
import RottenTomatoes from '@server/api/rating/rottentomatoes';
|
||||||
import TheMovieDb from '@server/api/themoviedb';
|
import TheMovieDb from '@server/api/themoviedb';
|
||||||
import { MediaType } from '@server/constants/media';
|
import { MediaType } from '@server/constants/media';
|
||||||
import { getRepository } from '@server/datasource';
|
|
||||||
import Media from '@server/entity/Media';
|
import Media from '@server/entity/Media';
|
||||||
import { Watchlist } from '@server/entity/Watchlist';
|
|
||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
import { mapTvResult } from '@server/models/Search';
|
import { mapTvResult } from '@server/models/Search';
|
||||||
import { mapSeasonWithEpisodes, mapTvDetails } from '@server/models/Tv';
|
import { mapSeasonWithEpisodes, mapTvDetails } from '@server/models/Tv';
|
||||||
@@ -21,24 +19,7 @@ tvRoutes.get('/:id', async (req, res, next) => {
|
|||||||
|
|
||||||
const media = await Media.getMedia(tv.id, MediaType.TV);
|
const media = await Media.getMedia(tv.id, MediaType.TV);
|
||||||
|
|
||||||
const onUserWatchlist = await getRepository(Watchlist).exist({
|
return res.status(200).json(mapTvDetails(tv, media));
|
||||||
where: {
|
|
||||||
tmdbId: Number(req.params.id),
|
|
||||||
requestedBy: {
|
|
||||||
id: req.user?.id,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const data = mapTvDetails(tv, media, onUserWatchlist);
|
|
||||||
|
|
||||||
// TMDB issue where it doesnt fallback to English when no overview is available in requested locale.
|
|
||||||
if (!data.overview) {
|
|
||||||
const tvEnglish = await tmdb.getTvShow({ tvId: Number(req.params.id) });
|
|
||||||
data.overview = tvEnglish.overview;
|
|
||||||
}
|
|
||||||
|
|
||||||
return res.status(200).json(data);
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.debug('Something went wrong retrieving series', {
|
logger.debug('Something went wrong retrieving series', {
|
||||||
label: 'API',
|
label: 'API',
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import JellyfinAPI from '@server/api/jellyfin';
|
|||||||
import PlexTvAPI from '@server/api/plextv';
|
import PlexTvAPI from '@server/api/plextv';
|
||||||
import TautulliAPI from '@server/api/tautulli';
|
import TautulliAPI from '@server/api/tautulli';
|
||||||
import { MediaType } from '@server/constants/media';
|
import { MediaType } from '@server/constants/media';
|
||||||
import { MediaServerType } from '@server/constants/server';
|
|
||||||
import { UserType } from '@server/constants/user';
|
import { UserType } from '@server/constants/user';
|
||||||
import { getRepository } from '@server/datasource';
|
import { getRepository } from '@server/datasource';
|
||||||
import Media from '@server/entity/Media';
|
import Media from '@server/entity/Media';
|
||||||
@@ -42,19 +41,7 @@ router.get('/', async (req, res, next) => {
|
|||||||
break;
|
break;
|
||||||
case 'displayname':
|
case 'displayname':
|
||||||
query = query.orderBy(
|
query = query.orderBy(
|
||||||
`CASE WHEN (user.username IS NULL OR user.username = '') THEN (
|
"(CASE WHEN (user.username IS NULL OR user.username = '') THEN (CASE WHEN (user.plexUsername IS NULL OR user.plexUsername = '') THEN user.email ELSE LOWER(user.plexUsername) END) ELSE LOWER(user.username) END)",
|
||||||
CASE WHEN (user.plexUsername IS NULL OR user.plexUsername = '') THEN (
|
|
||||||
CASE WHEN (user.jellyfinUsername IS NULL OR user.jellyfinUsername = '') THEN
|
|
||||||
user.email
|
|
||||||
ELSE
|
|
||||||
LOWER(user.jellyfinUsername)
|
|
||||||
END)
|
|
||||||
ELSE
|
|
||||||
LOWER(user.jellyfinUsername)
|
|
||||||
END)
|
|
||||||
ELSE
|
|
||||||
LOWER(user.username)
|
|
||||||
END`,
|
|
||||||
'ASC'
|
'ASC'
|
||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
@@ -103,13 +90,12 @@ router.post(
|
|||||||
const settings = getSettings();
|
const settings = getSettings();
|
||||||
|
|
||||||
const body = req.body;
|
const body = req.body;
|
||||||
const email = body.email || body.username;
|
|
||||||
const userRepository = getRepository(User);
|
const userRepository = getRepository(User);
|
||||||
|
|
||||||
const existingUser = await userRepository
|
const existingUser = await userRepository
|
||||||
.createQueryBuilder('user')
|
.createQueryBuilder('user')
|
||||||
.where('user.email = :email', {
|
.where('user.email = :email', {
|
||||||
email: email.toLowerCase(),
|
email: body.email.toLowerCase(),
|
||||||
})
|
})
|
||||||
.getOne();
|
.getOne();
|
||||||
|
|
||||||
@@ -122,7 +108,7 @@ router.post(
|
|||||||
}
|
}
|
||||||
|
|
||||||
const passedExplicitPassword = body.password && body.password.length > 0;
|
const passedExplicitPassword = body.password && body.password.length > 0;
|
||||||
const avatar = gravatarUrl(email, { default: 'mm', size: 200 });
|
const avatar = gravatarUrl(body.email, { default: 'mm', size: 200 });
|
||||||
|
|
||||||
if (
|
if (
|
||||||
!passedExplicitPassword &&
|
!passedExplicitPassword &&
|
||||||
@@ -132,9 +118,9 @@ router.post(
|
|||||||
}
|
}
|
||||||
|
|
||||||
const user = new User({
|
const user = new User({
|
||||||
email,
|
|
||||||
avatar: body.avatar ?? avatar,
|
avatar: body.avatar ?? avatar,
|
||||||
username: body.username,
|
username: body.username,
|
||||||
|
email: body.email,
|
||||||
password: body.password,
|
password: body.password,
|
||||||
permissions: settings.main.defaultPermissions,
|
permissions: settings.main.defaultPermissions,
|
||||||
plexToken: '',
|
plexToken: '',
|
||||||
@@ -502,20 +488,29 @@ router.post(
|
|||||||
// taken from auth.ts
|
// taken from auth.ts
|
||||||
const admin = await userRepository.findOneOrFail({
|
const admin = await userRepository.findOneOrFail({
|
||||||
where: { id: 1 },
|
where: { id: 1 },
|
||||||
select: ['id', 'jellyfinDeviceId', 'jellyfinUserId'],
|
select: [
|
||||||
|
'id',
|
||||||
|
'jellyfinAuthToken',
|
||||||
|
'jellyfinDeviceId',
|
||||||
|
'jellyfinUserId',
|
||||||
|
],
|
||||||
order: { id: 'ASC' },
|
order: { id: 'ASC' },
|
||||||
});
|
});
|
||||||
|
|
||||||
const hostname = getHostname();
|
|
||||||
const jellyfinClient = new JellyfinAPI(
|
const jellyfinClient = new JellyfinAPI(
|
||||||
hostname,
|
admin.jellyfinAuthToken ?? '',
|
||||||
settings.jellyfin.apiKey,
|
|
||||||
admin.jellyfinDeviceId ?? ''
|
admin.jellyfinDeviceId ?? ''
|
||||||
);
|
);
|
||||||
jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
|
jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
|
||||||
|
|
||||||
//const jellyfinUsersResponse = await jellyfinClient.getUsers();
|
//const jellyfinUsersResponse = await jellyfinClient.getUsers();
|
||||||
const createdUsers: User[] = [];
|
const createdUsers: User[] = [];
|
||||||
|
const { externalHostname } = getSettings().jellyfin;
|
||||||
|
const hostname = getHostname();
|
||||||
|
|
||||||
|
const jellyfinHost =
|
||||||
|
externalHostname && externalHostname.length > 0
|
||||||
|
? externalHostname
|
||||||
|
: hostname;
|
||||||
|
|
||||||
jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
|
jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
|
||||||
const jellyfinUsers = await jellyfinClient.getUsers();
|
const jellyfinUsers = await jellyfinClient.getUsers();
|
||||||
@@ -540,15 +535,12 @@ router.post(
|
|||||||
email: jellyfinUser?.Name,
|
email: jellyfinUser?.Name,
|
||||||
permissions: settings.main.defaultPermissions,
|
permissions: settings.main.defaultPermissions,
|
||||||
avatar: jellyfinUser?.PrimaryImageTag
|
avatar: jellyfinUser?.PrimaryImageTag
|
||||||
? `/Users/${jellyfinUser.Id}/Images/Primary/?tag=${jellyfinUser.PrimaryImageTag}&quality=90`
|
? `${jellyfinHost}/Users/${jellyfinUser.Id}/Images/Primary/?tag=${jellyfinUser.PrimaryImageTag}&quality=90`
|
||||||
: gravatarUrl(jellyfinUser?.Name ?? '', {
|
: gravatarUrl(jellyfinUser?.Name ?? '', {
|
||||||
default: 'mm',
|
default: 'mm',
|
||||||
size: 200,
|
size: 200,
|
||||||
}),
|
}),
|
||||||
userType:
|
userType: UserType.JELLYFIN,
|
||||||
settings.main.mediaServerType === MediaServerType.JELLYFIN
|
|
||||||
? UserType.JELLYFIN
|
|
||||||
: UserType.EMBY,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
await userRepository.save(newUser);
|
await userRepository.save(newUser);
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import { ApiErrorCode } from '@server/constants/error';
|
|
||||||
import { getRepository } from '@server/datasource';
|
import { getRepository } from '@server/datasource';
|
||||||
import { User } from '@server/entity/User';
|
import { User } from '@server/entity/User';
|
||||||
import { UserSettings } from '@server/entity/UserSettings';
|
import { UserSettings } from '@server/entity/UserSettings';
|
||||||
@@ -10,7 +9,6 @@ import { Permission } from '@server/lib/permissions';
|
|||||||
import { getSettings } from '@server/lib/settings';
|
import { getSettings } from '@server/lib/settings';
|
||||||
import logger from '@server/logger';
|
import logger from '@server/logger';
|
||||||
import { isAuthenticated } from '@server/middleware/auth';
|
import { isAuthenticated } from '@server/middleware/auth';
|
||||||
import { ApiError } from '@server/types/error';
|
|
||||||
import { Router } from 'express';
|
import { Router } from 'express';
|
||||||
import { canMakePermissionsChange } from '.';
|
import { canMakePermissionsChange } from '.';
|
||||||
|
|
||||||
@@ -100,17 +98,7 @@ userSettingsRoutes.post<
|
|||||||
}
|
}
|
||||||
|
|
||||||
user.username = req.body.username;
|
user.username = req.body.username;
|
||||||
const oldEmail = user.email;
|
user.email = req.body.email ?? user.email;
|
||||||
if (user.jellyfinUsername) {
|
|
||||||
user.email = req.body.email || user.jellyfinUsername || user.email;
|
|
||||||
}
|
|
||||||
|
|
||||||
const existingUser = await userRepository.findOne({
|
|
||||||
where: { email: user.email },
|
|
||||||
});
|
|
||||||
if (oldEmail !== user.email && existingUser) {
|
|
||||||
throw new ApiError(400, ApiErrorCode.InvalidEmail);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update quota values only if the user has the correct permissions
|
// Update quota values only if the user has the correct permissions
|
||||||
if (
|
if (
|
||||||
@@ -155,14 +143,7 @@ userSettingsRoutes.post<
|
|||||||
email: savedUser.email,
|
email: savedUser.email,
|
||||||
});
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (e.errorCode) {
|
next({ status: 500, message: e.message });
|
||||||
return next({
|
|
||||||
status: e.statusCode,
|
|
||||||
message: e.errorCode,
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
return next({ status: 500, message: e.message });
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1,68 +0,0 @@
|
|||||||
export type RateLimitOptions = {
|
|
||||||
maxRPS: number;
|
|
||||||
id?: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
type RateLimiteState<T extends (...args: Parameters<T>) => Promise<U>, U> = {
|
|
||||||
queue: {
|
|
||||||
args: Parameters<T>;
|
|
||||||
resolve: (value: U) => void;
|
|
||||||
reject: (reason?: unknown) => void;
|
|
||||||
}[];
|
|
||||||
lastTimestamps: number[];
|
|
||||||
timeout: ReturnType<typeof setTimeout>;
|
|
||||||
};
|
|
||||||
|
|
||||||
const rateLimitById: Record<string, unknown> = {};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add a rate limit to a function so it doesn't exceed a maximum number of requests per second. Function calls exceeding the rate will be delayed.
|
|
||||||
* @param fn The function to rate limit
|
|
||||||
* @param options.maxRPS Maximum number of Requests Per Second
|
|
||||||
* @param options.id An ID to share between rate limits, so it uses the same request queue.
|
|
||||||
* @returns The function with a rate limit
|
|
||||||
*/
|
|
||||||
export default function rateLimit<
|
|
||||||
T extends (...args: Parameters<T>) => Promise<U>,
|
|
||||||
U
|
|
||||||
>(fn: T, options: RateLimitOptions): (...args: Parameters<T>) => Promise<U> {
|
|
||||||
const state: RateLimiteState<T, U> = (rateLimitById[
|
|
||||||
options.id || ''
|
|
||||||
] as RateLimiteState<T, U>) || { queue: [], lastTimestamps: [] };
|
|
||||||
if (options.id) {
|
|
||||||
rateLimitById[options.id] = state;
|
|
||||||
}
|
|
||||||
|
|
||||||
const processQueue = () => {
|
|
||||||
// remove old timestamps
|
|
||||||
state.lastTimestamps = state.lastTimestamps.filter(
|
|
||||||
(timestamp) => Date.now() - timestamp < 1000
|
|
||||||
);
|
|
||||||
|
|
||||||
if (state.lastTimestamps.length < options.maxRPS) {
|
|
||||||
// process requests if RPS not exceeded
|
|
||||||
const item = state.queue.shift();
|
|
||||||
if (!item) return;
|
|
||||||
state.lastTimestamps.push(Date.now());
|
|
||||||
const { args, resolve, reject } = item;
|
|
||||||
fn(...args)
|
|
||||||
.then(resolve)
|
|
||||||
.catch(reject);
|
|
||||||
processQueue();
|
|
||||||
} else {
|
|
||||||
// rerun once the oldest item in queue is older than 1s
|
|
||||||
if (state.timeout) clearTimeout(state.timeout);
|
|
||||||
state.timeout = setTimeout(
|
|
||||||
processQueue,
|
|
||||||
1000 - (Date.now() - state.lastTimestamps[0])
|
|
||||||
);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
return (...args: Parameters<T>): Promise<U> => {
|
|
||||||
return new Promise<U>((resolve, reject) => {
|
|
||||||
state.queue.push({ args, resolve, reject });
|
|
||||||
processQueue();
|
|
||||||
});
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -13,8 +13,7 @@ class RestartFlag {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
this.settings.csrfProtection !== settings.csrfProtection ||
|
this.settings.csrfProtection !== settings.csrfProtection ||
|
||||||
this.settings.trustProxy !== settings.trustProxy ||
|
this.settings.trustProxy !== settings.trustProxy
|
||||||
this.settings.httpProxy !== settings.httpProxy
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,47 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<svg
|
|
||||||
version="1.1"
|
|
||||||
id="svg2"
|
|
||||||
viewBox="0 0 712.60077 712.5481"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:svg="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
|
||||||
xmlns:cc="http://creativecommons.org/ns#"
|
|
||||||
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
|
||||||
<defs
|
|
||||||
id="defs4" />
|
|
||||||
<metadata
|
|
||||||
id="metadata7">
|
|
||||||
<rdf:RDF>
|
|
||||||
<cc:Work
|
|
||||||
rdf:about="">
|
|
||||||
<dc:format>image/svg+xml</dc:format>
|
|
||||||
<dc:type
|
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
|
||||||
</cc:Work>
|
|
||||||
</rdf:RDF>
|
|
||||||
</metadata>
|
|
||||||
<rect
|
|
||||||
style="opacity:0;fill:#ffffff;stroke-width:4.12543"
|
|
||||||
id="rect249"
|
|
||||||
width="712.60077"
|
|
||||||
height="712.5481"
|
|
||||||
x="-0.00071160076"
|
|
||||||
y="2.0223413e-11" />
|
|
||||||
<rect
|
|
||||||
style="fill:#ffffff"
|
|
||||||
id="rect289"
|
|
||||||
width="230.18982"
|
|
||||||
height="229.82355"
|
|
||||||
x="241.20476"
|
|
||||||
y="241.36227" />
|
|
||||||
<g
|
|
||||||
id="layer1"
|
|
||||||
transform="matrix(0.70249853,0,0,0.70249853,88.770447,96.84571)">
|
|
||||||
<path
|
|
||||||
id="path3427"
|
|
||||||
d="m 327.06546,642.18589 c -45.39663,-45.86009 -82.73776,-83.3683 -82.98029,-83.3516 -0.24253,0.0167 -7.23324,6.65975 -15.53493,14.7623 l -15.09396,14.73193 -40.13624,-40.38805 C 151.24511,525.72706 108.73555,482.86504 78.854363,452.69158 l -54.329437,-54.86086 83.720394,-82.90796 83.72039,-82.90797 -15.19316,-15.20441 -15.19315,-15.20443 95.18008,-94.29313 c 52.34904,-51.86121 95.35849,-94.293118 95.57653,-94.293118 0.21805,0 37.39519,37.357576 82.61589,83.016832 45.22068,45.659256 82.53772,83.131956 82.92673,83.272666 0.38901,0.14071 7.46336,-6.49498 15.72077,-14.746 l 15.01348,-15.00184 7.14591,7.19902 c 73.95232,74.50189 181.50599,183.56427 181.36678,183.9109 -0.10065,0.25064 -37.54056,37.44106 -83.19981,82.64536 -45.65926,45.2043 -83.10802,82.41429 -83.21946,82.68884 -0.11145,0.27456 6.50478,7.34753 14.70272,15.71771 l 14.90534,15.21851 -15.3888,15.28883 c -21.09609,20.95904 -162.95155,161.27018 -169.79551,167.947 l -5.52526,5.39033 z m 89.8523,-204.1566 c 64.84836,-37.53366 117.81919,-68.54793 117.71294,-68.92058 -0.15927,-0.55862 -233.55022,-136.2489 -236.27084,-137.3646 -0.68441,-0.28068 -0.85761,27.45642 -0.85761,137.33982 0,99.83563 0.20749,137.62237 0.75471,137.43996 0.41509,-0.13837 53.81245,-30.96093 118.6608,-68.4946 z"
|
|
||||||
style="fill:#52b54b;fill-opacity:1;stroke:none" />
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
|
||||||
|
Before Width: | Height: | Size: 2.4 KiB |
@@ -1,131 +1,46 @@
|
|||||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
y="0px" width="100%" viewBox="0 0 617 188" enable-background="new 0 0 617 188" xml:space="preserve">
|
<svg
|
||||||
<path fill="#52B54B" opacity="1.000000" stroke="none" d="
|
version="1.1"
|
||||||
M89.583336,1.000000
|
id="svg2"
|
||||||
C90.189529,1.685005 90.166168,2.574803 90.599510,3.025271
|
viewBox="0 0 712.60077 712.5481"
|
||||||
C103.718315,16.662701 116.882103,30.256845 129.948212,43.764053
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
C130.577850,43.523941 130.916519,43.491173 131.111343,43.306595
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
C138.657471,36.157455 138.655273,36.156090 146.005478,43.505203
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
C159.538589,57.036308 173.016449,70.623535 186.654617,84.047913
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
C189.264145,86.616562 189.414017,88.253456 186.716782,90.895164
|
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
||||||
C174.709808,102.655037 162.893280,114.609337 151.008514,126.493958
|
<defs
|
||||||
C146.073502,131.428925 146.076691,131.427155 151.017944,136.523712
|
id="defs4" />
|
||||||
C151.698944,137.226120 152.340485,137.966812 153.259171,138.973434
|
<metadata
|
||||||
C151.947098,140.380035 150.766312,141.712204 149.516266,142.975861
|
id="metadata7">
|
||||||
C134.544815,158.110641 119.563087,173.235260 104.792023,188.681274
|
<rdf:RDF>
|
||||||
C103.611107,189.000000 102.222221,189.000000 100.624634,188.681274
|
<cc:Work
|
||||||
C86.361732,174.796494 72.307518,161.230438 57.702755,147.132965
|
rdf:about="">
|
||||||
C56.157101,149.136856 54.135899,151.757263 51.994804,154.533112
|
<dc:format>image/svg+xml</dc:format>
|
||||||
C35.932781,138.457108 20.569420,123.048477 5.141897,107.704361
|
<dc:type
|
||||||
C3.997114,106.565773 2.391420,105.890610 1.000000,105.000000
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
C1.000000,103.611107 1.000000,102.222221 1.318741,100.624641
|
</cc:Work>
|
||||||
C15.203506,86.361694 28.769531,72.307434 42.867004,57.702602
|
</rdf:RDF>
|
||||||
C40.863205,56.156994 38.242813,54.135792 35.425343,51.962570
|
</metadata>
|
||||||
C51.518696,35.908516 66.939468,20.557360 82.295547,5.141749
|
<rect
|
||||||
C83.434830,3.998048 84.109390,2.391417 85.000000,0.999999
|
style="opacity:0;fill:#ffffff;stroke-width:4.12543"
|
||||||
C86.388893,1.000000 87.777779,1.000000 89.583336,1.000000
|
id="rect249"
|
||||||
M73.196465,79.500702
|
width="712.60077"
|
||||||
C73.196465,96.254150 73.196465,113.007599 73.196465,130.872055
|
height="712.5481"
|
||||||
C94.273178,118.764557 114.417175,107.192863 135.221664,95.241745
|
x="-0.00071160076"
|
||||||
C114.247169,83.251732 94.091187,71.729622 73.196594,59.785294
|
y="2.0223413e-11" />
|
||||||
C73.196594,66.631348 73.196594,72.566254 73.196465,79.500702
|
<rect
|
||||||
z" />
|
style="fill:#ffffff"
|
||||||
<path fill="#FDFDFD" opacity="1.000000" stroke="none" d="
|
id="rect289"
|
||||||
M618.000000,60.571537
|
width="230.18982"
|
||||||
C617.004395,62.042580 615.613281,62.912964 615.073181,64.153824
|
height="229.82355"
|
||||||
C608.143372,80.073746 601.328613,96.043816 594.498169,112.006920
|
x="241.20476"
|
||||||
C586.973572,129.592300 579.343018,147.133865 571.999390,164.794601
|
y="241.36227" />
|
||||||
C568.632385,172.892075 568.893372,173.002594 560.133972,172.999832
|
<g
|
||||||
C555.470825,172.998367 550.807617,172.994385 546.144592,172.969360
|
id="layer1"
|
||||||
C545.841980,172.967712 545.540466,172.775543 544.836609,172.534256
|
transform="matrix(0.70249853,0,0,0.70249853,88.770447,96.84571)">
|
||||||
C548.592896,163.531219 551.714905,154.222061 556.286133,145.689255
|
<path
|
||||||
C559.733765,139.253830 559.138794,134.062668 556.454224,127.695969
|
id="path3427"
|
||||||
C546.360352,103.757523 536.803345,79.592712 526.837830,55.000847
|
d="m 327.06546,642.18589 c -45.39663,-45.86009 -82.73776,-83.3683 -82.98029,-83.3516 -0.24253,0.0167 -7.23324,6.65975 -15.53493,14.7623 l -15.09396,14.73193 -40.13624,-40.38805 C 151.24511,525.72706 108.73555,482.86504 78.854363,452.69158 l -54.329437,-54.86086 83.720394,-82.90796 83.72039,-82.90797 -15.19316,-15.20441 -15.19315,-15.20443 95.18008,-94.29313 c 52.34904,-51.86121 95.35849,-94.293118 95.57653,-94.293118 0.21805,0 37.39519,37.357576 82.61589,83.016832 45.22068,45.659256 82.53772,83.131956 82.92673,83.272666 0.38901,0.14071 7.46336,-6.49498 15.72077,-14.746 l 15.01348,-15.00184 7.14591,7.19902 c 73.95232,74.50189 181.50599,183.56427 181.36678,183.9109 -0.10065,0.25064 -37.54056,37.44106 -83.19981,82.64536 -45.65926,45.2043 -83.10802,82.41429 -83.21946,82.68884 -0.11145,0.27456 6.50478,7.34753 14.70272,15.71771 l 14.90534,15.21851 -15.3888,15.28883 c -21.09609,20.95904 -162.95155,161.27018 -169.79551,167.947 l -5.52526,5.39033 z m 89.8523,-204.1566 c 64.84836,-37.53366 117.81919,-68.54793 117.71294,-68.92058 -0.15927,-0.55862 -233.55022,-136.2489 -236.27084,-137.3646 -0.68441,-0.28068 -0.85761,27.45642 -0.85761,137.33982 0,99.83563 0.20749,137.62237 0.75471,137.43996 0.41509,-0.13837 53.81245,-30.96093 118.6608,-68.4946 z"
|
||||||
C534.817078,55.000847 542.437622,54.725182 550.003540,55.244331
|
style="fill:#52b54b;fill-opacity:1;stroke:none" />
|
||||||
C551.436218,55.342628 553.169678,58.412052 553.885010,60.423309
|
</g>
|
||||||
C558.720520,74.018005 563.307556,87.700912 568.003784,101.345413
|
|
||||||
C569.107483,104.551987 570.321045,107.720764 571.976196,112.255157
|
|
||||||
C573.889587,107.365631 575.415283,103.375916 577.007935,99.413109
|
|
||||||
C582.693298,85.266724 588.344238,71.105591 594.218018,57.037624
|
|
||||||
C594.650513,56.001743 596.734497,55.132927 598.079773,55.089733
|
|
||||||
C604.401855,54.886726 610.734131,54.999401 617.531372,54.999699
|
|
||||||
C618.000000,56.714359 618.000000,58.428715 618.000000,60.571537
|
|
||||||
z" />
|
|
||||||
<path fill="#FDFDFD" opacity="1.000000" stroke="none" d="
|
|
||||||
M430.000122,99.002235
|
|
||||||
C430.000122,112.477097 430.000122,125.452438 430.000122,138.713440
|
|
||||||
C423.048126,138.713440 416.308685,138.713440 408.999878,138.713440
|
|
||||||
C408.999878,129.350739 409.120758,119.916939 408.962219,110.487823
|
|
||||||
C408.832153,102.753624 409.088898,94.909142 407.866791,87.324188
|
|
||||||
C406.440887,78.474220 401.302399,74.201607 394.304291,74.000290
|
|
||||||
C387.617249,73.807938 380.317963,79.297188 378.047363,86.438652
|
|
||||||
C377.420715,88.409592 377.055725,90.550858 377.044647,92.616508
|
|
||||||
C376.962494,107.913475 377.000122,123.211082 377.000122,138.753479
|
|
||||||
C369.630646,138.753479 362.559692,138.753479 354.999878,138.753479
|
|
||||||
C354.999878,123.256836 355.044769,107.816956 354.977661,92.377571
|
|
||||||
C354.951050,86.251518 352.748199,80.799278 347.911346,77.066116
|
|
||||||
C339.239685,70.373154 327.811401,74.635170 324.084412,84.471092
|
|
||||||
C322.793915,87.876816 322.147491,91.713402 322.090881,95.366882
|
|
||||||
C321.868958,109.685005 322.000122,124.008591 322.000122,138.665009
|
|
||||||
C314.823853,138.665009 307.760773,138.665009 300.346558,138.665009
|
|
||||||
C300.346558,111.006645 300.346558,83.281189 300.346558,55.001301
|
|
||||||
C306.163818,55.001301 312.104645,54.855133 318.024780,55.139343
|
|
||||||
C319.060455,55.189068 320.450378,56.891682 320.882477,58.112110
|
|
||||||
C321.380768,59.519447 320.998291,61.238617 320.998291,64.136040
|
|
||||||
C328.715179,54.407440 338.407898,52.804527 348.408875,54.206123
|
|
||||||
C356.403381,55.326527 361.770447,57.638248 366.682190,66.544373
|
|
||||||
C372.325470,62.972542 377.601440,58.269657 383.771973,56.014080
|
|
||||||
C396.273407,51.444298 408.602570,53.673611 419.067657,61.818150
|
|
||||||
C426.629364,67.703125 429.037811,76.770744 429.932556,86.011482
|
|
||||||
C430.332214,90.138710 430.000122,94.336792 430.000122,99.002235
|
|
||||||
z" />
|
|
||||||
<path fill="#FDFDFD" opacity="1.000000" stroke="none" d="
|
|
||||||
M462.000427,35.006332
|
|
||||||
C462.000427,44.815434 462.000427,54.126144 462.000427,64.132019
|
|
||||||
C468.844696,58.319965 476.100769,54.654530 484.669739,53.656227
|
|
||||||
C496.686127,52.256294 507.565582,54.979622 516.927185,62.503853
|
|
||||||
C534.236755,76.416115 535.360107,106.231667 523.651062,123.341644
|
|
||||||
C516.745056,133.433182 506.539673,139.485458 493.555267,140.111023
|
|
||||||
C483.836304,140.579254 474.670624,139.889420 466.610413,133.799713
|
|
||||||
C465.039795,132.613068 463.390686,131.530289 461.957214,130.525391
|
|
||||||
C461.633789,132.375305 461.105469,135.397171 460.522095,138.733841
|
|
||||||
C454.446686,138.733841 448.017822,138.733841 441.292542,138.733841
|
|
||||||
C441.292542,99.722672 441.292542,60.652122 441.292542,21.290209
|
|
||||||
C447.943787,21.290209 454.684204,21.290209 462.000427,21.290209
|
|
||||||
C462.000427,25.636984 462.000427,30.072460 462.000427,35.006332
|
|
||||||
M480.890228,119.974937
|
|
||||||
C485.426086,119.681152 490.365997,120.444260 494.421356,118.893707
|
|
||||||
C506.182587,114.396866 510.858643,104.919495 509.036591,92.234833
|
|
||||||
C507.422546,80.997993 496.539307,71.772278 483.551605,73.864754
|
|
||||||
C469.724976,76.092384 464.376770,85.538391 463.152863,96.752327
|
|
||||||
C462.120667,106.209480 469.961761,116.189537 480.890228,119.974937
|
|
||||||
z" />
|
|
||||||
<path fill="#FDFDFD" opacity="1.000000" stroke="none" d="
|
|
||||||
M234.797928,54.654831
|
|
||||||
C244.856339,52.605957 254.504562,52.040043 264.239868,54.923946
|
|
||||||
C279.600891,59.474377 286.402191,68.163963 289.768585,81.937614
|
|
||||||
C291.530579,89.146889 290.954620,96.927589 291.469940,105.005005
|
|
||||||
C269.550385,105.005005 248.375092,105.005005 227.094437,105.005005
|
|
||||||
C229.577957,116.288628 239.741562,120.764336 248.594757,121.034813
|
|
||||||
C256.790771,121.285217 264.390472,119.882645 271.081848,114.731178
|
|
||||||
C271.774902,114.197632 273.962708,114.659111 274.786041,115.402222
|
|
||||||
C278.726318,118.958458 282.435333,122.770882 286.509888,126.770363
|
|
||||||
C281.309174,132.968170 274.787445,135.946014 267.542938,138.175064
|
|
||||||
C253.746231,142.420120 240.209259,142.317459 227.237503,135.935410
|
|
||||||
C212.712891,128.789368 205.730453,116.523628 204.973831,100.473404
|
|
||||||
C204.537735,91.222557 205.503754,82.283119 210.008469,74.017265
|
|
||||||
C215.396210,64.131088 223.372589,57.511646 234.797928,54.654831
|
|
||||||
M266.971497,78.708908
|
|
||||||
C259.384399,70.789909 249.920425,70.480316 240.489548,73.410858
|
|
||||||
C234.405487,75.301414 229.437546,79.631561 227.800247,86.722244
|
|
||||||
C242.152313,86.722244 256.002747,86.722244 270.947815,86.722244
|
|
||||||
C269.410950,83.870155 268.228943,81.676651 266.971497,78.708908
|
|
||||||
z" />
|
|
||||||
<path fill="#FCFEFC" opacity="1.000000" stroke="none" d="
|
|
||||||
M73.196533,79.000931
|
|
||||||
C73.196594,72.566254 73.196594,66.631348 73.196594,59.785294
|
|
||||||
C94.091187,71.729622 114.247169,83.251732 135.221664,95.241745
|
|
||||||
C114.417175,107.192863 94.273178,118.764557 73.196465,130.872055
|
|
||||||
C73.196465,113.007599 73.196465,96.254150 73.196533,79.000931
|
|
||||||
z" />
|
|
||||||
</svg>
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 2.4 KiB |
@@ -1,85 +1 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320.03 103.61"><defs><style>.cls-1{fill:#fff}.cls-2{fill:url(#a)}.cls-3{fill:#e5a00d}</style><radialGradient id="a" cx="258.33" cy="51.76" r="42.95" gradientUnits="userSpaceOnUse"><stop offset=".17" stop-color="#f9be03"/><stop offset=".51" stop-color="#e8a50b"/><stop offset="1" stop-color="#cc7c19"/></radialGradient></defs><polygon points="320.03 -.09 289.96 -.09 259.88 51.76 289.96 103.61 320.01 103.61 289.96 51.79" class="cls-1"/><polygon points="226.7 -.09 256.78 -.09 289.96 51.76 256.78 103.61 226.7 103.61 259.88 51.76" class="cls-2"/><polygon points="226.7 -.09 256.78 -.09 289.96 51.76 256.78 103.61 226.7 103.61 259.88 51.76" class="cls-3"/><path d="M216.32,103.61H156.49V-.09h59.83v18h-37.8V40.69H213.7v18H178.52V85.45h37.8Z" class="cls-1"/><path d="M82.07,103.61V-.09h22V85.45h42.07v18.16Z" class="cls-1"/><path d="M71.66,32.25Q71.66,49,61.2,57.87T31.44,66.73H22v36.88H0V-.09H33.14Q52-.09,61.83,8T71.66,32.25ZM22,48.71h7.24q10.15,0,15.18-4c3.37-2.66,5-6.56,5-11.67s-1.41-9-4.22-11.42S38,17.93,32,17.93H22Z" class="cls-1"/></svg>
|
||||||
<!-- Generator: Adobe Illustrator 26.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
|
||||||
|
|
||||||
<svg
|
|
||||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
|
||||||
xmlns:cc="http://creativecommons.org/ns#"
|
|
||||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
|
||||||
xmlns:svg="http://www.w3.org/2000/svg"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
|
||||||
version="1.1"
|
|
||||||
id="plex-logo"
|
|
||||||
x="0px"
|
|
||||||
y="0px"
|
|
||||||
viewBox="0 0 1000 460.89727"
|
|
||||||
xml:space="preserve"
|
|
||||||
sodipodi:docname="plex-logo.svg"
|
|
||||||
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
|
|
||||||
id="metadata25"><rdf:RDF><cc:Work
|
|
||||||
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
|
|
||||||
id="defs23">
|
|
||||||
</defs><sodipodi:namedview
|
|
||||||
pagecolor="#ffffff"
|
|
||||||
bordercolor="#111111"
|
|
||||||
borderopacity="1"
|
|
||||||
objecttolerance="10"
|
|
||||||
gridtolerance="10"
|
|
||||||
guidetolerance="10"
|
|
||||||
inkscape:pageopacity="0"
|
|
||||||
inkscape:pageshadow="2"
|
|
||||||
inkscape:window-width="1920"
|
|
||||||
inkscape:window-height="1017"
|
|
||||||
id="namedview21"
|
|
||||||
showgrid="false"
|
|
||||||
fit-margin-top="0"
|
|
||||||
fit-margin-left="0"
|
|
||||||
fit-margin-right="0"
|
|
||||||
fit-margin-bottom="0"
|
|
||||||
inkscape:zoom="0.27956081"
|
|
||||||
inkscape:cx="783.06912"
|
|
||||||
inkscape:cy="-132.85701"
|
|
||||||
inkscape:window-x="1912"
|
|
||||||
inkscape:window-y="-8"
|
|
||||||
inkscape:window-maximized="1"
|
|
||||||
inkscape:current-layer="plex-logo" />
|
|
||||||
<style
|
|
||||||
type="text/css"
|
|
||||||
id="style2">
|
|
||||||
.st0{fill:#FFFFFF;}
|
|
||||||
.st1{fill:#EBAF00;}
|
|
||||||
</style>
|
|
||||||
<path
|
|
||||||
class="st0"
|
|
||||||
d="m 164.18919,82.43243 c -39.86487,0 -65.540543,11.48648 -87.162163,38.51351 V 91.21621 H 0 v 366.21621 c 0,0 1.3513514,0.67567 5.4054053,1.35135 5.4054057,1.35135 33.7837827,7.43243 54.7297287,-10.13514 18.243244,-15.54054 22.297295,-33.78378 22.297295,-54.05405 v -52.7027 c 22.297301,23.64864 47.297301,33.78378 82.432431,33.78378 75.67567,0 133.78378,-61.48648 133.78378,-143.24323 0,-88.51352 -56.08108,-150 -134.45945,-150 z m -14.86487,223.64864 c -42.56756,0 -76.351351,-35.13513 -76.351351,-77.7027 0,-41.89189 39.864871,-75.67567 76.351351,-75.67567 43.24324,0 76.35135,33.1081 76.35135,76.35135 0,43.24324 -33.78378,77.02702 -76.35135,77.02702 z"
|
|
||||||
id="path4"
|
|
||||||
inkscape:connector-curvature="0"
|
|
||||||
style="fill:#ffffff;stroke-width:6.75675678" /><path
|
|
||||||
class="st0"
|
|
||||||
d="m 408.1081,223.64864 c 0,31.75676 3.37838,70.27027 34.45946,112.16216 0.67567,0.67567 2.02702,2.7027 2.02702,2.7027 -12.83783,21.62162 -28.37837,36.48648 -49.32432,36.48648 -16.21622,0 -32.43243,-8.78378 -45.94595,-23.64864 -14.18918,-16.21622 -20.94594,-37.16216 -20.94594,-59.45946 V 0 h 79.05405 z"
|
|
||||||
id="path6"
|
|
||||||
inkscape:connector-curvature="0"
|
|
||||||
style="fill:#ffffff;stroke-width:6.75675678" /><polygon
|
|
||||||
class="st1"
|
|
||||||
points="117.9,33.9 104.1,13.5 118.3,13.5 132,33.9 118.3,54.2 104.1,54.2 "
|
|
||||||
id="polygon8"
|
|
||||||
style="fill:#ebaf00"
|
|
||||||
transform="scale(6.7567568)" /><polygon
|
|
||||||
class="st0"
|
|
||||||
points="135.7,31.6 148,13.5 133.8,13.5 128.7,21 "
|
|
||||||
id="polygon10"
|
|
||||||
style="fill:#ffffff"
|
|
||||||
transform="scale(6.7567568)" /><path
|
|
||||||
class="st0"
|
|
||||||
d="m 869.59458,316.2162 c 0,0 16.2162,22.2973 16.2162,22.2973 15.54058,24.32432 35.8108,36.48648 59.45949,36.48648 25,-0.67567 42.56752,-22.29729 49.3243,-30.4054 0,0 -12.16218,-10.81081 -27.7027,-29.05405 -20.94598,-24.32432 -48.64868,-68.91892 -49.3243,-70.94594 z"
|
|
||||||
id="path12"
|
|
||||||
inkscape:connector-curvature="0"
|
|
||||||
style="fill:#ffffff;stroke-width:6.75675678" /><path
|
|
||||||
style="fill:#ffffff;stroke-width:6.75675678"
|
|
||||||
inkscape:connector-curvature="0"
|
|
||||||
id="path16"
|
|
||||||
d="m 632.43242,287.16215 c -16.21622,14.86486 -27.02703,22.97297 -49.32432,22.97297 -39.86487,0 -62.83784,-28.37837 -66.21622,-59.45945 h 211.4865 c 1.35131,-4.05406 2.027,-9.45946 2.027,-18.24324 0,-85.81082 -62.83783,-150 -145.27026,-150 -78.37837,0 -142.56756,65.54054 -142.56756,147.29729 0,81.08108 64.18919,145.27026 144.59459,145.27026 56.08108,0 104.72973,-31.75675 131.08105,-87.83783 z M 585.8108,147.29729 c 35.13513,0 61.48648,22.97297 67.56756,53.37838 H 519.59458 c 6.75676,-31.75676 31.75676,-53.37838 66.21622,-53.37838 z"
|
|
||||||
class="st0" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 1.1 KiB |
@@ -1,420 +0,0 @@
|
|||||||
import Badge from '@app/components/Common/Badge';
|
|
||||||
import Button from '@app/components/Common/Button';
|
|
||||||
import CachedImage from '@app/components/Common/CachedImage';
|
|
||||||
import ConfirmButton from '@app/components/Common/ConfirmButton';
|
|
||||||
import Header from '@app/components/Common/Header';
|
|
||||||
import LoadingSpinner from '@app/components/Common/LoadingSpinner';
|
|
||||||
import PageTitle from '@app/components/Common/PageTitle';
|
|
||||||
import useDebouncedState from '@app/hooks/useDebouncedState';
|
|
||||||
import { useUpdateQueryParams } from '@app/hooks/useUpdateQueryParams';
|
|
||||||
import { Permission, useUser } from '@app/hooks/useUser';
|
|
||||||
import globalMessages from '@app/i18n/globalMessages';
|
|
||||||
import Error from '@app/pages/_error';
|
|
||||||
import defineMessages from '@app/utils/defineMessages';
|
|
||||||
import {
|
|
||||||
ChevronLeftIcon,
|
|
||||||
ChevronRightIcon,
|
|
||||||
MagnifyingGlassIcon,
|
|
||||||
TrashIcon,
|
|
||||||
} from '@heroicons/react/24/solid';
|
|
||||||
import type {
|
|
||||||
BlacklistItem,
|
|
||||||
BlacklistResultsResponse,
|
|
||||||
} from '@server/interfaces/api/blacklistInterfaces';
|
|
||||||
import type { MovieDetails } from '@server/models/Movie';
|
|
||||||
import type { TvDetails } from '@server/models/Tv';
|
|
||||||
import Link from 'next/link';
|
|
||||||
import { useRouter } from 'next/router';
|
|
||||||
import type { ChangeEvent } from 'react';
|
|
||||||
import { useState } from 'react';
|
|
||||||
import { useInView } from 'react-intersection-observer';
|
|
||||||
import { FormattedRelativeTime, useIntl } from 'react-intl';
|
|
||||||
import { useToasts } from 'react-toast-notifications';
|
|
||||||
import useSWR from 'swr';
|
|
||||||
|
|
||||||
const messages = defineMessages('components.Blacklist', {
|
|
||||||
blacklistsettings: 'Blacklist Settings',
|
|
||||||
blacklistSettingsDescription: 'Manage blacklisted media.',
|
|
||||||
mediaName: 'Name',
|
|
||||||
mediaType: 'Type',
|
|
||||||
mediaTmdbId: 'tmdb Id',
|
|
||||||
blacklistdate: 'date',
|
|
||||||
blacklistedby: '{date} by {user}',
|
|
||||||
blacklistNotFoundError: '<strong>{title}</strong> is not blacklisted.',
|
|
||||||
});
|
|
||||||
|
|
||||||
const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => {
|
|
||||||
return (movie as MovieDetails).title !== undefined;
|
|
||||||
};
|
|
||||||
|
|
||||||
const Blacklist = () => {
|
|
||||||
const [currentPageSize, setCurrentPageSize] = useState<number>(10);
|
|
||||||
const [searchFilter, debouncedSearchFilter, setSearchFilter] =
|
|
||||||
useDebouncedState('');
|
|
||||||
const router = useRouter();
|
|
||||||
const intl = useIntl();
|
|
||||||
|
|
||||||
const page = router.query.page ? Number(router.query.page) : 1;
|
|
||||||
const pageIndex = page - 1;
|
|
||||||
const updateQueryParams = useUpdateQueryParams({ page: page.toString() });
|
|
||||||
|
|
||||||
const {
|
|
||||||
data,
|
|
||||||
error,
|
|
||||||
mutate: revalidate,
|
|
||||||
} = useSWR<BlacklistResultsResponse>(
|
|
||||||
`/api/v1/blacklist/?take=${currentPageSize}
|
|
||||||
&skip=${pageIndex * currentPageSize}
|
|
||||||
${debouncedSearchFilter ? `&search=${debouncedSearchFilter}` : ''}`,
|
|
||||||
{
|
|
||||||
refreshInterval: 0,
|
|
||||||
revalidateOnFocus: false,
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
// check if there's no data and no errors in the table
|
|
||||||
// so as to show a spinner inside the table and not refresh the whole component
|
|
||||||
if (!data && error) {
|
|
||||||
return <Error statusCode={500} />;
|
|
||||||
}
|
|
||||||
|
|
||||||
const searchItem = (e: ChangeEvent<HTMLInputElement>) => {
|
|
||||||
// Remove the "page" query param from the URL
|
|
||||||
// so that the "skip" query param on line 62 is empty
|
|
||||||
// and the search returns results without skipping items
|
|
||||||
if (router.query.page) router.replace(router.basePath);
|
|
||||||
|
|
||||||
setSearchFilter(e.target.value as string);
|
|
||||||
};
|
|
||||||
|
|
||||||
const hasNextPage = data && data.pageInfo.pages > pageIndex + 1;
|
|
||||||
const hasPrevPage = pageIndex > 0;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<PageTitle title={[intl.formatMessage(globalMessages.blacklist)]} />
|
|
||||||
<Header>{intl.formatMessage(globalMessages.blacklist)}</Header>
|
|
||||||
|
|
||||||
<div className="mt-2 flex flex-grow flex-col sm:flex-grow-0 sm:flex-row sm:justify-end">
|
|
||||||
<div className="mb-2 flex flex-grow sm:mb-0 sm:mr-2 md:flex-grow-0">
|
|
||||||
<span className="inline-flex cursor-default items-center rounded-l-md border border-r-0 border-gray-500 bg-gray-800 px-3 text-sm text-gray-100">
|
|
||||||
<MagnifyingGlassIcon className="h-6 w-6" />
|
|
||||||
</span>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
className="rounded-r-only"
|
|
||||||
value={searchFilter}
|
|
||||||
onChange={(e) => searchItem(e)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{!data ? (
|
|
||||||
<LoadingSpinner />
|
|
||||||
) : data.results.length === 0 ? (
|
|
||||||
<div className="flex w-full flex-col items-center justify-center py-24 text-white">
|
|
||||||
<span className="text-2xl text-gray-400">
|
|
||||||
{intl.formatMessage(globalMessages.noresults)}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
data.results.map((item: BlacklistItem) => {
|
|
||||||
return (
|
|
||||||
<div className="py-2" key={`request-list-${item.tmdbId}`}>
|
|
||||||
<BlacklistedItem item={item} revalidateList={revalidate} />
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
})
|
|
||||||
)}
|
|
||||||
|
|
||||||
<div className="actions">
|
|
||||||
<nav
|
|
||||||
className="mb-3 flex flex-col items-center space-y-3 sm:flex-row sm:space-y-0"
|
|
||||||
aria-label="Pagination"
|
|
||||||
>
|
|
||||||
<div className="hidden lg:flex lg:flex-1">
|
|
||||||
<p className="text-sm">
|
|
||||||
{data &&
|
|
||||||
(data?.results.length ?? 0) > 0 &&
|
|
||||||
intl.formatMessage(globalMessages.showingresults, {
|
|
||||||
from: pageIndex * currentPageSize + 1,
|
|
||||||
to:
|
|
||||||
data.results.length < currentPageSize
|
|
||||||
? pageIndex * currentPageSize + data.results.length
|
|
||||||
: (pageIndex + 1) * currentPageSize,
|
|
||||||
total: data.pageInfo.results,
|
|
||||||
strong: (msg: React.ReactNode) => (
|
|
||||||
<span className="font-medium">{msg}</span>
|
|
||||||
),
|
|
||||||
})}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div className="flex justify-center sm:flex-1 sm:justify-start lg:justify-center">
|
|
||||||
<span className="-mt-3 items-center truncate text-sm sm:mt-0">
|
|
||||||
{intl.formatMessage(globalMessages.resultsperpage, {
|
|
||||||
pageSize: (
|
|
||||||
<select
|
|
||||||
id="pageSize"
|
|
||||||
name="pageSize"
|
|
||||||
onChange={(e) => {
|
|
||||||
setCurrentPageSize(Number(e.target.value));
|
|
||||||
router
|
|
||||||
.push({
|
|
||||||
pathname: router.pathname,
|
|
||||||
query: router.query.userId
|
|
||||||
? { userId: router.query.userId }
|
|
||||||
: {},
|
|
||||||
})
|
|
||||||
.then(() => window.scrollTo(0, 0));
|
|
||||||
}}
|
|
||||||
value={currentPageSize}
|
|
||||||
className="short inline"
|
|
||||||
>
|
|
||||||
<option value="5">5</option>
|
|
||||||
<option value="10">10</option>
|
|
||||||
<option value="25">25</option>
|
|
||||||
<option value="50">50</option>
|
|
||||||
<option value="100">100</option>
|
|
||||||
</select>
|
|
||||||
),
|
|
||||||
})}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex flex-auto justify-center space-x-2 sm:flex-1 sm:justify-end">
|
|
||||||
<Button
|
|
||||||
disabled={!hasPrevPage}
|
|
||||||
onClick={() => updateQueryParams('page', (page - 1).toString())}
|
|
||||||
>
|
|
||||||
<ChevronLeftIcon />
|
|
||||||
<span>{intl.formatMessage(globalMessages.previous)}</span>
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
disabled={!hasNextPage}
|
|
||||||
onClick={() => updateQueryParams('page', (page + 1).toString())}
|
|
||||||
>
|
|
||||||
<span>{intl.formatMessage(globalMessages.next)}</span>
|
|
||||||
<ChevronRightIcon />
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default Blacklist;
|
|
||||||
|
|
||||||
interface BlacklistedItemProps {
|
|
||||||
item: BlacklistItem;
|
|
||||||
revalidateList: () => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
|
|
||||||
const [isUpdating, setIsUpdating] = useState<boolean>(false);
|
|
||||||
const { addToast } = useToasts();
|
|
||||||
const { ref, inView } = useInView({
|
|
||||||
triggerOnce: true,
|
|
||||||
});
|
|
||||||
const intl = useIntl();
|
|
||||||
const { hasPermission } = useUser();
|
|
||||||
|
|
||||||
const url =
|
|
||||||
item.mediaType === 'movie'
|
|
||||||
? `/api/v1/movie/${item.tmdbId}`
|
|
||||||
: `/api/v1/tv/${item.tmdbId}`;
|
|
||||||
const { data: title, error } = useSWR<MovieDetails | TvDetails>(
|
|
||||||
inView ? url : null
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!title && !error) {
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
className="h-64 w-full animate-pulse rounded-xl bg-gray-800 xl:h-28"
|
|
||||||
ref={ref}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const removeFromBlacklist = async (tmdbId: number, title?: string) => {
|
|
||||||
setIsUpdating(true);
|
|
||||||
|
|
||||||
const res = await fetch('/api/v1/blacklist/' + tmdbId, {
|
|
||||||
method: 'DELETE',
|
|
||||||
});
|
|
||||||
|
|
||||||
if (res.status === 204) {
|
|
||||||
addToast(
|
|
||||||
<span>
|
|
||||||
{intl.formatMessage(globalMessages.removeFromBlacklistSuccess, {
|
|
||||||
title,
|
|
||||||
strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
|
|
||||||
})}
|
|
||||||
</span>,
|
|
||||||
{ appearance: 'success', autoDismiss: true }
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
addToast(intl.formatMessage(globalMessages.blacklistError), {
|
|
||||||
appearance: 'error',
|
|
||||||
autoDismiss: true,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
revalidateList();
|
|
||||||
setIsUpdating(false);
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="relative flex w-full flex-col justify-between overflow-hidden rounded-xl bg-gray-800 py-4 text-gray-400 shadow-md ring-1 ring-gray-700 xl:h-28 xl:flex-row">
|
|
||||||
{title && title.backdropPath && (
|
|
||||||
<div className="absolute inset-0 z-0 w-full bg-cover bg-center xl:w-2/3">
|
|
||||||
<CachedImage
|
|
||||||
type="tmdb"
|
|
||||||
src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${title.backdropPath}`}
|
|
||||||
alt=""
|
|
||||||
style={{ width: '100%', height: '100%', objectFit: 'cover' }}
|
|
||||||
fill
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
className="absolute inset-0"
|
|
||||||
style={{
|
|
||||||
backgroundImage:
|
|
||||||
'linear-gradient(90deg, rgba(31, 41, 55, 0.47) 0%, rgba(31, 41, 55, 1) 100%)',
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div className="relative flex w-full flex-col justify-between overflow-hidden sm:flex-row">
|
|
||||||
<div className="relative z-10 flex w-full items-center overflow-hidden pl-4 pr-4 sm:pr-0 xl:w-7/12 2xl:w-2/3">
|
|
||||||
<Link
|
|
||||||
href={
|
|
||||||
item.mediaType === 'movie'
|
|
||||||
? `/movie/${item.tmdbId}`
|
|
||||||
: `/tv/${item.tmdbId}`
|
|
||||||
}
|
|
||||||
className="relative h-auto w-12 flex-shrink-0 scale-100 transform-gpu overflow-hidden rounded-md transition duration-300 hover:scale-105"
|
|
||||||
>
|
|
||||||
<CachedImage
|
|
||||||
type="tmdb"
|
|
||||||
src={
|
|
||||||
title?.posterPath
|
|
||||||
? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`
|
|
||||||
: '/images/overseerr_poster_not_found.png'
|
|
||||||
}
|
|
||||||
alt=""
|
|
||||||
sizes="100vw"
|
|
||||||
style={{ width: '100%', height: 'auto', objectFit: 'cover' }}
|
|
||||||
width={600}
|
|
||||||
height={900}
|
|
||||||
/>
|
|
||||||
</Link>
|
|
||||||
<div className="flex flex-col justify-center overflow-hidden pl-2 xl:pl-4">
|
|
||||||
<div className="pt-0.5 text-xs font-medium text-white sm:pt-1">
|
|
||||||
{title &&
|
|
||||||
(isMovie(title)
|
|
||||||
? title.releaseDate
|
|
||||||
: title.firstAirDate
|
|
||||||
)?.slice(0, 4)}
|
|
||||||
</div>
|
|
||||||
<Link
|
|
||||||
href={
|
|
||||||
item.mediaType === 'movie'
|
|
||||||
? `/movie/${item.tmdbId}`
|
|
||||||
: `/tv/${item.tmdbId}`
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<span className="mr-2 min-w-0 truncate text-lg font-bold text-white hover:underline xl:text-xl">
|
|
||||||
{title && (isMovie(title) ? title.title : title.name)}
|
|
||||||
</span>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="z-10 mt-4 ml-4 flex w-full flex-col justify-center overflow-hidden pr-4 text-sm sm:ml-2 sm:mt-0 xl:flex-1 xl:pr-0">
|
|
||||||
<div className="card-field">
|
|
||||||
<span className="card-field-name">Status</span>
|
|
||||||
<Badge badgeType="danger">
|
|
||||||
{intl.formatMessage(globalMessages.blacklisted)}
|
|
||||||
</Badge>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{item.createdAt && (
|
|
||||||
<div className="card-field">
|
|
||||||
<span className="card-field-name">
|
|
||||||
{intl.formatMessage(globalMessages.blacklisted)}
|
|
||||||
</span>
|
|
||||||
<span className="flex truncate text-sm text-gray-300">
|
|
||||||
{intl.formatMessage(messages.blacklistedby, {
|
|
||||||
date: (
|
|
||||||
<FormattedRelativeTime
|
|
||||||
value={Math.floor(
|
|
||||||
(new Date(item.createdAt).getTime() - Date.now()) / 1000
|
|
||||||
)}
|
|
||||||
updateIntervalInSeconds={1}
|
|
||||||
numeric="auto"
|
|
||||||
/>
|
|
||||||
),
|
|
||||||
user: (
|
|
||||||
<Link href={`/users/${item.user.id}`}>
|
|
||||||
<span className="group flex items-center truncate">
|
|
||||||
<CachedImage
|
|
||||||
type="avatar"
|
|
||||||
src={item.user.avatar}
|
|
||||||
alt=""
|
|
||||||
className="avatar-sm ml-1.5"
|
|
||||||
width={20}
|
|
||||||
height={20}
|
|
||||||
style={{ objectFit: 'cover' }}
|
|
||||||
/>
|
|
||||||
<span className="ml-1 truncate text-sm font-semibold group-hover:text-white group-hover:underline">
|
|
||||||
{item.user.displayName}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
</Link>
|
|
||||||
),
|
|
||||||
})}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div className="card-field">
|
|
||||||
{item.mediaType === 'movie' ? (
|
|
||||||
<div className="pointer-events-none z-40 self-start rounded-full border border-blue-500 bg-blue-600 bg-opacity-80 shadow-md">
|
|
||||||
<div className="flex h-4 items-center px-2 py-2 text-center text-xs font-medium uppercase tracking-wider text-white sm:h-5">
|
|
||||||
{intl.formatMessage(globalMessages.movie)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<div className="pointer-events-none z-40 self-start rounded-full border border-purple-600 bg-purple-600 bg-opacity-80 shadow-md">
|
|
||||||
<div className="flex h-4 items-center px-2 py-2 text-center text-xs font-medium uppercase tracking-wider text-white sm:h-5">
|
|
||||||
{intl.formatMessage(globalMessages.tvshow)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="z-10 mt-4 flex w-full flex-col justify-center space-y-2 pl-4 pr-4 xl:mt-0 xl:w-96 xl:items-end xl:pl-0">
|
|
||||||
{hasPermission(Permission.MANAGE_BLACKLIST) && (
|
|
||||||
<ConfirmButton
|
|
||||||
onClick={() =>
|
|
||||||
removeFromBlacklist(
|
|
||||||
item.tmdbId,
|
|
||||||
title && (isMovie(title) ? title.title : title.name)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
confirmText={intl.formatMessage(
|
|
||||||
isUpdating ? globalMessages.deleting : globalMessages.areyousure
|
|
||||||
)}
|
|
||||||
className={`w-full ${
|
|
||||||
isUpdating ? 'pointer-events-none opacity-50' : ''
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<TrashIcon />
|
|
||||||
<span>
|
|
||||||
{intl.formatMessage(globalMessages.removefromBlacklist)}
|
|
||||||
</span>
|
|
||||||
</ConfirmButton>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@@ -1,129 +0,0 @@
|
|||||||
import Badge from '@app/components/Common/Badge';
|
|
||||||
import Button from '@app/components/Common/Button';
|
|
||||||
import Tooltip from '@app/components/Common/Tooltip';
|
|
||||||
import { useUser } from '@app/hooks/useUser';
|
|
||||||
import globalMessages from '@app/i18n/globalMessages';
|
|
||||||
import defineMessages from '@app/utils/defineMessages';
|
|
||||||
import { CalendarIcon, TrashIcon, UserIcon } from '@heroicons/react/24/solid';
|
|
||||||
import type { Blacklist } from '@server/entity/Blacklist';
|
|
||||||
import Link from 'next/link';
|
|
||||||
import { useState } from 'react';
|
|
||||||
import { useIntl } from 'react-intl';
|
|
||||||
import { useToasts } from 'react-toast-notifications';
|
|
||||||
|
|
||||||
const messages = defineMessages('component.BlacklistBlock', {
|
|
||||||
blacklistedby: 'Blacklisted By',
|
|
||||||
blacklistdate: 'Blacklisted date',
|
|
||||||
});
|
|
||||||
|
|
||||||
interface BlacklistBlockProps {
|
|
||||||
blacklistItem: Blacklist;
|
|
||||||
onUpdate?: () => void;
|
|
||||||
onDelete?: () => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
const BlacklistBlock = ({
|
|
||||||
blacklistItem,
|
|
||||||
onUpdate,
|
|
||||||
onDelete,
|
|
||||||
}: BlacklistBlockProps) => {
|
|
||||||
const { user } = useUser();
|
|
||||||
const intl = useIntl();
|
|
||||||
const [isUpdating, setIsUpdating] = useState(false);
|
|
||||||
const { addToast } = useToasts();
|
|
||||||
|
|
||||||
const removeFromBlacklist = async (tmdbId: number, title?: string) => {
|
|
||||||
setIsUpdating(true);
|
|
||||||
|
|
||||||
const res = await fetch('/api/v1/blacklist/' + tmdbId, {
|
|
||||||
method: 'DELETE',
|
|
||||||
});
|
|
||||||
|
|
||||||
if (res.status === 204) {
|
|
||||||
addToast(
|
|
||||||
<span>
|
|
||||||
{intl.formatMessage(globalMessages.removeFromBlacklistSuccess, {
|
|
||||||
title,
|
|
||||||
strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
|
|
||||||
})}
|
|
||||||
</span>,
|
|
||||||
{ appearance: 'success', autoDismiss: true }
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
addToast(intl.formatMessage(globalMessages.blacklistError), {
|
|
||||||
appearance: 'error',
|
|
||||||
autoDismiss: true,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
onUpdate && onUpdate();
|
|
||||||
onDelete && onDelete();
|
|
||||||
|
|
||||||
setIsUpdating(false);
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="px-4 py-3 text-gray-300">
|
|
||||||
<div className="flex items-center justify-between">
|
|
||||||
<div className="mr-6 min-w-0 flex-1 flex-col items-center text-sm leading-5">
|
|
||||||
<div className="white mb-1 flex flex-nowrap">
|
|
||||||
<Tooltip content={intl.formatMessage(messages.blacklistedby)}>
|
|
||||||
<UserIcon className="mr-1.5 h-5 w-5 min-w-0 flex-shrink-0" />
|
|
||||||
</Tooltip>
|
|
||||||
<span className="w-40 truncate md:w-auto">
|
|
||||||
<Link
|
|
||||||
href={
|
|
||||||
blacklistItem.user.id === user?.id
|
|
||||||
? '/profile'
|
|
||||||
: `/users/${blacklistItem.user.id}`
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<span className="font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline">
|
|
||||||
{blacklistItem.user.displayName}
|
|
||||||
</span>
|
|
||||||
</Link>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="ml-2 flex flex-shrink-0 flex-wrap">
|
|
||||||
<Tooltip
|
|
||||||
content={intl.formatMessage(globalMessages.removefromBlacklist)}
|
|
||||||
>
|
|
||||||
<Button
|
|
||||||
buttonType="danger"
|
|
||||||
onClick={() =>
|
|
||||||
removeFromBlacklist(blacklistItem.tmdbId, blacklistItem.title)
|
|
||||||
}
|
|
||||||
disabled={isUpdating}
|
|
||||||
>
|
|
||||||
<TrashIcon className="icon-sm" />
|
|
||||||
</Button>
|
|
||||||
</Tooltip>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="mt-2 sm:flex sm:justify-between">
|
|
||||||
<div className="sm:flex">
|
|
||||||
<div className="mr-6 flex items-center text-sm leading-5">
|
|
||||||
<Badge badgeType="danger">
|
|
||||||
{intl.formatMessage(globalMessages.blacklisted)}
|
|
||||||
</Badge>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="mt-2 flex items-center text-sm leading-5 sm:mt-0">
|
|
||||||
<Tooltip content={intl.formatMessage(messages.blacklistdate)}>
|
|
||||||
<CalendarIcon className="mr-1.5 h-5 w-5 flex-shrink-0" />
|
|
||||||
</Tooltip>
|
|
||||||
<span>
|
|
||||||
{intl.formatDate(blacklistItem.createdAt, {
|
|
||||||
year: 'numeric',
|
|
||||||
month: 'long',
|
|
||||||
day: 'numeric',
|
|
||||||
})}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default BlacklistBlock;
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
import Modal from '@app/components/Common/Modal';
|
|
||||||
import globalMessages from '@app/i18n/globalMessages';
|
|
||||||
import defineMessages from '@app/utils/defineMessages';
|
|
||||||
import { Transition } from '@headlessui/react';
|
|
||||||
import type { MovieDetails } from '@server/models/Movie';
|
|
||||||
import type { TvDetails } from '@server/models/Tv';
|
|
||||||
import { useIntl } from 'react-intl';
|
|
||||||
import useSWR from 'swr';
|
|
||||||
|
|
||||||
interface BlacklistModalProps {
|
|
||||||
tmdbId: number;
|
|
||||||
type: 'movie' | 'tv' | 'collection';
|
|
||||||
show: boolean;
|
|
||||||
onComplete?: () => void;
|
|
||||||
onCancel?: () => void;
|
|
||||||
isUpdating?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
const messages = defineMessages('component.BlacklistModal', {
|
|
||||||
blacklisting: 'Blacklisting',
|
|
||||||
});
|
|
||||||
|
|
||||||
const isMovie = (
|
|
||||||
movie: MovieDetails | TvDetails | undefined
|
|
||||||
): movie is MovieDetails => {
|
|
||||||
if (!movie) return false;
|
|
||||||
return (movie as MovieDetails).title !== undefined;
|
|
||||||
};
|
|
||||||
|
|
||||||
const BlacklistModal = ({
|
|
||||||
tmdbId,
|
|
||||||
type,
|
|
||||||
show,
|
|
||||||
onComplete,
|
|
||||||
onCancel,
|
|
||||||
isUpdating,
|
|
||||||
}: BlacklistModalProps) => {
|
|
||||||
const intl = useIntl();
|
|
||||||
|
|
||||||
const { data, error } = useSWR<TvDetails | MovieDetails>(
|
|
||||||
`/api/v1/${type}/${tmdbId}`
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Transition
|
|
||||||
as="div"
|
|
||||||
enter="transition-opacity duration-300"
|
|
||||||
enterFrom="opacity-0"
|
|
||||||
enterTo="opacity-100"
|
|
||||||
leave="transition-opacity duration-300"
|
|
||||||
leaveFrom="opacity-100"
|
|
||||||
leaveTo="opacity-0"
|
|
||||||
show={show}
|
|
||||||
>
|
|
||||||
<Modal
|
|
||||||
loading={!data && !error}
|
|
||||||
backgroundClickable
|
|
||||||
title={`${intl.formatMessage(globalMessages.blacklist)} ${
|
|
||||||
isMovie(data)
|
|
||||||
? intl.formatMessage(globalMessages.movie)
|
|
||||||
: intl.formatMessage(globalMessages.tvshow)
|
|
||||||
}`}
|
|
||||||
subTitle={`${isMovie(data) ? data.title : data?.name}`}
|
|
||||||
onCancel={onCancel}
|
|
||||||
onOk={onComplete}
|
|
||||||
okText={
|
|
||||||
isUpdating
|
|
||||||
? intl.formatMessage(messages.blacklisting)
|
|
||||||
: intl.formatMessage(globalMessages.blacklist)
|
|
||||||
}
|
|
||||||
okButtonType="danger"
|
|
||||||
okDisabled={isUpdating}
|
|
||||||
backdrop={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${data?.backdropPath}`}
|
|
||||||
/>
|
|
||||||
</Transition>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default BlacklistModal;
|
|
||||||
@@ -183,11 +183,6 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const blacklistVisibility = hasPermission(
|
|
||||||
[Permission.MANAGE_BLACKLIST, Permission.VIEW_BLACKLIST],
|
|
||||||
{ type: 'or' }
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className="media-page"
|
className="media-page"
|
||||||
@@ -198,7 +193,6 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
|
|||||||
{data.backdropPath && (
|
{data.backdropPath && (
|
||||||
<div className="media-page-bg-image">
|
<div className="media-page-bg-image">
|
||||||
<CachedImage
|
<CachedImage
|
||||||
type="tmdb"
|
|
||||||
alt=""
|
alt=""
|
||||||
src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${data.backdropPath}`}
|
src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${data.backdropPath}`}
|
||||||
style={{ width: '100%', height: '100%', objectFit: 'cover' }}
|
style={{ width: '100%', height: '100%', objectFit: 'cover' }}
|
||||||
@@ -229,7 +223,6 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
|
|||||||
<div className="media-header">
|
<div className="media-header">
|
||||||
<div className="media-poster">
|
<div className="media-poster">
|
||||||
<CachedImage
|
<CachedImage
|
||||||
type="tmdb"
|
|
||||||
src={
|
src={
|
||||||
data.posterPath
|
data.posterPath
|
||||||
? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${data.posterPath}`
|
? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${data.posterPath}`
|
||||||
@@ -342,13 +335,7 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
|
|||||||
sliderKey="collection-movies"
|
sliderKey="collection-movies"
|
||||||
isLoading={false}
|
isLoading={false}
|
||||||
isEmpty={data.parts.length === 0}
|
isEmpty={data.parts.length === 0}
|
||||||
items={data.parts
|
items={data.parts.map((title) => (
|
||||||
.filter((title) => {
|
|
||||||
if (!blacklistVisibility)
|
|
||||||
return title.mediaInfo?.status !== MediaStatus.BLACKLISTED;
|
|
||||||
return title;
|
|
||||||
})
|
|
||||||
.map((title) => (
|
|
||||||
<TitleCard
|
<TitleCard
|
||||||
key={`collection-movie-${title.id}`}
|
key={`collection-movie-${title.id}`}
|
||||||
id={title.id}
|
id={title.id}
|
||||||
|
|||||||
@@ -4,34 +4,21 @@ import Image from 'next/image';
|
|||||||
|
|
||||||
const imageLoader: ImageLoader = ({ src }) => src;
|
const imageLoader: ImageLoader = ({ src }) => src;
|
||||||
|
|
||||||
export type CachedImageProps = ImageProps & {
|
|
||||||
src: string;
|
|
||||||
type: 'tmdb' | 'avatar';
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The CachedImage component should be used wherever
|
* The CachedImage component should be used wherever
|
||||||
* we want to offer the option to locally cache images.
|
* we want to offer the option to locally cache images.
|
||||||
**/
|
**/
|
||||||
const CachedImage = ({ src, type, ...props }: CachedImageProps) => {
|
const CachedImage = ({ src, ...props }: ImageProps) => {
|
||||||
const { currentSettings } = useSettings();
|
const { currentSettings } = useSettings();
|
||||||
|
|
||||||
let imageUrl: string;
|
let imageUrl = src;
|
||||||
|
|
||||||
if (type === 'tmdb') {
|
if (typeof imageUrl === 'string' && imageUrl.startsWith('http')) {
|
||||||
// tmdb stuff
|
const parsedUrl = new URL(imageUrl);
|
||||||
imageUrl =
|
|
||||||
currentSettings.cacheImages && !src.startsWith('/')
|
if (parsedUrl.host === 'image.tmdb.org' && currentSettings.cacheImages) {
|
||||||
? src.replace(/^https:\/\/image\.tmdb\.org\//, '/imageproxy/')
|
imageUrl = imageUrl.replace('https://image.tmdb.org', '/imageproxy');
|
||||||
: src;
|
}
|
||||||
} else if (type === 'avatar') {
|
|
||||||
// jellyfin avatar (in any)
|
|
||||||
const jellyfinAvatar = src.match(
|
|
||||||
/(\/Users\/\w+\/Images\/Primary\/?\?tag=\w+&quality=90)$/
|
|
||||||
)?.[1];
|
|
||||||
imageUrl = jellyfinAvatar ? `/avatarproxy` + jellyfinAvatar : src;
|
|
||||||
} else {
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return <Image unoptimized loader={imageLoader} src={imageUrl} {...props} />;
|
return <Image unoptimized loader={imageLoader} src={imageUrl} {...props} />;
|
||||||
|
|||||||
@@ -61,7 +61,6 @@ const ImageFader: ForwardRefRenderFunction<HTMLDivElement, ImageFaderProps> = (
|
|||||||
{...props}
|
{...props}
|
||||||
>
|
>
|
||||||
<CachedImage
|
<CachedImage
|
||||||
type="tmdb"
|
|
||||||
className="absolute inset-0 h-full w-full"
|
className="absolute inset-0 h-full w-full"
|
||||||
alt=""
|
alt=""
|
||||||
src={imageUrl}
|
src={imageUrl}
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
import PersonCard from '@app/components/PersonCard';
|
import PersonCard from '@app/components/PersonCard';
|
||||||
import TitleCard from '@app/components/TitleCard';
|
import TitleCard from '@app/components/TitleCard';
|
||||||
import TmdbTitleCard from '@app/components/TitleCard/TmdbTitleCard';
|
import TmdbTitleCard from '@app/components/TitleCard/TmdbTitleCard';
|
||||||
import { Permission, useUser } from '@app/hooks/useUser';
|
|
||||||
import useVerticalScroll from '@app/hooks/useVerticalScroll';
|
import useVerticalScroll from '@app/hooks/useVerticalScroll';
|
||||||
import globalMessages from '@app/i18n/globalMessages';
|
import globalMessages from '@app/i18n/globalMessages';
|
||||||
import { MediaStatus } from '@server/constants/media';
|
|
||||||
import type { WatchlistItem } from '@server/interfaces/api/discoverInterfaces';
|
import type { WatchlistItem } from '@server/interfaces/api/discoverInterfaces';
|
||||||
import type {
|
import type {
|
||||||
CollectionResult,
|
CollectionResult,
|
||||||
@@ -34,14 +32,7 @@ const ListView = ({
|
|||||||
mutateParent,
|
mutateParent,
|
||||||
}: ListViewProps) => {
|
}: ListViewProps) => {
|
||||||
const intl = useIntl();
|
const intl = useIntl();
|
||||||
const { hasPermission } = useUser();
|
|
||||||
useVerticalScroll(onScrollBottom, !isLoading && !isEmpty && !isReachingEnd);
|
useVerticalScroll(onScrollBottom, !isLoading && !isEmpty && !isReachingEnd);
|
||||||
|
|
||||||
const blacklistVisibility = hasPermission(
|
|
||||||
[Permission.MANAGE_BLACKLIST, Permission.VIEW_BLACKLIST],
|
|
||||||
{ type: 'or' }
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{isEmpty && (
|
{isEmpty && (
|
||||||
@@ -64,16 +55,7 @@ const ListView = ({
|
|||||||
</li>
|
</li>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
{items
|
{items?.map((title, index) => {
|
||||||
?.filter((title) => {
|
|
||||||
if (!blacklistVisibility)
|
|
||||||
return (
|
|
||||||
(title as TvResult | MovieResult).mediaInfo?.status !==
|
|
||||||
MediaStatus.BLACKLISTED
|
|
||||||
);
|
|
||||||
return title;
|
|
||||||
})
|
|
||||||
.map((title, index) => {
|
|
||||||
let titleCard: React.ReactNode;
|
let titleCard: React.ReactNode;
|
||||||
|
|
||||||
switch (title.mediaType) {
|
switch (title.mediaType) {
|
||||||
@@ -82,9 +64,7 @@ const ListView = ({
|
|||||||
<TitleCard
|
<TitleCard
|
||||||
key={title.id}
|
key={title.id}
|
||||||
id={title.id}
|
id={title.id}
|
||||||
isAddedToWatchlist={
|
isAddedToWatchlist={title.mediaInfo?.watchlists?.length ?? 0}
|
||||||
title.mediaInfo?.watchlists?.length ?? 0
|
|
||||||
}
|
|
||||||
image={title.posterPath}
|
image={title.posterPath}
|
||||||
status={title.mediaInfo?.status}
|
status={title.mediaInfo?.status}
|
||||||
summary={title.overview}
|
summary={title.overview}
|
||||||
@@ -104,9 +84,7 @@ const ListView = ({
|
|||||||
<TitleCard
|
<TitleCard
|
||||||
key={title.id}
|
key={title.id}
|
||||||
id={title.id}
|
id={title.id}
|
||||||
isAddedToWatchlist={
|
isAddedToWatchlist={title.mediaInfo?.watchlists?.length ?? 0}
|
||||||
title.mediaInfo?.watchlists?.length ?? 0
|
|
||||||
}
|
|
||||||
image={title.posterPath}
|
image={title.posterPath}
|
||||||
status={title.mediaInfo?.status}
|
status={title.mediaInfo?.status}
|
||||||
summary={title.overview}
|
summary={title.overview}
|
||||||
|
|||||||
@@ -123,7 +123,6 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
|
|||||||
{backdrop && (
|
{backdrop && (
|
||||||
<div className="absolute top-0 left-0 right-0 z-0 h-64 max-h-full w-full">
|
<div className="absolute top-0 left-0 right-0 z-0 h-64 max-h-full w-full">
|
||||||
<CachedImage
|
<CachedImage
|
||||||
type="tmdb"
|
|
||||||
alt=""
|
alt=""
|
||||||
src={backdrop}
|
src={backdrop}
|
||||||
style={{ width: '100%', height: '100%', objectFit: 'cover' }}
|
style={{ width: '100%', height: '100%', objectFit: 'cover' }}
|
||||||
|
|||||||
@@ -1,11 +1,6 @@
|
|||||||
import Spinner from '@app/assets/spinner.svg';
|
import Spinner from '@app/assets/spinner.svg';
|
||||||
import { CheckCircleIcon } from '@heroicons/react/20/solid';
|
import { CheckCircleIcon } from '@heroicons/react/20/solid';
|
||||||
import {
|
import { BellIcon, ClockIcon, MinusSmallIcon } from '@heroicons/react/24/solid';
|
||||||
BellIcon,
|
|
||||||
ClockIcon,
|
|
||||||
EyeSlashIcon,
|
|
||||||
MinusSmallIcon,
|
|
||||||
} from '@heroicons/react/24/solid';
|
|
||||||
import { MediaStatus } from '@server/constants/media';
|
import { MediaStatus } from '@server/constants/media';
|
||||||
|
|
||||||
interface StatusBadgeMiniProps {
|
interface StatusBadgeMiniProps {
|
||||||
@@ -49,10 +44,6 @@ const StatusBadgeMini = ({
|
|||||||
);
|
);
|
||||||
indicatorIcon = <BellIcon />;
|
indicatorIcon = <BellIcon />;
|
||||||
break;
|
break;
|
||||||
case MediaStatus.BLACKLISTED:
|
|
||||||
badgeStyle.push('bg-red-500 border-white-400 ring-white-400 text-white');
|
|
||||||
indicatorIcon = <EyeSlashIcon />;
|
|
||||||
break;
|
|
||||||
case MediaStatus.PARTIALLY_AVAILABLE:
|
case MediaStatus.PARTIALLY_AVAILABLE:
|
||||||
badgeStyle.push(
|
badgeStyle.push(
|
||||||
'bg-green-500 border-green-400 ring-green-400 text-green-100'
|
'bg-green-500 border-green-400 ring-green-400 text-green-100'
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ const CompanyCard = ({ image, url, name }: CompanyCardProps) => {
|
|||||||
>
|
>
|
||||||
<div className="relative h-full w-full">
|
<div className="relative h-full w-full">
|
||||||
<CachedImage
|
<CachedImage
|
||||||
type="tmdb"
|
|
||||||
src={image}
|
src={image}
|
||||||
alt={name}
|
alt={name}
|
||||||
className="relative z-40 h-full w-full"
|
className="relative z-40 h-full w-full"
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import { DiscoverSliderType } from '@server/constants/discover';
|
|||||||
import type DiscoverSlider from '@server/entity/DiscoverSlider';
|
import type DiscoverSlider from '@server/entity/DiscoverSlider';
|
||||||
import type { GenreSliderItem } from '@server/interfaces/api/discoverInterfaces';
|
import type { GenreSliderItem } from '@server/interfaces/api/discoverInterfaces';
|
||||||
import type { Keyword, ProductionCompany } from '@server/models/common';
|
import type { Keyword, ProductionCompany } from '@server/models/common';
|
||||||
|
import axios from 'axios';
|
||||||
import { Field, Form, Formik } from 'formik';
|
import { Field, Form, Formik } from 'formik';
|
||||||
import { useCallback, useEffect, useState } from 'react';
|
import { useCallback, useEffect, useState } from 'react';
|
||||||
import { useIntl } from 'react-intl';
|
import { useIntl } from 'react-intl';
|
||||||
@@ -76,9 +77,11 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
|
|||||||
|
|
||||||
const keywords = await Promise.all(
|
const keywords = await Promise.all(
|
||||||
slider.data.split(',').map(async (keywordId) => {
|
slider.data.split(',').map(async (keywordId) => {
|
||||||
const res = await fetch(`/api/v1/keyword/${keywordId}`);
|
const keyword = await axios.get<Keyword>(
|
||||||
const keyword: Keyword = await res.json();
|
`/api/v1/keyword/${keywordId}`
|
||||||
return keyword;
|
);
|
||||||
|
|
||||||
|
return keyword.data;
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -95,13 +98,15 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const res = await fetch(
|
const response = await axios.get<TmdbGenre[]>(
|
||||||
`/api/v1/genres/${
|
`/api/v1/genres/${
|
||||||
slider.type === DiscoverSliderType.TMDB_MOVIE_GENRE ? 'movie' : 'tv'
|
slider.type === DiscoverSliderType.TMDB_MOVIE_GENRE ? 'movie' : 'tv'
|
||||||
}`
|
}`
|
||||||
);
|
);
|
||||||
const genres: TmdbGenre[] = await res.json();
|
|
||||||
const genre = genres.find((genre) => genre.id === Number(slider.data));
|
const genre = response.data.find(
|
||||||
|
(genre) => genre.id === Number(slider.data)
|
||||||
|
);
|
||||||
|
|
||||||
setDefaultDataValue([
|
setDefaultDataValue([
|
||||||
{
|
{
|
||||||
@@ -116,8 +121,11 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const res = await fetch(`/api/v1/studio/${slider.data}`);
|
const response = await axios.get<ProductionCompany>(
|
||||||
const studio: ProductionCompany = await res.json();
|
`/api/v1/studio/${slider.data}`
|
||||||
|
);
|
||||||
|
|
||||||
|
const studio = response.data;
|
||||||
|
|
||||||
setDefaultDataValue([
|
setDefaultDataValue([
|
||||||
{
|
{
|
||||||
@@ -160,17 +168,16 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const loadKeywordOptions = async (inputValue: string) => {
|
const loadKeywordOptions = async (inputValue: string) => {
|
||||||
const res = await fetch(
|
const results = await axios.get<TmdbKeywordSearchResponse>(
|
||||||
`/api/v1/search/keyword?query=${encodeURIExtraParams(inputValue)}`,
|
'/api/v1/search/keyword',
|
||||||
{
|
{
|
||||||
headers: {
|
params: {
|
||||||
'Content-Type': 'application/json',
|
query: encodeURIExtraParams(inputValue),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
const results: TmdbKeywordSearchResponse = await res.json();
|
|
||||||
|
|
||||||
return results.results.map((result) => ({
|
return results.data.results.map((result) => ({
|
||||||
label: result.name,
|
label: result.name,
|
||||||
value: result.id,
|
value: result.id,
|
||||||
}));
|
}));
|
||||||
@@ -181,37 +188,38 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
|
|||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
const res = await fetch(
|
const results = await axios.get<TmdbCompanySearchResponse>(
|
||||||
`/api/v1/search/company?query=${encodeURIExtraParams(inputValue)}`,
|
'/api/v1/search/company',
|
||||||
{
|
{
|
||||||
headers: {
|
params: {
|
||||||
'Content-Type': 'application/json',
|
query: encodeURIExtraParams(inputValue),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
const results: TmdbCompanySearchResponse = await res.json();
|
|
||||||
|
|
||||||
return results.results.map((result) => ({
|
return results.data.results.map((result) => ({
|
||||||
label: result.name,
|
label: result.name,
|
||||||
value: result.id,
|
value: result.id,
|
||||||
}));
|
}));
|
||||||
};
|
};
|
||||||
|
|
||||||
const loadMovieGenreOptions = async () => {
|
const loadMovieGenreOptions = async () => {
|
||||||
const res = await fetch('/api/v1/discover/genreslider/movie');
|
const results = await axios.get<GenreSliderItem[]>(
|
||||||
const results: GenreSliderItem[] = await res.json();
|
'/api/v1/discover/genreslider/movie'
|
||||||
|
);
|
||||||
|
|
||||||
return results.map((result) => ({
|
return results.data.map((result) => ({
|
||||||
label: result.name,
|
label: result.name,
|
||||||
value: result.id,
|
value: result.id,
|
||||||
}));
|
}));
|
||||||
};
|
};
|
||||||
|
|
||||||
const loadTvGenreOptions = async () => {
|
const loadTvGenreOptions = async () => {
|
||||||
const res = await fetch('/api/v1/discover/genreslider/tv');
|
const results = await axios.get<GenreSliderItem[]>(
|
||||||
const results: GenreSliderItem[] = await res.json();
|
'/api/v1/discover/genreslider/tv'
|
||||||
|
);
|
||||||
|
|
||||||
return results.map((result) => ({
|
return results.data.map((result) => ({
|
||||||
label: result.name,
|
label: result.name,
|
||||||
value: result.id,
|
value: result.id,
|
||||||
}));
|
}));
|
||||||
@@ -306,31 +314,17 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
|
|||||||
onSubmit={async (values, { resetForm }) => {
|
onSubmit={async (values, { resetForm }) => {
|
||||||
try {
|
try {
|
||||||
if (slider) {
|
if (slider) {
|
||||||
const res = await fetch(`/api/v1/settings/discover/${slider.id}`, {
|
await axios.put(`/api/v1/settings/discover/${slider.id}`, {
|
||||||
method: 'PUT',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify({
|
|
||||||
type: Number(values.sliderType),
|
type: Number(values.sliderType),
|
||||||
title: values.title,
|
title: values.title,
|
||||||
data: values.data,
|
data: values.data,
|
||||||
}),
|
|
||||||
});
|
});
|
||||||
if (!res.ok) throw new Error();
|
|
||||||
} else {
|
} else {
|
||||||
const res = await fetch('/api/v1/settings/discover/add', {
|
await axios.post('/api/v1/settings/discover/add', {
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify({
|
|
||||||
type: Number(values.sliderType),
|
type: Number(values.sliderType),
|
||||||
title: values.title,
|
title: values.title,
|
||||||
data: values.data,
|
data: values.data,
|
||||||
}),
|
|
||||||
});
|
});
|
||||||
if (!res.ok) throw new Error();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
addToast(
|
addToast(
|
||||||
|
|||||||
@@ -48,11 +48,11 @@ const DiscoverTvNetwork = () => {
|
|||||||
<div className="mt-1 mb-5">
|
<div className="mt-1 mb-5">
|
||||||
<Header>
|
<Header>
|
||||||
{firstResultData?.network.logoPath ? (
|
{firstResultData?.network.logoPath ? (
|
||||||
<div className="relative mb-6 flex h-24 justify-center sm:h-32">
|
<div className="mb-6 flex justify-center">
|
||||||
<Image
|
<Image
|
||||||
src={`https://image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)${firstResultData.network.logoPath}`}
|
src={`//image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)${firstResultData.network.logoPath}`}
|
||||||
alt={firstResultData.network.name}
|
alt={firstResultData.network.name}
|
||||||
className="object-contain"
|
className="max-h-24 sm:max-h-32"
|
||||||
fill
|
fill
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import {
|
|||||||
} from '@heroicons/react/24/solid';
|
} from '@heroicons/react/24/solid';
|
||||||
import { DiscoverSliderType } from '@server/constants/discover';
|
import { DiscoverSliderType } from '@server/constants/discover';
|
||||||
import type DiscoverSlider from '@server/entity/DiscoverSlider';
|
import type DiscoverSlider from '@server/entity/DiscoverSlider';
|
||||||
|
import axios from 'axios';
|
||||||
import { useRef, useState } from 'react';
|
import { useRef, useState } from 'react';
|
||||||
import { useDrag, useDrop } from 'react-aria';
|
import { useDrag, useDrop } from 'react-aria';
|
||||||
import { useIntl } from 'react-intl';
|
import { useIntl } from 'react-intl';
|
||||||
@@ -77,10 +78,7 @@ const DiscoverSliderEdit = ({
|
|||||||
|
|
||||||
const deleteSlider = async () => {
|
const deleteSlider = async () => {
|
||||||
try {
|
try {
|
||||||
const res = await fetch(`/api/v1/settings/discover/${slider.id}`, {
|
await axios.delete(`/api/v1/settings/discover/${slider.id}`);
|
||||||
method: 'DELETE',
|
|
||||||
});
|
|
||||||
if (!res.ok) throw new Error();
|
|
||||||
addToast(intl.formatMessage(messages.deletesuccess), {
|
addToast(intl.formatMessage(messages.deletesuccess), {
|
||||||
appearance: 'success',
|
appearance: 'success',
|
||||||
autoDismiss: true,
|
autoDismiss: true,
|
||||||
|
|||||||
@@ -48,11 +48,11 @@ const DiscoverMovieStudio = () => {
|
|||||||
<div className="mt-1 mb-5">
|
<div className="mt-1 mb-5">
|
||||||
<Header>
|
<Header>
|
||||||
{firstResultData?.studio.logoPath ? (
|
{firstResultData?.studio.logoPath ? (
|
||||||
<div className="relative mb-6 flex h-24 justify-center sm:h-32">
|
<div className="mb-6 flex justify-center">
|
||||||
<Image
|
<Image
|
||||||
src={`https://image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)${firstResultData.studio.logoPath}`}
|
src={`//image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)${firstResultData.studio.logoPath}`}
|
||||||
alt={firstResultData.studio.name}
|
alt={firstResultData.studio.name}
|
||||||
className="object-contain"
|
className="max-h-24 sm:max-h-32"
|
||||||
fill
|
fill
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import {
|
|||||||
CompanySelector,
|
CompanySelector,
|
||||||
GenreSelector,
|
GenreSelector,
|
||||||
KeywordSelector,
|
KeywordSelector,
|
||||||
StatusSelector,
|
|
||||||
WatchProviderSelector,
|
WatchProviderSelector,
|
||||||
} from '@app/components/Selector';
|
} from '@app/components/Selector';
|
||||||
import useSettings from '@app/hooks/useSettings';
|
import useSettings from '@app/hooks/useSettings';
|
||||||
@@ -41,7 +40,6 @@ const messages = defineMessages('components.Discover.FilterSlideover', {
|
|||||||
runtime: 'Runtime',
|
runtime: 'Runtime',
|
||||||
streamingservices: 'Streaming Services',
|
streamingservices: 'Streaming Services',
|
||||||
voteCount: 'Number of votes between {minValue} and {maxValue}',
|
voteCount: 'Number of votes between {minValue} and {maxValue}',
|
||||||
status: 'Status',
|
|
||||||
});
|
});
|
||||||
|
|
||||||
type FilterSlideoverProps = {
|
type FilterSlideoverProps = {
|
||||||
@@ -152,23 +150,6 @@ const FilterSlideover = ({
|
|||||||
updateQueryParams('genre', value?.map((v) => v.value).join(','));
|
updateQueryParams('genre', value?.map((v) => v.value).join(','));
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
{type === 'tv' && (
|
|
||||||
<>
|
|
||||||
<span className="text-lg font-semibold">
|
|
||||||
{intl.formatMessage(messages.status)}
|
|
||||||
</span>
|
|
||||||
<StatusSelector
|
|
||||||
defaultValue={currentFilters.status}
|
|
||||||
isMulti
|
|
||||||
onChange={(value) => {
|
|
||||||
updateQueryParams(
|
|
||||||
'status',
|
|
||||||
value?.map((v) => v.value).join('|')
|
|
||||||
);
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
<span className="text-lg font-semibold">
|
<span className="text-lg font-semibold">
|
||||||
{intl.formatMessage(messages.keywords)}
|
{intl.formatMessage(messages.keywords)}
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
@@ -108,7 +108,6 @@ export const QueryFilterOptions = z.object({
|
|||||||
voteCountGte: z.string().optional(),
|
voteCountGte: z.string().optional(),
|
||||||
watchRegion: z.string().optional(),
|
watchRegion: z.string().optional(),
|
||||||
watchProviders: z.string().optional(),
|
watchProviders: z.string().optional(),
|
||||||
status: z.string().optional(),
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export type FilterOptions = z.infer<typeof QueryFilterOptions>;
|
export type FilterOptions = z.infer<typeof QueryFilterOptions>;
|
||||||
@@ -148,10 +147,6 @@ export const prepareFilterValues = (
|
|||||||
filterValues.genre = values.genre;
|
filterValues.genre = values.genre;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (values.status) {
|
|
||||||
filterValues.status = values.status;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (values.keywords) {
|
if (values.keywords) {
|
||||||
filterValues.keywords = values.keywords;
|
filterValues.keywords = values.keywords;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ import {
|
|||||||
} from '@heroicons/react/24/solid';
|
} from '@heroicons/react/24/solid';
|
||||||
import { DiscoverSliderType } from '@server/constants/discover';
|
import { DiscoverSliderType } from '@server/constants/discover';
|
||||||
import type DiscoverSlider from '@server/entity/DiscoverSlider';
|
import type DiscoverSlider from '@server/entity/DiscoverSlider';
|
||||||
|
import axios from 'axios';
|
||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
import { useIntl } from 'react-intl';
|
import { useIntl } from 'react-intl';
|
||||||
import { useToasts } from 'react-toast-notifications';
|
import { useToasts } from 'react-toast-notifications';
|
||||||
@@ -75,14 +76,7 @@ const Discover = () => {
|
|||||||
|
|
||||||
const updateSliders = async () => {
|
const updateSliders = async () => {
|
||||||
try {
|
try {
|
||||||
const res = await fetch('/api/v1/settings/discover', {
|
await axios.post('/api/v1/settings/discover', sliders);
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify(sliders),
|
|
||||||
});
|
|
||||||
if (!res.ok) throw new Error();
|
|
||||||
|
|
||||||
addToast(intl.formatMessage(messages.updatesuccess), {
|
addToast(intl.formatMessage(messages.updatesuccess), {
|
||||||
appearance: 'success',
|
appearance: 'success',
|
||||||
@@ -100,10 +94,7 @@ const Discover = () => {
|
|||||||
|
|
||||||
const resetSliders = async () => {
|
const resetSliders = async () => {
|
||||||
try {
|
try {
|
||||||
const res = await fetch('/api/v1/settings/discover/reset', {
|
await axios.get('/api/v1/settings/discover/reset');
|
||||||
method: 'GET',
|
|
||||||
});
|
|
||||||
if (!res.ok) throw new Error();
|
|
||||||
|
|
||||||
addToast(intl.formatMessage(messages.resetsuccess), {
|
addToast(intl.formatMessage(messages.resetsuccess), {
|
||||||
appearance: 'success',
|
appearance: 'success',
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import useLocale from '@app/hooks/useLocale';
|
|||||||
import useSettings from '@app/hooks/useSettings';
|
import useSettings from '@app/hooks/useSettings';
|
||||||
import { MediaType } from '@server/constants/media';
|
import { MediaType } from '@server/constants/media';
|
||||||
import { MediaServerType } from '@server/constants/server';
|
import { MediaServerType } from '@server/constants/server';
|
||||||
|
import getConfig from 'next/config';
|
||||||
|
|
||||||
interface ExternalLinkBlockProps {
|
interface ExternalLinkBlockProps {
|
||||||
mediaType: 'movie' | 'tv';
|
mediaType: 'movie' | 'tv';
|
||||||
@@ -30,6 +31,7 @@ const ExternalLinkBlock = ({
|
|||||||
mediaUrl,
|
mediaUrl,
|
||||||
}: ExternalLinkBlockProps) => {
|
}: ExternalLinkBlockProps) => {
|
||||||
const settings = useSettings();
|
const settings = useSettings();
|
||||||
|
const { publicRuntimeConfig } = getConfig();
|
||||||
const { locale } = useLocale();
|
const { locale } = useLocale();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -43,8 +45,7 @@ const ExternalLinkBlock = ({
|
|||||||
>
|
>
|
||||||
{settings.currentSettings.mediaServerType === MediaServerType.PLEX ? (
|
{settings.currentSettings.mediaServerType === MediaServerType.PLEX ? (
|
||||||
<PlexLogo />
|
<PlexLogo />
|
||||||
) : settings.currentSettings.mediaServerType ===
|
) : publicRuntimeConfig.JELLYFIN_TYPE == 'emby' ? (
|
||||||
MediaServerType.EMBY ? (
|
|
||||||
<EmbyLogo />
|
<EmbyLogo />
|
||||||
) : (
|
) : (
|
||||||
<JellyfinLogo />
|
<JellyfinLogo />
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ const GenreCard = ({ image, url, name, canExpand = false }: GenreCardProps) => {
|
|||||||
tabIndex={0}
|
tabIndex={0}
|
||||||
>
|
>
|
||||||
<CachedImage
|
<CachedImage
|
||||||
type="tmdb"
|
|
||||||
src={image}
|
src={image}
|
||||||
alt=""
|
alt=""
|
||||||
style={{ width: '100%', height: '100%', objectFit: 'cover' }}
|
style={{ width: '100%', height: '100%', objectFit: 'cover' }}
|
||||||
|
|||||||
@@ -1,12 +1,13 @@
|
|||||||
import Button from '@app/components/Common/Button';
|
import Button from '@app/components/Common/Button';
|
||||||
import CachedImage from '@app/components/Common/CachedImage';
|
|
||||||
import Modal from '@app/components/Common/Modal';
|
import Modal from '@app/components/Common/Modal';
|
||||||
import { Permission, useUser } from '@app/hooks/useUser';
|
import { Permission, useUser } from '@app/hooks/useUser';
|
||||||
import defineMessages from '@app/utils/defineMessages';
|
import defineMessages from '@app/utils/defineMessages';
|
||||||
import { Menu, Transition } from '@headlessui/react';
|
import { Menu, Transition } from '@headlessui/react';
|
||||||
import { EllipsisVerticalIcon } from '@heroicons/react/24/solid';
|
import { EllipsisVerticalIcon } from '@heroicons/react/24/solid';
|
||||||
import type { default as IssueCommentType } from '@server/entity/IssueComment';
|
import type { default as IssueCommentType } from '@server/entity/IssueComment';
|
||||||
|
import axios from 'axios';
|
||||||
import { Field, Form, Formik } from 'formik';
|
import { Field, Form, Formik } from 'formik';
|
||||||
|
import Image from 'next/image';
|
||||||
import Link from 'next/link';
|
import Link from 'next/link';
|
||||||
import { Fragment, useState } from 'react';
|
import { Fragment, useState } from 'react';
|
||||||
import { FormattedRelativeTime, useIntl } from 'react-intl';
|
import { FormattedRelativeTime, useIntl } from 'react-intl';
|
||||||
@@ -48,10 +49,7 @@ const IssueComment = ({
|
|||||||
|
|
||||||
const deleteComment = async () => {
|
const deleteComment = async () => {
|
||||||
try {
|
try {
|
||||||
const res = await fetch(`/api/v1/issueComment/${comment.id}`, {
|
await axios.delete(`/api/v1/issueComment/${comment.id}`);
|
||||||
method: 'DELETE',
|
|
||||||
});
|
|
||||||
if (!res.ok) throw new Error();
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
// something went wrong deleting the comment
|
// something went wrong deleting the comment
|
||||||
} finally {
|
} finally {
|
||||||
@@ -88,8 +86,7 @@ const IssueComment = ({
|
|||||||
</Modal>
|
</Modal>
|
||||||
</Transition>
|
</Transition>
|
||||||
<Link href={isActiveUser ? '/profile' : `/users/${comment.user.id}`}>
|
<Link href={isActiveUser ? '/profile' : `/users/${comment.user.id}`}>
|
||||||
<CachedImage
|
<Image
|
||||||
type="avatar"
|
|
||||||
src={comment.user.avatar}
|
src={comment.user.avatar}
|
||||||
alt=""
|
alt=""
|
||||||
className="h-10 w-10 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
|
className="h-10 w-10 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
|
||||||
@@ -178,17 +175,9 @@ const IssueComment = ({
|
|||||||
<Formik
|
<Formik
|
||||||
initialValues={{ newMessage: comment.message }}
|
initialValues={{ newMessage: comment.message }}
|
||||||
onSubmit={async (values) => {
|
onSubmit={async (values) => {
|
||||||
const res = await fetch(
|
await axios.put(`/api/v1/issueComment/${comment.id}`, {
|
||||||
`/api/v1/issueComment/${comment.id}`,
|
message: values.newMessage,
|
||||||
{
|
});
|
||||||
method: 'PUT',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify({ message: values.newMessage }),
|
|
||||||
}
|
|
||||||
);
|
|
||||||
if (!res.ok) throw new Error();
|
|
||||||
|
|
||||||
if (onUpdate) {
|
if (onUpdate) {
|
||||||
onUpdate();
|
onUpdate();
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import useDeepLinks from '@app/hooks/useDeepLinks';
|
|||||||
import useSettings from '@app/hooks/useSettings';
|
import useSettings from '@app/hooks/useSettings';
|
||||||
import { Permission, useUser } from '@app/hooks/useUser';
|
import { Permission, useUser } from '@app/hooks/useUser';
|
||||||
import globalMessages from '@app/i18n/globalMessages';
|
import globalMessages from '@app/i18n/globalMessages';
|
||||||
import ErrorPage from '@app/pages/_error';
|
import Error from '@app/pages/_error';
|
||||||
import defineMessages from '@app/utils/defineMessages';
|
import defineMessages from '@app/utils/defineMessages';
|
||||||
import { Transition } from '@headlessui/react';
|
import { Transition } from '@headlessui/react';
|
||||||
import {
|
import {
|
||||||
@@ -27,7 +27,10 @@ import { MediaServerType } from '@server/constants/server';
|
|||||||
import type Issue from '@server/entity/Issue';
|
import type Issue from '@server/entity/Issue';
|
||||||
import type { MovieDetails } from '@server/models/Movie';
|
import type { MovieDetails } from '@server/models/Movie';
|
||||||
import type { TvDetails } from '@server/models/Tv';
|
import type { TvDetails } from '@server/models/Tv';
|
||||||
|
import axios from 'axios';
|
||||||
import { Field, Form, Formik } from 'formik';
|
import { Field, Form, Formik } from 'formik';
|
||||||
|
import getConfig from 'next/config';
|
||||||
|
import Image from 'next/image';
|
||||||
import Link from 'next/link';
|
import Link from 'next/link';
|
||||||
import { useRouter } from 'next/router';
|
import { useRouter } from 'next/router';
|
||||||
import { useState } from 'react';
|
import { useState } from 'react';
|
||||||
@@ -106,13 +109,14 @@ const IssueDetails = () => {
|
|||||||
(opt) => opt.issueType === issueData?.issueType
|
(opt) => opt.issueType === issueData?.issueType
|
||||||
);
|
);
|
||||||
const settings = useSettings();
|
const settings = useSettings();
|
||||||
|
const { publicRuntimeConfig } = getConfig();
|
||||||
|
|
||||||
if (!data && !error) {
|
if (!data && !error) {
|
||||||
return <LoadingSpinner />;
|
return <LoadingSpinner />;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!data || !issueData) {
|
if (!data || !issueData) {
|
||||||
return <ErrorPage statusCode={404} />;
|
return <Error statusCode={404} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
const belongsToUser = issueData.createdBy.id === currentUser?.id;
|
const belongsToUser = issueData.createdBy.id === currentUser?.id;
|
||||||
@@ -121,14 +125,9 @@ const IssueDetails = () => {
|
|||||||
|
|
||||||
const editFirstComment = async (newMessage: string) => {
|
const editFirstComment = async (newMessage: string) => {
|
||||||
try {
|
try {
|
||||||
const res = await fetch(`/api/v1/issueComment/${firstComment.id}`, {
|
await axios.put(`/api/v1/issueComment/${firstComment.id}`, {
|
||||||
method: 'PUT',
|
message: newMessage,
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify({ message: newMessage }),
|
|
||||||
});
|
});
|
||||||
if (!res.ok) throw new Error();
|
|
||||||
|
|
||||||
addToast(intl.formatMessage(messages.toasteditdescriptionsuccess), {
|
addToast(intl.formatMessage(messages.toasteditdescriptionsuccess), {
|
||||||
appearance: 'success',
|
appearance: 'success',
|
||||||
@@ -145,10 +144,7 @@ const IssueDetails = () => {
|
|||||||
|
|
||||||
const updateIssueStatus = async (newStatus: 'open' | 'resolved') => {
|
const updateIssueStatus = async (newStatus: 'open' | 'resolved') => {
|
||||||
try {
|
try {
|
||||||
const res = await fetch(`/api/v1/issue/${issueData.id}/${newStatus}`, {
|
await axios.post(`/api/v1/issue/${issueData.id}/${newStatus}`);
|
||||||
method: 'POST',
|
|
||||||
});
|
|
||||||
if (!res.ok) throw new Error();
|
|
||||||
|
|
||||||
addToast(intl.formatMessage(messages.toaststatusupdated), {
|
addToast(intl.formatMessage(messages.toaststatusupdated), {
|
||||||
appearance: 'success',
|
appearance: 'success',
|
||||||
@@ -165,10 +161,7 @@ const IssueDetails = () => {
|
|||||||
|
|
||||||
const deleteIssue = async () => {
|
const deleteIssue = async () => {
|
||||||
try {
|
try {
|
||||||
const res = await fetch(`/api/v1/issue/${issueData.id}`, {
|
await axios.delete(`/api/v1/issue/${issueData.id}`);
|
||||||
method: 'DELETE',
|
|
||||||
});
|
|
||||||
if (!res.ok) throw new Error();
|
|
||||||
|
|
||||||
addToast(intl.formatMessage(messages.toastissuedeleted), {
|
addToast(intl.formatMessage(messages.toastissuedeleted), {
|
||||||
appearance: 'success',
|
appearance: 'success',
|
||||||
@@ -217,7 +210,6 @@ const IssueDetails = () => {
|
|||||||
{data.backdropPath && (
|
{data.backdropPath && (
|
||||||
<div className="media-page-bg-image">
|
<div className="media-page-bg-image">
|
||||||
<CachedImage
|
<CachedImage
|
||||||
type="tmdb"
|
|
||||||
alt=""
|
alt=""
|
||||||
src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${data.backdropPath}`}
|
src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${data.backdropPath}`}
|
||||||
style={{ width: '100%', height: '100%', objectFit: 'cover' }}
|
style={{ width: '100%', height: '100%', objectFit: 'cover' }}
|
||||||
@@ -236,7 +228,6 @@ const IssueDetails = () => {
|
|||||||
<div className="media-header">
|
<div className="media-header">
|
||||||
<div className="media-poster">
|
<div className="media-poster">
|
||||||
<CachedImage
|
<CachedImage
|
||||||
type="tmdb"
|
|
||||||
src={
|
src={
|
||||||
data.posterPath
|
data.posterPath
|
||||||
? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${data.posterPath}`
|
? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${data.posterPath}`
|
||||||
@@ -288,11 +279,10 @@ const IssueDetails = () => {
|
|||||||
}
|
}
|
||||||
className="group ml-1 inline-flex h-full items-center xl:ml-1.5"
|
className="group ml-1 inline-flex h-full items-center xl:ml-1.5"
|
||||||
>
|
>
|
||||||
<CachedImage
|
<Image
|
||||||
type="avatar"
|
className="mr-0.5 h-5 w-5 scale-100 transform-gpu rounded-full object-cover transition duration-300 group-hover:scale-105 xl:mr-1 xl:h-6 xl:w-6"
|
||||||
src={issueData.createdBy.avatar}
|
src={issueData.createdBy.avatar}
|
||||||
alt=""
|
alt=""
|
||||||
className="mr-0.5 h-5 w-5 scale-100 transform-gpu rounded-full object-cover transition duration-300 group-hover:scale-105 xl:mr-1 xl:h-6 xl:w-6"
|
|
||||||
width={20}
|
width={20}
|
||||||
height={20}
|
height={20}
|
||||||
/>
|
/>
|
||||||
@@ -390,8 +380,7 @@ const IssueDetails = () => {
|
|||||||
>
|
>
|
||||||
<PlayIcon />
|
<PlayIcon />
|
||||||
<span>
|
<span>
|
||||||
{settings.currentSettings.mediaServerType ===
|
{publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
|
||||||
MediaServerType.EMBY
|
|
||||||
? intl.formatMessage(messages.playonplex, {
|
? intl.formatMessage(messages.playonplex, {
|
||||||
mediaServerName: 'Emby',
|
mediaServerName: 'Emby',
|
||||||
})
|
})
|
||||||
@@ -438,8 +427,7 @@ const IssueDetails = () => {
|
|||||||
>
|
>
|
||||||
<PlayIcon />
|
<PlayIcon />
|
||||||
<span>
|
<span>
|
||||||
{settings.currentSettings.mediaServerType ===
|
{publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
|
||||||
MediaServerType.EMBY
|
|
||||||
? intl.formatMessage(messages.play4konplex, {
|
? intl.formatMessage(messages.play4konplex, {
|
||||||
mediaServerName: 'Emby',
|
mediaServerName: 'Emby',
|
||||||
})
|
})
|
||||||
@@ -502,17 +490,9 @@ const IssueDetails = () => {
|
|||||||
}}
|
}}
|
||||||
validationSchema={CommentSchema}
|
validationSchema={CommentSchema}
|
||||||
onSubmit={async (values, { resetForm }) => {
|
onSubmit={async (values, { resetForm }) => {
|
||||||
const res = await fetch(
|
await axios.post(`/api/v1/issue/${issueData?.id}/comment`, {
|
||||||
`/api/v1/issue/${issueData?.id}/comment`,
|
message: values.message,
|
||||||
{
|
});
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify({ message: values.message }),
|
|
||||||
}
|
|
||||||
);
|
|
||||||
if (!res.ok) throw new Error();
|
|
||||||
revalidateIssue();
|
revalidateIssue();
|
||||||
resetForm();
|
resetForm();
|
||||||
}}
|
}}
|
||||||
@@ -664,8 +644,7 @@ const IssueDetails = () => {
|
|||||||
>
|
>
|
||||||
<PlayIcon />
|
<PlayIcon />
|
||||||
<span>
|
<span>
|
||||||
{settings.currentSettings.mediaServerType ===
|
{publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
|
||||||
MediaServerType.EMBY
|
|
||||||
? intl.formatMessage(messages.playonplex, {
|
? intl.formatMessage(messages.playonplex, {
|
||||||
mediaServerName: 'Emby',
|
mediaServerName: 'Emby',
|
||||||
})
|
})
|
||||||
@@ -711,8 +690,7 @@ const IssueDetails = () => {
|
|||||||
>
|
>
|
||||||
<PlayIcon />
|
<PlayIcon />
|
||||||
<span>
|
<span>
|
||||||
{settings.currentSettings.mediaServerType ===
|
{publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
|
||||||
MediaServerType.EMBY
|
|
||||||
? intl.formatMessage(messages.play4konplex, {
|
? intl.formatMessage(messages.play4konplex, {
|
||||||
mediaServerName: 'Emby',
|
mediaServerName: 'Emby',
|
||||||
})
|
})
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user