Added clubrename command

src/Nadeko.Bot.Modules.Xp/Club/Club.cs

@@ -58,17 +58,17 @@ public partial class Xp
         [Cmd]
         public async Task ClubCreate([Leftover] string clubName)
         {
-            if (string.IsNullOrWhiteSpace(clubName) || clubName.Length > 20)
+            var result = await _service.CreateClubAsync(ctx.User, clubName);
+
+            if (result == ClubCreateResult.NameTooLong)
             {
                 await ReplyErrorLocalizedAsync(strs.club_name_too_long);
                 return;
             }
-
+            
-            var result = await _service.CreateClubAsync(ctx.User, clubName);
-
             if (result == ClubCreateResult.NameTaken)
             {
-                await ReplyErrorLocalizedAsync(strs.club_create_error_name);
+                await ReplyErrorLocalizedAsync(strs.club_name_taken);
                 return;
             }
 
@@ -420,5 +420,32 @@ public partial class Xp
 
             return ctx.Channel.EmbedAsync(embed);
         }
+
+        [Cmd]
+        public async Task ClubRename([Leftover] string clubName)
+        {
+            var res = await _service.RenameClubAsync(ctx.User.Id, clubName);
+
+            switch (res)
+            {
+                case ClubRenameResult.NameTooLong:
+                    await ReplyErrorLocalizedAsync(strs.club_name_too_long);
+                    return;
+                case ClubRenameResult.Success:
+                {
+                    var embed = _eb.Create().WithTitle(GetText(strs.club_renamed(clubName))).WithOkColor();
+                    await ctx.Channel.EmbedAsync(embed);
+                    return;
+                }
+                case ClubRenameResult.NameTaken:
+                    await ReplyErrorLocalizedAsync(strs.club_name_taken);
+                    return;
+                case ClubRenameResult.NotOwnerOrAdmin:
+                    await ReplyErrorLocalizedAsync(strs.club_admin_perms);
+                    return;
+                default:
+                    return;
+            }
+        }
     }
 }

src/Nadeko.Bot.Modules.Xp/Club/ClubService.cs

@@ -22,6 +22,9 @@ public class ClubService : INService, IClubService
     
     public async Task<ClubCreateResult> CreateClubAsync(IUser user, string clubName)
     {
+        if (!CheckClubName(clubName))
+            return ClubCreateResult.NameTooLong;
+        
         //must be lvl 5 and must not be in a club already
 
         await using var uow = _db.GetDbContext();
@@ -316,4 +319,31 @@ public class ClubService : INService, IClubService
         using var uow = _db.GetDbContext();
         return uow.Set<ClubInfo>().GetClubLeaderboardPage(page);
     }
+
+    public async Task<ClubRenameResult> RenameClubAsync(ulong userId, string clubName)
+    {
+        if (!CheckClubName(clubName))
+            return ClubRenameResult.NameTooLong;
+        
+        await using var uow = _db.GetDbContext();
+        
+        var club = uow.Set<ClubInfo>().GetByOwnerOrAdmin(userId);
+        
+        if (club is null)
+            return ClubRenameResult.NotOwnerOrAdmin;
+        
+        if (await uow.Set<ClubInfo>().AnyAsyncEF(x => x.Name == clubName))
+            return ClubRenameResult.NameTaken;
+
+        club.Name = clubName;
+
+        await uow.SaveChangesAsync();
+
+        return ClubRenameResult.Success;
+    }
+
+    private static bool CheckClubName(string clubName)
+    {
+        return !(string.IsNullOrWhiteSpace(clubName) || clubName.Length > 20);
+    }
 }

src/Nadeko.Bot.Modules.Xp/Club/IClubService.cs

@@ -21,6 +21,7 @@ public interface IClubService
     ClubUnbanResult UnBan(ulong ownerUserId, string userName, out ClubInfo club);
     ClubKickResult Kick(ulong kickerId, string userName, out ClubInfo club);
     List<ClubInfo> GetClubLeaderboardPage(int page);
+    Task<ClubRenameResult> RenameClubAsync(ulong userId, string clubName);
 }
 
 public enum ClubApplyResult

