adding a role to a sar group which already exists in another group will simply move it, instead of reporting success but not doing anything

.notify commands are no longer owner only, they now require Admin permissions
.notify messages can now mention anyone

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 Mostly based on [keepachangelog](https://keepachangelog.com/en/1.1.0/) except date format. a-c-f-r-o
 
+## [5.3.3] - 16.12.2024
+
+## Fixed
+
+- `.notify` commands are no longer owner only, they now require Admin permissions
+- `.notify` messages can now mention anyone
+
 ## [5.3.2] - 14.12.2024
 
 ## Fixed

src/EllieBot/EllieBot.csproj

@@ -4,7 +4,7 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>true</ImplicitUsings>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-        <Version>5.3.2</Version>
+        <Version>5.3.3</Version>
 
         <!-- Output/build -->
         <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>

src/EllieBot/Migrations/MigrationQueries.cs

@@ -17,6 +17,9 @@ public static class MigrationQueries
 
     public static void MigrateSar(MigrationBuilder migrationBuilder)
     {
+        if (migrationBuilder.IsNpgsql())
+            return;
+
         migrationBuilder.Sql("""
                              INSERT INTO GroupName (Number, GuildConfigId)
                              SELECT DISTINCT "Group", GC.Id

src/EllieBot/Modules/Administration/Notify/NotifyCommands.cs

@@ -8,7 +8,7 @@ public partial class Administration
     public class NotifyCommands : EllieModule<NotifyService>
     {
         [Cmd]
-        [OwnerOnly]
+        [UserPerm(GuildPerm.Administrator)]
         public async Task Notify()
         {
             await Response()
@@ -42,7 +42,7 @@ public partial class Administration
             };
 
         [Cmd]
-        [OwnerOnly]
+        [UserPerm(GuildPerm.Administrator)]
         public async Task Notify(NotifyType nType, [Leftover] string? message = null)
         {
             if (string.IsNullOrWhiteSpace(message))
@@ -76,7 +76,7 @@ public partial class Administration
         }
 
         [Cmd]
-        [OwnerOnly]
+        [UserPerm(GuildPerm.Administrator)]
         public async Task NotifyList(int page = 1)
         {
             if (--page < 0)
@@ -104,7 +104,7 @@ public partial class Administration
         }
 
         [Cmd]
-        [OwnerOnly]
+        [UserPerm(GuildPerm.Administrator)]
         public async Task NotifyClear(NotifyType nType)
         {
             await _service.DisableAsync(ctx.Guild.Id, nType);

src/EllieBot/Modules/Administration/Notify/NotifyService.cs

@@ -146,6 +146,7 @@ public sealed class NotifyService : IReadyExecutor, INotifySubscriber, IEService
 
         await _mss.Response(channel)
                   .Text(st)
+                  .Sanitize(false)
                   .SendAsync();
     }
 

src/EllieBot/Modules/Administration/Self/CheckForUpdatesService.cs

@@ -19,7 +19,7 @@ public sealed class CheckForUpdatesService : IEService, IReadyExecutor
     private readonly IMessageSenderService _sender;
 
 
-    private const string RELEASES_URL = "https://toastielab.dev/api/v1/repos/Emotions-stuff/elliebot/releases";
+    private const string RELEASES_URL = "https://toastielab.dev/api/v1/repos/EllieBotDevs/elliebot/releases";
 
     public CheckForUpdatesService(
         BotConfigService bcs,
@@ -72,7 +72,7 @@ public sealed class CheckForUpdatesService : IEService, IReadyExecutor
                     UpdateLastKnownVersion(latestVersion);
 
                     // pull changelog
-                    var changelog = await http.GetStringAsync("https://toastielab.dev/Emotions-stuff/elliebot/raw/branch/v5/CHANGELOG.md");
+                    var changelog = await http.GetStringAsync("https://toastielab.dev/EllieBotDevs/elliebot/raw/branch/v5/CHANGELOG.md");
 
                     var thisVersionChangelog = GetVersionChangelog(latestVersion, changelog);
 
@@ -95,7 +95,7 @@ public sealed class CheckForUpdatesService : IEService, IReadyExecutor
                                                    .WithOkColor()
                                                    .WithAuthor($"EllieBot v{latest} Released!")
                                                    .WithTitle("Changelog")
-                                                   .WithUrl("https://toastielab.dev/Emotions-stuff/elliebot/src/branch/v5/CHANGELOG.md")
+                                                   .WithUrl("https://toastielab.dev/EllieBotDevs/elliebot/src/branch/v5/CHANGELOG.md")
                                                    .WithDescription(thisVersionChangelog.TrimTo(4096))
                                                    .WithFooter(
                                                        "You may disable these messages by typing '.conf bot checkforupdates false'");

src/EllieBot/Modules/Administration/SelfAssignableRoles/SelfAssignedRolesService.cs

@@ -59,10 +59,15 @@ public class SelfAssignedRolesService : IEService, IReadyExecutor
                  },
                      _ => new()
                      {
+                         SarGroupId = ctx.GetTable<SarGroup>()
+                                         .Where(x => x.GuildId == guildId && x.GroupNumber == groupNumber)
+                                         .Select(x => x.Id)
+                                         .First()
                      },
                      () => new()
                      {
                          RoleId = roleId,
+                         GuildId = guildId,
                      });
     }
 
@@ -280,8 +285,12 @@ public sealed class SarAssignerService : IEService, IReadyExecutor
 
                 if (item.Group.IsExclusive)
                 {
-                    var rolesToRemove = item.Group.Roles.Select(x => x.RoleId);
+                    var rolesToRemove = item.Group.Roles
-                    await item.User.RemoveRolesAsync(rolesToRemove);
+                                            .Where(x => item.User.RoleIds.Contains(x.RoleId))
+                                            .Select(x => x.RoleId)
+                                            .ToArray();
+                    if (rolesToRemove.Length > 0)
+                        await item.User.RemoveRolesAsync(rolesToRemove);
                 }
 
                 await item.User.AddRoleAsync(item.RoleId);