MythEclipse/Booster-role
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: enhance role handling by updating reply structure and adding role assignment functionality

Browse Source
This commit is contained in:
MythEclipse
2026-05-16 00:32:29 +07:00
parent c6ee7bb8c6
commit 41c6b567a6
6 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/discord/bot.ts
+7 -3
View File
@@ -37,7 +37,11 @@ export function attachBotHandlers(client: Client, config: AppConfig): void {
});
}
function resolveAnchorPosition(guild: { roles: { cache: { get(id: string): { position: number } | undefined } } }, anchorRoleId: string | null): number {
if (!anchorRoleId) return 1;
return guild.roles.cache.get(anchorRoleId)?.position ?? 1;
function resolveAnchorPosition(guild: { members: { me: { roles: { highest: { position: number } } } | null }; roles: { cache: { get(id: string): { position: number } | undefined } } }, anchorRoleId: string | null): number {
if (!anchorRoleId) return botRolePosition(guild);
return guild.roles.cache.get(anchorRoleId)?.position ?? botRolePosition(guild);
}
function botRolePosition(guild: { members: { me: { roles: { highest: { position: number } } } | null } }): number {
return guild.members.me?.roles.highest.position ?? 1;
}
src/discord/interactionHandler.test.ts
+5 -4
View File
@@ -1,7 +1,8 @@
import { MessageFlags } from "discord.js";
import { describe, expect, test } from "bun:test";
import { handleInteraction, type BoosterRoleCommandService, type ChatInputInteractionLike } from "./interactionHandler";
type Reply = { content: string; ephemeral: boolean };
type Reply = { content: string; flags: MessageFlags.Ephemeral };
class FakeInteraction implements ChatInputInteractionLike {
commandName = "booster-role";
@@ -59,7 +60,7 @@ describe("handleInteraction", () => {
await handleInteraction(interaction, service, { isBoosting: async () => true });
expect(service.calls).toEqual(["claim"]);
expect(interaction.replies[0]).toEqual({ content: "Booster role created: <@&role-1>", ephemeral: true });
expect(interaction.replies[0]).toEqual({ content: "Booster role created: <@&role-1>", flags: MessageFlags.Ephemeral });
});
test("routes update subcommands and replies", async () => {
@@ -70,7 +71,7 @@ describe("handleInteraction", () => {
await handleInteraction(interaction, service, { isBoosting: async () => true });
expect(service.calls).toEqual([subcommand]);
expect(interaction.replies[0]?.ephemeral).toBe(true);
expect(interaction.replies[0]?.flags).toBe(MessageFlags.Ephemeral);
}
});
@@ -83,6 +84,6 @@ describe("handleInteraction", () => {
await handleInteraction(interaction, service, { isBoosting: async () => true });
expect(interaction.replies[0]).toEqual({ content: "Role name is already used", ephemeral: true });
expect(interaction.replies[0]).toEqual({ content: "Role name is already used", flags: MessageFlags.Ephemeral });
});
});
src/discord/interactionHandler.ts
+8 -7
View File
@@ -1,3 +1,4 @@
import { MessageFlags } from "discord.js";
import type { BoosterRoleRecord, RoleIcon } from "../services/boosterRoleService";
export type ChatInputInteractionLike = {
@@ -5,7 +6,7 @@ export type ChatInputInteractionLike = {
guildId: string | null;
user: { id: string };
isChatInputCommand(): boolean;
reply(input: { content: string; ephemeral: boolean }): Promise<unknown>;
reply(input: { content: string; flags: MessageFlags.Ephemeral }): Promise<unknown>;
options: {
getSubcommand(): string;
getString(name: string): string | null;
@@ -46,37 +47,37 @@ export async function handleInteraction(
icon: optionalIcon(interaction, "icon"),
isBoosting: await deps.isBoosting(guildId, userId)
});
await interaction.reply({ content: `Booster role created: <@&${role.roleId}>`, ephemeral: true });
await interaction.reply({ content: `Booster role created: <@&${role.roleId}>`, flags: MessageFlags.Ephemeral });
return;
}
if (subcommand === "rename") {
await service.renameRole({ guildId, userId, name: requireString(interaction, "name") });
await interaction.reply({ content: "Booster role renamed.", ephemeral: true });
await interaction.reply({ content: "Booster role renamed.", flags: MessageFlags.Ephemeral });
return;
}
if (subcommand === "recolor") {
await service.recolorRole({ guildId, userId, color: requireString(interaction, "color") });
await interaction.reply({ content: "Booster role color updated.", ephemeral: true });
await interaction.reply({ content: "Booster role color updated.", flags: MessageFlags.Ephemeral });
return;
}
if (subcommand === "icon") {
await service.setRoleIcon({ guildId, userId, icon: requireIcon(interaction, "image") });
await interaction.reply({ content: "Booster role icon updated.", ephemeral: true });
await interaction.reply({ content: "Booster role icon updated.", flags: MessageFlags.Ephemeral });
return;
}
if (subcommand === "delete") {
await service.deleteRole({ guildId, userId });
await interaction.reply({ content: "Booster role deleted.", ephemeral: true });
await interaction.reply({ content: "Booster role deleted.", flags: MessageFlags.Ephemeral });
return;
}
throw new Error("Unknown booster-role subcommand");
} catch (error) {
await interaction.reply({ content: error instanceof Error ? error.message : "Command failed", ephemeral: true });
await interaction.reply({ content: error instanceof Error ? error.message : "Command failed", flags: MessageFlags.Ephemeral });
}
}
src/services/boosterRoleService.test.ts
+6
View File
@@ -20,6 +20,7 @@ class MemoryRoleStore {
class FakeRoleRepository implements RoleRepository {
roles = new Map<string, { id: string; name: string; permissions: string[]; position: number; color: string | null; icon?: string | null }>();
deletedRoleIds: string[] = [];
assignedRoles: Array<{ userId: string; roleId: string }> = [];
constructor(initialRoles = [{ id: "existing-vip", name: "VIP", permissions: [], position: 1, color: null }]) {
for (const role of initialRoles) {
@@ -43,6 +44,10 @@ class FakeRoleRepository implements RoleRepository {
this.roles.set(roleId, { ...role, ...input });
}
async assignRole(userId: string, roleId: string) {
this.assignedRoles.push({ userId, roleId });
}
async deleteRole(roleId: string) {
this.deletedRoleIds.push(roleId);
this.roles.delete(roleId);
@@ -60,6 +65,7 @@ describe("BoosterRoleService", () => {
expect(claimed.roleId).toBe("created-2");
expect(roles.roles.get(claimed.roleId)?.permissions).toEqual([]);
expect(roles.roles.get(claimed.roleId)?.position).toBe(9);
expect(roles.assignedRoles).toEqual([{ userId: "user", roleId: claimed.roleId }]);
expect(await store.findByUser("guild", "user")).toEqual(claimed);
});
src/services/boosterRoleService.ts
+3
View File
@@ -28,6 +28,7 @@ export type RoleRepository = {
listRoles(): Promise<ExistingRole[]>;
createRole(input: { name: string; color: string | null; permissions: string[]; position: number }): Promise<{ id: string }>;
updateRole(roleId: string, input: { name?: string; color?: string | null; icon?: string | null }): Promise<void>;
assignRole(userId: string, roleId: string): Promise<void>;
deleteRole(roleId: string): Promise<void>;
};
@@ -83,6 +84,8 @@ export class BoosterRoleService {
await this.roles.updateRole(role.id, { icon: input.icon.dataUri });
}
await this.roles.assignRole(userId, role.id);
const timestamp = this.now();
const record = {
guildId,
src/services/discordRoleRepository.ts
+9 -4
View File
@@ -12,7 +12,7 @@ export class DiscordRoleRepository implements RoleRepository {
async createRole(input: { name: string; color: string | null; permissions: string[]; position: number }): Promise<{ id: string }> {
const role = await this.guild.roles.create({
name: input.name,
color: toDiscordColor(input.color),
colors: toDiscordColors(input.color),
permissions: 0n
});
@@ -24,11 +24,16 @@ export class DiscordRoleRepository implements RoleRepository {
const role = await this.fetchRole(roleId);
await role.edit({
name: input.name,
color: input.color === undefined ? undefined : toDiscordColor(input.color),
colors: input.color === undefined ? undefined : toDiscordColors(input.color),
icon: input.icon === undefined ? undefined : input.icon
});
}
async assignRole(userId: string, roleId: string): Promise<void> {
const member = await this.guild.members.fetch(userId);
await member.roles.add(roleId);
}
async deleteRole(roleId: string): Promise<void> {
const role = await this.fetchRole(roleId);
await role.delete();
@@ -48,6 +53,6 @@ export class DiscordRoleRepository implements RoleRepository {
}
}
function toDiscordColor(color: string | null): ColorResolvable | undefined {
return color === null ? undefined : (color as ColorResolvable);
function toDiscordColors(color: string | null): { primaryColor: ColorResolvable } | undefined {
return color === null ? undefined : { primaryColor: color as ColorResolvable };
}