src/Nadeko.Bot.Modules.Xp/Club/Results/ClubCreateResult.cs

@@ -6,4 +6,5 @@ public enum ClubCreateResult
     AlreadyInAClub,
     NameTaken,
     InsufficientLevel,
+    NameTooLong
 }

src/Nadeko.Bot.Modules.Xp/Club/Results/ClubRenameResult.cs

@@ -0,0 +1,9 @@
+namespace NadekoBot.Modules.Xp.Services;
+
+public enum ClubRenameResult
+{
+    NotOwnerOrAdmin,
+    Success,
+    NameTaken,
+    NameTooLong
+}

src/NadekoBot/Db/NadekoContext.cs

@@ -237,10 +237,11 @@ public abstract class NadekoContext : DbContext
           .HasForeignKey<ClubInfo>(x => x.OwnerId)
           .OnDelete(DeleteBehavior.SetNull);
 
-        ci.HasAlternateKey(x => new
+        ci.HasIndex(x => new
-        {
+          {
-            x.Name
+              x.Name
-        });
+          })
+          .IsUnique();
 
         #endregion
 

src/NadekoBot/Migrations/Mysql/20230903153202_clubinfo-name-index.cs

@@ -0,0 +1,73 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Db.Migrations.Mysql
+{
+    /// <inheritdoc />
+    public partial class clubinfonameindex : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropUniqueConstraint(
+                name: "ak_clubs_name",
+                table: "clubs");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "name",
+                table: "clubs",
+                type: "varchar(20)",
+                maxLength: 20,
+                nullable: true,
+                collation: "utf8mb4_bin",
+                oldClrType: typeof(string),
+                oldType: "varchar(20)",
+                oldMaxLength: 20,
+                oldCollation: "utf8mb4_bin")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "ix_clubs_name",
+                table: "clubs",
+                column: "name",
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "ix_clubs_name",
+                table: "clubs");
+
+            migrationBuilder.UpdateData(
+                table: "clubs",
+                keyColumn: "name",
+                keyValue: null,
+                column: "name",
+                value: "");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "name",
+                table: "clubs",
+                type: "varchar(20)",
+                maxLength: 20,
+                nullable: false,
+                collation: "utf8mb4_bin",
+                oldClrType: typeof(string),
+                oldType: "varchar(20)",
+                oldMaxLength: 20,
+                oldNullable: true,
+                oldCollation: "utf8mb4_bin")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AddUniqueConstraint(
+                name: "ak_clubs_name",
+                table: "clubs",
+                column: "name");
+        }
+    }
+}

src/NadekoBot/Migrations/Mysql/MysqlContextModelSnapshot.cs

@@ -135,7 +135,6 @@ namespace NadekoBot.Db.Migrations.Mysql
                         .HasColumnName("imageurl");
 
                     b.Property<string>("Name")
-                        .IsRequired()
                         .HasMaxLength(20)
                         .HasColumnType("varchar(20)")
                         .HasColumnName("name")
@@ -152,8 +151,9 @@ namespace NadekoBot.Db.Migrations.Mysql
                     b.HasKey("Id")
                         .HasName("pk_clubs");
 
-                    b.HasAlternateKey("Name")
+                    b.HasIndex("Name")
-                        .HasName("ak_clubs_name");
+                        .IsUnique()
+                        .HasDatabaseName("ix_clubs_name");
 
                     b.HasIndex("OwnerId")
                         .IsUnique()

src/NadekoBot/Migrations/Postgresql/20230903154851_clubinfo-name-index.cs

@@ -0,0 +1,59 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Db.Migrations
+{
+    /// <inheritdoc />
+    public partial class clubinfonameindex : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropUniqueConstraint(
+                name: "ak_clubs_name",
+                table: "clubs");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "name",
+                table: "clubs",
+                type: "character varying(20)",
+                maxLength: 20,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(20)",
+                oldMaxLength: 20);
+
+            migrationBuilder.CreateIndex(
+                name: "ix_clubs_name",
+                table: "clubs",
+                column: "name",
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "ix_clubs_name",
+                table: "clubs");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "name",
+                table: "clubs",
+                type: "character varying(20)",
+                maxLength: 20,
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "character varying(20)",
+                oldMaxLength: 20,
+                oldNullable: true);
+
+            migrationBuilder.AddUniqueConstraint(
+                name: "ak_clubs_name",
+                table: "clubs",
+                column: "name");
+        }
+    }
+}

