Merge pull request #27 from rarDevelopment/dev

add link command, update references to the site
rarDevelopment · Jan 15, 2024 · 1ee0cd4 · 1ee0cd4
2 parents 39e172d + 37b569e
commit 1ee0cd4
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 16 deletions.
diff --git a/TimeZoneBot.BusinessLayer/TimeZoneBot.BusinessLayer.csproj b/TimeZoneBot.BusinessLayer/TimeZoneBot.BusinessLayer.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Discord.Net" Version="3.13.0" />
-    <PackageReference Include="NodaTime" Version="3.1.9" />
+    <PackageReference Include="NodaTime" Version="3.1.10" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/TimeZoneBot.DataLayer/TimeZoneBot.DataLayer.csproj b/TimeZoneBot.DataLayer/TimeZoneBot.DataLayer.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.22.0" />
-    <PackageReference Include="NodaTime" Version="3.1.9" />
+    <PackageReference Include="MongoDB.Driver" Version="2.23.1" />
+    <PackageReference Include="NodaTime" Version="3.1.10" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/TimeZoneBot.Models/DiscordSettings.cs b/TimeZoneBot.Models/DiscordSettings.cs
@@ -4,4 +4,5 @@ public class DiscordSettings
 {
     public string? BotToken { get; set; }
     public int? HourForBirthdayAnnouncements { get; set; }
+    public string? TimeZoneConfigWebsite { get; set; }
 }
diff --git a/TimeZoneBot.Models/TimeZoneBot.Models.csproj b/TimeZoneBot.Models/TimeZoneBot.Models.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NodaTime" Version="3.1.9" />
+    <PackageReference Include="NodaTime" Version="3.1.10" />
   </ItemGroup>
 
 </Project>
diff --git a/TimeZoneBot/Commands/LinkCommand.cs b/TimeZoneBot/Commands/LinkCommand.cs
@@ -0,0 +1,18 @@
+using DiscordDotNetUtilities.Interfaces;
+using TimeZoneBot.Models;
+
+namespace TimeZoneBot.Commands;
+
+public class LinkCommand(IDiscordFormatter discordFormatter, DiscordSettings discordSettings)
+    : InteractionModuleBase<SocketInteractionContext>
+{
+    [SlashCommand("link-to-timezone-site", "Get a link to the website where you can find and set your time zone.")]
+    public async Task LinkSlashCommand()
+    {
+        await RespondAsync(embed: discordFormatter.BuildRegularEmbedWithUserFooter(
+            "Click here to visit the site where you can find and set your time zone",
+            "You will have to log in with your Discord account and then click Settings under TimeZoneBot.",
+            Context.User,
+            url: discordSettings.TimeZoneConfigWebsite!));
+    }
+}
diff --git a/TimeZoneBot/Commands/SetDefaultTimeZoneCommand.cs b/TimeZoneBot/Commands/SetDefaultTimeZoneCommand.cs
@@ -1,18 +1,20 @@
 using DiscordDotNetUtilities.Interfaces;
 using NodaTime;
 using TimeZoneBot.BusinessLayer.Interfaces;
