From 2a9cd897835f2a636f790c8c63a59de570d1b479 Mon Sep 17 00:00:00 2001
From: Sarah Faey <s.ruspekhofer@gmail.com>
Date: Sat, 3 Dec 2022 11:02:59 +0100
Subject: [PATCH] reminders now always include the raid name

---
 Lieb/Data/DiscordService.cs | 14 +++++++-------
 Lieb/Data/RaidService.cs    | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Lieb/Data/DiscordService.cs b/Lieb/Data/DiscordService.cs
index 7d7a777..61ac9ac 100644
--- a/Lieb/Data/DiscordService.cs
+++ b/Lieb/Data/DiscordService.cs
@@ -182,9 +182,9 @@ namespace Lieb.Data
             return false;
         }
 
-        public async Task SendChannelReminder(RaidReminder reminder)
+        public async Task SendChannelReminder(RaidReminder reminder, string raidTitle)
         {
-            if (await SendChannelMessage(reminder.DiscordServerId, reminder.DiscordChannelId, reminder.Message))
+            if (await SendChannelMessage(reminder.DiscordServerId, reminder.DiscordChannelId, reminder.Message, raidTitle))
             {                
                 reminder.Sent = true;
                 using var context = _contextFactory.CreateDbContext();
@@ -193,13 +193,13 @@ namespace Lieb.Data
             }
         }
 
-        public async Task<bool> SendChannelMessage(ulong discordServerId, ulong discordChannelId, string message)
+        public async Task<bool> SendChannelMessage(ulong discordServerId, ulong discordChannelId, string message, string raidTitle)
         {
             try
             {
                 var httpClient = _httpClientFactory.CreateClient(Constants.HttpClientName);
 
-                ApiChannelReminder apiReminder = ConvertChannelReminder(discordServerId, discordChannelId, message);
+                ApiChannelReminder apiReminder = ConvertChannelReminder(discordServerId, discordChannelId, message, raidTitle);
 
                 var raidItemJson = new StringContent(
                     JsonSerializer.Serialize(apiReminder),
@@ -305,7 +305,7 @@ namespace Lieb.Data
         {
             ApiUserReminder apiReminder = new ApiUserReminder()
             {
-                Message = message
+                Message = $"{raid.Title}: {message}"
             };
             apiReminder.UserIds = new List<ulong>();
             HashSet<ulong> userIds = new HashSet<ulong>();
@@ -320,13 +320,13 @@ namespace Lieb.Data
             return apiReminder;
         }
 
-        public static ApiChannelReminder ConvertChannelReminder(ulong discordServerId, ulong discordChannelId, string message)
+        public static ApiChannelReminder ConvertChannelReminder(ulong discordServerId, ulong discordChannelId, string message, string raidTitle)
         {
             return new ApiChannelReminder()
             {
                 DiscordServerId = discordServerId,
                 DiscordChannelId = discordChannelId,
-                Message = message
+                Message = $"{raidTitle}: {message}"
             };
         }
 
diff --git a/Lieb/Data/RaidService.cs b/Lieb/Data/RaidService.cs
index 161abfb..8ea0ead 100644
--- a/Lieb/Data/RaidService.cs
+++ b/Lieb/Data/RaidService.cs
@@ -477,13 +477,13 @@ namespace Lieb.Data
                     signedUpByUserName = signedUpByUser.Name;
                 }
 
-                string message = $"{raid.Title}: {signedUpByUserName} signed up {userName} as {signUp.SignUpType.ToString()}";
+                string message = $"{signedUpByUserName} signed up {userName} as {signUp.SignUpType.ToString()}";
                 foreach(DiscordRaidMessage discordMessage in raid.DiscordRaidMessages)
                 {
                     DiscordSettings settings = _discordService.GetDiscordSettings(discordMessage.DiscordGuildId);
                     if(settings.DiscordLogChannel > 0)
                     {
-                        await _discordService.SendChannelMessage(discordMessage.DiscordGuildId, settings.DiscordLogChannel, message);
+                        await _discordService.SendChannelMessage(discordMessage.DiscordGuildId, settings.DiscordLogChannel, message, raid.Title);
                     }
                 }
             }
@@ -500,17 +500,17 @@ namespace Lieb.Data
             DateTimeOffset utcNow = DateTimeOffset.UtcNow;
             foreach(RaidReminder reminder in reminders.Where(r => r.ReminderTimeUTC < utcNow))
             {
+                Raid raid = context.Raids
+                    .Include(r => r.SignUps)
+                    .Include(r => r.Reminders)
+                    .First(r => r.Reminders.Where(re => re.RaidReminderId == reminder.RaidReminderId).Any());
                 switch(reminder.Type)
                 {
                     case RaidReminder.ReminderType.User:
-                        Raid raid = context.Raids
-                            .Include(r => r.SignUps)
-                            .Include(r => r.Reminders)
-                            .First(r => r.Reminders.Where(re => re.RaidReminderId == reminder.RaidReminderId).Any());
                         await _discordService.SendUserReminder(reminder, raid);
                         break;
                     case RaidReminder.ReminderType.Channel:
-                        await _discordService.SendChannelReminder(reminder);
+                        await _discordService.SendChannelReminder(reminder, raid.Title);
                         break;
                 }
             }