From 0e744f0fe0b9a48654df691d3e811c05a8a26158 Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 9 Jan 2019 22:28:39 +0000 Subject: [PATCH 01/23] Update CHANGELOG.md --- CHANGELOG.md | 108 +++++++++------------------------------------------ 1 file changed, 18 insertions(+), 90 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0035180dc..f83641e45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,18 @@ # Changelog -## (unreleased) +## v3.0.4119 (2019-1-09) ### **New Features** +- Added a new Custom Page, this will allow you to completely change the page via a WYSIWYG editor! [TidusJar] + +- Added the ability to search movies via the movie db with a different language! [tidusjar] + +- Added the ability to specify a year when searching for movies. [tidusjar] + +- Made the newsletter use the default lanuage code set in the Ombi settings for movie information. [TidusJar] + - Added a global language flag that now applies to the search by default. [tidusjar] - Updated the frontend packages (Using Angular 7 now) [TidusJar] @@ -13,105 +21,28 @@ - Added {AvailableDate} as a Notification Variable, this is the date the request was marked as available. See here: https://github.com/tidusjar/Ombi/wiki/Notification-Template-Variables. [tidusjar] -- Added the ability to search movies via the movie db with a different language! [tidusjar] +- Updated the Newsletter template! Better mail client support [d1slact0r] -- Added the ability to specify a year when searching for movies. [tidusjar] - -- Update NewsletterTemplate.html. [d1slact0r] - -- Update NewsletterTemplate.html. [d1slact0r] - -- Update NewsletterTemplate.html. [d1slact0r] - -- Update HtmlTemplateGenerator.cs. [d1slact0r] - -- Update NewsletterTemplate.html. [d1slact0r] - -- Update HtmlTemplateGenerator.cs. [d1slact0r] - -- Update NewsletterTemplate.html. [d1slact0r] - -- Update NewsletterTemplate.html. [d1slact0r] - -- Update NewsletterTemplate.html. [d1slact0r] - -- Update HtmlTemplateGenerator.cs. [d1slact0r] - -- Updated boostrap #2694. [Jamie] +- Updated boostrap #2694. [TidusJar] - Added the ability to deny a request with a reason. [TidusJar] -## v3.0.4036 (2018-12-11) - - -- Update EmbyEpisodeSync.cs. [Jamie] - -- Updated to .net core 2.2 and included a linux-arm64 build. [TidusJar] - -### **Fixes** - -- Made the newsletter use the default lanuage code set in the Ombi settings for movie information. [TidusJar] - -- Save the language code against the request so we can use it later e.g. Sending to the DVR apps. [tidusjar] - -- Fixed #2716. [tidusjar] +- Updated to .net core 2.2 and included a linux-arm64 build. [aptalca] - Make the newsletter BCC the users rather than creating a million newsletters (Hopefully will stop SMTP providers from marking as spam). This does mean that the custom user customization in the newsletter will no longer work. [TidusJar] +- New translations [TidusJar] + +### **Fixes** + +- Fixed #2716. [tidusjar] + - If we don't know the Plex agent, then see if it's a ImdbId, if it's not check the string for any episode and season hints #2695. [tidusjar] -- New translations en.json (Swedish) [Jamie] - -- New translations en.json (Spanish) [Jamie] - -- New translations en.json (Portuguese, Brazilian) [Jamie] - -- New translations en.json (Polish) [Jamie] - -- New translations en.json (Norwegian) [Jamie] - -- New translations en.json (Italian) [Jamie] - -- New translations en.json (German) [Jamie] - -- New translations en.json (French) [Jamie] - -- New translations en.json (Dutch) [Jamie] - -- New translations en.json (Danish) [Jamie] - -- New translations en.json (Dutch) [Jamie] - -- New translations en.json (Dutch) [Jamie] - -- New translations en.json (Dutch) [Jamie] - -- Made the search results the language specified in the search refinement. [tidusjar] - - Fixed #2704. [tidusjar] -- Now it is fixed :) [d1slact0r] - -- Android please be nice now. [d1slact0r] - -- Fixed title bit better. [d1slact0r] - -- Fixed titles. [d1slact0r] - -- This should fix the build for sure (stupid quotes) [d1slact0r] - -- Fixes build. [d1slact0r] - -- Rewritten the whole newsletter template. [d1slact0r] - - Fixed #2697. [tidusjar] -- Add linux-arm runtime identifier. [aptalca] - -- Add back arm packages. [aptalca] - -- Add arm32 package. [aptalca] - - Fixed #2691. [tidusjar] - Fixed linting. [TidusJar] @@ -120,13 +51,10 @@ - Fixed #2678. [TidusJar] -- Deny reason for movie requests. [TidusJar] - - Set the landing and login pages background refresh to 15 seconds rather than 10 and 7. [TidusJar] - Fixed a bug with us thinking future dated emby episodes are not available, Consoldated the emby and plex search rules (since they have the same logic) [TidusJar] -- Fixed build. [TidusJar] ## v3.0.4036 (2018-12-11) From c8ee14d8d7d744260136f01fc337340f18e37d67 Mon Sep 17 00:00:00 2001 From: Jamie Date: Thu, 10 Jan 2019 08:13:29 +0000 Subject: [PATCH 02/23] Update README.md --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6347a8a5f..61cda24f3 100644 --- a/README.md +++ b/README.md @@ -117,13 +117,12 @@ Please feel free to submit a pull request! # Donation If you feel like donating you can donate with the below buttons! -[![Patreon](https://www.ombi.io/img/patreondonate.svg)](https://patreon.com/tidusjar/Ombi) -[![Paypal](https://www.ombi.io/img/paypaldonate.svg)](https://paypal.me/PlexRequestsNet) + +[![Patreon](https://img.shields.io/badge/patreon-donate-yellow.svg)](https://patreon.com/tidusjar/Ombi) +[![Paypal](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://paypal.me/PlexRequestsNet) ### A massive thanks to everyone for all their help! -## Stats -[![Throughput Graph](https://graphs.waffle.io/tidusjar/PlexRequests.Net/throughput.svg)](https://waffle.io/tidusjar/PlexRequests.Net/metrics/throughput) ### Sponsors ### - [JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools From 1593e3e93a301ec2e13f16da5534a531e35c1f30 Mon Sep 17 00:00:00 2001 From: Andrew Metzger Date: Sun, 20 Jan 2019 10:49:24 -0500 Subject: [PATCH 03/23] Minor grammatical edits Minor changes to grammar and spelling --- .github/ISSUE_TEMPLATE.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 2684ccc3e..87a94617f 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -2,10 +2,10 @@ !! Please use the Support / bug report template, otherwise we will close the Github issue !! -Version 2.X is not supported anymore. Please don't open a issue for the 2.x version. +Version 2.X is not supported anymore. Please don't open an issue for the 2.x version. See https://github.com/tidusjar/Ombi/issues/1455 for more information. -(Pleas submit a feature request over here: http://feathub.com/tidusjar/Ombi) +(Please submit a feature request over here: http://feathub.com/tidusjar/Ombi) ---> @@ -18,7 +18,7 @@ V 3.0.XX Open Beta -#### Media Sever: +#### Media Server: Plex/Emby @@ -45,4 +45,4 @@ Plex/Emby #### Reproduction Steps: -Please include any steps to reproduce the issue, this the request that is causing the problem etc. +Please include any steps to reproduce the issue, this is the request that is causing the problem etc. From 8bc96d1129edf87617246ed90d88d59bd8a3fc99 Mon Sep 17 00:00:00 2001 From: Andrew Metzger Date: Sun, 20 Jan 2019 11:07:11 -0500 Subject: [PATCH 04/23] More minor grammatical edits Edited the last sentence to improve clarity a bit. --- .github/ISSUE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 87a94617f..d2492d590 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -45,4 +45,4 @@ Plex/Emby #### Reproduction Steps: -Please include any steps to reproduce the issue, this is the request that is causing the problem etc. +Please include any steps to reproduce the issue, the request that is causing the problem, etc. From 02f73fc60a2043515a4f8364a21c2529e045bbaf Mon Sep 17 00:00:00 2001 From: Jamie Date: Mon, 21 Jan 2019 12:44:28 +0000 Subject: [PATCH 05/23] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..2236cc395 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,37 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**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. 3.0.1158] +- Media Server [e.g. Plex] + +**Additional context** +Add any other context about the problem here. From 1ac7aa0fd44a392baf3a715666e2e3ab9c8e21b3 Mon Sep 17 00:00:00 2001 From: Jamie Date: Mon, 21 Jan 2019 12:44:56 +0000 Subject: [PATCH 06/23] Delete ISSUE_TEMPLATE.md --- .github/ISSUE_TEMPLATE.md | 48 --------------------------------------- 1 file changed, 48 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index d2492d590..000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,48 +0,0 @@ - - -#### Ombi build Version: - -V 3.0.XX - -#### Update Branch: - -Open Beta - -#### Media Server: - -Plex/Emby - -#### Media Server Version: - - - -#### Operating System: - -(Place text here) - - -#### Ombi Applicable Logs (from `/logs/` directory or the Admin page): - -``` - -(Logs go here. Don't remove the ' tags for showing your logs correctly. Please make sure you remove any personal information from the logs) - -``` - -#### Problem Description: - -(Place text here) - -#### Reproduction Steps: - -Please include any steps to reproduce the issue, the request that is causing the problem, etc. From 5b46c7bd25aca84226a4b4a7e36033dcb32884f4 Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 30 Jan 2019 19:21:58 +0000 Subject: [PATCH 07/23] New translations en.json (Portuguese, Brazilian) --- src/Ombi/wwwroot/translations/pt.json | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Ombi/wwwroot/translations/pt.json b/src/Ombi/wwwroot/translations/pt.json index d9791a032..aecd9903f 100644 --- a/src/Ombi/wwwroot/translations/pt.json +++ b/src/Ombi/wwwroot/translations/pt.json @@ -48,7 +48,7 @@ "Requests": "Solicitações", "UserManagement": "Gerenciador de Usuário", "Issues": "Problemas", - "Vote": "Vote", + "Vote": "Votar", "Donate": "Fazer uma doação!", "DonateLibraryMaintainer": "Doar para o Dono da Biblioteca", "DonateTooltip": "É assim que eu convenço a minha mulher a deixar-me passar o meu tempo livre desenvolvendo Ombi;)", @@ -74,7 +74,7 @@ "ViewOnEmby": "Assistir no Emby", "RequestAdded": "Pedido de {{title}} foi adicionado com sucesso", "Similar": "Semelhante", - "Refine": "Refine", + "Refine": "Filtro", "Movies": { "PopularMovies": "Filmes populares", "UpcomingMovies": "Próximos filmes", @@ -137,11 +137,11 @@ "SortStatusAsc": "Status ▲", "SortStatusDesc": "Status ▼", "Remaining": { - "Quota": "{{remaining}}/{{total}} requests remaining", - "NextDays": "Another request will be added in {{time}} days", - "NextHours": "Another request will be added in {{time}} hours", - "NextMinutes": "Another request will be added in {{time}} minutes", - "NextMinute": "Another request will be added in {{time}} minute" + "Quota": "{{remaining}}/{{total}} solicitações restantes", + "NextDays": "Outro pedido será adicionado em {{time}} dias", + "NextHours": "Outro pedido será adicionado em {{time}} horas", + "NextMinutes": "Outro pedido será adicionado em {{time}} minutos", + "NextMinute": "Outro pedido será adicionado em {{time}} minuto" } }, "Issues": { @@ -171,15 +171,15 @@ "PendingApproval": "Aprovação Pendente" }, "UserManagment": { - "TvRemaining": "TV: {{remaining}}/{{total}} remaining", - "MovieRemaining": "Movies: {{remaining}}/{{total}} remaining", - "MusicRemaining": "Music: {{remaining}}/{{total}} remaining", + "TvRemaining": "Tv: {{remaining}}/{{total}} restantes", + "MovieRemaining": "Filmes: {{remaining}}/{{total}} restantes", + "MusicRemaining": "Música: {{remaining}}/{{total}} restantes", "TvDue": "TV: {{date}}", - "MovieDue": "Movie: {{date}}", - "MusicDue": "Music: {{date}}" + "MovieDue": "Filme: {{date}}", + "MusicDue": "Música: {{date}}" }, "Votes": { - "CompletedVotesTab": "Voted", - "VotesTab": "Votes Needed" + "CompletedVotesTab": "Votado", + "VotesTab": "Votos necessários" } } From a9511f2bb04283cff408e37fbaa4568949b8ba4e Mon Sep 17 00:00:00 2001 From: Jamie Date: Sun, 3 Feb 2019 19:31:14 +0000 Subject: [PATCH 08/23] New translations en.json (Spanish) --- src/Ombi/wwwroot/translations/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Ombi/wwwroot/translations/es.json b/src/Ombi/wwwroot/translations/es.json index 947041a93..a0a2b1b37 100644 --- a/src/Ombi/wwwroot/translations/es.json +++ b/src/Ombi/wwwroot/translations/es.json @@ -126,7 +126,7 @@ "GridTitle": "Título", "AirDate": "Fecha de estreno", "GridStatus": "Estado", - "ReportIssue": "Informar de un problema/error", + "ReportIssue": "Informar de un Problema", "Filter": "Filtrar", "Sort": "Ordenar", "SeasonNumberHeading": "Temporada: {seasonNumber}", From d2aedfa726856bf91db4ae7b47c44990226d41a0 Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 6 Feb 2019 16:23:17 +0000 Subject: [PATCH 09/23] New translations en.json (Dutch) --- src/Ombi/wwwroot/translations/nl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Ombi/wwwroot/translations/nl.json b/src/Ombi/wwwroot/translations/nl.json index ce82bc9c1..fdf70aad1 100644 --- a/src/Ombi/wwwroot/translations/nl.json +++ b/src/Ombi/wwwroot/translations/nl.json @@ -13,7 +13,7 @@ "ContinueButton": "Doorgaan", "Available": "Beschikbaar", "PartiallyAvailable": "Deels Beschikbaar", - "Monitored": "Gecontroleerd", + "Monitored": "Onder toezicht", "NotAvailable": "Niet Beschikbaar", "ProcessingRequest": "Verzoek wordt verwerkt", "PendingApproval": "Wacht op goedkeuring", From 42eae458d866d9c6b3483c052cc33112c6d759d5 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Fri, 8 Feb 2019 13:47:22 +0000 Subject: [PATCH 10/23] Fixed #2786 --- src/Ombi.Core/Engine/TvSearchEngine.cs | 4 +- .../Rule/Rules/Search/ExistingRule.cs | 7 ++-- .../Entities/Requests/SeasonRequests.cs | 4 +- .../ClientApp/app/interfaces/IRequestModel.ts | 1 + .../search/seriesinformation.component.html | 5 ++- .../app/search/seriesinformation.component.ts | 1 + src/Ombi/package-lock.json | 41 ++++++++++++++----- 7 files changed, 45 insertions(+), 18 deletions(-) diff --git a/src/Ombi.Core/Engine/TvSearchEngine.cs b/src/Ombi.Core/Engine/TvSearchEngine.cs index b2e07f05e..3a1fead18 100644 --- a/src/Ombi.Core/Engine/TvSearchEngine.cs +++ b/src/Ombi.Core/Engine/TvSearchEngine.cs @@ -99,7 +99,7 @@ namespace Ombi.Core.Engine { Url = e.url, Title = e.name, - AirDate = DateTime.Parse(e.airstamp ?? DateTime.MinValue.ToString()), + AirDate = e.airstamp.HasValue() ? DateTime.Parse(e.airstamp) : DateTime.MinValue, EpisodeNumber = e.number, }); @@ -112,7 +112,7 @@ namespace Ombi.Core.Engine { Url = e.url, Title = e.name, - AirDate = DateTime.Parse(e.airstamp ?? DateTime.MinValue.ToString()), + AirDate = e.airstamp.HasValue() ? DateTime.Parse(e.airstamp) : DateTime.MinValue, EpisodeNumber = e.number, }); } diff --git a/src/Ombi.Core/Rule/Rules/Search/ExistingRule.cs b/src/Ombi.Core/Rule/Rules/Search/ExistingRule.cs index 965fcdfaf..2d4482ba9 100644 --- a/src/Ombi.Core/Rule/Rules/Search/ExistingRule.cs +++ b/src/Ombi.Core/Rule/Rules/Search/ExistingRule.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System; +using System.Linq; using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using Ombi.Core.Models.Search; @@ -87,11 +88,11 @@ namespace Ombi.Core.Rule.Rules.Search } } - if (request.SeasonRequests.Any() && request.SeasonRequests.All(x => x.Episodes.All(e => e.Available))) + if (request.SeasonRequests.Any() && request.SeasonRequests.All(x => x.Episodes.All(e => e.Available && e.AirDate > DateTime.MinValue))) { request.FullyAvailable = true; } - if (request.SeasonRequests.Any() && request.SeasonRequests.All(x => x.Episodes.Any(e => e.Available))) + if (request.SeasonRequests.Any() && request.SeasonRequests.All(x => x.Episodes.Any(e => e.Available && e.AirDate > DateTime.MinValue))) { request.PartlyAvailable = true; } diff --git a/src/Ombi.Store/Entities/Requests/SeasonRequests.cs b/src/Ombi.Store/Entities/Requests/SeasonRequests.cs index 521cf5b94..6abaa4de3 100644 --- a/src/Ombi.Store/Entities/Requests/SeasonRequests.cs +++ b/src/Ombi.Store/Entities/Requests/SeasonRequests.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; +using System.Globalization; using Ombi.Store.Entities; using Ombi.Store.Entities.Requests; @@ -27,9 +28,10 @@ namespace Ombi.Store.Repository.Requests public bool Approved { get; set; } public bool Requested { get; set; } - public int SeasonId { get; set; } [ForeignKey(nameof(SeasonId))] public SeasonRequests Season { get; set; } + + [NotMapped] public string AirDateDisplay => AirDate == DateTime.MinValue ? "Unknown" : AirDate.ToString(CultureInfo.InvariantCulture); } } \ No newline at end of file diff --git a/src/Ombi/ClientApp/app/interfaces/IRequestModel.ts b/src/Ombi/ClientApp/app/interfaces/IRequestModel.ts index e9b7c53f7..f187db0b8 100644 --- a/src/Ombi/ClientApp/app/interfaces/IRequestModel.ts +++ b/src/Ombi/ClientApp/app/interfaces/IRequestModel.ts @@ -146,6 +146,7 @@ export interface IEpisodesRequests { episodeNumber: number; title: string; airDate: Date; + airDateDisplay: string; url: string; available: boolean; requested: boolean; diff --git a/src/Ombi/ClientApp/app/search/seriesinformation.component.html b/src/Ombi/ClientApp/app/search/seriesinformation.component.html index 2ae6408c7..12059e417 100644 --- a/src/Ombi/ClientApp/app/search/seriesinformation.component.html +++ b/src/Ombi/ClientApp/app/search/seriesinformation.component.html @@ -42,8 +42,11 @@ {{ep.title}} - + {{ep.airDate | amLocal | amDateFormat: 'L' }} + + + {{ep.airDateDisplay }} Available diff --git a/src/Ombi/ClientApp/app/search/seriesinformation.component.ts b/src/Ombi/ClientApp/app/search/seriesinformation.component.ts index 6a918a69a..c0d86f9a7 100644 --- a/src/Ombi/ClientApp/app/search/seriesinformation.component.ts +++ b/src/Ombi/ClientApp/app/search/seriesinformation.component.ts @@ -29,6 +29,7 @@ export class SeriesInformationComponent implements OnInit { this.searchService.getShowInformation(this.seriesId) .subscribe(x => { this.series = x; + debugger; }); } diff --git a/src/Ombi/package-lock.json b/src/Ombi/package-lock.json index fec5ad4b2..4ad391ab8 100644 --- a/src/Ombi/package-lock.json +++ b/src/Ombi/package-lock.json @@ -4190,7 +4190,8 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true + "bundled": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -4208,11 +4209,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4225,15 +4228,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -4336,7 +4342,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -4346,6 +4353,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4358,17 +4366,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -4385,6 +4396,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -4457,7 +4469,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -4467,6 +4480,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -4542,7 +4556,8 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true + "bundled": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -4572,6 +4587,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4589,6 +4605,7 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -4627,11 +4644,13 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true + "bundled": true, + "optional": true }, "yallist": { "version": "3.0.3", - "bundled": true + "bundled": true, + "optional": true } } }, From 14d8d98979e3f57816f5120b66f3e68181a6917e Mon Sep 17 00:00:00 2001 From: tidusjar Date: Fri, 8 Feb 2019 14:02:42 +0000 Subject: [PATCH 11/23] Added the functionality to remove a user from getting notifications to their mobile device #2780 --- .../app/search/seriesinformation.component.ts | 1 - .../ClientApp/app/services/mobile.service.ts | 4 ++++ .../notifications/mobile.component.html | 9 +++++-- .../notifications/mobile.component.ts | 20 ++++++++++++++++ src/Ombi/Controllers/MobileController.cs | 24 ++++++++++++++++++- 5 files changed, 54 insertions(+), 4 deletions(-) diff --git a/src/Ombi/ClientApp/app/search/seriesinformation.component.ts b/src/Ombi/ClientApp/app/search/seriesinformation.component.ts index c0d86f9a7..6a918a69a 100644 --- a/src/Ombi/ClientApp/app/search/seriesinformation.component.ts +++ b/src/Ombi/ClientApp/app/search/seriesinformation.component.ts @@ -29,7 +29,6 @@ export class SeriesInformationComponent implements OnInit { this.searchService.getShowInformation(this.seriesId) .subscribe(x => { this.series = x; - debugger; }); } diff --git a/src/Ombi/ClientApp/app/services/mobile.service.ts b/src/Ombi/ClientApp/app/services/mobile.service.ts index 1f9e3fb24..9ff9b947d 100644 --- a/src/Ombi/ClientApp/app/services/mobile.service.ts +++ b/src/Ombi/ClientApp/app/services/mobile.service.ts @@ -15,4 +15,8 @@ export class MobileService extends ServiceHelpers { public getUserDeviceList(): Observable { return this.http.get(`${this.url}notification/`, {headers: this.headers}); } + + public deleteUser(userId: string): Observable { + return this.http.post(`${this.url}remove/`, userId, {headers: this.headers}); + } } diff --git a/src/Ombi/ClientApp/app/settings/notifications/mobile.component.html b/src/Ombi/ClientApp/app/settings/notifications/mobile.component.html index 5c82e03d5..2b7ea9b2c 100644 --- a/src/Ombi/ClientApp/app/settings/notifications/mobile.component.html +++ b/src/Ombi/ClientApp/app/settings/notifications/mobile.component.html @@ -35,7 +35,7 @@
- +