src/NadekoBot/Migrations/Postgresql/PostgreSqlContextModelSnapshot.cs

@@ -144,7 +144,6 @@ namespace NadekoBot.Db.Migrations
                         .HasColumnName("imageurl");
 
                     b.Property<string>("Name")
-                        .IsRequired()
                         .HasMaxLength(20)
                         .HasColumnType("character varying(20)")
                         .HasColumnName("name");
@@ -160,8 +159,9 @@ namespace NadekoBot.Db.Migrations
                     b.HasKey("Id")
                         .HasName("pk_clubs");
 
-                    b.HasAlternateKey("Name")
+                    b.HasIndex("Name")
-                        .HasName("ak_clubs_name");
+                        .IsUnique()
+                        .HasDatabaseName("ix_clubs_name");
 
                     b.HasIndex("OwnerId")
                         .IsUnique()

src/NadekoBot/Migrations/Sqlite/20230903153230_clubinfo-name-index.cs

@@ -0,0 +1,59 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Db.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class clubinfonameindex : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropUniqueConstraint(
+                name: "AK_Clubs_Name",
+                table: "Clubs");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Name",
+                table: "Clubs",
+                type: "TEXT",
+                maxLength: 20,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "TEXT",
+                oldMaxLength: 20);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Clubs_Name",
+                table: "Clubs",
+                column: "Name",
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_Clubs_Name",
+                table: "Clubs");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Name",
+                table: "Clubs",
+                type: "TEXT",
+                maxLength: 20,
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "TEXT",
+                oldMaxLength: 20,
+                oldNullable: true);
+
+            migrationBuilder.AddUniqueConstraint(
+                name: "AK_Clubs_Name",
+                table: "Clubs",
+                column: "Name");
+        }
+    }
+}

src/NadekoBot/Migrations/Sqlite/SqliteContextModelSnapshot.cs

@@ -109,7 +109,6 @@ namespace NadekoBot.Db.Migrations.Sqlite
                         .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
-                        .IsRequired()
                         .HasMaxLength(20)
                         .HasColumnType("TEXT");
 
@@ -121,7 +120,8 @@ namespace NadekoBot.Db.Migrations.Sqlite
 
                     b.HasKey("Id");
 
-                    b.HasAlternateKey("Name");
+                    b.HasIndex("Name")
+                        .IsUnique();
 
                     b.HasIndex("OwnerId")
                         .IsUnique();

src/NadekoBot/data/strings/commands/commands.en-US.yml

@@ -2359,3 +2359,7 @@ doas:
   desc: "Execute the command as if you were the target user. Requires bot ownership and server administrator permission."
   args:
     - "@Thief .give all @Admin"
+clubrename:
+  desc: "Renames your club. Requires you club ownership or club-admin status."
+  args:
+    - "New cool club name"

src/NadekoBot/data/strings/responses/responses.en-US.json

@@ -841,7 +841,6 @@
   "club_insuff_lvl": "You're insufficient level to join that club.",
   "club_join_banned": "You're banned from that club.",
   "club_already_in": "You are already a member of a club.",
-  "club_create_error_name": "Failed creating the club. A club with that name already exists.",
   "club_name_too_long": "Club name is too long.",
   "club_created": "Club {0} successfully created!",
   "club_create_insuff_lvl": "You don't meet the minimum level requirements in order to create a club.",
@@ -875,6 +874,8 @@
   "club_apps_for": "Applicants for {0} club",
   "club_leaderboard": "Club leaderboard - page {0}",
   "club_kick_hierarchy": "Only club owner can kick club admins. Owner can't be kicked.",
+  "club_renamed": "Club has been renamed to {0}",
+  "club_name_taken": "A club with that name already exists.",
   "template_reloaded": "Xp template has been reloaded.",
   "expr_edited": "Expression Edited",
   "self_assign_are_exclusive": "You can only choose 1 role from each group.",