.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,35 @@
+---
+name: "\U0001F41B Bug report"
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Logs (Logs directory where Ombi is located)**
+If applicable, a snippet of the logs that seems relevant to the bug if present.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+
+**Ombi Version (please complete the following information):**
+ - Version [e.g. 4.0.958]
+- Media Server [e.g. Plex]
+- Database Type: SQLite (Please change if using MySQL)
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,50 +0,0 @@
-name: "\U0001F41B Bug report"
-description: 'Report a reproducible bug in Ombi'
-body:
-  - type: markdown
-    attributes:
-      value: Thanks for taking the time to file a bug report! Please fill out this form as completely as possible.
-  - type: markdown
-    attributes:
-      value: |
-        If you leave out sections there is a high likelihood your issue will be closed.
-        If you have a question or you think your issue might be caused by your application code, you can get help from the community on [Discord](https://discord.gg/Sa7wNWb).
-  - type: textarea
-    attributes:
-      label: Summary
-      description: |
-        Clearly describe what the expected behavior is vs. what is actually happening. Please include any reproduction steps that is required to reproduce this issue.
-        If your summary is simply, for example: "I cannot setup Plex", then you will need to [continue debugging on your own](https://docs.ombi.app/) to more precisely define your issue before proceeding.
-    validations:
-      required: true
-  - type: input
-    id: version
-    attributes:
-      label: Ombi Version
-      description: What version of ombi are you running?
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: What platform(s) does this occur on?
-      multiple: true
-      options:
-        - Docker
-        - Windows
-        - Linux
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: What database are you using?
-      options:
-        - SQLite (Default)
-        - MySQL
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant log output
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: shell

.github/ISSUE_TEMPLATE/config.yml

@@ -3,8 +3,8 @@ contact_links:
   - name: Docs
     url: https://docs.ombi.app/
     about: The Ombi documentation should help guide you through installation and setup as well as help resolve common problems and answer frequently asked questions
-  - name: Discord support
+  - name: Reddit support
-    url: https://discord.gg/Sa7wNWb
+    url: https://www.reddit.com/r/Ombi
     about: Ask questions about Ombi
   - name: Feature suggestions
     url: https://ombifeatures.featureupvote.com

.github/workflows/build.yml

@@ -12,10 +12,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '20'
+          node-version: '14'
 
       - name: NodeModules Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: '**/node_modules'
           key: node_modules-${{ hashFiles('**/yarn.lock') }}
@@ -27,7 +27,7 @@ jobs:
         run: yarn --cwd ./src/Ombi/ClientApp run build
 
       - name: Publish UI Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: angular_dist
           path: |
@@ -39,10 +39,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '6.0.x'
 
       - name: Nuget Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -84,10 +84,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: win-x64
+          - os: win10-x64
             format: zip
             compression: zip
-          - os: win-x86
+          - os: win10-x86
             format: zip
             compression: zip
           - os: linux-x64
@@ -106,13 +106,13 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '6.0.x'      
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.x'
 
       - name: Nuget Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -130,7 +130,7 @@ jobs:
         working-directory: src/Ombi
 
       - name: Download Angular
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
         with:
           name: angular_dist
           path: ~/src/Ombi/dist
@@ -156,7 +156,7 @@ jobs:
           directory: 'src/Ombi/${{ matrix.os }}'
 
       - name: Publish Release
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: ${{ matrix.os }}
           path: |
@@ -170,7 +170,7 @@ jobs:
 
       - name: Download Artifacts
         id: download
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
         with:
           path: artifacts
 
@@ -190,7 +190,7 @@ jobs:
         if: contains(github.ref, 'develop')
         with:
           prerelease: true
-          generate_release_notes: false
+          generate_release_notes: true
           body: ${{ needs.versioning.outputs.changelog }}
           name: ${{ needs.versioning.outputs.tag }}
           tag_name: ${{ needs.versioning.outputs.tag }}

.github/workflows/chromatic.yml

@@ -1,47 +1,47 @@
-# name: 'Chromatic'
+name: 'Chromatic'
 
-# # Event for the workflow
+# Event for the workflow
-# on:
+on:
-#   push:
+  push:
-#   workflow_dispatch:
+  workflow_dispatch:
 
-# # List of jobs
+# List of jobs
-# jobs:
+jobs:
-#   storybook-build:
+  storybook-build:
-#     # Operating System
+    # Operating System
-#     runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
-#     steps:
+    steps:
-#       - name: Checkout repository
+      - name: Checkout repository
-#         uses: actions/checkout@v2
+        uses: actions/checkout@v2
-#         with:
+        with:
-#           fetch-depth: 0
+          fetch-depth: 0
 
-#       - name: NodeModules Cache
+      - name: NodeModules Cache
-#         uses: actions/cache@v4
+        uses: actions/cache@v2
-#         with:
+        with:
-#           path: '**/node_modules'
+          path: '**/node_modules'
-#           key: node_modules-${{ hashFiles('**/yarn.lock') }}
+          key: node_modules-${{ hashFiles('**/yarn.lock') }}
 
-#       - name: Install dependencies
+      - name: Install dependencies
-#         working-directory: ./src/Ombi/ClientApp
+        working-directory: ./src/Ombi/ClientApp
-#         run: yarn
+        run: yarn
 
-#       - name: Publish to Chromatic
+      - name: Publish to Chromatic
-#         if: github.ref != 'refs/heads/master'
+        if: github.ref != 'refs/heads/master'
-#         uses: chromaui/action@v1
+        uses: chromaui/action@v1
-#         with:
+        with:
-#           projectToken: 7c47e1a1a4bd
+          projectToken: 7c47e1a1a4bd
-#           exitZeroOnChanges: true
+          exitZeroOnChanges: true
-#           workingDir: ./src/Ombi/ClientApp
+          workingDir: ./src/Ombi/ClientApp
-#           buildScriptName: storybookbuild
+          buildScriptName: storybookbuild
-#           exitOnceUploaded: true
+          exitOnceUploaded: true
 
-#       - name: Publish to Chromatic and auto accept changes
+      - name: Publish to Chromatic and auto accept changes
-#         if: github.ref == 'refs/heads/develop'
+        if: github.ref == 'refs/heads/develop'
-#         uses: chromaui/action@v1
+        uses: chromaui/action@v1
-#         with:
+        with:
-#           projectToken: 7c47e1a1a4bd
+          projectToken: 7c47e1a1a4bd
-#           autoAcceptChanges: true # 👈 Option to accept all changes
+          autoAcceptChanges: true # 👈 Option to accept all changes
-#           workingDir: ./src/Ombi/ClientApp
+          workingDir: ./src/Ombi/ClientApp
-#           buildScriptName: storybookbuild
+          buildScriptName: storybookbuild
-#           exitOnceUploaded: true
+          exitOnceUploaded: true

.github/workflows/codeql-analysis.yml

@@ -37,7 +37,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -48,7 +48,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v1
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -62,4 +62,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v1

.github/workflows/cypress.yml

@@ -19,12 +19,12 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 6.0.x
     - uses: actions/setup-node@v2
       with:
-        node-version: '20'
+        node-version: '14'
 
-    - uses: actions/cache@v4
+    - uses: actions/cache@v2
       with:
         path: |
           '**/node_modules'
@@ -34,45 +34,39 @@ jobs:
     - name: Install Frontend Deps
       run: yarn --cwd ./src/Ombi/ClientApp install
 
-    - name: Install Test Dependencies
+    - name: Build Frontend
-      run: yarn --cwd ./tests install
+      run: yarn --cwd ./src/Ombi/ClientApp build
 
-    - name: Start Frontend
+    - name: Build Docker Image
-      run: |
+      run: docker build -t ombi src/
-        nohup yarn --cwd ./src/Ombi/ClientApp start &
 
-    - name: Restore .NET Dependencies
+    - name: Run Docker Image
-      run: dotnet restore ./src/Ombi/Ombi.csproj
+      run: nohup docker run --rm -p 5000:5000 ombi &
-
-    - name: Build .NET Project
-      run: dotnet build ./src/Ombi/Ombi.csproj --no-restore
-
-    - name: Start Backend
-      run: |
-        nohup dotnet run --project ./src/Ombi -- --host http://*:3577 &
-
-    - name: Run Wiremock
-      run: nohup docker run --rm -p 32400:8080 --name wiremock wiremock/wiremock:2.35.0 &
 
     - name: Sleep for server to start
       run: sleep 20
 
+    # - name: Start Frontend
+    #   run: |
+    #       nohup yarn --cwd ./src/Ombi/ClientApp start &
+
+    # - name: Install Automation Deps
+    #   run: yarn --cwd ./tests install
+
+    # - name: Start Backend
+    #   run: |
+    #       nohup dotnet run --project ./src/Ombi -- --host http://*:3577 &
+
     - name: Cypress Tests
-      uses: cypress-io/github-action@v4
+      uses: cypress-io/github-action@v2.8.2
       with:
         record: true
         browser: chrome
         headless: true
         working-directory: tests
-        wait-on: http://localhost:3577/
+        wait-on: http://localhost:5000/
         # 10 minutes
         wait-on-timeout: 600
       env:
         CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Stop Services
-      if: always()
-      run: |
-        pkill -f "dotnet.*Ombi" || true
-        docker container kill wiremock || true

.github/workflows/pr.yml

@@ -17,10 +17,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '20'
+          node-version: '14'
 
       - name: NodeModules Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: '**/node_modules'
           key: node_modules-${{ hashFiles('**/yarn.lock') }}
@@ -38,10 +38,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '6.0.x'
 
       - name: Nuget Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -76,10 +76,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: win-x64
+          - os: win10-x64
             format: zip
             compression: zip
-          - os: win-x86
+          - os: win10-x86
             format: zip
             compression: zip
           - os: linux-x64
@@ -98,10 +98,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '6.0.x'
 
       - name: Nuget Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}

.gitignore

@@ -7,7 +7,7 @@
 *.userosscache
 *.sln.docstates
 
-# User-specific files
+# User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
 # Build results
@@ -252,4 +252,3 @@ _Pvt_Extensions
 /src/Ombi/healthchecksdb
 /src/Ombi/ClientApp/package-lock.json
 /src/Ombi.Core/Properties/launchSettings.json
-.yarn

src/.idea/.idea.Ombi/.idea/dbnavigator.xml

@@ -1,440 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DBNavigator.Project.DDLFileAttachmentManager">
-    <mappings />
-    <preferences />
-  </component>
-  <component name="DBNavigator.Project.DatabaseAssistantManager">
-    <assistants />
-  </component>
-  <component name="DBNavigator.Project.DatabaseBrowserManager">
-    <autoscroll-to-editor value="false" />
-    <autoscroll-from-editor value="true" />
-    <show-object-properties value="true" />
-    <loaded-nodes />
-  </component>
-  <component name="DBNavigator.Project.DatabaseFileManager">
-    <open-files />
-  </component>
-  <component name="DBNavigator.Project.ExecutionManager">
-    <retain-sticky-names value="false" />
-  </component>
-  <component name="DBNavigator.Project.ParserDiagnosticsManager">
-    <diagnostics-history />
-  </component>
-  <component name="DBNavigator.Project.Settings">
-    <connections />
-    <browser-settings>
-      <general>
-        <display-mode value="TABBED" />
-        <navigation-history-size value="100" />
-        <show-object-details value="false" />
-        <enable-sticky-paths value="true" />
-      </general>
-      <filters>
-        <object-type-filter>
-          <object-type name="SCHEMA" enabled="true" />
-          <object-type name="USER" enabled="true" />
-          <object-type name="ROLE" enabled="true" />
-          <object-type name="PRIVILEGE" enabled="true" />
-          <object-type name="CHARSET" enabled="true" />
-          <object-type name="TABLE" enabled="true" />
-          <object-type name="VIEW" enabled="true" />
-          <object-type name="MATERIALIZED_VIEW" enabled="true" />
-          <object-type name="NESTED_TABLE" enabled="true" />
-          <object-type name="COLUMN" enabled="true" />
-          <object-type name="INDEX" enabled="true" />
-          <object-type name="CONSTRAINT" enabled="true" />
-          <object-type name="DATASET_TRIGGER" enabled="true" />
-          <object-type name="DATABASE_TRIGGER" enabled="true" />
-          <object-type name="SYNONYM" enabled="true" />
-          <object-type name="SEQUENCE" enabled="true" />
-          <object-type name="PROCEDURE" enabled="true" />
-          <object-type name="FUNCTION" enabled="true" />
-          <object-type name="PACKAGE" enabled="true" />
-          <object-type name="TYPE" enabled="true" />
-          <object-type name="TYPE_ATTRIBUTE" enabled="true" />
-          <object-type name="ARGUMENT" enabled="true" />
-          <object-type name="JAVA_CLASS" enabled="true" />
-          <object-type name="JAVA_INNER_CLASS" enabled="true" />
-          <object-type name="JAVA_FIELD" enabled="true" />
-          <object-type name="JAVA_METHOD" enabled="true" />
-          <object-type name="DIMENSION" enabled="true" />
-          <object-type name="CLUSTER" enabled="true" />
-          <object-type name="DBLINK" enabled="true" />
-          <object-type name="CREDENTIAL" enabled="true" />
-          <object-type name="AI_PROFILE" enabled="true" />
-        </object-type-filter>
-      </filters>
-      <sorting>
-        <object-type name="COLUMN" sorting-type="NAME" />
-        <object-type name="FUNCTION" sorting-type="NAME" />
-        <object-type name="PROCEDURE" sorting-type="NAME" />
-        <object-type name="ARGUMENT" sorting-type="POSITION" />
-        <object-type name="TYPE ATTRIBUTE" sorting-type="POSITION" />
-      </sorting>
-      <default-editors>
-        <object-type name="VIEW" editor-type="SELECTION" />
-        <object-type name="PACKAGE" editor-type="SELECTION" />
-        <object-type name="TYPE" editor-type="SELECTION" />
-      </default-editors>
-    </browser-settings>
-    <navigation-settings>
-      <lookup-filters>
-        <lookup-objects>
-          <object-type name="SCHEMA" enabled="true" />
-          <object-type name="USER" enabled="false" />
-          <object-type name="ROLE" enabled="false" />
-          <object-type name="PRIVILEGE" enabled="false" />
-          <object-type name="CHARSET" enabled="false" />
-          <object-type name="TABLE" enabled="true" />
-          <object-type name="VIEW" enabled="true" />
-          <object-type name="MATERIALIZED VIEW" enabled="true" />
-          <object-type name="INDEX" enabled="true" />
-          <object-type name="CONSTRAINT" enabled="true" />
-          <object-type name="DATASET TRIGGER" enabled="true" />
-          <object-type name="DATABASE TRIGGER" enabled="true" />
-          <object-type name="SYNONYM" enabled="false" />
-          <object-type name="SEQUENCE" enabled="true" />
-          <object-type name="PROCEDURE" enabled="true" />
-          <object-type name="FUNCTION" enabled="true" />
-          <object-type name="PACKAGE" enabled="true" />
-          <object-type name="TYPE" enabled="true" />
-          <object-type name="JAVA CLASS" enabled="true" />
-          <object-type name="INNER CLASS" enabled="true" />
-          <object-type name="JAVA FIELD" enabled="true" />
-          <object-type name="JAVA METHOD" enabled="true" />
-          <object-type name="JAVA PARAMETER" enabled="true" />
-          <object-type name="DIMENSION" enabled="false" />
-          <object-type name="CLUSTER" enabled="false" />
-          <object-type name="DBLINK" enabled="false" />
-          <object-type name="CREDENTIAL" enabled="false" />
-        </lookup-objects>
-        <force-database-load value="false" />
-        <prompt-connection-selection value="true" />
-        <prompt-schema-selection value="true" />
-      </lookup-filters>
-    </navigation-settings>
-    <dataset-grid-settings>
-      <general>
-        <enable-zooming value="true" />
-        <enable-column-tooltip value="true" />
-      </general>
-      <sorting>
-        <nulls-first value="true" />
-        <max-sorting-columns value="4" />
-      </sorting>
-      <audit-columns>
-        <column-names value="" />
-        <visible value="true" />
-        <editable value="false" />
-      </audit-columns>
-    </dataset-grid-settings>
-    <dataset-editor-settings>
-      <text-editor-popup>
-        <active value="false" />
-        <active-if-empty value="false" />
-        <data-length-threshold value="100" />
-        <popup-delay value="1000" />
-      </text-editor-popup>
-      <values-actions-popup>
-        <show-popup-button value="true" />
-        <element-count-threshold value="1000" />
-        <data-length-threshold value="250" />
-      </values-actions-popup>
-      <general>
-        <fetch-block-size value="100" />
-        <fetch-timeout value="30" />
-        <trim-whitespaces value="true" />
-        <convert-empty-strings-to-null value="true" />
-        <select-content-on-cell-edit value="true" />
-        <large-value-preview-active value="true" />
-      </general>
-      <filters>
-        <prompt-filter-dialog value="true" />
-        <default-filter-type value="BASIC" />
-      </filters>
-      <qualified-text-editor text-length-threshold="300">
-        <content-types>
-          <content-type name="Text" enabled="true" />
-          <content-type name="Properties" enabled="true" />
-          <content-type name="XML" enabled="true" />
-          <content-type name="DTD" enabled="true" />
-          <content-type name="HTML" enabled="true" />
-          <content-type name="XHTML" enabled="true" />
-          <content-type name="CSS" enabled="true" />
-          <content-type name="SQL" enabled="true" />
-          <content-type name="PL/SQL" enabled="true" />
-          <content-type name="JavaScript" enabled="true" />
-          <content-type name="JSON" enabled="true" />
-          <content-type name="JSON5" enabled="true" />
-          <content-type name="YAML" enabled="true" />
-          <content-type name="C#" enabled="true" />
-        </content-types>
-      </qualified-text-editor>
-      <record-navigation>
-        <navigation-target value="VIEWER" />
-      </record-navigation>
-    </dataset-editor-settings>
-    <code-editor-settings>
-      <general>
-        <show-object-navigation-gutter value="false" />
-        <show-spec-declaration-navigation-gutter value="true" />
-        <enable-spellchecking value="true" />
-        <enable-reference-spellchecking value="false" />
-      </general>
-      <confirmations>
-        <save-changes value="false" />
-        <revert-changes value="true" />
-        <exit-on-changes value="ASK" />
-      </confirmations>
-    </code-editor-settings>
-    <code-completion-settings>
-      <filters>
-        <basic-filter>
-          <filter-element type="RESERVED_WORD" id="keyword" selected="true" />
-          <filter-element type="RESERVED_WORD" id="function" selected="true" />
-          <filter-element type="RESERVED_WORD" id="parameter" selected="true" />
-          <filter-element type="RESERVED_WORD" id="datatype" selected="true" />
-          <filter-element type="RESERVED_WORD" id="exception" selected="true" />
-          <filter-element type="OBJECT" id="schema" selected="true" />
-          <filter-element type="OBJECT" id="role" selected="true" />
-          <filter-element type="OBJECT" id="user" selected="true" />
-          <filter-element type="OBJECT" id="privilege" selected="true" />
-          <user-schema>
-            <filter-element type="OBJECT" id="table" selected="true" />
-            <filter-element type="OBJECT" id="view" selected="true" />
-            <filter-element type="OBJECT" id="materialized view" selected="true" />
-            <filter-element type="OBJECT" id="index" selected="true" />
-            <filter-element type="OBJECT" id="constraint" selected="true" />
-            <filter-element type="OBJECT" id="trigger" selected="true" />
-            <filter-element type="OBJECT" id="synonym" selected="false" />
-            <filter-element type="OBJECT" id="sequence" selected="true" />
-            <filter-element type="OBJECT" id="procedure" selected="true" />
-            <filter-element type="OBJECT" id="function" selected="true" />
-            <filter-element type="OBJECT" id="package" selected="true" />
-            <filter-element type="OBJECT" id="type" selected="true" />
-            <filter-element type="OBJECT" id="dimension" selected="true" />
-            <filter-element type="OBJECT" id="cluster" selected="true" />
-            <filter-element type="OBJECT" id="dblink" selected="true" />
-          </user-schema>
-          <public-schema>
-            <filter-element type="OBJECT" id="table" selected="false" />
-            <filter-element type="OBJECT" id="view" selected="false" />
-            <filter-element type="OBJECT" id="materialized view" selected="false" />
-            <filter-element type="OBJECT" id="index" selected="false" />
-            <filter-element type="OBJECT" id="constraint" selected="false" />
-            <filter-element type="OBJECT" id="trigger" selected="false" />
-            <filter-element type="OBJECT" id="synonym" selected="false" />
-            <filter-element type="OBJECT" id="sequence" selected="false" />
-            <filter-element type="OBJECT" id="procedure" selected="false" />
-            <filter-element type="OBJECT" id="function" selected="false" />
-            <filter-element type="OBJECT" id="package" selected="false" />
-            <filter-element type="OBJECT" id="type" selected="false" />
-            <filter-element type="OBJECT" id="dimension" selected="false" />
-            <filter-element type="OBJECT" id="cluster" selected="false" />
-            <filter-element type="OBJECT" id="dblink" selected="false" />
-          </public-schema>
-          <any-schema>
-            <filter-element type="OBJECT" id="table" selected="true" />
-            <filter-element type="OBJECT" id="view" selected="true" />
-            <filter-element type="OBJECT" id="materialized view" selected="true" />
-            <filter-element type="OBJECT" id="index" selected="true" />
-            <filter-element type="OBJECT" id="constraint" selected="true" />
-            <filter-element type="OBJECT" id="trigger" selected="true" />
-            <filter-element type="OBJECT" id="synonym" selected="true" />
-            <filter-element type="OBJECT" id="sequence" selected="true" />
-            <filter-element type="OBJECT" id="procedure" selected="true" />
-            <filter-element type="OBJECT" id="function" selected="true" />
-            <filter-element type="OBJECT" id="package" selected="true" />
-            <filter-element type="OBJECT" id="type" selected="true" />
-            <filter-element type="OBJECT" id="dimension" selected="true" />
-            <filter-element type="OBJECT" id="cluster" selected="true" />
-            <filter-element type="OBJECT" id="dblink" selected="true" />
-          </any-schema>
-        </basic-filter>
-        <extended-filter>
-          <filter-element type="RESERVED_WORD" id="keyword" selected="true" />
-          <filter-element type="RESERVED_WORD" id="function" selected="true" />
-          <filter-element type="RESERVED_WORD" id="parameter" selected="true" />
-          <filter-element type="RESERVED_WORD" id="datatype" selected="true" />
-          <filter-element type="RESERVED_WORD" id="exception" selected="true" />
-          <filter-element type="OBJECT" id="schema" selected="true" />
-          <filter-element type="OBJECT" id="user" selected="true" />
-          <filter-element type="OBJECT" id="role" selected="true" />
-          <filter-element type="OBJECT" id="privilege" selected="true" />
-          <user-schema>
-            <filter-element type="OBJECT" id="table" selected="true" />
-            <filter-element type="OBJECT" id="view" selected="true" />
-            <filter-element type="OBJECT" id="materialized view" selected="true" />
-            <filter-element type="OBJECT" id="index" selected="true" />
-            <filter-element type="OBJECT" id="constraint" selected="true" />
-            <filter-element type="OBJECT" id="trigger" selected="true" />
-            <filter-element type="OBJECT" id="synonym" selected="true" />
-            <filter-element type="OBJECT" id="sequence" selected="true" />
-            <filter-element type="OBJECT" id="procedure" selected="true" />
-            <filter-element type="OBJECT" id="function" selected="true" />
-            <filter-element type="OBJECT" id="package" selected="true" />
-            <filter-element type="OBJECT" id="type" selected="true" />
-            <filter-element type="OBJECT" id="dimension" selected="true" />
-            <filter-element type="OBJECT" id="cluster" selected="true" />
-            <filter-element type="OBJECT" id="dblink" selected="true" />
-          </user-schema>
-          <public-schema>
-            <filter-element type="OBJECT" id="table" selected="true" />
-            <filter-element type="OBJECT" id="view" selected="true" />
-            <filter-element type="OBJECT" id="materialized view" selected="true" />
-            <filter-element type="OBJECT" id="index" selected="true" />
-            <filter-element type="OBJECT" id="constraint" selected="true" />
-            <filter-element type="OBJECT" id="trigger" selected="true" />
-            <filter-element type="OBJECT" id="synonym" selected="true" />
-            <filter-element type="OBJECT" id="sequence" selected="true" />
-            <filter-element type="OBJECT" id="procedure" selected="true" />
-            <filter-element type="OBJECT" id="function" selected="true" />
-            <filter-element type="OBJECT" id="package" selected="true" />
-            <filter-element type="OBJECT" id="type" selected="true" />
-            <filter-element type="OBJECT" id="dimension" selected="true" />
-            <filter-element type="OBJECT" id="cluster" selected="true" />
-            <filter-element type="OBJECT" id="dblink" selected="true" />
-          </public-schema>
-          <any-schema>
-            <filter-element type="OBJECT" id="table" selected="true" />
-            <filter-element type="OBJECT" id="view" selected="true" />
-            <filter-element type="OBJECT" id="materialized view" selected="true" />
-            <filter-element type="OBJECT" id="index" selected="true" />
-            <filter-element type="OBJECT" id="constraint" selected="true" />
-            <filter-element type="OBJECT" id="trigger" selected="true" />
-            <filter-element type="OBJECT" id="synonym" selected="true" />
-            <filter-element type="OBJECT" id="sequence" selected="true" />
-            <filter-element type="OBJECT" id="procedure" selected="true" />
-            <filter-element type="OBJECT" id="function" selected="true" />
-            <filter-element type="OBJECT" id="package" selected="true" />
-            <filter-element type="OBJECT" id="type" selected="true" />
-            <filter-element type="OBJECT" id="dimension" selected="true" />
-            <filter-element type="OBJECT" id="cluster" selected="true" />
-            <filter-element type="OBJECT" id="dblink" selected="true" />
-          </any-schema>
-        </extended-filter>
-      </filters>
-      <sorting enabled="true">
-        <sorting-element type="RESERVED_WORD" id="keyword" />
-        <sorting-element type="RESERVED_WORD" id="datatype" />
-        <sorting-element type="OBJECT" id="column" />
-        <sorting-element type="OBJECT" id="table" />
-        <sorting-element type="OBJECT" id="view" />
-        <sorting-element type="OBJECT" id="materialized view" />
-        <sorting-element type="OBJECT" id="index" />
-        <sorting-element type="OBJECT" id="constraint" />
-        <sorting-element type="OBJECT" id="trigger" />
-        <sorting-element type="OBJECT" id="synonym" />
-        <sorting-element type="OBJECT" id="sequence" />
-        <sorting-element type="OBJECT" id="procedure" />
-        <sorting-element type="OBJECT" id="function" />
-        <sorting-element type="OBJECT" id="package" />
-        <sorting-element type="OBJECT" id="type" />
-        <sorting-element type="OBJECT" id="dimension" />
-        <sorting-element type="OBJECT" id="cluster" />
-        <sorting-element type="OBJECT" id="dblink" />
-        <sorting-element type="OBJECT" id="schema" />
-        <sorting-element type="OBJECT" id="role" />
-        <sorting-element type="OBJECT" id="user" />
-        <sorting-element type="RESERVED_WORD" id="function" />
-        <sorting-element type="RESERVED_WORD" id="parameter" />
-      </sorting>
-      <format>
-        <enforce-code-style-case value="true" />
-      </format>
-    </code-completion-settings>
-    <execution-engine-settings>
-      <statement-execution>
-        <fetch-block-size value="100" />
-        <execution-timeout value="20" />
-        <debug-execution-timeout value="600" />
-        <focus-result value="false" />
-        <prompt-execution value="false" />
-      </statement-execution>
-      <script-execution>
-        <command-line-interfaces />
-        <execution-timeout value="300" />
-      </script-execution>
-      <method-execution>
-        <execution-timeout value="30" />
-        <debug-execution-timeout value="600" />
-        <parameter-history-size value="10" />
-      </method-execution>
-    </execution-engine-settings>
-    <operation-settings>
-      <transactions>
-        <uncommitted-changes>
-          <on-project-close value="ASK" />
-          <on-disconnect value="ASK" />
-          <on-autocommit-toggle value="ASK" />
-        </uncommitted-changes>
-        <multiple-uncommitted-changes>
-          <on-commit value="ASK" />
-          <on-rollback value="ASK" />
-        </multiple-uncommitted-changes>
-      </transactions>
-      <session-browser>
-        <disconnect-session value="ASK" />
-        <kill-session value="ASK" />
-        <reload-on-filter-change value="false" />
-      </session-browser>
-      <compiler>
-        <compile-type value="KEEP" />
-        <compile-dependencies value="ASK" />
-        <always-show-controls value="false" />
-      </compiler>
-    </operation-settings>
-    <ddl-file-settings>
-      <extensions>
-        <mapping file-type-id="VIEW" extensions="vw" />
-        <mapping file-type-id="TRIGGER" extensions="trg" />
-        <mapping file-type-id="PROCEDURE" extensions="prc" />
-        <mapping file-type-id="FUNCTION" extensions="fnc" />
-        <mapping file-type-id="PACKAGE" extensions="pkg" />
-        <mapping file-type-id="PACKAGE_SPEC" extensions="pks" />
-        <mapping file-type-id="PACKAGE_BODY" extensions="pkb" />
-        <mapping file-type-id="TYPE" extensions="tpe" />
-        <mapping file-type-id="TYPE_SPEC" extensions="tps" />
-        <mapping file-type-id="TYPE_BODY" extensions="tpb" />
-        <mapping file-type-id="JAVA_SOURCE" extensions="sql" />
-      </extensions>
-      <general>
-        <lookup-ddl-files value="true" />
-        <create-ddl-files value="false" />
-        <synchronize-ddl-files value="true" />
-        <use-qualified-names value="false" />
-        <make-scripts-rerunnable value="true" />
-      </general>
-    </ddl-file-settings>
-    <assistant-settings>
-      <credential-settings>
-        <credentials />
-      </credential-settings>
-    </assistant-settings>
-    <general-settings>
-      <regional-settings>
-        <date-format value="MEDIUM" />
-        <number-format value="UNGROUPED" />
-        <locale value="SYSTEM_DEFAULT" />
-        <use-custom-formats value="false" />
-      </regional-settings>
-      <environment>
-        <environment-types>
-          <environment-type id="development" name="Development" description="Development environment" color="-2430209/-12296320" readonly-code="false" readonly-data="false" />
-          <environment-type id="integration" name="Integration" description="Integration environment" color="-2621494/-12163514" readonly-code="true" readonly-data="false" />
-          <environment-type id="production" name="Production" description="Productive environment" color="-11574/-10271420" readonly-code="true" readonly-data="true" />
-          <environment-type id="other" name="Other" description="" color="-1576/-10724543" readonly-code="false" readonly-data="false" />
-        </environment-types>
-        <visibility-settings>
-          <connection-tabs value="true" />
-          <dialog-headers value="true" />
-          <object-editor-tabs value="true" />
-          <script-editor-tabs value="false" />
-          <execution-result-tabs value="true" />
-        </visibility-settings>
-      </environment>
-    </general-settings>
-  </component>
-</project>

src/.idea/.idea.Ombi/.idea/indexLayout.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="UserContentModel">
+  <component name="ContentModelUserStore">
     <attachedFolders />
     <explicitIncludes />
     <explicitExcludes />

src/.idea/.idea.Ombi/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/.idea.Ombi/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.Ombi/riderModule.iml" />
+    </modules>
+  </component>
+</project>

src/.idea/.idea.Ombi/.idea/projectSettingsUpdater.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RiderProjectSettingsUpdater">
-    <option name="singleClickDiffPreview" value="1" />
-    <option name="vcsConfiguration" value="3" />
-  </component>
-</project>

src/.idea/.idea.Ombi/.idea/workspace.xml

@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
   <component name="ChangeListManager">
     <list default="true" id="57001998-efde-494a-80b3-d7acfc91f770" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/Ombi/ClientApp/src/app/settings/plex/plex.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/Ombi/ClientApp/src/app/settings/plex/plex.component.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Ombi.Core/Engine/Interfaces/IMusicSearchEngineV2.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Ombi.Core/Engine/V2/MusicSearchEngineV2.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Ombi.Core/Models/Search/V2/Music/ArtistInformation.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Ombi/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Ombi/.idea/contentModel.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Ombi/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Ombi/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/config/applicationhost.config" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/config/applicationhost.config" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Ombi.Api.MusicBrainz/Models/Artist/ArtistInformation.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Ombi.Api.MusicBrainz/Models/Artist/ArtistInformation.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Ombi.DependencyInjection/IocExtensions.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Ombi.DependencyInjection/IocExtensions.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Ombi/ClientApp/src/app/media-details/components/artist/artist-details.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/Ombi/ClientApp/src/app/media-details/components/artist/artist-details.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Ombi/ClientApp/src/app/services/searchV2.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/Ombi/ClientApp/src/app/services/searchV2.service.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Ombi/Controllers/V2/SearchController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Ombi/Controllers/V2/SearchController.cs" afterDir="false" />
     </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="DpaMonitoringSettings">
-    <option name="firstShow" value="false" />
-  </component>
   <component name="FileEditorManager">
     <leaf>
       <file pinned="false" current-in-tab="false">
@@ -232,75 +237,27 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
   </component>
-  <component name="GitHubPullRequestSearchHistory">{
-  &quot;lastFilter&quot;: {
-    &quot;state&quot;: &quot;OPEN&quot;,
-    &quot;assignee&quot;: &quot;tidusjar&quot;
-  }
-}</component>
-  <component name="GitToolBoxStore">
-    <option name="recentBranches">
-      <RecentBranches>
-        <option name="branchesForRepo">
-          <list>
-            <RecentBranchesForRepo>
-              <option name="branches">
-                <list>
-                  <RecentBranch>
-                    <option name="branchName" value="wizard-database" />
-                    <option name="lastUsedInstant" value="1735917525" />
-                  </RecentBranch>
-                  <RecentBranch>
-                    <option name="branchName" value="develop" />
-                    <option name="lastUsedInstant" value="1735917524" />
-                  </RecentBranch>
-                </list>
-              </option>
-              <option name="repositoryRootUrl" value="file://$PROJECT_DIR$/.." />
-            </RecentBranchesForRepo>
-          </list>
-        </option>
-      </RecentBranches>
-    </option>
-  </component>
-  <component name="GithubProjectSettings">
-    <option name="branchProtectionPatterns">
-      <list>
-        <option value="master" />
-        <option value="develop" />
-      </list>
-    </option>
-  </component>
-  <component name="GithubPullRequestsUISettings">{
-  &quot;selectedUrlAndAccountId&quot;: {
-    &quot;url&quot;: &quot;https://github.com/ombi-app/ombi&quot;,
-    &quot;accountId&quot;: &quot;22dd09fe-fb9e-48a4-bfcc-3c152edf3f25&quot;
-  }
-}</component>
   <component name="HighlightingSettingsPerFile">
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/990126b794024fe2bd16aebdd37eba1d7b600/93/25662f04/ServerVersion.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/3bd4df5aff92cabbc4d630be64227073db1b8539b3a1e47786b4b189d7cdb7/DbContext.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/449b441523c469ed34ff5a5e14f0bafcd8f097aa463655303dc19048fa44ac3/EntityFrameworkServiceCollectionExtensions.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/7d81b2d4f22bee75e5438c707251ae43cb0974c207db91ffc159118c84b4eb9/ServiceProvider.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/a424e6912048b4cd25715f158e789aae24db5c2911d9e622d39bc6ac3246c6/MySqlConnectionStringBuilder.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/bd1d5c50194fea68ff3559c160230b0ab50f5acf4ce3061bffd6d62958e2182/ExceptionDispatchInfo.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/e9881a453a581134c1a18331ac1f8f1201a5382a685bf2a40777fa22619/DbContextOptions`.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Api.MusicBrainz/IMusicBrainzApi.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Api.MusicBrainz/MusicBrainzApi.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/Interfaces/IMusicSearchEngineV2.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/MusicSearchEngine.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/RecentlyAddedEngine.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/UserStatsEngine.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/V2/IMultiSearchEngine.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/V2/MultiSearchEngine.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/V2/MusicSearchEngineV2.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.Core/Models/Search/V2/Music/ArtistInformation.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi.DependencyInjection/IocExtensions.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Ombi.Helpers.Tests/EmbyHelperTests.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Api.MusicBrainz/MusicBrainzApi.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Ombi.Schedule.Tests/OmbiQuartzTests.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Ombi/Controllers/V1/TokenController.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Api.MusicBrainz/Models/Artist/ArtistInformation.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Ombi/Controllers/V2/SearchController.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.DependencyInjection/IocExtensions.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/V2/MultiSearchEngine.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/V2/IMultiSearchEngine.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Api.MusicBrainz/IMusicBrainzApi.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/Interfaces/IMusicSearchEngineV2.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Core/Models/Search/V2/Music/ArtistInformation.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="mock:///Dummy.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/V2/MusicSearchEngineV2.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/RecentlyAddedEngine.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="mock:///Dummy.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi/Controllers/V1/TokenController.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/MusicSearchEngine.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Ombi/Program.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Ombi.Core/Engine/UserStatsEngine.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="mock:///Dummy.cs" root0="FORCE_HIGHLIGHTING" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
@@ -318,17 +275,12 @@
   <component name="PackageJsonUpdateNotifier">
     <dismissed value="$PROJECT_DIR$/Ombi/ClientApp/package.json" />
   </component>
-  <component name="ProjectColorInfo">{
-  &quot;customColor&quot;: &quot;&quot;,
-  &quot;associatedIndex&quot;: 0
-}</component>
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="1087" />
     <option name="y" value="-1113" />
     <option name="width" value="1400" />
     <option name="height" value="1000" />
   </component>
-  <component name="ProjectId" id="2wGwbN5gDqLwyiO1WJdlwJzZ5M9" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
   </component>
@@ -391,26 +343,27 @@
       <pane id="FileSystemExplorer" />
     </panes>
   </component>
-  <component name="ProjectViewState">
+  <component name="PropertiesComponent">
-    <option name="hideEmptyMiddlePackages" value="true" />
+    <property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <option name="showLibraryContents" value="true" />
+    <property name="Rider.DefaultBreakpoints.AreToggled" value="true" />
+    <property name="Rider.ProjectViewActivator.IsNotFirstRun" value="true" />
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="nodejs_package_manager_path" value="npm" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
+  <component name="RunDashboard">
-  "keyToString": {
+    <option name="ruleStates">
-    ".NET Launch Settings Profile.Ombi.Schedule.Tests.executor": "Run",
+      <list>
-    ".NET Launch Settings Profile.Ombi.executor": "Debug",
+        <RuleState>
-    "RunOnceActivity.ShowReadmeOnStart": "true",
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-    "RunOnceActivity.git.unshallow": "true",
+        </RuleState>
-    "fb34c741-04ca-4b4f-8ea1-651a011b42c8.executor": "Debug",
+        <RuleState>
-    "git-widget-placeholder": "watchlist-expired-notification",
+          <option name="name" value="StatusDashboardGroupingRule" />
-    "node.js.detected.package.eslint": "true",
+        </RuleState>
-    "node.js.selected.package.eslint": "(autodetect)",
+      </list>
-    "node.js.selected.package.tslint": "(autodetect)",
+    </option>
-    "nodejs_package_manager_path": "yarn",
+  </component>
-    "vue.rearranger.settings.migration": "true"
+  <component name="RunManager" selected=".NET Launch Settings Profile.Ombi: IIS Express">
-  }
-}]]></component>
-  <component name="RunManager" selected=".NET Launch Settings Profile.Ombi">
     <configuration name="Ombi" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
       <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/Ombi/Ombi.csproj" />
       <option name="LAUNCH_PROFILE_TFM" value=".NETCoreApp,Version=v2.2" />
@@ -423,7 +376,7 @@
       <option name="SEND_DEBUG_REQUEST" value="1" />
       <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
       <method v="2">
-        <option name="Build" />
+        <option name="Build" enabled="true" />
       </method>
     </configuration>
     <configuration name="Ombi: IIS Express" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
@@ -438,7 +391,7 @@
       <option name="SEND_DEBUG_REQUEST" value="1" />
       <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
       <method v="2">
-        <option name="Build" />
+        <option name="Build" enabled="true" />
       </method>
     </configuration>
     <configuration name="Ombi.Schedule.Tests" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
@@ -453,7 +406,7 @@
       <option name="SEND_DEBUG_REQUEST" value="1" />
       <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
       <method v="2">
-        <option name="Build" />
+        <option name="Build" enabled="true" />
       </method>
     </configuration>
     <configuration name="Ombi.Schedule.Tests: IIS Express" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
@@ -468,7 +421,7 @@
       <option name="SEND_DEBUG_REQUEST" value="1" />
       <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
       <method v="2">
-        <option name="Build" />
+        <option name="Build" enabled="true" />
       </method>
     </configuration>
     <configuration name="Ombi.Updater" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
@@ -483,11 +436,10 @@
       <option name="SEND_DEBUG_REQUEST" value="1" />
       <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
       <method v="2">
-        <option name="Build" />
+        <option name="Build" enabled="true" />
       </method>
     </configuration>
   </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="57001998-efde-494a-80b3-d7acfc91f770" name="Default Changelist" comment="" />
@@ -496,9 +448,6 @@
       <option name="presentableId" value="Default" />
       <updated>1563957157468</updated>
       <workItem from="1563957162999" duration="5401000" />
-      <workItem from="1745681294313" duration="1814000" />
-      <workItem from="1747080279165" duration="838000" />
-      <workItem from="1747082180432" duration="1994000" />
     </task>
     <servers />
   </component>
@@ -544,11 +493,7 @@
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
+    <option name="version" value="1" />
-  </component>
-  <component name="UnityProjectConfiguration" hasMinimizedUI="false" />
-  <component name="VcsManagerConfiguration">
-    <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -560,7 +505,7 @@
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
           <url>file://$PROJECT_DIR$/Ombi/Controllers/V1/TokenController.cs</url>
           <line>48</line>
-          <properties documentPath="$PROJECT_DIR$/Ombi/Controllers/V1/TokenController.cs">
+          <properties documentPath="$PROJECT_DIR$/Ombi/Controllers/V1/TokenController.cs" initialLine="48">
             <startOffsets>
               <option value="1518" />
             </startOffsets>
@@ -573,12 +518,12 @@
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
           <url>file://$PROJECT_DIR$/Ombi.Core/Engine/V2/MultiSearchEngine.cs</url>
           <line>59</line>
-          <properties documentPath="$PROJECT_DIR$/Ombi.Core/Engine/V2/MultiSearchEngine.cs" containingFunctionPresentation="Method 'MultiSearch'">
+          <properties documentPath="$PROJECT_DIR$/Ombi.Core/Engine/V2/MultiSearchEngine.cs" initialLine="59">
             <startOffsets>
-              <option value="2369" />
+              <option value="2276" />
             </startOffsets>
             <endOffsets>
-              <option value="2576" />
+              <option value="2316" />
             </endOffsets>
           </properties>
           <option name="timeStamp" value="4" />
@@ -586,12 +531,12 @@
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
           <url>file://$PROJECT_DIR$/Ombi.Core/Engine/V2/MultiSearchEngine.cs</url>
           <line>49</line>
-          <properties documentPath="$PROJECT_DIR$/Ombi.Core/Engine/V2/MultiSearchEngine.cs" containingFunctionPresentation="Method 'MultiSearch'">
+          <properties documentPath="$PROJECT_DIR$/Ombi.Core/Engine/V2/MultiSearchEngine.cs" initialLine="49">
             <startOffsets>
-              <option value="1903" />
+              <option value="2001" />
             </startOffsets>
             <endOffsets>
-              <option value="1945" />
+              <option value="2002" />
             </endOffsets>
           </properties>
           <option name="timeStamp" value="5" />
@@ -599,55 +544,16 @@
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
           <url>file://$PROJECT_DIR$/Ombi.Api.MusicBrainz/MusicBrainzApi.cs</url>
           <line>30</line>
-          <properties documentPath="$PROJECT_DIR$/Ombi.Api.MusicBrainz/MusicBrainzApi.cs" containingFunctionPresentation="Method 'SearchArtist'">
+          <properties documentPath="$PROJECT_DIR$/Ombi.Api.MusicBrainz/MusicBrainzApi.cs" initialLine="30">
             <startOffsets>
-              <option value="833" />
+              <option value="917" />
             </startOffsets>
             <endOffsets>
-              <option value="834" />
+              <option value="1016" />
             </endOffsets>
           </properties>
           <option name="timeStamp" value="7" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Ombi.Schedule/Jobs/Plex/PlexWatchlistImport.cs</url>
-          <line>110</line>
-          <properties documentPath="$PROJECT_DIR$/Ombi.Schedule/Jobs/Plex/PlexWatchlistImport.cs" containingFunctionPresentation="Method 'Execute'">
-            <startOffsets>
-              <option value="5123" />
-            </startOffsets>
-            <endOffsets>
-              <option value="5206" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="10" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Ombi.Schedule/Jobs/Plex/PlexWatchlistImport.cs</url>
-          <line>77</line>
-          <properties documentPath="$PROJECT_DIR$/Ombi.Schedule/Jobs/Plex/PlexWatchlistImport.cs" containingFunctionPresentation="Method 'Execute'">
-            <startOffsets>
-              <option value="3324" />
-            </startOffsets>
-            <endOffsets>
-              <option value="3365" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="11" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Ombi.Schedule/Jobs/Plex/PlexWatchlistImport.cs</url>
-          <line>100</line>
-          <properties documentPath="$PROJECT_DIR$/Ombi.Schedule/Jobs/Plex/PlexWatchlistImport.cs" containingFunctionPresentation="Method 'Execute'">
-            <startOffsets>
-              <option value="4602" />
-            </startOffsets>
-            <endOffsets>
-              <option value="4636" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="12" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>

src/.idea/.idea.Ombi/riderModule.iml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RIDER_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$USER_HOME$/.nuget/packages/microsoft.net.test.sdk/16.0.1/build/netcoreapp1.0" />
+    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.13.0/build/netcoreapp1.0/NUnit3.TestAdapter.dll" />
+    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.13.0/build/netcoreapp1.0/NUnit3.TestAdapter.pdb" />
+    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.13.0/build/netcoreapp1.0/nunit.engine.netstandard.dll" />
+    <content url="file://$MODULE_DIR$/../../../CHANGELOG.md" />
+    <content url="file://$MODULE_DIR$/../../../appveyor.yml" />
+    <content url="file://$MODULE_DIR$/../../../build.cake" />
+    <content url="file://$MODULE_DIR$/../.." />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

src/.vscode/tasks.json

@@ -1,31 +1,22 @@
 {
-    "version": "2.0.0",
+    "version": "0.1.0",
     "command": "dotnet",
+    "isShellCommand": true,
     "args": [],
     "tasks": [
         {
-            "label": "build",
+            "taskName": "build",
-            "type": "shell",
-            "command": "dotnet",
             "args": [
-                "build",
                 "${workspaceRoot}/Ombi/Ombi.csproj"
             ],
-            "problemMatcher": "$msCompile",
+            "isBuildCommand": true,
-            "group": {
+            "problemMatcher": "$msCompile"
-                "_id": "build",
-                "isDefault": false
-            }
         },
         {
-            "label": "lint",
+            "taskName": "lint",
-            "type": "shell",
             "command": "npm",
-            "args": [
+            "isShellCommand": true,
-                "run",
+            "args": ["run", "lint"]
-                "lint"
-            ],
-            "problemMatcher": []
         }
     ]
 }

src/Ombi.Api.CloudService/Ombi.Api.CloudService.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Configurations>Debug;Release;NonUiBuild</Configurations>
   </PropertyGroup>
 

src/Ombi.Api.CouchPotato/Ombi.Api.CouchPotato.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Configurations>Debug;Release;NonUiBuild</Configurations>
   </PropertyGroup>

src/Ombi.Api.Discord/DiscordApi.cs

@@ -1,6 +1,4 @@
-using System;
+using System.Net.Http;
-using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Ombi.Api.Discord.Models;
@@ -14,31 +12,18 @@ namespace Ombi.Api.Discord
             Api = api;
         }
         
-        private const string _baseUrl = "https://discordapp.com/api/";
+        private const string BaseUrl = "https://discordapp.com/api/";
         private IApi Api { get; }
         
         public async Task SendMessage(DiscordWebhookBody body, string webhookId, string webhookToken)
         {
-            var request = new Request($"webhooks/{webhookId}/{webhookToken}", _baseUrl, HttpMethod.Post);
+            var request = new Request($"webhooks/{webhookId}/{webhookToken}", BaseUrl, HttpMethod.Post);
 
             request.AddJsonBody(body);
 
             request.ApplicationJsonContentType();
 
-            var response = await Api.Request(request);
+            await Api.Request(request);
-
-            if (!response.IsSuccessStatusCode)
-            {
-                var content = await response.Content.ReadAsStringAsync();
-                throw new DiscordException(content, response.StatusCode);
-            }
-        }
-
-        public class DiscordException : Exception
-        {
-            public DiscordException(string content, HttpStatusCode code) : base($"Exception when calling Discord with status code {code} and message: {content}")
-            {
-            }
         }
     }
 }

src/Ombi.Api.Discord/Models/DiscordWebhookBody.cs

@@ -7,7 +7,6 @@ namespace Ombi.Api.Discord.Models
     {
         public string content { get; set; }
         public string username { get; set; }
-        public string avatar_url { get; set; }
         public List<DiscordEmbeds> embeds { get; set; }
     }
 
@@ -33,6 +32,7 @@ namespace Ombi.Api.Discord.Models
     {
         public string name { get; set; }
         public string url { get; set; }
+        public string iconurl { get; set; }
     }
 
     public class DiscordField

src/Ombi.Api.Discord/Ombi.Api.Discord.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>

src/Ombi.Api.DogNzb/Ombi.Api.DogNzb.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Configurations>Debug;Release;NonUiBuild</Configurations>
   </PropertyGroup>

src/Ombi.Api.Emby/EmbyApi.cs

@@ -56,7 +56,7 @@ namespace Ombi.Api.Emby
             return obj;
         }
 
-        public async Task<EmbyUser> LogIn(string username, string password, string apiKey, string baseUri, string clientIpAddress)
+        public async Task<EmbyUser> LogIn(string username, string password, string apiKey, string baseUri)
         {
             var request = new Request("emby/users/authenticatebyname", baseUri, HttpMethod.Post);
             var body = new
@@ -71,11 +71,6 @@ namespace Ombi.Api.Emby
                 $"MediaBrowser Client=\"Ombi\", Device=\"Ombi\", DeviceId=\"v3\", Version=\"v3\"");
             AddHeaders(request, apiKey);
 
-            if (!string.IsNullOrEmpty(clientIpAddress))
-            {
-                request.AddHeader("X-Forwarded-For", clientIpAddress);
-            }
-
             var obj = await Api.Request<EmbyUser>(request);
             return obj;
         }
@@ -253,49 +248,5 @@ namespace Ombi.Api.Emby
             req.AddContentHeader("Content-Type", "application/json");
             req.AddHeader("Device", "Ombi");
         }
-
-        public async Task<EmbyItemContainer<EmbyMovie>> GetMoviesPlayed(string apiKey, string parentIdFilder, int startIndex, int count, string userId, string baseUri) =>
-            await GetPlayed<EmbyMovie>("Movie", apiKey, userId, baseUri, startIndex, count, parentIdFilder, "ProviderIds");
-
-        public async Task<EmbyItemContainer<EmbyEpisodes>> GetTvPlayed(string apiKey, string parentIdFilder, int startIndex, int count, string userId, string baseUri) =>
-           await GetPlayed<EmbyEpisodes>("Episode", apiKey, userId, baseUri, startIndex, count, parentIdFilder);
-
-        private async Task<EmbyItemContainer<T>> GetPlayed<T>(
-            string type,
-            string apiKey,
-            string userId,
-            string baseUri,
-            int startIndex,
-            int count,
-            string parentIdFilder = default,
-            string fields = default)
-        {
-            var request = new Request($"emby/items", baseUri, HttpMethod.Get);
-
-            request.AddQueryString("Recursive", true.ToString());
-            request.AddQueryString("IncludeItemTypes", type);
-            if (!string.IsNullOrEmpty(fields))
-            {
-                request.AddQueryString("Fields", fields);
-            }
-            request.AddQueryString("UserId", userId);
-            request.AddQueryString("isPlayed", true.ToString());
-
-            // paginate and display recently played items first
-            request.AddQueryString("sortBy", "DatePlayed");
-            request.AddQueryString("SortOrder", "Descending");
-            request.AddQueryString("startIndex", startIndex.ToString());
-            request.AddQueryString("limit", count.ToString());
-
-            if (!string.IsNullOrEmpty(parentIdFilder))
-            {
-                request.AddQueryString("ParentId", parentIdFilder);
-            }
-
-            AddHeaders(request, apiKey);
-
-            var obj = await Api.Request<EmbyItemContainer<T>>(request);
-            return obj;
-        }
     }
 }

src/Ombi.Api.Emby/IBaseEmbyApi.cs

@@ -11,7 +11,7 @@ namespace Ombi.Api.Emby
     {
         Task<EmbySystemInfo> GetSystemInformation(string apiKey, string baseUrl);
         Task<List<EmbyUser>> GetUsers(string baseUri, string apiKey);
-        Task<EmbyUser> LogIn(string username, string password, string apiKey, string baseUri, string clientIpAddress);
+        Task<EmbyUser> LogIn(string username, string password, string apiKey, string baseUri);
 
         Task<EmbyItemContainer<EmbyMovie>> GetAllMovies(string apiKey, string parentIdFilder, int startIndex, int count, string userId,
             string baseUri);
@@ -32,8 +32,5 @@ namespace Ombi.Api.Emby
         Task<EmbyItemContainer<EmbyMovie>> RecentlyAddedMovies(string apiKey, string parentIdFilder, int startIndex, int count, string userId, string baseUri);
         Task<EmbyItemContainer<EmbyEpisodes>> RecentlyAddedEpisodes(string apiKey, string parentIdFilder, int startIndex, int count, string userId, string baseUri);
         Task<EmbyItemContainer<EmbySeries>> RecentlyAddedShows(string apiKey, string parentIdFilder, int startIndex, int count, string userId, string baseUri);
-        
-        Task<EmbyItemContainer<EmbyMovie>> GetMoviesPlayed(string apiKey, string parentIdFilder, int startIndex, int count, string userId, string baseUri);
-        Task<EmbyItemContainer<EmbyEpisodes>> GetTvPlayed(string apiKey, string parentIdFilder, int startIndex, int count, string userId, string baseUri);
     }
 }

src/Ombi.Api.Emby/Models/Media/Movie/EmbyMovie.cs

@@ -5,8 +5,30 @@ namespace Ombi.Api.Emby.Models.Movie
     public class EmbyMovie
     {
         public string Name { get; set; }
+        public string ServerId { get; set; }
         public string Id { get; set; }
+        public string Container { get; set; }
+        public DateTime PremiereDate { get; set; }
+        public object[] ProductionLocations { get; set; }
+        public string OfficialRating { get; set; }
+        public float CommunityRating { get; set; }
+        public long RunTimeTicks { get; set; }
+        public string PlayAccess { get; set; }
+        public int ProductionYear { get; set; }
+        public bool IsPlaceHolder { get; set; }
+        public bool IsHD { get; set; }
+        public bool IsFolder { get; set; }
         public string Type { get; set; }
+        public int LocalTrailerCount { get; set; }
+        public EmbyUserdata UserData { get; set; }
+        public string VideoType { get; set; }
+        public EmbyImagetags ImageTags { get; set; }
+        public string[] BackdropImageTags { get; set; }
+        public string LocationType { get; set; }
+        public string MediaType { get; set; }
+        public bool HasSubtitles { get; set; }
+        public int CriticRating { get; set; }
+        public string Overview { get; set; }
         public EmbyProviderids ProviderIds { get; set; }
         public EmbyMediastream[] MediaStreams { get; set; }
     }

src/Ombi.Api.Emby/Ombi.Api.Emby.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>

src/Ombi.Api.FanartTv/Ombi.Api.FanartTv.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>

src/Ombi.Api.Github/Ombi.Api.Github.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Configurations>Debug;Release;NonUiBuild</Configurations>
   </PropertyGroup>

src/Ombi.Api.Gotify/Ombi.Api.Gotify.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>

src/Ombi.Api.GroupMe/Ombi.Api.GroupMe.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Configurations>Debug;Release;NonUiBuild</Configurations>
   </PropertyGroup>

src/Ombi.Api.Jellyfin/Models/Media/Movie/JellyfinMovie.cs

@@ -5,8 +5,30 @@ namespace Ombi.Api.Jellyfin.Models.Movie
     public class JellyfinMovie
     {
         public string Name { get; set; }
+        public string ServerId { get; set; }
         public string Id { get; set; }
+        public string Container { get; set; }
+        public DateTime PremiereDate { get; set; }
+        public object[] ProductionLocations { get; set; }
+        public string OfficialRating { get; set; }
+        public float CommunityRating { get; set; }
+        public long RunTimeTicks { get; set; }
+        public string PlayAccess { get; set; }
+        public int ProductionYear { get; set; }
+        public bool IsPlaceHolder { get; set; }
+        public bool IsHD { get; set; }
+        public bool IsFolder { get; set; }
         public string Type { get; set; }
+        public int LocalTrailerCount { get; set; }
+        public JellyfinUserdata UserData { get; set; }
+        public string VideoType { get; set; }
+        public JellyfinImagetags ImageTags { get; set; }
+        public string[] BackdropImageTags { get; set; }
+        public string LocationType { get; set; }
+        public string MediaType { get; set; }
+        public bool HasSubtitles { get; set; }
+        public int CriticRating { get; set; }
+        public string Overview { get; set; }
         public JellyfinProviderids ProviderIds { get; set; }
         public JellyfinMediastream[] MediaStreams { get; set; }
     }

src/Ombi.Api.Jellyfin/Ombi.Api.Jellyfin.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>

src/Ombi.Api.Lidarr/Ombi.Api.Lidarr.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Configurations>Debug;Release;NonUiBuild</Configurations>
   </PropertyGroup>

src/Ombi.Api.Mattermost/Ombi.Api.Mattermost.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Api.MediaServer/Ombi.Api.MediaServer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>

src/Ombi.Api.MusicBrainz/MusicBrainzApi.cs

@@ -1,10 +1,12 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Hqub.MusicBrainz.API;
 using Hqub.MusicBrainz.API.Entities;
+using Hqub.MusicBrainz.API.Entities.Collections;
 using Newtonsoft.Json;
 using Ombi.Api.MusicBrainz.Models;
 
@@ -12,30 +14,28 @@ namespace Ombi.Api.MusicBrainz
 {
     public class MusicBrainzApi : IMusicBrainzApi
     {
-        private readonly MusicBrainzClient _client;
         private readonly IApi _api;
 
-        public MusicBrainzApi(MusicBrainzClient client, IApi api)
+        public MusicBrainzApi(IApi api)
         {
-            _client = client;
             _api = api;
         }
 
         public Task<Release> GetAlbumInformation(string albumId)
         {
-            var album = _client.Releases.GetAsync(albumId);
+            var album = Release.GetAsync(albumId);
             return album;
         }
 
         public async Task<IEnumerable<Artist>> SearchArtist(string artistQuery)
         {
-            var artist = await _client.Artists.SearchAsync(artistQuery, 10);
+            var artist = await Artist.SearchAsync(artistQuery, 10);
             return artist.Items.Where(x => x.Type != null);
         }
 
         public async Task<Artist> GetArtistInformation(string artistId)
         {
-            var artist = await _client.Artists.GetAsync(artistId, "artist-rels", "url-rels", "releases", "release-groups");
+            var artist = await Artist.GetAsync(artistId, "artist-rels", "url-rels", "releases", "release-groups");
             return artist;
         }
 
@@ -49,7 +49,8 @@ namespace Ombi.Api.MusicBrainz
             };
 
             // Search for a release by title.
-            var releases = await _client.Releases.SearchAsync(query);
+            var releases = await Release.SearchAsync(query);
+
             return releases.Items;
         }
 
@@ -64,5 +65,10 @@ namespace Ombi.Api.MusicBrainz
             }
             return null;
         }
+
+        private void AddHeaders(Request req)
+        {
+            req.AddHeader("Accept", "application/json");
+        }
     }
 }

src/Ombi.Api.MusicBrainz/Ombi.Api.MusicBrainz.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Configurations>Debug;Release;NonUiBuild</Configurations>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MusicBrainzAPI" Version="2.5.0" />
+    <PackageReference Include="MusicBrainzAPI" Version="2.0.1" />
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Api.Notifications/Ombi.Api.Notifications.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Configurations>Debug;Release;NonUiBuild</Configurations>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Humanizer.Core" Version="2.14.1" />
+    <PackageReference Include="Humanizer.Core" Version="2.4.2" />
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Api.Plex/IPlexApi.cs

@@ -21,7 +21,7 @@ namespace Ombi.Api.Plex
         Task<PlexMetadata> GetMetadata(string authToken, string plexFullHost, string itemId);
         Task<PlexMetadata> GetSeasons(string authToken, string plexFullHost, string ratingKey);
         Task<PlexContainer> GetAllEpisodes(string authToken, string host, string section, int start, int retCount);
-        Task<PlexUsers> GetUsers(string authToken);
+        Task<PlexFriends> GetUsers(string authToken);
         Task<PlexAccount> GetAccount(string authToken);
         Task<PlexMetadata> GetRecentlyAdded(string authToken, string uri, string sectionId);
         Task<OAuthContainer> GetPin(int pinId);
@@ -29,6 +29,5 @@ namespace Ombi.Api.Plex
         Task<PlexAddWrapper> AddUser(string emailAddress, string serverId, string authToken, int[] libs);
         Task<PlexWatchlistContainer> GetWatchlist(string plexToken, CancellationToken cancellationToken);
         Task<PlexWatchlistMetadataContainer> GetWatchlistMetadata(string ratingKey, string plexToken, CancellationToken cancellationToken);
-        Task<bool> Ping(string authToken, CancellationToken cancellationToken = default);
     }
 }

src/Ombi.Api.Plex/Models/Friends/PlexFriends.cs

@@ -2,42 +2,46 @@
 
 namespace Ombi.Api.Plex.Models.Friends
 {
-    [XmlRoot(ElementName = "User")]
+    [XmlRoot(ElementName = "Server")]
-    public class UserFriends
+    public class Server
     {
         [XmlAttribute(AttributeName = "id")]
         public string Id { get; set; }
-        /// <summary>
+        [XmlAttribute(AttributeName = "serverId")]
-        /// Title is for Home Users only
+        public string ServerId { get; set; }
-        /// </summary>
+        [XmlAttribute(AttributeName = "machineIdentifier")]
+        public string MachineIdentifier { get; set; }
+        [XmlAttribute(AttributeName = "name")]
+        public string Name { get; set; }
+        [XmlAttribute(AttributeName = "lastSeenAt")]
+        public string LastSeenAt { get; set; }
+        [XmlAttribute(AttributeName = "numLibraries")]
+        public string NumLibraries { get; set; }
+        [XmlAttribute(AttributeName = "owned")]
+        public string Owned { get; set; }
+    }
+
+    [XmlRoot(ElementName = "User")]
+    public class UserFriends
+    {
+        [XmlElement(ElementName = "Server")]
+        public Server Server { get; set; }
+        [XmlAttribute(AttributeName = "id")]
+        public string Id { get; set; }
         [XmlAttribute(AttributeName = "title")]
         public string Title { get; set; }
         [XmlAttribute(AttributeName = "username")]
         public string Username { get; set; }
         [XmlAttribute(AttributeName = "email")]
         public string Email { get; set; }
-        /// <summary>
+        [XmlAttribute(AttributeName = "recommendationsPlaylistId")]
-        /// DO NOT USE THIS
+        public string RecommendationsPlaylistId { get; set; }
-        /// Home Users can actually be an unmanaged account with an email/username to log in.
+        [XmlAttribute(AttributeName = "thumb")]
-        /// </summary>
+        public string Thumb { get; set; }
-        [XmlAttribute(AttributeName = "home")]
-        public bool HomeUser { get; set; }
-        
-        [XmlElement(ElementName = "Server")]
-        public PlexUserServer[] Server { get; set; }
-    }
-
-    public class PlexUserServer
-    {
-        [XmlAttribute(AttributeName = "id")]
-        public string Id { get; set; }
-        
-        [XmlAttribute(AttributeName = "serverId")]
-        public string ServerId { get; set; }
     }
 
     [XmlRoot(ElementName = "MediaContainer")]
-    public class PlexUsers
+    public class PlexFriends
     {
         [XmlElement(ElementName = "User")]
         public UserFriends[] User { get; set; }

src/Ombi.Api.Plex/Ombi.Api.Plex.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>

src/Ombi.Api.Plex/PlexApi.cs

@@ -65,10 +65,10 @@ namespace Ombi.Api.Plex
         }
 
         private const string SignInUri = "https://plex.tv/users/sign_in.json";
-        private const string FriendsUri = "https://plex.tv/api/users"; 
+        private const string FriendsUri = "https://plex.tv/pms/friends/all";
         private const string GetAccountUri = "https://plex.tv/users/account.json";
         private const string ServerUri = "https://plex.tv/pms/servers.xml";
-        private const string WatchlistUri = "https://discover.provider.plex.tv/";
+        private const string WatchlistUri = "https://metadata.provider.plex.tv/";
 
         /// <summary>
         /// Sign into the Plex API
@@ -195,12 +195,12 @@ namespace Ombi.Api.Plex
         /// </summary>
         /// <param name="authToken"></param>
         /// <returns></returns>
-        public async Task<PlexUsers> GetUsers(string authToken)
+        public async Task<PlexFriends> GetUsers(string authToken)
         {
             var request = new Request(string.Empty, FriendsUri, HttpMethod.Get, ContentType.Xml);
             await AddHeaders(request, authToken);
 
-            return await Api.Request<PlexUsers>(request);
+            return await Api.Request<PlexFriends>(request);
         }
 
         public async Task<PlexMetadata> GetRecentlyAdded(string authToken, string uri, string sectionId)
@@ -320,30 +320,6 @@ namespace Ombi.Api.Plex
             return result;
         }
 
-        /// <summary>
-        /// Pings the Plex API to validate if a token is still valid
-        /// </summary>
-        /// <param name="authToken">The authentication token to validate</param>
-        /// <param name="cancellationToken">Cancellation token</param>
-        /// <returns>True if the token is valid, false otherwise</returns>
-        public async Task<bool> Ping(string authToken, CancellationToken cancellationToken = default)
-        {
-            try
-            {
-                var request = new Request("api/v2/ping", "https://plex.tv/", HttpMethod.Get);
-                await AddHeaders(request, authToken);
-                
-                // We don't need to parse the response, just check if the request succeeds
-                await Api.Request(request, cancellationToken);
-                return true;
-            }
-            catch
-            {
-                // If the request fails (401, 403, etc.), the token is invalid
-                return false;
-            }
-        }
-
 
         /// <summary>
         /// Adds the required headers and also the authorization header

src/Ombi.Api.Pushbullet/Ombi.Api.Pushbullet.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>

src/Ombi.Api.Pushover/Ombi.Api.Pushover.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>

src/Ombi.Api.Radarr/IRadarrV3Api.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Ombi.Api.Radarr.Models;
 using Ombi.Api.Radarr.Models.V3;
@@ -15,8 +14,7 @@ namespace Ombi.Api.Radarr
         Task<MovieResponse> GetMovie(int id, string apiKey, string baseUrl);
         Task<MovieResponse> UpdateMovie(MovieResponse movie, string apiKey, string baseUrl);
         Task<bool> MovieSearch(int[] movieIds, string apiKey, string baseUrl);
-        Task<RadarrAddMovie> AddMovie(int tmdbId, string title, int year, int qualityId, string rootPath,string apiKey, string baseUrl, bool searchNow, string minimumAvailability, List<int> tags);
+        Task<RadarrAddMovie> AddMovie(int tmdbId, string title, int year, int qualityId, string rootPath,string apiKey, string baseUrl, bool searchNow, string minimumAvailability);
         Task<List<Tag>> GetTags(string apiKey, string baseUrl);
-        Task<Tag> CreateTag(string apiKey, string baseUrl, string tagName);
     }
 }

src/Ombi.Api.Radarr/Models/V2/RadarrAddMovie.cs

@@ -29,6 +29,5 @@ namespace Ombi.Api.Radarr.Models
         public int year { get; set; }
         public string minimumAvailability { get; set; }
         public long sizeOnDisk { get; set; }
-        public int[] tags { get; set; }
     }
 }

src/Ombi.Api.Radarr/Ombi.Api.Radarr.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Api.Radarr/RadarrV3Api.cs

@@ -72,7 +72,7 @@ namespace Ombi.Api.Radarr
             return await Api.Request<MovieResponse>(request);
         }
 
-        public async Task<RadarrAddMovie> AddMovie(int tmdbId, string title, int year, int qualityId, string rootPath, string apiKey, string baseUrl, bool searchNow, string minimumAvailability, List<int> tags)
+        public async Task<RadarrAddMovie> AddMovie(int tmdbId, string title, int year, int qualityId, string rootPath, string apiKey, string baseUrl, bool searchNow, string minimumAvailability)
         {
             var request = new Request("/api/v3/movie", baseUrl, HttpMethod.Post);
 
@@ -86,8 +86,7 @@ namespace Ombi.Api.Radarr
                 monitored = true,
                 year = year,
                 minimumAvailability = minimumAvailability,
-                sizeOnDisk = 0,
+                sizeOnDisk = 0
-                tags = tags.Any() ? tags.ToArray() : Enumerable.Empty<int>().ToArray()
             };
 
             if (searchNow)
@@ -157,14 +156,5 @@ namespace Ombi.Api.Radarr
         {
             request.AddHeader("X-Api-Key", key);
         }
-
-        public Task<Tag> CreateTag(string apiKey, string baseUrl, string tagName)
-        {
-            var request = new Request($"/api/v3/tag", baseUrl, HttpMethod.Post);
-            request.AddHeader("X-Api-Key", apiKey);
-            request.AddJsonBody(new { Label = tagName });
-
-            return Api.Request<Tag>(request);
-        }
     }
 }

src/Ombi.Api.RottenTomatoes/Ombi.Api.RottenTomatoes.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Configurations>Debug;Release;NonUiBuild</Configurations>
   </PropertyGroup>

src/Ombi.Api.Service/Ombi.Api.Service.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Api.SickRage/Ombi.Api.SickRage.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Configurations>Debug;Release;NonUiBuild</Configurations>
   </PropertyGroup>

src/Ombi.Api.Slack/Ombi.Api.Slack.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>

src/Ombi.Api.Sonarr/ISonarrV3Api.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Ombi.Api.Sonarr.Models;
+using System.Net.Http;
 using Ombi.Api.Sonarr.Models.V3;
 
 namespace Ombi.Api.Sonarr
@@ -8,8 +9,5 @@ namespace Ombi.Api.Sonarr
     public interface ISonarrV3Api : ISonarrApi
     {
         Task<IEnumerable<LanguageProfiles>> LanguageProfiles(string apiKey, string baseUrl);
-        Task<Tag> CreateTag(string apiKey, string baseUrl, string tagName);
-        Task<Tag> GetTag(int tagId, string apiKey, string baseUrl);
-        Task<List<MonitoredEpisodeResult>> MonitorEpisode(int[] episodeIds, bool monitor, string apiKey, string baseUrl);
     }
 }

src/Ombi.Api.Sonarr/Models/Episode.cs

@@ -113,17 +113,6 @@ namespace Ombi.Api.Sonarr.Models
         public int real { get; set; }
     }
 
-    public class MonitoredEpisodeResult
-    {
-        public int seriesId { get; set; }
-        public int tvdbId { get; set; }
-        public int episodeFileId { get; set; }
-        public int seasonNumber { get; set; }
-        public int episodeNumber { get; set; }
-        public string overview { get; set; }
-        public bool monitored { get; set; }
-        public int id { get; set; }
-    }
 
     public class EpisodeUpdateResult
     {

src/Ombi.Api.Sonarr/Models/NewSeries.cs

@@ -26,7 +26,6 @@ namespace Ombi.Api.Sonarr.Models
         public string seriesType { get; set; }
         public int id { get; set; }
         public List<SonarrImage> images { get; set; }
-        public List<int> tags { get; set; }
 
         // V3 Property
         public int languageProfileId { get; set; }

src/Ombi.Api.Sonarr/Models/SonarrSeries.cs

@@ -40,7 +40,7 @@ namespace Ombi.Api.Sonarr.Models
         public string titleSlug { get; set; }
         public string certification { get; set; }
         public string[] genres { get; set; }
-        public List<int> tags { get; set; }
+        public object[] tags { get; set; }
         public DateTime added { get; set; }
         public Ratings ratings { get; set; }
         public int qualityProfileId { get; set; }

src/Ombi.Api.Sonarr/Models/SystemStatus.cs

@@ -3,6 +3,23 @@ namespace Ombi.Api.Sonarr
     public class SystemStatus
     {
         public string version { get; set; }
+        public string buildTime { get; set; }
+        public bool isDebug { get; set; }
+        public bool isProduction { get; set; }
+        public bool isAdmin { get; set; }
+        public bool isUserInteractive { get; set; }
+        public string startupPath { get; set; }
+        public string appData { get; set; }
+        public string osVersion { get; set; }
+        public bool isMonoRuntime { get; set; }
+        public bool isMono { get; set; }
+        public bool isLinux { get; set; }
+        public bool isOsx { get; set; }
+        public bool isWindows { get; set; }
+        public string branch { get; set; }
+        public string authentication { get; set; }
+        public string sqliteVersion { get; set; }
         public string urlBase { get; set; }
+        public string runtimeVersion { get; set; }
     }
 }

src/Ombi.Api.Sonarr/Ombi.Api.Sonarr.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>

src/Ombi.Api.Sonarr/SonarrV3Api.cs

@@ -11,6 +11,7 @@ namespace Ombi.Api.Sonarr
     {
         public SonarrV3Api(IApi api) : base(api)
         {
+
         }
 
         protected override string ApiBaseUrl => "/api/v3/";
@@ -29,30 +30,5 @@ namespace Ombi.Api.Sonarr
             request.AddHeader("X-Api-Key", apiKey);
             return await Api.Request<List<SonarrProfile>>(request);
         }
-
-        public Task<Tag> CreateTag(string apiKey, string baseUrl, string tagName)
-        {
-            var request = new Request($"{ApiBaseUrl}tag", baseUrl, HttpMethod.Post);
-            request.AddHeader("X-Api-Key", apiKey);
-            request.AddJsonBody(new { Label = tagName });
-
-            return Api.Request<Tag>(request);
-        }
-
-        public Task<Tag> GetTag(int tagId, string apiKey, string baseUrl)
-        {
-            var request = new Request($"{ApiBaseUrl}tag/{tagId}", baseUrl, HttpMethod.Get);
-            request.AddHeader("X-Api-Key", apiKey);
-
-            return Api.Request<Tag>(request);
-        }
-
-        public async Task<List<MonitoredEpisodeResult>> MonitorEpisode(int[] episodeIds, bool monitor, string apiKey, string baseUrl)
-        {
-            var request = new Request($"{ApiBaseUrl}episode/monitor", baseUrl, HttpMethod.Put);
-            request.AddHeader("X-Api-Key", apiKey);
-            request.AddJsonBody(new { episodeIds = episodeIds, monitored = monitor });
-            return await Api.Request<List<MonitoredEpisodeResult>>(request);
-        }
     }
 }

src/Ombi.Api.Telegram/Ombi.Api.Telegram.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Configurations>Debug;Release;NonUiBuild</Configurations>
   </PropertyGroup>

src/Ombi.Api.Trakt/Ombi.Api.Trakt.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>

src/Ombi.Api.TvMaze/Ombi.Api.TvMaze.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>

src/Ombi.Api.Twilio/Ombi.Api.Twilio.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Configurations>Debug;Release;NonUiBuild</Configurations>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Twilio" Version="5.80.1" />
+    <PackageReference Include="Twilio" Version="5.37.2" />
   </ItemGroup>
 
 </Project>

src/Ombi.Api.Webhook/Ombi.Api.Webhook.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>

src/Ombi.Api/Ombi.Api.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>
@@ -11,10 +11,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="Polly" Version="7.2.3" />
+    <PackageReference Include="Polly" Version="7.1.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Core.Tests/Engine/MovieRequestEngineTests.cs

@@ -2,6 +2,7 @@
 using Moq;
 using Moq.AutoMock;
 using NUnit.Framework;
+using Ombi.Core.Authentication;
 using Ombi.Core.Engine;
 using Ombi.Core.Helpers;
 using Ombi.Core.Models.Requests;
@@ -51,8 +52,7 @@ namespace Ombi.Core.Tests.Engine
 
             _subject = _mocker.CreateInstance<MovieRequestEngine>();
             var list = DbHelper.GetQueryableMockDbSet(new RequestSubscription());
-            _mocker.Setup<IRepository<RequestSubscription>, IQueryable<RequestSubscription>>(x => x.GetAll()).Returns(new List<RequestSubscription>().AsQueryable().BuildMock());
+            _mocker.Setup<IRepository<RequestSubscription>, IQueryable<RequestSubscription>>(x => x.GetAll()).Returns(new List<RequestSubscription>().AsQueryable().BuildMock().Object);
-            _mocker.Setup<IUserPlayedMovieRepository, IQueryable<UserPlayedMovie>>(x => x.GetAll()).Returns(new List<UserPlayedMovie>().AsQueryable().BuildMock());
         }
 
         [Test]

src/Ombi.Core.Tests/Engine/MovieRequestLimitsTests.cs

@@ -3,6 +3,7 @@ using Moq;
 using Moq.AutoMock;
 using NUnit.Framework;
 using Ombi.Core.Authentication;
+using Ombi.Core.Engine;
 using Ombi.Core.Helpers;
 using Ombi.Core.Models;
 using Ombi.Core.Services;
@@ -63,7 +64,7 @@ namespace Ombi.Core.Tests.Engine
             var user = new OmbiUser();
 
             var um = _mocker.GetMock<OmbiUserManager>();
-            um.SetupGet(x => x.Users).Returns(new List<OmbiUser> { user }.AsQueryable().BuildMock());
+            um.SetupGet(x => x.Users).Returns(new List<OmbiUser> { user }.AsQueryable().BuildMock().Object);
             
 
 
@@ -81,7 +82,7 @@ namespace Ombi.Core.Tests.Engine
             };
 
             var um = _mocker.GetMock<OmbiUserManager>();
-            um.SetupGet(x => x.Users).Returns(new List<OmbiUser> { user }.AsQueryable().BuildMock());
+            um.SetupGet(x => x.Users).Returns(new List<OmbiUser> { user }.AsQueryable().BuildMock().Object);
 
 
 
@@ -99,7 +100,7 @@ namespace Ombi.Core.Tests.Engine
                 MovieRequestLimit = 1
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(new List<RequestLog>().AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(new List<RequestLog>().AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMovieRequests(user);
 
@@ -130,7 +131,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMovieRequests(user);
 
@@ -205,7 +206,7 @@ namespace Ombi.Core.Tests.Engine
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMovieRequests(user);
 
@@ -238,7 +239,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMovieRequests(user);
 
@@ -271,7 +272,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMovieRequests(user);
 
@@ -300,17 +301,17 @@ namespace Ombi.Core.Tests.Engine
                 {
                     UserId = "id1",
                     RequestType = RequestType.Movie,
-                    RequestDate = today.AddMinutes(-1),
+                    RequestDate = today.AddHours(-1),
                 },
                 new RequestLog
                 {
                     UserId = "id1",
                     RequestType = RequestType.Movie,
-                    RequestDate = today.AddMinutes(-2),
+                    RequestDate = today.AddHours(-2),
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMovieRequests(user);
 
@@ -343,7 +344,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMovieRequests(user);
 
@@ -375,7 +376,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMovieRequests(user, today);
 
@@ -414,7 +415,7 @@ namespace Ombi.Core.Tests.Engine
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMovieRequests(user, today);
 
@@ -447,7 +448,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMovieRequests(user, today);
 
@@ -480,7 +481,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMovieRequests(user, today);
 
@@ -520,7 +521,7 @@ namespace Ombi.Core.Tests.Engine
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMovieRequests(user, today);
 

src/Ombi.Core.Tests/Engine/MusicRequestLimitTests.cs

@@ -3,6 +3,7 @@ using Moq;
 using Moq.AutoMock;
 using NUnit.Framework;
 using Ombi.Core.Authentication;
+using Ombi.Core.Engine;
 using Ombi.Core.Helpers;
 using Ombi.Core.Models;
 using Ombi.Core.Services;
@@ -61,7 +62,7 @@ namespace Ombi.Core.Tests.Engine
             var user = new OmbiUser();
 
             var um = _mocker.GetMock<OmbiUserManager>();
-            um.SetupGet(x => x.Users).Returns(new List<OmbiUser> { user }.AsQueryable().BuildMock());
+            um.SetupGet(x => x.Users).Returns(new List<OmbiUser> { user }.AsQueryable().BuildMock().Object);
             
 
 
@@ -79,7 +80,7 @@ namespace Ombi.Core.Tests.Engine
             };
 
             var um = _mocker.GetMock<OmbiUserManager>();
-            um.SetupGet(x => x.Users).Returns(new List<OmbiUser> { user }.AsQueryable().BuildMock());
+            um.SetupGet(x => x.Users).Returns(new List<OmbiUser> { user }.AsQueryable().BuildMock().Object);
 
 
 
@@ -97,7 +98,7 @@ namespace Ombi.Core.Tests.Engine
                 MusicRequestLimit = 1
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(new List<RequestLog>().AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(new List<RequestLog>().AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMusicRequests(user);
 
@@ -128,7 +129,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMusicRequests(user);
 
@@ -203,7 +204,7 @@ namespace Ombi.Core.Tests.Engine
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMusicRequests(user);
 
@@ -236,7 +237,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMusicRequests(user);
 
@@ -269,7 +270,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMusicRequests(user);
 
@@ -298,17 +299,17 @@ namespace Ombi.Core.Tests.Engine
                 {
                     UserId = "id1",
                     RequestType = RequestType.Album,
-                    RequestDate = today.AddMinutes(-1),
+                    RequestDate = today.AddHours(-1),
                 },
                 new RequestLog
                 {
                     UserId = "id1",
                     RequestType = RequestType.Album,
-                    RequestDate = today.AddMinutes(-2),
+                    RequestDate = today.AddHours(-2),
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMusicRequests(user);
 
@@ -341,7 +342,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMusicRequests(user);
 
@@ -373,7 +374,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMusicRequests(user, today);
 
@@ -412,7 +413,7 @@ namespace Ombi.Core.Tests.Engine
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMusicRequests(user);
 
@@ -444,7 +445,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMusicRequests(user);
 
@@ -477,7 +478,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMusicRequests(user);
 
@@ -517,7 +518,7 @@ namespace Ombi.Core.Tests.Engine
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingMusicRequests(user, today);
 

src/Ombi.Core.Tests/Engine/TvRequestLimitsTests.cs

@@ -3,6 +3,7 @@ using Moq;
 using Moq.AutoMock;
 using NUnit.Framework;
 using Ombi.Core.Authentication;
+using Ombi.Core.Engine;
 using Ombi.Core.Helpers;
 using Ombi.Core.Models;
 using Ombi.Core.Services;
@@ -58,7 +59,7 @@ namespace Ombi.Core.Tests.Engine
             var user = new OmbiUser();
 
             var um = _mocker.GetMock<OmbiUserManager>();
-            um.SetupGet(x => x.Users).Returns(new List<OmbiUser> { user }.AsQueryable().BuildMock());
+            um.SetupGet(x => x.Users).Returns(new List<OmbiUser> { user }.AsQueryable().BuildMock().Object);
 
 
 
@@ -76,7 +77,7 @@ namespace Ombi.Core.Tests.Engine
             };
 
             var um = _mocker.GetMock<OmbiUserManager>();
-            um.SetupGet(x => x.Users).Returns(new List<OmbiUser> { user }.AsQueryable().BuildMock());
+            um.SetupGet(x => x.Users).Returns(new List<OmbiUser> { user }.AsQueryable().BuildMock().Object);
 
 
 
@@ -94,7 +95,7 @@ namespace Ombi.Core.Tests.Engine
                 EpisodeRequestLimit = 1
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(new List<RequestLog>().AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(new List<RequestLog>().AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingTvRequests(user);
 
@@ -125,7 +126,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingTvRequests(user);
 
@@ -208,7 +209,7 @@ namespace Ombi.Core.Tests.Engine
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingTvRequests(user);
 
@@ -242,7 +243,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingTvRequests(user);
 
@@ -275,7 +276,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingTvRequests(user);
 
@@ -304,7 +305,7 @@ namespace Ombi.Core.Tests.Engine
                 {
                     UserId = "id1",
                     RequestType = RequestType.TvShow,
-                    RequestDate = today.AddMinutes(-1),
+                    RequestDate = today.AddHours(-1),
                     EpisodeCount = 1,
                 },
                 new RequestLog
@@ -312,11 +313,11 @@ namespace Ombi.Core.Tests.Engine
                     UserId = "id1",
                     RequestType = RequestType.TvShow,
                     EpisodeCount = 1,
-                    RequestDate = today.AddMinutes(-2),
+                    RequestDate = today.AddHours(-2),
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingTvRequests(user);
 
@@ -345,7 +346,7 @@ namespace Ombi.Core.Tests.Engine
                 {
                     UserId = "id1",
                     RequestType = RequestType.TvShow,
-                    RequestDate = today.AddMinutes(-1),
+                    RequestDate = today.AddHours(-1),
                     EpisodeCount = 5,
                 },
                 new RequestLog
@@ -353,11 +354,11 @@ namespace Ombi.Core.Tests.Engine
                     UserId = "id1",
                     RequestType = RequestType.TvShow,
                     EpisodeCount = 4,
-                    RequestDate = today.AddMinutes(-2),
+                    RequestDate = today.AddHours(-2),
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingTvRequests(user);
 
@@ -379,7 +380,7 @@ namespace Ombi.Core.Tests.Engine
                 EpisodeRequestLimitType = RequestLimitType.Week,
                 Id = "id1"
             };
-            var lastWeek = DateTime.UtcNow.AddDays(-8);
+            var lastWeek = DateTime.Now.AddDays(-8);
             var log = new List<RequestLog>
             {
                 new RequestLog
@@ -391,7 +392,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingTvRequests(user);
 
@@ -424,7 +425,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingTvRequests(user);
 
@@ -465,7 +466,7 @@ namespace Ombi.Core.Tests.Engine
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingTvRequests(user);
 
@@ -506,7 +507,7 @@ namespace Ombi.Core.Tests.Engine
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingTvRequests(user);
 
@@ -540,7 +541,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingTvRequests(user);
 
@@ -573,7 +574,7 @@ namespace Ombi.Core.Tests.Engine
                 }
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingTvRequests(user);
 
@@ -614,7 +615,7 @@ namespace Ombi.Core.Tests.Engine
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingTvRequests(user);
 
@@ -655,7 +656,7 @@ namespace Ombi.Core.Tests.Engine
                 },
             };
             var repoMock = _mocker.GetMock<IRepository<RequestLog>>();
-            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock());
+            repoMock.Setup(x => x.GetAll()).Returns(log.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRemainingTvRequests(user);
 

src/Ombi.Core.Tests/Engine/V2/MovieRequestEngineTests.cs

@@ -46,9 +46,8 @@ namespace Ombi.Core.Tests.Engine.V2
             var requestSubs = new Mock<IRepository<RequestSubscription>>();
             var mediaCache = new Mock<IMediaCacheService>();
             var featureService = new Mock<IFeatureService>();
-            var userPlayedMovieRepository = new Mock<IUserPlayedMovieRepository>();
             _engine = new MovieRequestEngine(movieApi.Object, requestService.Object, user.Object, notificationHelper.Object, rules.Object, movieSender.Object,
-                logger.Object, userManager.Object, requestLogRepo.Object, cache.Object, ombiSettings.Object, requestSubs.Object, mediaCache.Object, featureService.Object, userPlayedMovieRepository.Object);
+                logger.Object, userManager.Object, requestLogRepo.Object, cache.Object, ombiSettings.Object, requestSubs.Object, mediaCache.Object, featureService.Object);
         }
 
         [Test]

src/Ombi.Core.Tests/Engine/VoteEngineTests.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Principal;
 using System.Threading.Tasks;
 using AutoFixture;
 using MockQueryable.Moq;
@@ -70,7 +71,7 @@ namespace Ombi.Core.Tests.Engine
 
             VoteRepository.Setup(x => x.GetAll()).Returns(new EnumerableQuery<Votes>(votes)
                 .AsQueryable()
-                .BuildMock());
+                .BuildMock().Object);
             var result = new VoteEngineResult();
             if (type == VoteType.Downvote)
             {
@@ -117,7 +118,7 @@ namespace Ombi.Core.Tests.Engine
             });
             VoteRepository.Setup(x => x.GetAll()).Returns(new EnumerableQuery<Votes>(votes)
                 .AsQueryable()
-                .BuildMock());
+                .BuildMock().Object);
             var result = new VoteEngineResult();
             if (type == VoteType.Downvote)
             {
@@ -162,7 +163,7 @@ namespace Ombi.Core.Tests.Engine
             });
             VoteRepository.Setup(x => x.GetAll()).Returns(new EnumerableQuery<Votes>(votes)
                 .AsQueryable()
-                .BuildMock());
+                .BuildMock().Object);
 
             var result = new VoteEngineResult();
             if (type == VoteType.Downvote)

src/Ombi.Core.Tests/Ombi.Core.Tests.csproj

@@ -1,24 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
   <Configurations>Debug;Release;NonUiBuild</Configurations>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.18.0" />
+    <PackageReference Include="AutoFixture" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
-    <PackageReference Include="Moq" Version="4.18.2" />
+    <PackageReference Include="Moq" Version="4.15.1" />
-    <PackageReference Include="Moq.AutoMock" Version="3.4.0" />
+    <PackageReference Include="Moq.AutoMock" Version="3.0.0" />
-    <PackageReference Include="Nunit" Version="3.13.3" />
+    <PackageReference Include="Nunit" Version="3.12.0" />
-    <PackageReference Include="NUnit.ConsoleRunner" Version="3.15.2" />
+    <PackageReference Include="NUnit.ConsoleRunner" Version="3.11.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <packagereference Include="Microsoft.NET.Test.Sdk" Version="17.6.2"></packagereference>
+    <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
+    <packagereference Include="Microsoft.NET.Test.Sdk" Version="16.8.0"></packagereference>
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Core.Tests/Rule/Request/AutoApproveRuleTests.cs

@@ -54,17 +54,6 @@ namespace Ombi.Core.Tests.Rule.Request
             Assert.True(request.Approved);
         }
 
-        [Test]
-        public async Task Should_ReturnSuccess_WhenAdminAndRequest4KMovie()
-        {
-            UserManager.Setup(x => x.IsInRoleAsync(It.IsAny<OmbiUser>(), OmbiRoles.Admin)).ReturnsAsync(true);
-            var request = new MovieRequests() { RequestType = Store.Entities.RequestType.Movie, Is4kRequest = true };
-            var result = await Rule.Execute(request);
-
-            Assert.True(result.Success);
-            Assert.True(request.Approved);
-        }
-
         [Test]
         public async Task Should_ReturnSuccess_WhenAdminAndRequestTV()
         {
@@ -87,17 +76,6 @@ namespace Ombi.Core.Tests.Rule.Request
             Assert.True(request.Approved);
         }
 
-        [Test]
-        public async Task Should_ReturnSuccess_WhenAutoApprove4KMovieAndRequest4KMovie()
-        {
-            UserManager.Setup(x => x.IsInRoleAsync(It.IsAny<OmbiUser>(), OmbiRoles.AutoApprove4KMovie)).ReturnsAsync(true);
-            var request = new MovieRequests() { RequestType = Store.Entities.RequestType.Movie, Is4kRequest = true };
-            var result = await Rule.Execute(request);
-
-            Assert.True(result.Success);
-            Assert.True(request.Approved);
-        }
-
         [Test]
         public async Task Should_ReturnFail_WhenAutoApproveMovie_And_RequestTV()
         {
@@ -137,7 +115,7 @@ namespace Ombi.Core.Tests.Rule.Request
         public async Task Should_ReturnFail_WhenAutoApproveTV_And_RequestMovie()
         {
             UserManager.Setup(x => x.IsInRoleAsync(It.IsAny<OmbiUser>(), OmbiRoles.AutoApproveTv)).ReturnsAsync(true);
-            var request = new MovieRequests() { RequestType = Store.Entities.RequestType.Movie };
+            var request = new BaseRequest() { RequestType = Store.Entities.RequestType.Movie };
             var result = await Rule.Execute(request);
 
             Assert.True(result.Success);
@@ -148,7 +126,7 @@ namespace Ombi.Core.Tests.Rule.Request
         public async Task Should_ReturnFail_WhenNoClaimsAndRequestMovie()
         {
             UserManager.Setup(x => x.IsInRoleAsync(It.IsAny<OmbiUser>(), It.IsAny<string>())).ReturnsAsync(false);
-            var request = new MovieRequests() { RequestType = Store.Entities.RequestType.Movie };
+            var request = new BaseRequest() { RequestType = Store.Entities.RequestType.Movie };
             var result = await Rule.Execute(request);
 
             Assert.True(result.Success);

src/Ombi.Core.Tests/Rule/Request/CanRequestRuleTests.cs

@@ -51,20 +51,11 @@ namespace Ombi.Core.Tests.Rule.Request
         }
 
         [Test]
-        public async Task Should_ReturnSuccess_WhenRequestingMovieWithAutoApproveRole()
+        public async Task Should_ReturnSuccess_WhenRequestingMovie4KWithMovieRole()
-        {
-            UserManager.Setup(x => x.IsInRoleAsync(It.IsAny<OmbiUser>(), OmbiRoles.AutoApproveMovie)).ReturnsAsync(true);
-            var request = new MovieRequests() { RequestType = Store.Entities.RequestType.Movie };
-            var result = await Rule.Execute(request);
-
-            Assert.True(result.Success);
-        }
-
-        [Test]
-        public async Task Should_ReturnSuccess_WhenRequestingMovie4KWithMovie4KRole()
         {
+            UserManager.Setup(x => x.IsInRoleAsync(It.IsAny<OmbiUser>(), OmbiRoles.RequestMovie)).ReturnsAsync(true);
             UserManager.Setup(x => x.IsInRoleAsync(It.IsAny<OmbiUser>(), OmbiRoles.Request4KMovie)).ReturnsAsync(true);
-            var request = new MovieRequests() { RequestType = Store.Entities.RequestType.Movie, Is4kRequest = true };
+            var request = new MovieRequests() { RequestType = Store.Entities.RequestType.Movie, Has4KRequest = true };
             var result = await Rule.Execute(request);
 
             Assert.True(result.Success);
@@ -83,29 +74,15 @@ namespace Ombi.Core.Tests.Rule.Request
         }
 
         [Test]
-        public async Task Should_ReturnSuccess_WhenRequestingMovie4KWithAutoApprove4K()
+        public async Task Should_ReturnSuccess_WhenRequestingMovie4KWithAutoApprove()
-        {
-            UserManager.Setup(x => x.IsInRoleAsync(It.IsAny<OmbiUser>(), OmbiRoles.RequestMovie)).ReturnsAsync(false);
-            UserManager.Setup(x => x.IsInRoleAsync(It.IsAny<OmbiUser>(), OmbiRoles.AutoApproveMovie)).ReturnsAsync(false);
-            UserManager.Setup(x => x.IsInRoleAsync(It.IsAny<OmbiUser>(), OmbiRoles.Request4KMovie)).ReturnsAsync(false);
-            UserManager.Setup(x => x.IsInRoleAsync(It.IsAny<OmbiUser>(), OmbiRoles.AutoApprove4KMovie)).ReturnsAsync(true);
-            var request = new MovieRequests() { RequestType = Store.Entities.RequestType.Movie, Is4kRequest = true };
-            var result = await Rule.Execute(request);
-
-            Assert.True(result.Success);
-        }
-
-        [Test]
-        public async Task Should_ReturnFailure_WhenRequestingMovie4KWithout4KRoles()
         {
             UserManager.Setup(x => x.IsInRoleAsync(It.IsAny<OmbiUser>(), OmbiRoles.RequestMovie)).ReturnsAsync(true);
             UserManager.Setup(x => x.IsInRoleAsync(It.IsAny<OmbiUser>(), OmbiRoles.AutoApproveMovie)).ReturnsAsync(true);
             UserManager.Setup(x => x.IsInRoleAsync(It.IsAny<OmbiUser>(), OmbiRoles.Request4KMovie)).ReturnsAsync(false);
-            UserManager.Setup(x => x.IsInRoleAsync(It.IsAny<OmbiUser>(), OmbiRoles.AutoApprove4KMovie)).ReturnsAsync(false);
+            var request = new MovieRequests() { RequestType = Store.Entities.RequestType.Movie, Has4KRequest = true };
-            var request = new MovieRequests() { RequestType = Store.Entities.RequestType.Movie, Is4kRequest = true };
             var result = await Rule.Execute(request);
 
-            Assert.False(result.Success);
+            Assert.True(result.Success);
         }
 
         [Test]

src/Ombi.Core.Tests/Rule/Request/ExistingMovieRequestRuleTests.cs

@@ -1,15 +1,21 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Principal;
 using System.Threading.Tasks;
 using MockQueryable.Moq;
 using Moq;
 using NUnit.Framework;
+using Ombi.Core.Authentication;
+using Ombi.Core.Rule.Rules;
 using Ombi.Core.Rule.Rules.Request;
 using Ombi.Core.Services;
+using Ombi.Helpers;
 using Ombi.Settings.Settings.Models;
 using Ombi.Store.Entities;
 using Ombi.Store.Entities.Requests;
 using Ombi.Store.Repository.Requests;
+using Ombi.Test.Common;
 
 namespace Ombi.Core.Tests.Rule.Request
 {
@@ -39,7 +45,7 @@ namespace Ombi.Core.Tests.Rule.Request
                     TheMovieDbId = 1,
                     RequestType = RequestType.Movie
                 }
-            }.AsQueryable().BuildMock());
+            }.AsQueryable().BuildMock().Object);
             var o = new MovieRequests
             {
                 TheMovieDbId = 1,
@@ -61,7 +67,7 @@ namespace Ombi.Core.Tests.Rule.Request
                     ImdbId = 1.ToString(),
                     RequestType = RequestType.Movie
                 }
-            }.AsQueryable().BuildMock());
+            }.AsQueryable().BuildMock().Object);
             var o = new MovieRequests
             {
                 ImdbId = 1.ToString(),
@@ -83,7 +89,7 @@ namespace Ombi.Core.Tests.Rule.Request
                     ImdbId = "2",
                     RequestType = RequestType.Movie
                 }
-            }.AsQueryable().BuildMock());
+            }.AsQueryable().BuildMock().Object);
             var o = new MovieRequests
             {
                 TheMovieDbId = 1,
@@ -107,7 +113,7 @@ namespace Ombi.Core.Tests.Rule.Request
                     RequestType = RequestType.Movie,
                     Is4kRequest = true
                 }
-            }.AsQueryable().BuildMock());
+            }.AsQueryable().BuildMock().Object);
             var o = new MovieRequests
             {
                 TheMovieDbId = 2,
@@ -133,7 +139,7 @@ namespace Ombi.Core.Tests.Rule.Request
                     RequestType = RequestType.Movie,
                     Is4kRequest = false
                 }
-            }.AsQueryable().BuildMock());
+            }.AsQueryable().BuildMock().Object);
             var o = new MovieRequests
             {
                 TheMovieDbId = 2,
@@ -159,7 +165,7 @@ namespace Ombi.Core.Tests.Rule.Request
                     RequestType = RequestType.Movie,
                     Is4kRequest = false
                 }
-            }.AsQueryable().BuildMock());
+            }.AsQueryable().BuildMock().Object);
             var o = new MovieRequests
             {
                 TheMovieDbId = 2,

src/Ombi.Core.Tests/Rule/Request/ExistingPlexRequestRuleTests.cs

@@ -7,8 +7,10 @@ using Ombi.Store.Entities;
 using Ombi.Store.Entities.Requests;
 using Ombi.Store.Repository;
 using Ombi.Store.Repository.Requests;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 
 namespace Ombi.Core.Tests.Rule.Request
@@ -29,7 +31,7 @@ namespace Ombi.Core.Tests.Rule.Request
         [Test]
         public async Task RequestShow_DoesNotExistAtAll_IsSuccessful()
         {
-            PlexContentRepo.Setup(x => x.GetAll()).Returns(new List<PlexServerContent>().AsQueryable().BuildMock());
+            PlexContentRepo.Setup(x => x.GetAll()).Returns(new List<PlexServerContent>().AsQueryable().BuildMock().Object);
             var req = new ChildRequests
             {
                 SeasonRequests = new List<SeasonRequests>
@@ -201,7 +203,7 @@ namespace Ombi.Core.Tests.Rule.Request
                     TheMovieDbId = 123.ToString(),
                 }
             };
-            PlexContentRepo.Setup(x => x.GetAll()).Returns(content.AsQueryable().BuildMock());
+            PlexContentRepo.Setup(x => x.GetAll()).Returns(content.AsQueryable().BuildMock().Object);
 
             var req = new MovieRequests
             {
@@ -243,7 +245,7 @@ namespace Ombi.Core.Tests.Rule.Request
                     }
                 }
             };
-            PlexContentRepo.Setup(x => x.GetAll()).Returns(childRequests.AsQueryable().BuildMock());
+            PlexContentRepo.Setup(x => x.GetAll()).Returns(childRequests.AsQueryable().BuildMock().Object);
         }
     }
 }

src/Ombi.Core.Tests/Rule/Request/ExistingTvRequestRuleTests.cs

@@ -5,8 +5,10 @@ using Ombi.Core.Rule.Rules.Request;
 using Ombi.Store.Entities;
 using Ombi.Store.Entities.Requests;
 using Ombi.Store.Repository.Requests;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 
 namespace Ombi.Core.Tests.Rule.Request
@@ -27,7 +29,7 @@ namespace Ombi.Core.Tests.Rule.Request
         [Test]
         public async Task RequestShow_DoesNotExistAtAll_IsSuccessful()
         {
-            TvRequestRepo.Setup(x => x.GetChild()).Returns(new List<ChildRequests>().AsQueryable().BuildMock());
+            TvRequestRepo.Setup(x => x.GetChild()).Returns(new List<ChildRequests>().AsQueryable().BuildMock().Object);
             var req = new ChildRequests
             {
                 SeasonRequests = new List<SeasonRequests>
@@ -207,7 +209,7 @@ namespace Ombi.Core.Tests.Rule.Request
                     }
                 }
             };
-            TvRequestRepo.Setup(x => x.GetChild()).Returns(childRequests.AsQueryable().BuildMock());
+            TvRequestRepo.Setup(x => x.GetChild()).Returns(childRequests.AsQueryable().BuildMock().Object);
         }
     }
 }

src/Ombi.Core.Tests/Senders/MassEmailSenderTests.cs

@@ -54,7 +54,7 @@ namespace Ombi.Core.Tests.Senders
                     Id = "a",
                     Email = "Test@test.com"
                 }
-            }.AsQueryable().BuildMock());
+            }.AsQueryable().BuildMock().Object);
 
             var result = await _subject.SendMassEmail(model);
 
@@ -95,7 +95,7 @@ namespace Ombi.Core.Tests.Senders
                     Id = "b",
                     Email = "b@test.com"
                 }
-            }.AsQueryable().BuildMock());
+            }.AsQueryable().BuildMock().Object);
 
             var result = await _subject.SendMassEmail(model);
 
@@ -129,7 +129,7 @@ namespace Ombi.Core.Tests.Senders
                 {
                     Id = "a",
                 }
-            }.AsQueryable().BuildMock());
+            }.AsQueryable().BuildMock().Object);
 
             var result = await _subject.SendMassEmail(model);
             _mocker.Verify<ILogger<MassEmailSender>>(
@@ -177,7 +177,7 @@ namespace Ombi.Core.Tests.Senders
                     Id = "b",
                     Email = "b@test.com"
                 }
-            }.AsQueryable().BuildMock());
+            }.AsQueryable().BuildMock().Object);
 
             var result = await _subject.SendMassEmail(model);
 
@@ -217,7 +217,7 @@ namespace Ombi.Core.Tests.Senders
                 {
                     Id = "b",
                 }
-            }.AsQueryable().BuildMock());
+            }.AsQueryable().BuildMock().Object);
 
             var result = await _subject.SendMassEmail(model);
 

src/Ombi.Core.Tests/Services/PlexServiceTests.cs

@@ -59,7 +59,7 @@ namespace Ombi.Core.Tests.Services
             _subject = _mocker.CreateInstance<PlexService>();
 
             _mocker.Setup<IRepository<PlexWatchlistUserError>, IQueryable<PlexWatchlistUserError>>(x => x.GetAll())
-                .Returns(new List<PlexWatchlistUserError>().AsQueryable().BuildMock());
+                .Returns(new List<PlexWatchlistUserError>().AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetWatchlistUsers(CancellationToken.None);
 
@@ -95,7 +95,7 @@ namespace Ombi.Core.Tests.Services
             _subject = _mocker.CreateInstance<PlexService>();
 
             _mocker.Setup<IRepository<PlexWatchlistUserError>, IQueryable<PlexWatchlistUserError>>(x => x.GetAll())
-                .Returns(new List<PlexWatchlistUserError>().AsQueryable().BuildMock());
+                .Returns(new List<PlexWatchlistUserError>().AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetWatchlistUsers(CancellationToken.None);
 
@@ -132,7 +132,7 @@ namespace Ombi.Core.Tests.Services
                         UserId = "1",
                         MediaServerToken = "test",
                     }
-                }.AsQueryable().BuildMock());
+                }.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetWatchlistUsers(CancellationToken.None);
 

src/Ombi.Core.Tests/Services/RecentlyRequestedServiceTests.cs

@@ -15,6 +15,7 @@ using Ombi.Store.Repository.Requests;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -69,9 +70,9 @@ namespace Ombi.Core.Tests.Services
             };
             var albums = new List<AlbumRequest>();
             var chilRequests = new List<ChildRequests>();
-            _mocker.Setup<IMovieRequestRepository, IQueryable<MovieRequests>>(x => x.GetAll()).Returns(movies.AsQueryable().BuildMock());
+            _mocker.Setup<IMovieRequestRepository, IQueryable<MovieRequests>>(x => x.GetAll()).Returns(movies.AsQueryable().BuildMock().Object);
-            _mocker.Setup<IMusicRequestRepository, IQueryable<AlbumRequest>>(x => x.GetAll()).Returns(albums.AsQueryable().BuildMock());
+            _mocker.Setup<IMusicRequestRepository, IQueryable<AlbumRequest>>(x => x.GetAll()).Returns(albums.AsQueryable().BuildMock().Object);
-            _mocker.Setup<ITvRequestRepository, IQueryable<ChildRequests>>(x => x.GetChild()).Returns(chilRequests.AsQueryable().BuildMock());
+            _mocker.Setup<ITvRequestRepository, IQueryable<ChildRequests>>(x => x.GetChild()).Returns(chilRequests.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRecentlyRequested(CancellationToken.None);
 
@@ -131,9 +132,9 @@ namespace Ombi.Core.Tests.Services
             };
             var albums = new List<AlbumRequest>();
             var chilRequests = new List<ChildRequests>();
-            _mocker.Setup<IMovieRequestRepository, IQueryable<MovieRequests>>(x => x.GetAll()).Returns(movies.AsQueryable().BuildMock());
+            _mocker.Setup<IMovieRequestRepository, IQueryable<MovieRequests>>(x => x.GetAll()).Returns(movies.AsQueryable().BuildMock().Object);
-            _mocker.Setup<IMusicRequestRepository, IQueryable<AlbumRequest>>(x => x.GetAll()).Returns(albums.AsQueryable().BuildMock());
+            _mocker.Setup<IMusicRequestRepository, IQueryable<AlbumRequest>>(x => x.GetAll()).Returns(albums.AsQueryable().BuildMock().Object);
-            _mocker.Setup<ITvRequestRepository, IQueryable<ChildRequests>>(x => x.GetChild()).Returns(chilRequests.AsQueryable().BuildMock());
+            _mocker.Setup<ITvRequestRepository, IQueryable<ChildRequests>>(x => x.GetChild()).Returns(chilRequests.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRecentlyRequested(CancellationToken.None);
 
@@ -162,9 +163,9 @@ namespace Ombi.Core.Tests.Services
             var albums = _fixture.CreateMany<AlbumRequest>(10);
             var chilRequests = _fixture.CreateMany<ChildRequests>(10);
 
-            _mocker.Setup<IMovieRequestRepository, IQueryable<MovieRequests>>(x => x.GetAll()).Returns(movies.AsQueryable().BuildMock());
+            _mocker.Setup<IMovieRequestRepository, IQueryable<MovieRequests>>(x => x.GetAll()).Returns(movies.AsQueryable().BuildMock().Object);
-            _mocker.Setup<IMusicRequestRepository, IQueryable<AlbumRequest>>(x => x.GetAll()).Returns(albums.AsQueryable().BuildMock());
+            _mocker.Setup<IMusicRequestRepository, IQueryable<AlbumRequest>>(x => x.GetAll()).Returns(albums.AsQueryable().BuildMock().Object);
-            _mocker.Setup<ITvRequestRepository, IQueryable<ChildRequests>>(x => x.GetChild()).Returns(chilRequests.AsQueryable().BuildMock());
+            _mocker.Setup<ITvRequestRepository, IQueryable<ChildRequests>>(x => x.GetChild()).Returns(chilRequests.AsQueryable().BuildMock().Object);
 
             var result = await _subject.GetRecentlyRequested(CancellationToken.None);
 
@@ -173,7 +174,6 @@ namespace Ombi.Core.Tests.Services
 
 
         [Test]
-        [Ignore("Flaky")]
         public async Task GetRecentlyRequested_HideUsernames()
         {
             _mocker.Setup<ISettingsService<CustomizationSettings>, Task<CustomizationSettings>>(x => x.GetSettingsAsync())
@@ -183,25 +183,20 @@ namespace Ombi.Core.Tests.Services
             var releaseDate = new DateTime(2019, 01, 01);
             var requestDate = DateTime.Now;
 
-            var movies = _fixture.CreateMany<MovieRequests>(10).ToList();
+            var movies = _fixture.CreateMany<MovieRequests>(10);
             var albums = _fixture.CreateMany<AlbumRequest>(10);
             var chilRequests = _fixture.CreateMany<ChildRequests>(10);
-            movies.Add(_fixture.Build<MovieRequests>().With(x => x.RequestedUserId, "a").With(x => x.Title, "unit").Create());
 
-            _mocker.Setup<IMovieRequestRepository, IQueryable<MovieRequests>>(x => x.GetAll()).Returns(movies.AsQueryable().BuildMock());
+            _mocker.Setup<IMovieRequestRepository, IQueryable<MovieRequests>>(x => x.GetAll()).Returns(movies.AsQueryable().BuildMock().Object);
-            _mocker.Setup<IMusicRequestRepository, IQueryable<AlbumRequest>>(x => x.GetAll()).Returns(albums.AsQueryable().BuildMock());
+            _mocker.Setup<IMusicRequestRepository, IQueryable<AlbumRequest>>(x => x.GetAll()).Returns(albums.AsQueryable().BuildMock().Object);
-            _mocker.Setup<ITvRequestRepository, IQueryable<ChildRequests>>(x => x.GetChild()).Returns(chilRequests.AsQueryable().BuildMock());
+            _mocker.Setup<ITvRequestRepository, IQueryable<ChildRequests>>(x => x.GetChild()).Returns(chilRequests.AsQueryable().BuildMock().Object);
-            _mocker.Setup<ICurrentUser, Task<OmbiUser>>(x => x.GetUser()).ReturnsAsync(new OmbiUser { UserName = "test", Id = "a", Alias = "alias", UserType = UserType.LocalUser  });
+            _mocker.Setup<ICurrentUser, Task<OmbiUser>>(x => x.GetUser()).ReturnsAsync(new OmbiUser { UserName = "test", Alias = "alias", UserType = UserType.LocalUser  });
             _mocker.Setup<ICurrentUser, string>(x => x.Username).Returns("test");
             _mocker.Setup<OmbiUserManager, Task<bool>>(x => x.IsInRoleAsync(It.IsAny<OmbiUser>(), It.IsAny<string>())).ReturnsAsync(false);
 
             var result = await _subject.GetRecentlyRequested(CancellationToken.None);
 
-            Assert.Multiple(() =>
+            CollectionAssert.IsEmpty(result.Where(x => !string.IsNullOrEmpty(x.Username) && !string.IsNullOrEmpty(x.UserId)));
-            {
-                Assert.That(result.Count, Is.EqualTo(1));
-                Assert.That(result.First().Title, Is.EqualTo("unit"));
-            });
         }
     }
 }

src/Ombi.Core/Authentication/OmbiUserManager.cs

@@ -69,8 +69,6 @@ namespace Ombi.Core.Authentication
         private readonly ISettingsService<EmbySettings> _embySettings;
         private readonly ISettingsService<JellyfinSettings> _jellyfinSettings;
         private readonly ISettingsService<AuthenticationSettings> _authSettings;
-        private string _clientIpAddress;
-        public string ClientIpAddress { get => _clientIpAddress; set => _clientIpAddress = value; }
 
         public override async Task<bool> CheckPasswordAsync(OmbiUser user, string password)
         {
@@ -90,7 +88,7 @@ namespace Ombi.Core.Authentication
             }
             if (user.UserType == UserType.EmbyUser || user.UserType == UserType.EmbyConnectUser)
             {
-                return await CheckEmbyPasswordAsync(user, password, ClientIpAddress);
+                return await CheckEmbyPasswordAsync(user, password);
             }
             if (user.UserType == UserType.JellyfinUser)
             {
@@ -170,7 +168,7 @@ namespace Ombi.Core.Authentication
         /// <param name="user"></param>
         /// <param name="password"></param>
         /// <returns></returns>
-        private async Task<bool> CheckEmbyPasswordAsync(OmbiUser user, string password, string clientIpAddress="")
+        private async Task<bool> CheckEmbyPasswordAsync(OmbiUser user, string password)
         {
             var embySettings = await _embySettings.GetSettingsAsync();
             var client = _embyApi.CreateClient(embySettings);
@@ -198,7 +196,7 @@ namespace Ombi.Core.Authentication
             {
                 try
                 {
-                    var result = await client.LogIn(user.UserName, password, server.ApiKey, server.FullUri, clientIpAddress);
+                    var result = await client.LogIn(user.UserName, password, server.ApiKey, server.FullUri);
                     if (result != null)
                     {
                         return true;

src/Ombi.Core/Authentication/PlexTokenKeepAliveService.cs

@@ -1,52 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using Ombi.Api.Plex;
-
-namespace Ombi.Core.Authentication
-{
-    public interface IPlexTokenKeepAliveService
-    {
-        Task<bool> KeepTokenAliveAsync(string token, CancellationToken cancellationToken);
-    }
-
-    public class PlexTokenKeepAliveService : IPlexTokenKeepAliveService
-    {
-        private readonly IPlexApi _plexApi;
-        private readonly ILogger<PlexTokenKeepAliveService> _logger;
-
-        public PlexTokenKeepAliveService(IPlexApi plexApi, ILogger<PlexTokenKeepAliveService> logger)
-        {
-            _plexApi = plexApi;
-            _logger = logger;
-        }
-
-        public async Task<bool> KeepTokenAliveAsync(string token, CancellationToken cancellationToken)
-        {
-            try
-            {
-                if (string.IsNullOrEmpty(token))
-                {
-                    _logger.LogWarning("Token is null or empty");
-                    return false;
-                }
-
-                // Use the Ping method to validate the token
-                var isValid = await _plexApi.Ping(token, cancellationToken);
-                
-                if (!isValid)
-                {
-                    _logger.LogWarning("Token validation failed - token may be expired or invalid");
-                }
-
-                return isValid;
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error occurred while keeping token alive");
-                return false;
-            }
-        }
-    }
-} 

src/Ombi.Core/Engine/MovieRequestEngine.cs

@@ -33,8 +33,7 @@ namespace Ombi.Core.Engine
             INotificationHelper helper, IRuleEvaluator r, IMovieSender sender, ILogger<MovieRequestEngine> log,
             OmbiUserManager manager, IRepository<RequestLog> rl, ICacheService cache,
             ISettingsService<OmbiSettings> ombiSettings, IRepository<RequestSubscription> sub, IMediaCacheService mediaCacheService,
-            IFeatureService featureService,
+            IFeatureService featureService)
-            IUserPlayedMovieRepository userPlayedMovieRepository)
             : base(user, requestService, r, manager, cache, ombiSettings, sub)
         {
             MovieApi = movieApi;
@@ -44,7 +43,6 @@ namespace Ombi.Core.Engine
             _requestLog = rl;
             _mediaCacheService = mediaCacheService;
             _featureService = featureService;
-            _userPlayedMovieRepository = userPlayedMovieRepository;
         }
 
         private IMovieDbApi MovieApi { get; }
@@ -54,7 +52,6 @@ namespace Ombi.Core.Engine
         private readonly IRepository<RequestLog> _requestLog;
         private readonly IMediaCacheService _mediaCacheService;
         private readonly IFeatureService _featureService;
-        protected readonly IUserPlayedMovieRepository _userPlayedMovieRepository;
 
         /// <summary>
         /// Requests the movie.
@@ -80,8 +77,7 @@ namespace Ombi.Core.Engine
             var userDetails = await GetUser();
             var canRequestOnBehalf = model.RequestOnBehalf.HasValue();
 
-            var isAdmin = Username.Equals("API", StringComparison.CurrentCultureIgnoreCase)
+            var isAdmin = await UserManager.IsInRoleAsync(userDetails, OmbiRoles.PowerUser)
-                || await UserManager.IsInRoleAsync(userDetails, OmbiRoles.PowerUser)
                 || await UserManager.IsInRoleAsync(userDetails, OmbiRoles.Admin);
             if (canRequestOnBehalf && !isAdmin)
             {
@@ -256,7 +252,7 @@ namespace Ombi.Core.Engine
             var requests = await (OrderMovies(allRequests, orderFilter.OrderType)).Skip(position).Take(count)
                 .ToListAsync();
 
-            await FillAdditionalFields(shouldHide, requests);
+            await CheckForSubscription(shouldHide.UserId, requests);
             return new RequestsViewModel<MovieRequests>
             {
                 Collection = requests,
@@ -300,7 +296,7 @@ namespace Ombi.Core.Engine
             var total = requests.Count();
             requests = requests.Skip(position).Take(count).ToList();
 
-            await FillAdditionalFields(shouldHide, requests);
+            await CheckForSubscription(shouldHide.UserId, requests);
             return new RequestsViewModel<MovieRequests>
             {
                 Collection = requests,
@@ -385,7 +381,7 @@ namespace Ombi.Core.Engine
             // TODO fix this so we execute this on the server
             requests = requests.Skip(position).Take(count).ToList();
 
-            await FillAdditionalFields(shouldHide, requests);
+            await CheckForSubscription(shouldHide.UserId, requests);
             return new RequestsViewModel<MovieRequests>
             {
                 Collection = requests,
@@ -428,7 +424,7 @@ namespace Ombi.Core.Engine
             var total = requests.Count();
             requests = requests.Skip(position).Take(count).ToList();
 
-            await FillAdditionalFields(shouldHide, requests);
+            await CheckForSubscription(shouldHide.UserId, requests);
             return new RequestsViewModel<MovieRequests>
             {
                 Collection = requests,
@@ -510,25 +506,18 @@ namespace Ombi.Core.Engine
                 allRequests = await MovieRepository.GetWithUser().ToListAsync();
             }
 
-            await FillAdditionalFields(shouldHide, allRequests);
+            await CheckForSubscription(shouldHide.UserId, allRequests);
 
             return allRequests;
         }
 
         public async Task<MovieRequests> GetRequest(int requestId)
         {
-            var shouldHide = await HideFromOtherUsers();
-            // TODO: this query should return the request only if the user is allowed to see it (see shouldHide implementations)
             var request = await MovieRepository.GetWithUser().Where(x => x.Id == requestId).FirstOrDefaultAsync();
-            await FillAdditionalFields(shouldHide, new List<MovieRequests> { request });
+            await CheckForSubscription((await GetUser()).Id, new List<MovieRequests> { request });
 
             return request;
         }
-        private async Task FillAdditionalFields(HideResult shouldHide, List<MovieRequests> requests)
-        {
-            await CheckForSubscription(shouldHide.UserId, requests);
-            await CheckForPlayed(shouldHide, requests);
-        }
 
         private async Task CheckForSubscription(string UserId, List<MovieRequests> movieRequests)
         {
@@ -555,23 +544,6 @@ namespace Ombi.Core.Engine
             }
         }
 
-        private async Task CheckForPlayed(HideResult shouldHide, List<MovieRequests> movieRequests)
-        {
-            var theMovieDbIds = movieRequests.Select(x => x.TheMovieDbId);
-            var plays = await _userPlayedMovieRepository.GetAll().Where(x =>
-                theMovieDbIds.Contains(x.TheMovieDbId))
-                .ToListAsync();
-            foreach (var request in movieRequests)
-            {
-                request.WatchedByRequestedUser = plays.Exists(x => x.TheMovieDbId == request.TheMovieDbId && x.UserId == request.RequestedUserId);
-                
-                if (!shouldHide.Hide) 
-                {
-                    request.PlayedByUsersCount = plays.Count(x => x.TheMovieDbId == request.TheMovieDbId);
-                }
-            }
-        }
-
         /// <summary>
         /// Searches the movie request.
         /// </summary>
@@ -591,20 +563,20 @@ namespace Ombi.Core.Engine
             }
 
             var results = allRequests.Where(x => x.Title.Contains(search, CompareOptions.IgnoreCase)).ToList();
-            await FillAdditionalFields(shouldHide, results);
+            await CheckForSubscription(shouldHide.UserId, results);
 
             return results;
         }
 
         public async Task<RequestEngineResult> ApproveMovieById(int requestId, bool is4K)
         {
-            var request = await MovieRepository.GetWithUser().FirstOrDefaultAsync(x => x.Id == requestId);
+            var request = await MovieRepository.Find(requestId);
             return await ApproveMovie(request, is4K);
         }
 
         public async Task<RequestEngineResult> DenyMovieById(int modelId, string denyReason, bool is4K)
         {
-            var request = await MovieRepository.GetWithUser().FirstOrDefaultAsync(x => x.Id == modelId);
+            var request = await MovieRepository.Find(modelId);
             if (request == null)
             {
                 return new RequestEngineResult
@@ -790,7 +762,7 @@ namespace Ombi.Core.Engine
 
         public async Task<RequestEngineResult> ReProcessRequest(int requestId, bool is4K, CancellationToken cancellationToken)
         {
-            var request = await MovieRepository.GetWithUser().FirstOrDefaultAsync(x => x.Id == requestId);
+            var request = await MovieRepository.Find(requestId);
             if (request == null)
             {
                 return new RequestEngineResult
@@ -805,7 +777,7 @@ namespace Ombi.Core.Engine
 
         public async Task<RequestEngineResult> MarkUnavailable(int modelId, bool is4K)
         {
-            var request = await MovieRepository.GetWithUser().FirstOrDefaultAsync(x => x.Id == modelId);
+            var request = await MovieRepository.Find(modelId);
             if (request == null)
             {
                 return new RequestEngineResult
@@ -834,7 +806,7 @@ namespace Ombi.Core.Engine
 
         public async Task<RequestEngineResult> MarkAvailable(int modelId, bool is4K)
         {
-            var request = await MovieRepository.GetWithUser().FirstOrDefaultAsync(x => x.Id == modelId);
+            var request = await MovieRepository.Find(modelId);
             if (request == null)
             {
                 return new RequestEngineResult

src/Ombi.Core/Engine/TvRequestEngine.cs

@@ -35,8 +35,7 @@ namespace Ombi.Core.Engine
         public TvRequestEngine(ITvMazeApi tvApi, IMovieDbApi movApi, IRequestServiceMain requestService, ICurrentUser user,
             INotificationHelper helper, IRuleEvaluator rule, OmbiUserManager manager, ILogger<TvRequestEngine> logger,
             ITvSender sender, IRepository<RequestLog> rl, ISettingsService<OmbiSettings> settings, ICacheService cache,
-            IRepository<RequestSubscription> sub, IMediaCacheService mediaCacheService,
+            IRepository<RequestSubscription> sub, IMediaCacheService mediaCacheService) : base(user, requestService, rule, manager, cache, settings, sub)
-            IUserPlayedEpisodeRepository userPlayedEpisodeRepository) : base(user, requestService, rule, manager, cache, settings, sub)
         {
             TvApi = tvApi;
             MovieDbApi = movApi;
@@ -45,7 +44,6 @@ namespace Ombi.Core.Engine
             TvSender = sender;
             _requestLog = rl;
             _mediaCacheService = mediaCacheService;
-            _userPlayedEpisodeRepository = userPlayedEpisodeRepository;
         }
 
         private INotificationHelper NotificationHelper { get; }
@@ -56,7 +54,6 @@ namespace Ombi.Core.Engine
         private readonly ILogger<TvRequestEngine> _logger;
         private readonly IRepository<RequestLog> _requestLog;
         private readonly IMediaCacheService _mediaCacheService;
-        private readonly IUserPlayedEpisodeRepository _userPlayedEpisodeRepository;
 
         public async Task<RequestEngineResult> RequestTvShow(TvRequestViewModel tv)
         {
@@ -164,7 +161,7 @@ namespace Ombi.Core.Engine
             var user = await GetUser();
             var canRequestOnBehalf = tv.RequestOnBehalf.HasValue();
 
-            var isAdmin = Username.Equals("API", StringComparison.CurrentCultureIgnoreCase) || await UserManager.IsInRoleAsync(user, OmbiRoles.PowerUser) || await UserManager.IsInRoleAsync(user, OmbiRoles.Admin);
+            var isAdmin = await UserManager.IsInRoleAsync(user, OmbiRoles.PowerUser) || await UserManager.IsInRoleAsync(user, OmbiRoles.Admin);
             if (tv.RequestOnBehalf.HasValue() && !isAdmin)
             {
                 return new RequestEngineResult
@@ -295,7 +292,7 @@ namespace Ombi.Core.Engine
                     .Skip(position).Take(count).ToListAsync();
 
             }
-            await FillAdditionalFields(shouldHide, allRequests);
+            await CheckForSubscription(shouldHide, allRequests);
 
             return new RequestsViewModel<TvRequests>
             {
@@ -331,7 +328,7 @@ namespace Ombi.Core.Engine
                 return new RequestsViewModel<TvRequests>();
             }
 
-            await FillAdditionalFields(shouldHide, allRequests);
+            await CheckForSubscription(shouldHide, allRequests);
 
             return new RequestsViewModel<TvRequests>
             {
@@ -354,7 +351,7 @@ namespace Ombi.Core.Engine
                 allRequests = await TvRepository.Get().ToListAsync();
             }
 
-            await FillAdditionalFields(shouldHide, allRequests);
+            await CheckForSubscription(shouldHide, allRequests);
             return allRequests;
         }
 
@@ -399,7 +396,7 @@ namespace Ombi.Core.Engine
                 ? allRequests.OrderBy(x => prop.GetValue(x)).ToList()
                 : allRequests.OrderByDescending(x => prop.GetValue(x)).ToList();
             
-            await FillAdditionalFields(shouldHide, allRequests);
+            await CheckForSubscription(shouldHide, allRequests);
 
             // Make sure we do not show duplicate child requests
             allRequests = allRequests.DistinctBy(x => x.ParentRequest.Title).ToList();
@@ -472,7 +469,7 @@ namespace Ombi.Core.Engine
                 ? allRequests.OrderBy(x => prop.GetValue(x)).ToList()
                 : allRequests.OrderByDescending(x => prop.GetValue(x)).ToList();
             
-            await FillAdditionalFields(shouldHide, allRequests);
+            await CheckForSubscription(shouldHide, allRequests);
 
             // Make sure we do not show duplicate child requests
             allRequests = allRequests.DistinctBy(x => x.ParentRequest.Title).ToList();
@@ -526,7 +523,7 @@ namespace Ombi.Core.Engine
             allRequests = sortOrder.Equals("asc", StringComparison.InvariantCultureIgnoreCase)
                 ? allRequests.OrderBy(x => prop.GetValue(x)).ToList()
                 : allRequests.OrderByDescending(x => prop.GetValue(x)).ToList();
-            await FillAdditionalFields(shouldHide, allRequests);
+            await CheckForSubscription(shouldHide, allRequests);
 
             // Make sure we do not show duplicate child requests
             allRequests = allRequests.DistinctBy(x => x.ParentRequest.Title).ToList();
@@ -554,7 +551,7 @@ namespace Ombi.Core.Engine
                 allRequests = await TvRepository.GetLite().ToListAsync();
             }
 
-            await FillAdditionalFields(shouldHide, allRequests);
+            await CheckForSubscription(shouldHide, allRequests);
             return allRequests;
         }
 
@@ -573,7 +570,7 @@ namespace Ombi.Core.Engine
                 request = await TvRepository.Get().Where(x => x.Id == requestId).FirstOrDefaultAsync();
             }
 
-            await FillAdditionalFields(shouldHide, new List<TvRequests>{request});
+            await CheckForSubscription(shouldHide, new List<TvRequests>{request});
             return request;
         }
 
@@ -627,7 +624,7 @@ namespace Ombi.Core.Engine
                 allRequests = await TvRepository.GetChild().Include(x => x.SeasonRequests).Where(x => x.ParentRequestId == tvId).ToListAsync();
             }
 
-            await FillAdditionalFields(shouldHide, allRequests);
+            await CheckForSubscription(shouldHide, allRequests);
 
             return allRequests;
         }
@@ -646,7 +643,7 @@ namespace Ombi.Core.Engine
             }
             var results = await allRequests.Where(x => x.Title.Contains(search, CompareOptions.IgnoreCase)).ToListAsync();
 
-            await FillAdditionalFields(shouldHide, results);
+            await CheckForSubscription(shouldHide, results);
             return results;
         }
 
@@ -696,8 +693,6 @@ namespace Ombi.Core.Engine
                     ErrorMessage = "Child Request does not exist"
                 };
             }
-
-            request.MarkedAsApproved = DateTime.Now;
             request.Approved = true;
             request.Denied = false;
 
@@ -869,20 +864,14 @@ namespace Ombi.Core.Engine
             }
         }
 
-        private async Task FillAdditionalFields(HideResult shouldHide, List<TvRequests> x)
+        private async Task CheckForSubscription(HideResult shouldHide, List<TvRequests> x)
         {
             foreach (var tvRequest in x)
             {
-                await FillAdditionalFields(shouldHide, tvRequest.ChildRequests);
+                await CheckForSubscription(shouldHide, tvRequest.ChildRequests);
             }
         }
 
-        private async Task FillAdditionalFields(HideResult shouldHide, List<ChildRequests> childRequests)
-        {
-            await CheckForSubscription(shouldHide, childRequests);
-            CheckForPlayed(shouldHide, childRequests);
-        }
-
         private async Task CheckForSubscription(HideResult shouldHide, List<ChildRequests> childRequests)
         {
             var sub = _subscriptionRepository.GetAll();
@@ -907,59 +896,6 @@ namespace Ombi.Core.Engine
             }
         }
 
-        private class EpisodeKey
-        {
-            public int SeasonNumber;
-            public int EpisodeNumber;
-        }
-
-        private void CheckForPlayed(HideResult shouldHide, List<ChildRequests> childRequests)
-        {
-            var theMovieDbIds = childRequests.Select(x => x.Id);
-            foreach (var request in childRequests)
-            {
-                var requestedEpisodes = GetEpisodesKeys(request);
-
-                var playedEpisodes = _userPlayedEpisodeRepository
-                    .GetAll()
-                    .Where(x => x.TheMovieDbId == request.Id && x.UserId == request.RequestedUserId)
-                    .AsEnumerable()
-                    .Join(requestedEpisodes,
-                        played => new { played.SeasonNumber, played.EpisodeNumber },
-                        requested => new { requested.SeasonNumber, requested.EpisodeNumber },
-                        (played, requested) => new { played });
-
-                var playedCount = playedEpisodes.Count();
-                var toWatchCount = requestedEpisodes.Count();
-                if (playedCount == 0 || toWatchCount == 0)
-                {
-                    request.RequestedUserPlayedProgress = 0;
-                }
-                else
-                {
-                    request.RequestedUserPlayedProgress = 100 * playedCount / toWatchCount;
-                }
-                
-            }
-        }
-
-        private List<EpisodeKey> GetEpisodesKeys(ChildRequests request)
-        {
-            List<EpisodeKey> result = new List<EpisodeKey>();
-            foreach(var season in request.SeasonRequests) 
-            {
-                foreach(var episode in season.Episodes) 
-                {
-                    result.Add(new EpisodeKey
-                    {
-                        SeasonNumber = season.SeasonNumber,
-                        EpisodeNumber = episode.EpisodeNumber
-                    });
-                }
-            }
-            return result;
-        }
-
         private async Task<RequestEngineResult> AddExistingRequest(ChildRequests newRequest, TvRequests existingRequest, string requestOnBehalf, int rootFolder, int qualityProfile)
         {
             // Add the child

src/Ombi.Core/Engine/UserDeletionEngine.cs

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.VisualBasic;
 using Ombi.Core.Authentication;
 using Ombi.Store.Entities;
 using Ombi.Store.Entities.Requests;

src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs

@@ -200,14 +200,19 @@ namespace Ombi.Core.Engine.V2
         public async Task<IEnumerable<SearchMovieViewModel>> NowPlayingMovies(int currentPosition, int amountToLoad)
         {
             var langCode = await DefaultLanguageCode(null);
+            var isOldTrendingSourceEnabled = await _feature.FeatureEnabled(FeatureNames.OldTrendingSource); 
 
             var pages = PaginationHelper.GetNextPages(currentPosition, amountToLoad, _theMovieDbMaxPageItems);
 
             var results = new List<MovieDbSearchResult>();
             foreach (var pagesToLoad in pages)
             {
+                var search = () => (isOldTrendingSourceEnabled) ? 
+                     MovieApi.NowPlaying(langCode, pagesToLoad.Page) 
+                     : MovieApi.TrendingMovies(langCode, pagesToLoad.Page);
+                
                 var apiResult = await Cache.GetOrAddAsync(nameof(NowPlayingMovies) + pagesToLoad.Page + langCode,
-                    () => MovieApi.TrendingMovies(langCode, pagesToLoad.Page), DateTimeOffset.Now.AddHours(12));
+                    search, DateTimeOffset.Now.AddHours(12));
                 results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take));
             }
             return await TransformMovieResultsToResponse(results);

src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs

@@ -138,13 +138,17 @@ namespace Ombi.Core.Engine.V2
         public async Task<IEnumerable<SearchTvShowViewModel>> Trending(int currentlyLoaded, int amountToLoad)
         {           
             var langCode = await DefaultLanguageCode(null);
+            var isOldTrendingSourceEnabled = await _feature.FeatureEnabled(FeatureNames.OldTrendingSource); 
 
             var pages = PaginationHelper.GetNextPages(currentlyLoaded, amountToLoad, ResultLimit);
             var results = new List<MovieDbSearchResult>();
             foreach (var pagesToLoad in pages)
             {
+                var search = ( async () => (isOldTrendingSourceEnabled) ?
+                                await _movieApi.TopRatedTv(langCode, pagesToLoad.Page) 
+                                : await _movieApi.TrendingTv(langCode, pagesToLoad.Page));
                 var apiResult = await Cache.GetOrAddAsync(nameof(Trending) + langCode + pagesToLoad.Page,
-                    () => _movieApi.TrendingTv(langCode, pagesToLoad.Page), DateTimeOffset.Now.AddHours(12));
+                    search, DateTimeOffset.Now.AddHours(12));
                 results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take));
             }
 

src/Ombi.Core/Helpers/DatabaseConfigurationSetup.cs

@@ -1,67 +0,0 @@
-using System;
-using System.Text;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Storage;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal;
-using Ombi.Core.Models;
-using Polly;
-using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
-
-namespace Ombi.Core.Helpers;
-
-public static class DatabaseConfigurationSetup
-{
-    public static void ConfigurePostgres(DbContextOptionsBuilder options, PerDatabaseConfiguration config)
-    {
-        options.UseNpgsql(config.ConnectionString, b =>
-        {
-            b.EnableRetryOnFailure();
-        }).ReplaceService<ISqlGenerationHelper, NpgsqlCaseInsensitiveSqlGenerationHelper>();
-    }
-    
-    public static void ConfigureMySql(DbContextOptionsBuilder options, PerDatabaseConfiguration config)
-    {
-        if (string.IsNullOrEmpty(config.ConnectionString))
-        {
-            throw new ArgumentNullException("ConnectionString for the MySql/Mariadb database is empty");
-        }
-
-        options.UseMySql(config.ConnectionString, GetServerVersion(config.ConnectionString), b =>
-        {
-            //b.CharSetBehavior(Pomelo.EntityFrameworkCore.MySql.Infrastructure.CharSetBehavior.NeverAppend); // ##ISSUE, link to migrations?
-            b.EnableRetryOnFailure();
-        });
-    }
-    
-    private static ServerVersion GetServerVersion(string connectionString)
-    {
-        // Workaround Windows bug, that can lead to the following exception:
-        //
-        // MySqlConnector.MySqlException (0x80004005): SSL Authentication Error
-        //     ---> System.Security.Authentication.AuthenticationException: Authentication failed, see inner exception.
-        //     ---> System.ComponentModel.Win32Exception (0x8009030F): The message or signature supplied for verification has been altered
-        //
-        // See https://github.com/dotnet/runtime/issues/17005#issuecomment-305848835
-        //
-        // Also workaround for the fact, that ServerVersion.AutoDetect() does not use any retrying strategy.
-        ServerVersion serverVersion = null;
-#pragma warning disable EF1001
-        var retryPolicy = Policy.Handle<Exception>(exception => MySqlTransientExceptionDetector.ShouldRetryOn(exception))
-#pragma warning restore EF1001
-            .WaitAndRetry(3, (count, context) => TimeSpan.FromMilliseconds(count * 250));
-
-        serverVersion = retryPolicy.Execute(() => serverVersion = ServerVersion.AutoDetect(connectionString));
-
-        return serverVersion;
-    }
-    public class NpgsqlCaseInsensitiveSqlGenerationHelper : NpgsqlSqlGenerationHelper
-    {
-        const string EFMigrationsHisory = "__EFMigrationsHistory";
-        public NpgsqlCaseInsensitiveSqlGenerationHelper(RelationalSqlGenerationHelperDependencies dependencies)
-            : base(dependencies) { }
-        public override string DelimitIdentifier(string identifier) =>
-            base.DelimitIdentifier(identifier == EFMigrationsHisory ? identifier : identifier.ToLower());
-        public override void DelimitIdentifier(StringBuilder builder, string identifier)
-            => base.DelimitIdentifier(builder, identifier == EFMigrationsHisory ? identifier : identifier.ToLower());
-    }
-}

src/Ombi.Core/Helpers/FileSystem.cs

@@ -1,10 +0,0 @@
-namespace Ombi.Core.Helpers;
-
-public class FileSystem : IFileSystem
-{
-    public bool FileExists(string path)
-    {
-        return System.IO.File.Exists(path);
-    }
-    // Implement other file system operations as needed
-}

src/Ombi.Core/Helpers/IFileSystem.cs

@@ -1,7 +0,0 @@
-namespace Ombi.Core.Helpers;
-
-public interface IFileSystem
-{
-    bool FileExists(string path);
-    // Add other file system operations as needed
-}

src/Ombi.Core/Models/DatabaseConfiguration.cs

@@ -1,40 +0,0 @@
-using System.IO;
-
-namespace Ombi.Core.Models;
-
-public class DatabaseConfiguration
-{
-    public const string SqliteDatabase = "Sqlite";
-
-    public DatabaseConfiguration()
-    {
-
-    }
-
-    public DatabaseConfiguration(string defaultSqlitePath)
-    {
-        OmbiDatabase = new PerDatabaseConfiguration(SqliteDatabase, $"Data Source={Path.Combine(defaultSqlitePath, "Ombi.db")}");
-        SettingsDatabase = new PerDatabaseConfiguration(SqliteDatabase, $"Data Source={Path.Combine(defaultSqlitePath, "OmbiSettings.db")}");
-        ExternalDatabase = new PerDatabaseConfiguration(SqliteDatabase, $"Data Source={Path.Combine(defaultSqlitePath, "OmbiExternal.db")}");
-    }
-    public PerDatabaseConfiguration OmbiDatabase { get; set; }
-    public PerDatabaseConfiguration SettingsDatabase { get; set; }
-    public PerDatabaseConfiguration ExternalDatabase { get; set; }
-}
-
-public class PerDatabaseConfiguration
-{
-    public PerDatabaseConfiguration(string type, string connectionString)
-    {
-        Type = type;
-        ConnectionString = connectionString;
-    }
-
-    // Used in Deserialization
-    public PerDatabaseConfiguration()
-    {
-
-    }
-    public string Type { get; set; }
-    public string ConnectionString { get; set; }
-}

src/Ombi.Core/Models/Requests/RecentlyRequestedModel.cs

@@ -16,7 +16,6 @@ namespace Ombi.Core.Models.Requests
         public string Overview { get; set; }
         public DateTime ReleaseDate { get; set; }
         public bool Approved { get; set; }
-        public bool Denied { get; set; }
         public string MediaId { get; set; }
 
         public string PosterPath { get; set; }

src/Ombi.Core/Models/TesterResultModel.cs

@@ -3,8 +3,6 @@
     public class TesterResultModel
     {
         public bool IsValid { get; set; }
-        public string Version { get; set; }
         public string ExpectedSubDir { get; set; }
-        public string AdditionalInformation { get; set; }
     }
 }

src/Ombi.Core/Ombi.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
     <Version></Version>
@@ -11,13 +11,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="12.0.0" />
+    <PackageReference Include="AutoMapper" Version="10.0.0" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="6.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
-    <PackageReference Include="MusicBrainzAPI" Version="2.5.0" />
+    <PackageReference Include="MusicBrainzAPI" Version="2.0.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.1.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Core/Rule/Rules/Request/AutoApproveRule.cs

@@ -36,7 +36,7 @@ namespace Ombi.Core.Rule.Rules.Request
             {
                 if (obj is MovieRequests movie)
                 {
-                    await ApproveMovie(movie);
+                    await Check4K(movie);
                 }
                 else
                 {
@@ -45,14 +45,10 @@ namespace Ombi.Core.Rule.Rules.Request
                 return Success();
             }
 
-            if (obj.RequestType == RequestType.Movie)
+            if (obj.RequestType == RequestType.Movie && await _manager.IsInRoleAsync(user, OmbiRoles.AutoApproveMovie))
             {
                 var movie = (MovieRequests)obj;
-                var autoApproveRole = movie.Is4kRequest ? OmbiRoles.AutoApprove4KMovie : OmbiRoles.AutoApproveMovie;
+                await Check4K(movie);
-                if (await _manager.IsInRoleAsync(user, autoApproveRole))
-                {
-                    await ApproveMovie(movie);
-                }
             }
             if (obj.RequestType == RequestType.TvShow && await _manager.IsInRoleAsync(user, OmbiRoles.AutoApproveTv))
                 obj.Approved = true;
@@ -61,7 +57,7 @@ namespace Ombi.Core.Rule.Rules.Request
             return Success(); // We don't really care, we just don't set the obj to approve
         }
 
-        private async Task ApproveMovie(MovieRequests movie)
+        private async Task Check4K(MovieRequests movie)
         {
             var featureEnabled = await _featureService.FeatureEnabled(FeatureNames.Movie4KRequests);
             if (movie.Is4kRequest && featureEnabled)

src/Ombi.Core/Rule/Rules/Request/CanRequestRule.cs

@@ -36,13 +36,21 @@ namespace Ombi.Core.Rule.Rules.Request
             if (obj.RequestType == RequestType.Movie)
             {
                 var movie = (MovieRequests)obj;
-                
+                var hasAutoApprove = await _manager.IsInRoleAsync(user, OmbiRoles.AutoApproveMovie);
-                var requestRole = movie.Is4kRequest ? OmbiRoles.Request4KMovie : OmbiRoles.RequestMovie;
+                if (await _manager.IsInRoleAsync(user, OmbiRoles.RequestMovie) || hasAutoApprove)
-                var autoApproveRole = movie.Is4kRequest ? OmbiRoles.AutoApprove4KMovie : OmbiRoles.AutoApproveMovie;
-
-                if (await _manager.IsInRoleAsync(user, requestRole) || await _manager.IsInRoleAsync(user, autoApproveRole))
                 {
-                    return Success();
+                    if (movie.Is4kRequest && !hasAutoApprove)
+                    {
+                        var has4kPermission = await _manager.IsInRoleAsync(user, OmbiRoles.Request4KMovie);
+                        if (has4kPermission)
+                        {
+                            return Success();
+                        }
+                    }
+                    else
+                    {
+                        return Success();
+                    }
                 }
                 return Fail(ErrorCode.NoPermissionsRequestMovie, "You do not have permissions to Request a Movie");
             }