+using TimeZoneBot.Models;
 
 namespace TimeZoneBot.Commands;
 
 public class SetDefaultTimeZoneCommand(IConfigurationBusinessLayer configurationBusinessLayer,
         IDiscordFormatter discordFormatter,
+        DiscordSettings discordSettings,
         ILogger<DiscordBot> logger)
     : InteractionModuleBase<SocketInteractionContext>
 {
     [DefaultMemberPermissions(GuildPermission.Administrator)]
     [SlashCommand("set-default-time-zone", "Set the default time zone for birthday checks when members have not set their time zone.")]
     public async Task SetDefaultTimeZoneSlashCommand(
-        [Summary("time-zone", "Time Zone ID (visit https://rardk64.com/timezones/ and set your time zone there).")] string timeZoneName
+        [Summary("time-zone", "Time Zone ID (use /link to find)")] string timeZoneName
         )
     {
         var member = Context.Guild.Users.FirstOrDefault(u => u.Id == Context.User.Id);
@@ -34,7 +36,7 @@ public async Task SetDefaultTimeZoneSlashCommand(
         if (timeZone == null)
         {
             await FollowupAsync(embed: discordFormatter.BuildErrorEmbedWithUserFooter("Invalid Time Zone",
-                "The provided time zone was not valid. Please visit https://rardk64.com/timezones/ and set your time zone there, or copy it and set it here.",
+                $"The provided time zone was not valid. Please visit {discordSettings.TimeZoneConfigWebsite} and set your time zone there, or copy it and set it here.",
                 member));
             return;
         }

diff --git a/TimeZoneBot/Commands/SetTimeZoneCommand.cs b/TimeZoneBot/Commands/SetTimeZoneCommand.cs
@@ -2,18 +2,20 @@
 using NodaTime;
 using TimeZoneBot.BusinessLayer;
 using TimeZoneBot.BusinessLayer.Interfaces;
+using TimeZoneBot.Models;
 using TimeZoneBot.Models.Exceptions;
 
 namespace TimeZoneBot.Commands;
 
 public class SetTimeZoneCommand(ITimeZoneBusinessLayer timeZoneBusinessLayer,
         IDiscordFormatter discordFormatter,
+        DiscordSettings discordSettings,
         ILogger<DiscordBot> logger)
     : InteractionModuleBase<SocketInteractionContext>
 {
-    [SlashCommand("set-time-zone", "Set your time zone.")]
+    [SlashCommand("set-time-zone", "Set your time zone (recommended: use /link to set this instead).")]
     public async Task SetTimeZoneSlashCommand(
-        [Summary("time-zone", "Time Zone name (visit https://rardk64.com/timezones/ and set your time zone there).")]
+        [Summary("time-zone", "Time Zone ID")]
         string timeZoneName)
     {
         var member = Context.Guild.Users.FirstOrDefault(u => u.Id == Context.User.Id);
@@ -29,7 +31,7 @@ public async Task SetTimeZoneSlashCommand(
         if (timeZone == null)
         {
             await FollowupAsync(embed: discordFormatter.BuildErrorEmbedWithUserFooter("Invalid Time Zone",
-                "The provided time zone was not valid. Please visit https://rardk64.com/timezones/ and set your time zone there, or copy it and set it here.",
+                $"The provided time zone was not valid. Please visit {discordSettings.TimeZoneConfigWebsite} and set your time zone there, or copy it and set it here.",
                 member));
             return;
         }

diff --git a/TimeZoneBot/EventHandlers/ReactionAddedNotificationHandler.cs b/TimeZoneBot/EventHandlers/ReactionAddedNotificationHandler.cs
@@ -66,7 +66,7 @@ public Task Handle(ReactionAddedNotification notification, CancellationToken can
             {
                 logger.LogError(ex, "Error in ReactionAddedNotificationHandler");
                 await message.ReplyAsync(embed: discordFormatter.BuildErrorEmbedWithUserFooter("Error!",
-                    "There was an error retrieving the time(s) for that user. Make sure the user has set up their timezone.", reactingUser), allowedMentions: AllowedMentions.None);
+                    "There was an error retrieving the time(s) for that user. Make sure the user has set up their time zone.", reactingUser), allowedMentions: AllowedMentions.None);
                 return Task.CompletedTask;
             }
 

diff --git a/TimeZoneBot/Startup.cs b/TimeZoneBot/Startup.cs
@@ -5,7 +5,6 @@
 global using Microsoft.Extensions.Logging;
 using DiscordDotNetUtilities;
 using DiscordDotNetUtilities.Interfaces;
-using MediatR;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Serilog;
@@ -54,7 +53,9 @@
     {
         BotToken = host.Configuration["Discord:BotToken"],
         HourForBirthdayAnnouncements = Convert.ToInt32(host.Configuration["Discord:HourForBirthdayAnnouncements"]),
+        TimeZoneConfigWebsite = host.Configuration["Discord:TimeZoneConfigWebsite"],
     };
+
     var databaseSettings = new DatabaseSettings
     {
         Cluster = host.Configuration["Database:Cluster"],

diff --git a/TimeZoneBot/TimeZoneBot.csproj b/TimeZoneBot/TimeZoneBot.csproj
@@ -25,16 +25,16 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
 
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
     <PackageReference Include="Sgbj.Cron.CronTimer" Version="1.0.2" />

diff --git a/TimeZoneBot/appsettings.json b/TimeZoneBot/appsettings.json
@@ -1,10 +1,11 @@
 {
   "Version": {
-    "VersionNumber": "7.7.0"
+    "VersionNumber": "7.8.0"
   },
   "Discord": {
     "BotToken": "token",
-    "HourForBirthdayAnnouncements": 8
+    "HourForBirthdayAnnouncements": 8,
+    "TimeZoneConfigWebsite": "https://rardk.com/bots/timezonebot/"
   },
   "Database": {
     "Cluster": "placeholder",