From 48bd8d718c3353b4eb40400786157984a918c796 Mon Sep 17 00:00:00 2001 From: Twan Ariens <34845004+twanariens@users.noreply.github.com> Date: Tue, 11 Aug 2020 21:04:21 +0200 Subject: [PATCH 01/15] Update 20200218230644_MobileDevices.cs --- .../Migrations/OmbiMySql/20200218230644_MobileDevices.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Ombi.Store/Migrations/OmbiMySql/20200218230644_MobileDevices.cs b/src/Ombi.Store/Migrations/OmbiMySql/20200218230644_MobileDevices.cs index ce2c2ebd2..ae533b901 100644 --- a/src/Ombi.Store/Migrations/OmbiMySql/20200218230644_MobileDevices.cs +++ b/src/Ombi.Store/Migrations/OmbiMySql/20200218230644_MobileDevices.cs @@ -11,7 +11,7 @@ namespace Ombi.Store.Migrations.OmbiMySql migrationBuilder.Sql(@"CREATE TABLE `MobileDevices` ( `Id` int NOT NULL AUTO_INCREMENT, `Token` longtext CHARACTER SET utf8mb4 NULL, - `UserId` varchar(255) COLLATE utf8mb4_bin NOT NULL, + `UserId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, `AddedAt` datetime(6) NOT NULL, CONSTRAINT `PK_MobileDevices` PRIMARY KEY (`Id`), CONSTRAINT `FK_MobileDevices_AspNetUsers_UserId` FOREIGN KEY (`UserId`) REFERENCES `AspNetUsers` (`Id`) ON DELETE RESTRICT From daea8a5e87e7957aed365926a371290a53cff26f Mon Sep 17 00:00:00 2001 From: tidusjar Date: Mon, 17 Aug 2020 08:10:18 +0100 Subject: [PATCH 02/15] Fixed #3723 --- .../src/app/settings/customization/customization.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html index f9ab12c6b..178978380 100644 --- a/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html +++ b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html @@ -45,7 +45,7 @@
Custom Donation URL - +
From 23be71d8d9588da0398a172cab2e4609d610a371 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 20 Aug 2020 22:24:40 +0100 Subject: [PATCH 03/15] Fixed the issue for larger devices not scrolling, also fixed the funny scroll issue on mobile devices --- .../discover/discover.component.scss | 30 +++++++++---------- .../components/discover/discover.component.ts | 21 ++++++++++--- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.scss b/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.scss index dd8879545..5d08d5656 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.scss +++ b/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.scss @@ -49,9 +49,6 @@ max-width: 100%; min-width: 100%; } - .small-middle-container{ - width:100%; - } .btn-group { width:100%; @@ -61,16 +58,16 @@ width:100%; } - .col{ + .col { padding-right: 10px !important; padding-left:10px !important; } - .row{ + .row { margin-left:0px; } - .small-padding{ + .small-padding { padding-left: 5px !important; padding-right: 0px !important; height: 40em; @@ -100,7 +97,7 @@ ::ng-deep .mat-card-image { height:75% !important; } -} +} @media (min-width: 660px) { .col-xl-2 { @@ -137,7 +134,7 @@ width:auto; } } - + @media (min-width: 870px) { .col-xl-2 { flex: 0 0 33.33333%; @@ -145,7 +142,7 @@ min-width: 33.33333%; } } - + @media (min-width: 1100px) { .col-xl-2 { flex: 0 0 20%; @@ -153,27 +150,28 @@ min-width: 25%; } } - -@media (min-width: 1300px) { + +@media (min-width: 1300px) { .col-xl-2 { flex: 0 0 18%; max-width: 20%; min-width: 20%; } -} +} + @media (min-width: 1600px) { .col-xl-2 { flex: 0 0 16.66666667%; max-width: 16.66666667%; min-width: 16.66666667%; - } + } } @media (min-width: 1900px) { .col-xl-2 { flex: 0 0 14.285713%; max-width: 14.285713%; min-width: 14.285713%; - } + } } @media (min-width: 2200px) { @@ -181,7 +179,7 @@ flex: 0 0 12.5%; max-width: 12.5%; min-width: 12.5%; - } + } } @media (min-width: 2500px) { @@ -189,5 +187,5 @@ flex: 0 0 11.111111%; max-width: 11.111111%; min-width: 11.111111%; - } + } } \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.ts b/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.ts index a92d92c5f..5e1f8f640 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.ts +++ b/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.ts @@ -1,9 +1,10 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit, Inject } from "@angular/core"; import { SearchV2Service } from "../../../services"; import { ISearchMovieResult, ISearchTvResult, RequestType } from "../../../interfaces"; import { IDiscoverCardResult, DiscoverOption } from "../../interfaces"; import { trigger, transition, style, animate } from "@angular/animations"; import { StorageService } from "../../../shared/storage/storage-service"; +import { DOCUMENT } from "@angular/common"; @Component({ templateUrl: "./discover.component.html", @@ -42,7 +43,9 @@ export class DiscoverComponent implements OnInit { private mediaTypeStorageKey = "DiscoverOptions"; constructor(private searchService: SearchV2Service, - private storageService: StorageService) { } + private storageService: StorageService, + @Inject(DOCUMENT) private container: Document) { } + public async ngOnInit() { this.loading() @@ -68,6 +71,9 @@ export class DiscoverComponent implements OnInit { this.createInitialModel(); this.scrollDisabled = false; + if (!this.containerHasScrollBar()) { + await this.onScroll(); + } } public async onScroll() { @@ -209,7 +215,7 @@ export class DiscoverComponent implements OnInit { public async switchDiscoverMode(newMode: DiscoverOption) { this.loading(); this.clear(); - this.discoverOptions = newMode; + this.discoverOptions = newMode; this.storageService.save(this.mediaTypeStorageKey, newMode.toString()); await this.ngOnInit(); this.finishLoading(); @@ -242,7 +248,7 @@ export class DiscoverComponent implements OnInit { this.movies.forEach(m => { tempResults.push({ available: m.available, - posterPath: m.posterPath ? `https://image.tmdb.org/t/p/w300/${m.posterPath}` : "../../../images/default_movie_poster.png", + posterPath: m.posterPath ? `https://image.tmdb.org/t/p/w500/${m.posterPath}` : "../../../images/default_movie_poster.png", requested: m.requested, title: m.title, type: RequestType.movie, @@ -301,4 +307,11 @@ export class DiscoverComponent implements OnInit { private finishLoading() { this.loadingFlag = false; } + + private containerHasScrollBar(): boolean { + return + // div.scrollHeight > div.clientHeight; + this.container.documentElement.scrollHeight > this.container.documentElement.clientHeight; + // this.container.documentElement.scrollHeight > (window.innerHeight + window.pageYOffset); + } } From 95ba89df4441575f1a380394a086485c81c9808e Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 20 Aug 2020 23:10:57 +0100 Subject: [PATCH 04/15] wip on the movie db exclusion --- .../themoviedb/themoviedb.component.html | 27 ++++++- .../themoviedb/themoviedb.component.scss | 6 +- .../themoviedb/themoviedb.component.ts | 76 ++++++++++++++++++- 3 files changed, 102 insertions(+), 7 deletions(-) diff --git a/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.html b/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.html index f57962ac2..1c972bf53 100644 --- a/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.html +++ b/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.html @@ -6,14 +6,37 @@
- +
-
diff --git a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts index 505a188c6..cee54b65a 100644 --- a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts @@ -43,6 +43,7 @@ export class RadarrComponent implements OnInit { port: [x.port, [Validators.required]], addOnly: [x.addOnly], minimumAvailability: [x.minimumAvailability, [Validators.required]], + scanForAvailability: [x.scanForAvailability] }); if (x.defaultQualityProfile) { diff --git a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html index aeda043a1..ac5327c5f 100644 --- a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html +++ b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html @@ -17,6 +17,9 @@
Advanced
+
+ Scan for Availability +
diff --git a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.ts b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.ts index c4cb0d920..157accf02 100644 --- a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.ts @@ -73,6 +73,7 @@ export class SonarrComponent implements OnInit { seasonFolders: [x.seasonFolders], v3: [x.v3], languageProfile: [x.languageProfile], + scanForAvailability: [x.scanForAvailability] }); if (x.qualityProfile) { From ebea0caeb8dba2088c8bfbba598fc1ec4a8ddfb6 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 2 Sep 2020 15:50:37 +0100 Subject: [PATCH 15/15] Discord use the Alias and not the requested username --- .../Agents/DiscordNotification.cs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/Ombi.Notifications/Agents/DiscordNotification.cs b/src/Ombi.Notifications/Agents/DiscordNotification.cs index 7c49dc7d5..e1f0e78c5 100644 --- a/src/Ombi.Notifications/Agents/DiscordNotification.cs +++ b/src/Ombi.Notifications/Agents/DiscordNotification.cs @@ -107,11 +107,20 @@ namespace Ombi.Notifications.Agents var fields = new List(); - if (model.Data.TryGetValue("RequestedUser", out var requestedUser)) + if (model.Data.TryGetValue("Alias", out var alias)) { - if (requestedUser.HasValue()) + if (alias.HasValue()) { - fields.Add(new DiscordField { name = "Requested By", value = requestedUser, inline = true }); + fields.Add(new DiscordField { name = "Requested By", value = alias, inline = true }); + } + } else + { + if (model.Data.TryGetValue("RequestedUser", out var requestedUser)) + { + if (requestedUser.HasValue()) + { + fields.Add(new DiscordField { name = "Requested By", value = requestedUser, inline = true }); + } } } if (model.Data.TryGetValue("DenyReason", out var denyReason))