Merge branch 'develop'

fit-ctu-discord · Sep 19, 2022 · cb16b97 · cb16b97
2 parents 1653a59 + eaec8cf
commit cb16b97
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2022.4.1</Version>
+    <Version>2022.4.2</Version>
     <TargetFramework>net6.0</TargetFramework>
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>

diff --git a/Packages.props b/Packages.props
@@ -23,6 +23,6 @@
         <PackageReference Update="xunit" Version="2.4.2" />
         <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" />
         <PackageReference Update="Shouldly" Version="4.1.0" />
-        <PackageReference Update="Html2Markdown" Version="4.0.0.427" />
+        <PackageReference Update="Html2Markdown" Version="5.0.2.561" />
     </ItemGroup>
 </Project>
diff --git a/src/HonzaBotner.Discord.Services/Commands/NewsManagementCommands.cs b/src/HonzaBotner.Discord.Services/Commands/NewsManagementCommands.cs
@@ -156,8 +156,9 @@ public async Task EditLastRunConfigCommandAsync(InteractionContext ctx,
     [SlashCommand("run-once", "Fetch news once")]
     public async Task RunOnceCommandAsync(InteractionContext ctx)
     {
+        await ctx.DeferAsync();
         await _newsJobProvider.ExecuteAsync(default);
-        await ctx.CreateResponseAsync("News job - done");
+        await ctx.EditResponseAsync( new DiscordWebhookBuilder().WithContent("News job - done"));
     }
 
     private static DateTime? ParseDateTime(string datetime)

diff --git a/src/HonzaBotner.Discord.Services/Jobs/NewsJobProvider.cs b/src/HonzaBotner.Discord.Services/Jobs/NewsJobProvider.cs
@@ -11,9 +11,12 @@
 
 namespace HonzaBotner.Discord.Services.Jobs;
 
-[Cron("0 * * * * *")]
+// Run every 30 minutes
+[Cron("0 */30 * * * *")]
 public class NewsJobProvider : IJob
 {
+    private const int RunOffset = -3;
+
     public string Name { get; } = "news-publisher";
 
     private readonly ILogger<NewsJobProvider> _logger;
@@ -47,7 +50,7 @@ public async Task ExecuteAsync(CancellationToken cancellationToken)
                 scope.ServiceProvider.GetRequiredService(GetType(newsSource.Publisher.ToType())) as IPublisherService
                 ?? throw new InvalidCastException("Type must be IPublisherService");
 
-            DateTime now = DateTime.Now;
+            DateTime now = DateTime.Now.AddMinutes(RunOffset);
             IAsyncEnumerable<News> news = newsService.FetchDataAsync(newsSource.Source, newsSource.LastFetched);
 
             await foreach (News item in news.WithCancellation(cancellationToken))