Add private IPv6 networks

(cherry picked from commit 52972e7efcce800560cbbaa64f5f76aaef6cbe77)

frontend/src/Settings/Applications/Applications/AddApplicationItem.js

@@ -1,18 +1,14 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Label from 'Components/Label';
 import Button from 'Components/Link/Button';
 import Link from 'Components/Link/Link';
 import Menu from 'Components/Menu/Menu';
 import MenuContent from 'Components/Menu/MenuContent';
-import { kinds, sizes } from 'Helpers/Props';
+import { sizes } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import AddApplicationPresetMenuItem from './AddApplicationPresetMenuItem';
 import styles from './AddApplicationItem.css';
 
-const DEPRECATED_APPLICATIONS = ['Readarr'];
-const OBSOLETE_APPLICATIONS = [];
-
 class AddApplicationItem extends Component {
 
   //
@@ -40,8 +36,6 @@ class AddApplicationItem extends Component {
     } = this.props;
 
     const hasPresets = !!presets && !!presets.length;
-    const isDeprecated = DEPRECATED_APPLICATIONS.includes(implementation);
-    const isObsolete = OBSOLETE_APPLICATIONS.includes(implementation);
 
     return (
       <div
@@ -55,24 +49,6 @@ class AddApplicationItem extends Component {
         <div className={styles.overlay}>
           <div className={styles.name}>
             {implementationName}
-            {
-              isDeprecated &&
-                <Label
-                  kind={kinds.WARNING}
-                  title={translate('DeprecatedApplicationMessage', { applicationName: implementationName })}
-                >
-                  {translate('Deprecated')}
-                </Label>
-            }
-            {
-              isObsolete &&
-                <Label
-                  kind={kinds.DANGER}
-                  title={translate('ObsoleteApplicationMessage', { applicationName: implementationName })}
-                >
-                  {translate('Obsolete')}
-                </Label>
-            }
           </div>
 
           <div className={styles.actions}>

frontend/src/Settings/Applications/Applications/Application.js

@@ -10,9 +10,6 @@ import translate from 'Utilities/String/translate';
 import EditApplicationModalConnector from './EditApplicationModalConnector';
 import styles from './Application.css';
 
-const DEPRECATED_APPLICATIONS = ['Readarr'];
-const OBSOLETE_APPLICATIONS = [];
-
 class Application extends Component {
 
   //
@@ -64,13 +61,10 @@ class Application extends Component {
       syncLevel,
       fields,
       tags,
-      tagList,
-      implementation
+      tagList
     } = this.props;
 
     const applicationUrl = fields.find((field) => field.name === 'baseUrl')?.value;
-    const isDeprecated = DEPRECATED_APPLICATIONS.includes(implementation);
-    const isObsolete = OBSOLETE_APPLICATIONS.includes(implementation);
 
     return (
       <Card
@@ -94,26 +88,6 @@ class Application extends Component {
           }
         </div>
 
-        {
-          isDeprecated &&
-            <Label
-              kind={kinds.WARNING}
-              title={translate('DeprecatedApplicationMessage', { applicationName: implementation })}
-            >
-              {translate('Deprecated')}
-            </Label>
-        }
-
-        {
-          isObsolete &&
-            <Label
-              kind={kinds.DANGER}
-              title={translate('ObsoleteApplicationMessage', { applicationName: implementation })}
-            >
-              {translate('Obsolete')}
-            </Label>
-        }
-
         {
           syncLevel === 'addOnly' &&
             <Label kind={kinds.WARNING}>
@@ -167,7 +141,6 @@ class Application extends Component {
 Application.propTypes = {
   id: PropTypes.number.isRequired,
   name: PropTypes.string.isRequired,
-  implementation: PropTypes.string.isRequired,
   enable: PropTypes.bool.isRequired,
   syncLevel: PropTypes.string.isRequired,
   fields: PropTypes.arrayOf(PropTypes.object).isRequired,

frontend/src/Settings/Applications/Applications/EditApplicationModalContent.js

@@ -39,9 +39,6 @@ const syncLevelOptions = [
   }
 ];
 
-const DEPRECATED_APPLICATIONS = ['Readarr'];
-const OBSOLETE_APPLICATIONS = [];
-
 function EditApplicationModalContent(props) {
   const {
     advancedSettings,
@@ -63,7 +60,6 @@ function EditApplicationModalContent(props) {
 
   const {
     id,
-    implementation,
     implementationName,
     name,
     syncLevel,
@@ -72,9 +68,6 @@ function EditApplicationModalContent(props) {
     message
   } = item;
 
-  const isDeprecated = DEPRECATED_APPLICATIONS.includes(implementation);
-  const isObsolete = OBSOLETE_APPLICATIONS.includes(implementation);
-
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
@@ -97,28 +90,6 @@ function EditApplicationModalContent(props) {
         {
           !isFetching && !error &&
             <Form {...otherProps}>
-              {
-                isDeprecated &&
-                  <Alert
-                    className={styles.message}
-                    kind={kinds.WARNING}
-                  >
-                    <div>{translate('DeprecatedApplicationTitle', { applicationName: implementationName })}</div>
-                    <div>{translate('DeprecatedApplicationMessage', { applicationName: implementationName })}</div>
-                  </Alert>
-              }
-
-              {
-                isObsolete &&
-                  <Alert
-                    className={styles.message}
-                    kind={kinds.DANGER}
-                  >
-                    <div>{translate('ObsoleteApplicationTitle', { applicationName: implementationName })}</div>
-                    <div>{translate('ObsoleteApplicationMessage', { applicationName: implementationName })}</div>
-                  </Alert>
-              }
-
               {
                 !!message &&
                   <Alert

src/NzbDrone.Core/Applications/Lidarr/LidarrV1Proxy.cs

@@ -159,7 +159,7 @@ namespace NzbDrone.Core.Applications.Lidarr
                     case HttpStatusCode.BadRequest:
                         if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: https://wiki.servarr.com/prowlarr/faq#prowlarr-will-not-sync-x-indexer-to-app");
+                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
                             break;
                         }
 

src/NzbDrone.Core/Applications/Radarr/RadarrV3Proxy.cs

@@ -172,7 +172,7 @@ namespace NzbDrone.Core.Applications.Radarr
                     case HttpStatusCode.BadRequest:
                         if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: https://wiki.servarr.com/prowlarr/faq#prowlarr-will-not-sync-x-indexer-to-app");
+                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
                             break;
                         }
 

src/NzbDrone.Core/Applications/Readarr/Readarr.cs

@@ -14,7 +14,6 @@ using NzbDrone.Core.Indexers;
 
 namespace NzbDrone.Core.Applications.Readarr
 {
-    [Obsolete("Readarr is deprecated and will be removed in a future version")]
     public class Readarr : ApplicationBase<ReadarrSettings>
     {
         public override string Name => "Readarr";

src/NzbDrone.Core/Applications/Readarr/ReadarrV1Proxy.cs

@@ -146,7 +146,7 @@ namespace NzbDrone.Core.Applications.Readarr
                     case HttpStatusCode.BadRequest:
                         if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: https://wiki.servarr.com/prowlarr/faq#prowlarr-will-not-sync-x-indexer-to-app");
+                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
                             break;
                         }
 

src/NzbDrone.Core/Applications/Sonarr/SonarrV3Proxy.cs

@@ -159,7 +159,7 @@ namespace NzbDrone.Core.Applications.Sonarr
                     case HttpStatusCode.BadRequest:
                         if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: https://wiki.servarr.com/prowlarr/faq#prowlarr-will-not-sync-x-indexer-to-app");
+                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
                             break;
                         }
 

src/NzbDrone.Core/Applications/Whisparr/WhisparrV3Proxy.cs

@@ -144,7 +144,7 @@ namespace NzbDrone.Core.Applications.Whisparr
                     case HttpStatusCode.BadRequest:
                         if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: https://wiki.servarr.com/prowlarr/faq#prowlarr-will-not-sync-x-indexer-to-app");
+                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
                             break;
                         }
 

src/NzbDrone.Core/Localization/Core/en.json

@@ -538,12 +538,6 @@
   "NotificationsTelegramSettingsIncludeAppName": "Include {appName} in Title",
   "NotificationsTelegramSettingsIncludeAppNameHelpText": "Optionally prefix message title with {appName} to differentiate notifications from different applications",
   "OAuthPopupMessage": "Pop-ups are being blocked by your browser",
-  "Obsolete": "Obsolete",
-  "ObsoleteApplicationMessage": "{applicationName} is obsolete and has been removed",
-  "ObsoleteApplicationTitle": "{applicationName} is Obsolete",
-  "Deprecated": "Deprecated",
-  "DeprecatedApplicationMessage": "{applicationName} is deprecated and will be removed in a future version",
-  "DeprecatedApplicationTitle": "{applicationName} is Deprecated",
   "Ok": "Ok",
   "OnApplicationUpdate": "On Application Update",
   "OnApplicationUpdateHelpText": "On Application Update",

src/NzbDrone.Host/Startup.cs

@@ -64,6 +64,8 @@ namespace NzbDrone.Host
                 options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("10.0.0.0"), 8));
                 options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("172.16.0.0"), 12));
                 options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("192.168.0.0"), 16));
+                options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("fc00::"), 7));
+                options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("fe80::"), 10));
             });
 
             services.AddRouting(options => options.LowercaseUrls = true);