From 3ebd736fee2887ecd3faf78b1dd27a7a650c5fd4 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 8 Jan 2021 13:35:57 +0100 Subject: [PATCH] Notifo updated. --- .../History/NotifoService.cs | 18 +++++++++--------- .../Squidex.Domain.Apps.Entities.csproj | 6 +++--- .../Squidex.Infrastructure.csproj | 10 +++++----- backend/src/Squidex/Squidex.csproj | 10 +++++----- backend/tests/RunCoverage.ps1 | 2 +- .../Squidex.Domain.Apps.Entities.Tests.csproj | 2 +- .../Squidex.Infrastructure.Tests.csproj | 4 ++-- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/backend/src/Squidex.Domain.Apps.Entities/History/NotifoService.cs b/backend/src/Squidex.Domain.Apps.Entities/History/NotifoService.cs index 0de802c41..23bf294c5 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/History/NotifoService.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/History/NotifoService.cs @@ -79,13 +79,13 @@ namespace Squidex.Domain.Apps.Entities.History { [Providers.WebPush] = new NotificationSettingDto { - Send = true, + Send = NotificationSend.Send, DelayInSeconds = null }, [Providers.Email] = new NotificationSettingDto { - Send = true, + Send = NotificationSend.Send, DelayInSeconds = 5 * 60 } }; @@ -133,7 +133,7 @@ namespace Squidex.Domain.Apps.Entities.History if (publishedEvents.Any()) { - var requests = new List(); + var requests = new List(); foreach (var @event in publishedEvents) { @@ -143,7 +143,7 @@ namespace Squidex.Domain.Apps.Entities.History { foreach (var userId in comment.Mentions!) { - var publishRequest = new PublishRequestDto + var publishRequest = new PublishDto { Topic = $"users/{userId}" }; @@ -166,7 +166,7 @@ namespace Squidex.Domain.Apps.Entities.History { var historyEvent = @event.HistoryEvent; - var publishRequest = new PublishRequestDto + var publishRequest = new PublishDto { Properties = new EventProperties() }; @@ -194,7 +194,7 @@ namespace Squidex.Domain.Apps.Entities.History } } - var request = new PublishManyRequestDto + var request = new PublishManyDto { Requests = requests }; @@ -219,7 +219,7 @@ namespace Squidex.Domain.Apps.Entities.History try { - var request = new AddAllowedTopicRequest + var request = new AddAllowedTopicDto { Prefix = GetAppPrefix(contributorAssigned) }; @@ -265,7 +265,7 @@ namespace Squidex.Domain.Apps.Entities.History return appEvent is CommentCreated comment && comment.Mentions?.Length > 0; } - private static void SetUser(AppEvent appEvent, PublishRequestDto publishRequest) + private static void SetUser(AppEvent appEvent, PublishDto publishRequest) { if (appEvent.Actor.IsSubject) { @@ -273,7 +273,7 @@ namespace Squidex.Domain.Apps.Entities.History } } - private static void SetTopic(AppEvent appEvent, PublishRequestDto publishRequest, HistoryEvent @event) + private static void SetTopic(AppEvent appEvent, PublishDto publishRequest, HistoryEvent @event) { var topicPrefix = GetAppPrefix(appEvent); var topicSuffix = @event.Channel.Replace('.', '/').Trim(); diff --git a/backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj b/backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj index 3d54dd808..e38acfb9b 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj +++ b/backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj @@ -26,12 +26,12 @@ - + all runtime; build; native; contentfiles; analyzers - - + + diff --git a/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj b/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj index 1c1cbf7d0..0fa8191c4 100644 --- a/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj +++ b/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj @@ -14,23 +14,23 @@ - + - + all runtime; build; native; contentfiles; analyzers - - + + - + diff --git a/backend/src/Squidex/Squidex.csproj b/backend/src/Squidex/Squidex.csproj index caa02321f..5bdd6b090 100644 --- a/backend/src/Squidex/Squidex.csproj +++ b/backend/src/Squidex/Squidex.csproj @@ -45,9 +45,9 @@ - - - + + + @@ -57,7 +57,7 @@ - + @@ -65,7 +65,7 @@ - + diff --git a/backend/tests/RunCoverage.ps1 b/backend/tests/RunCoverage.ps1 index 32fd283d1..e9e54ad44 100644 --- a/backend/tests/RunCoverage.ps1 +++ b/backend/tests/RunCoverage.ps1 @@ -81,6 +81,6 @@ if ($all -Or $web) { -oldStyle } -&"$folderHome\.nuget\packages\ReportGenerator\4.4.6\tools\net47\ReportGenerator.exe" ` +&"$folderHome\.nuget\packages\ReportGenerator\4.8.4\tools\net47\ReportGenerator.exe" ` -reports:"$folderWorking\$folderReports\*.xml" ` -targetdir:"$folderWorking\$folderReports\Output" \ No newline at end of file diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj index 7a8d74e8c..955025742 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj @@ -25,7 +25,7 @@ - + diff --git a/backend/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj b/backend/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj index fc468d152..9f89762d6 100644 --- a/backend/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj +++ b/backend/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj @@ -18,8 +18,8 @@ - - + + all runtime; build; native; contentfiles; analyzers