minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-11 17:58:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

- Removed NadekoCommand and Aliases attribute from all commands

Browse Source 
- All commands must be marked as partial
- Added [Cmd] Attribute to all commands
- Cmd Attribute comes from the source generator which adds [NadekoCommand] and [Aliases] Attribute to each command
- Should be updated in the future probably to be more performant and maybe add extra data to the commands
- Started reorganizing modules and submodules
This commit is contained in:
Kwoth
2021-12-31 16:04:12 +01:00
parent 6eee161b6b
commit 25eeffa163
107 changed files with 1620 additions and 3236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
src/NadekoBot/Modules/Xp/Club.cs
View File

@@ -6,16 +6,15 @@ namespace NadekoBot.Modules.Xp;
public partial class Xp
{
[Group]
public class Club : NadekoSubmodule<ClubService>
public partial class Club : NadekoSubmodule<ClubService>
{
private readonly XpService _xps;
public Club(XpService xps)
=> _xps = xps;
[NadekoCommand]
[Aliases]
public async Task ClubTransfer([Leftover] IUser newOwner)
[Cmd]
public async partial Task ClubTransfer([Leftover] IUser newOwner)
{
var club = _service.TransferClub(ctx.User, newOwner);
@@ -26,9 +25,8 @@ public partial class Xp
await ReplyErrorLocalizedAsync(strs.club_transfer_failed);
}
[NadekoCommand]
[Aliases]
public async Task ClubAdmin([Leftover] IUser toAdmin)
[Cmd]
public async partial Task ClubAdmin([Leftover] IUser toAdmin)
{
bool admin;
try
@@ -47,9 +45,8 @@ public partial class Xp
await ReplyConfirmLocalizedAsync(strs.club_admin_remove(Format.Bold(toAdmin.ToString())));
}
[NadekoCommand]
[Aliases]
public async Task ClubCreate([Leftover] string clubName)
[Cmd]
public async partial Task ClubCreate([Leftover] string clubName)
{
if (string.IsNullOrWhiteSpace(clubName) || clubName.Length > 20)
{
@@ -66,9 +63,8 @@ public partial class Xp
await ReplyConfirmLocalizedAsync(strs.club_created(Format.Bold(club.ToString())));
}
[NadekoCommand]
[Aliases]
public async Task ClubIcon([Leftover] string url = null)
[Cmd]
public async partial Task ClubIcon([Leftover] string url = null)
{
if ((!Uri.IsWellFormedUriString(url, UriKind.Absolute) && url != null)
|| !await _service.SetClubIcon(ctx.User.Id, url is null ? null : new Uri(url)))
@@ -80,10 +76,9 @@ public partial class Xp
await ReplyConfirmLocalizedAsync(strs.club_icon_set);
}
[NadekoCommand]
[Aliases]
[Cmd]
[Priority(1)]
public async Task ClubInformation(IUser user = null)
public async partial Task ClubInformation(IUser user = null)
{
user ??= ctx.User;
var club = _service.GetClubByMember(user);
@@ -96,10 +91,9 @@ public partial class Xp
await ClubInformation(club.ToString());
}
[NadekoCommand]
[Aliases]
[Cmd]
[Priority(0)]
public async Task ClubInformation([Leftover] string clubName = null)
public async partial Task ClubInformation([Leftover] string clubName = null)
{
if (string.IsNullOrWhiteSpace(clubName))
{
@@ -159,9 +153,8 @@ public partial class Xp
10);
}
[NadekoCommand]
[Aliases]
public Task ClubBans(int page = 1)
[Cmd]
public partial Task ClubBans(int page = 1)
{
if (--page < 0)
return Task.CompletedTask;
@@ -187,9 +180,8 @@ public partial class Xp
}
[NadekoCommand]
[Aliases]
public Task ClubApps(int page = 1)
[Cmd]
public partial Task ClubApps(int page = 1)
{
if (--page < 0)
return Task.CompletedTask;
@@ -214,9 +206,8 @@ public partial class Xp
10);
}
[NadekoCommand]
[Aliases]
public async Task ClubApply([Leftover] string clubName)
[Cmd]
public async partial Task ClubApply([Leftover] string clubName)
{
if (string.IsNullOrWhiteSpace(clubName))
return;
@@ -233,16 +224,14 @@ public partial class Xp
await ReplyErrorLocalizedAsync(strs.club_apply_error);
}
[NadekoCommand]
[Aliases]
[Cmd]
[Priority(1)]
public Task ClubAccept(IUser user)
public partial Task ClubAccept(IUser user)
=> ClubAccept(user.ToString());
[NadekoCommand]
[Aliases]
[Cmd]
[Priority(0)]
public async Task ClubAccept([Leftover] string userName)
public async partial Task ClubAccept([Leftover] string userName)
{
if (_service.AcceptApplication(ctx.User.Id, userName, out var discordUser))
await ReplyConfirmLocalizedAsync(strs.club_accepted(Format.Bold(discordUser.ToString())));
@@ -250,9 +239,8 @@ public partial class Xp
await ReplyErrorLocalizedAsync(strs.club_accept_error);
}
[NadekoCommand]
[Aliases]
public async Task Clubleave()
[Cmd]
public async partial Task Clubleave()
{
if (_service.LeaveClub(ctx.User))
await ReplyConfirmLocalizedAsync(strs.club_left);
@@ -260,16 +248,14 @@ public partial class Xp
await ReplyErrorLocalizedAsync(strs.club_not_in_club);
}
[NadekoCommand]
[Aliases]
[Cmd]
[Priority(1)]
public Task ClubKick([Leftover] IUser user)
public partial Task ClubKick([Leftover] IUser user)
=> ClubKick(user.ToString());
[NadekoCommand]
[Aliases]
[Cmd]
[Priority(0)]
public Task ClubKick([Leftover] string userName)
public partial Task ClubKick([Leftover] string userName)
{
if (_service.Kick(ctx.User.Id, userName, out var club))
return ReplyConfirmLocalizedAsync(strs.club_user_kick(Format.Bold(userName),
@@ -277,16 +263,14 @@ public partial class Xp
return ReplyErrorLocalizedAsync(strs.club_user_kick_fail);
}
[NadekoCommand]
[Aliases]
[Cmd]
[Priority(1)]
public Task ClubBan([Leftover] IUser user)
public partial Task ClubBan([Leftover] IUser user)
=> ClubBan(user.ToString());
[NadekoCommand]
[Aliases]
[Cmd]
[Priority(0)]
public Task ClubBan([Leftover] string userName)
public partial Task ClubBan([Leftover] string userName)
{
if (_service.Ban(ctx.User.Id, userName, out var club))
return ReplyConfirmLocalizedAsync(strs.club_user_banned(Format.Bold(userName),
@@ -294,16 +278,14 @@ public partial class Xp
return ReplyErrorLocalizedAsync(strs.club_user_ban_fail);
}
[NadekoCommand]
[Aliases]
[Cmd]
[Priority(1)]
public Task ClubUnBan([Leftover] IUser user)
public partial Task ClubUnBan([Leftover] IUser user)
=> ClubUnBan(user.ToString());
[NadekoCommand]
[Aliases]
[Cmd]
[Priority(0)]
public Task ClubUnBan([Leftover] string userName)
public partial Task ClubUnBan([Leftover] string userName)
{
if (_service.UnBan(ctx.User.Id, userName, out var club))
return ReplyConfirmLocalizedAsync(strs.club_user_unbanned(Format.Bold(userName),
@@ -311,9 +293,8 @@ public partial class Xp
return ReplyErrorLocalizedAsync(strs.club_user_unban_fail);
}
[NadekoCommand]
[Aliases]
public async Task ClubLevelReq(int level)
[Cmd]
public async partial Task ClubLevelReq(int level)
{
if (_service.ChangeClubLevelReq(ctx.User.Id, level))
await ReplyConfirmLocalizedAsync(strs.club_level_req_changed(Format.Bold(level.ToString())));
@@ -321,9 +302,8 @@ public partial class Xp
await ReplyErrorLocalizedAsync(strs.club_level_req_change_error);
}
[NadekoCommand]
[Aliases]
public async Task ClubDescription([Leftover] string desc = null)
[Cmd]
public async partial Task ClubDescription([Leftover] string desc = null)
{
if (_service.ChangeClubDescription(ctx.User.Id, desc))
await ReplyConfirmLocalizedAsync(strs.club_desc_updated(Format.Bold(desc ?? "-")));
@@ -331,9 +311,8 @@ public partial class Xp
await ReplyErrorLocalizedAsync(strs.club_desc_update_failed);
}
[NadekoCommand]
[Aliases]
public async Task ClubDisband()
[Cmd]
public async partial Task ClubDisband()
{
if (_service.Disband(ctx.User.Id, out var club))
await ReplyConfirmLocalizedAsync(strs.club_disbanded(Format.Bold(club.ToString())));
@@ -341,9 +320,8 @@ public partial class Xp
await ReplyErrorLocalizedAsync(strs.club_disband_error);
}
[NadekoCommand]
[Aliases]
public Task ClubLeaderboard(int page = 1)
[Cmd]
public partial Task ClubLeaderboard(int page = 1)
{
if (--page < 0)
return Task.CompletedTask;

17
src/NadekoBot/Modules/Xp/ResetCommands.cs
View File

@@ -5,20 +5,18 @@ namespace NadekoBot.Modules.Xp;
public partial class Xp
{
public class ResetCommands : NadekoSubmodule<XpService>
public partial class ResetCommands : NadekoSubmodule<XpService>
{
[NadekoCommand]
[Aliases]
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.Administrator)]
public Task XpReset(IGuildUser user)
public partial Task XpReset(IGuildUser user)
=> XpReset(user.Id);
[NadekoCommand]
[Aliases]
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.Administrator)]
public async Task XpReset(ulong userId)
public async partial Task XpReset(ulong userId)
{
var embed = _eb.Create().WithTitle(GetText(strs.reset)).WithDescription(GetText(strs.reset_user_confirm));
@@ -30,11 +28,10 @@ public partial class Xp
await ReplyConfirmLocalizedAsync(strs.reset_user(userId));
}
[NadekoCommand]
[Aliases]
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.Administrator)]
public async Task XpReset()
public async partial Task XpReset()
{
var embed = _eb.Create().WithTitle(GetText(strs.reset)).WithDescription(GetText(strs.reset_server_confirm));

90
src/NadekoBot/Modules/Xp/Xp.cs
View File

@@ -29,10 +29,9 @@ public partial class Xp : NadekoModule<XpService>
_gss = gss;
}
[NadekoCommand]
[Aliases]
[Cmd]
[RequireContext(ContextType.Guild)]
public async Task Experience([Leftover] IUser user = null)
public async partial Task Experience([Leftover] IUser user = null)
{
user ??= ctx.User;
await ctx.Channel.TriggerTypingAsync();
@@ -43,11 +42,10 @@ public partial class Xp : NadekoModule<XpService>
}
}
[NadekoCommand]
[Aliases]
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.Administrator)]
public async Task XpRewsReset()
public async partial Task XpRewsReset()
{
var reply = await PromptUserConfirmAsync(_eb.Create()
.WithPendingColor()
@@ -60,10 +58,9 @@ public partial class Xp : NadekoModule<XpService>
await ctx.OkAsync();
}
[NadekoCommand]
[Aliases]
[Cmd]
[RequireContext(ContextType.Guild)]
public Task XpLevelUpRewards(int page = 1)
public partial Task XpLevelUpRewards(int page = 1)
{
page--;
@@ -119,25 +116,23 @@ public partial class Xp : NadekoModule<XpService>
9);
}
[NadekoCommand]
[Aliases]
[Cmd]
[UserPerm(GuildPerm.Administrator)]
[BotPerm(GuildPerm.ManageRoles)]
[RequireContext(ContextType.Guild)]
[Priority(2)]
public async Task XpRoleReward(int level)
public async partial Task XpRoleReward(int level)
{
_service.ResetRoleReward(ctx.Guild.Id, level);
await ReplyConfirmLocalizedAsync(strs.xp_role_reward_cleared(level));
}
[NadekoCommand]
[Aliases]
[Cmd]
[UserPerm(GuildPerm.Administrator)]
[BotPerm(GuildPerm.ManageRoles)]
[RequireContext(ContextType.Guild)]
[Priority(1)]
public async Task XpRoleReward(int level, AddRemove action, [Leftover] IRole role)
public async partial Task XpRoleReward(int level, AddRemove action, [Leftover] IRole role)
{
if (level < 1)
return;
@@ -150,11 +145,10 @@ public partial class Xp : NadekoModule<XpService>
Format.Bold(role.ToString())));
}
[NadekoCommand]
[Aliases]
[Cmd]
[RequireContext(ContextType.Guild)]
[OwnerOnly]
public async Task XpCurrencyReward(int level, int amount = 0)
public async partial Task XpCurrencyReward(int level, int amount = 0)
{
if (level < 1 || amount < 0)
return;
@@ -177,10 +171,9 @@ public partial class Xp : NadekoModule<XpService>
return GetText(strs.xpn_notif_disabled);
}
[NadekoCommand]
[Aliases]
[Cmd]
[RequireContext(ContextType.Guild)]
public async Task XpNotify()
public async partial Task XpNotify()
{
var globalSetting = _service.GetNotificationType(ctx.User);
var serverSetting = _service.GetNotificationType(ctx.User.Id, ctx.Guild.Id);
@@ -193,10 +186,9 @@ public partial class Xp : NadekoModule<XpService>
await ctx.Channel.EmbedAsync(embed);
}
[NadekoCommand]
[Aliases]
[Cmd]
[RequireContext(ContextType.Guild)]
public async Task XpNotify(NotifyPlace place, XpNotificationLocation type)
public async partial Task XpNotify(NotifyPlace place, XpNotificationLocation type)
{
if (place == NotifyPlace.Guild)
await _service.ChangeNotificationType(ctx.User.Id, ctx.Guild.Id, type);
@@ -206,11 +198,10 @@ public partial class Xp : NadekoModule<XpService>
await ctx.OkAsync();
}
[NadekoCommand]
[Aliases]
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.Administrator)]
public async Task XpExclude(Server _)
public async partial Task XpExclude(Server _)
{
var ex = _service.ToggleExcludeServer(ctx.Guild.Id);
@@ -220,11 +211,10 @@ public partial class Xp : NadekoModule<XpService>
await ReplyConfirmLocalizedAsync(strs.not_excluded(Format.Bold(ctx.Guild.ToString())));
}
[NadekoCommand]
[Aliases]
[Cmd]
[UserPerm(GuildPerm.ManageRoles)]
[RequireContext(ContextType.Guild)]
public async Task XpExclude(Role _, [Leftover] IRole role)
public async partial Task XpExclude(Role _, [Leftover] IRole role)
{
var ex = _service.ToggleExcludeRole(ctx.Guild.Id, role.Id);
@@ -234,11 +224,10 @@ public partial class Xp : NadekoModule<XpService>
await ReplyConfirmLocalizedAsync(strs.not_excluded(Format.Bold(role.ToString())));
}
[NadekoCommand]
[Aliases]
[Cmd]
[UserPerm(GuildPerm.ManageChannels)]
[RequireContext(ContextType.Guild)]
public async Task XpExclude(Channel _, [Leftover] IChannel channel = null)
public async partial Task XpExclude(Channel _, [Leftover] IChannel channel = null)
{
if (channel is null)
channel = ctx.Channel;
@@ -251,10 +240,9 @@ public partial class Xp : NadekoModule<XpService>
await ReplyConfirmLocalizedAsync(strs.not_excluded(Format.Bold(channel.ToString())));
}
[NadekoCommand]
[Aliases]
[Cmd]
[RequireContext(ContextType.Guild)]
public async Task XpExclusionList()
public async partial Task XpExclusionList()
{
var serverExcluded = _service.IsServerExcluded(ctx.Guild.Id);
var roles = _service.GetExcludedRoles(ctx.Guild.Id)
@@ -292,20 +280,18 @@ public partial class Xp : NadekoModule<XpService>
15);
}
[NadekoCommand]
[Aliases]
[Cmd]
[NadekoOptions(typeof(LbOpts))]
[Priority(0)]
[RequireContext(ContextType.Guild)]
public Task XpLeaderboard(params string[] args)
public partial Task XpLeaderboard(params string[] args)
=> XpLeaderboard(1, args);
[NadekoCommand]
[Aliases]
[Cmd]
[NadekoOptions(typeof(LbOpts))]
[Priority(1)]
[RequireContext(ContextType.Guild)]
public async Task XpLeaderboard(int page = 1, params string[] args)
public async partial Task XpLeaderboard(int page = 1, params string[] args)
{
if (--page < 0 || page > 100)
return;
@@ -363,10 +349,9 @@ public partial class Xp : NadekoModule<XpService>
false);
}
[NadekoCommand]
[Aliases]
[Cmd]
[RequireContext(ContextType.Guild)]
public async Task XpGlobalLeaderboard(int page = 1)
public async partial Task XpGlobalLeaderboard(int page = 1)
{
if (--page < 0 || page > 99)
return;
@@ -387,11 +372,10 @@ public partial class Xp : NadekoModule<XpService>
await ctx.Channel.EmbedAsync(embed);
}
[NadekoCommand]
[Aliases]
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.Administrator)]
public async Task XpAdd(int amount, ulong userId)
public async partial Task XpAdd(int amount, ulong userId)
{
if (amount == 0)
return;
@@ -401,18 +385,16 @@ public partial class Xp : NadekoModule<XpService>
await ReplyConfirmLocalizedAsync(strs.modified(Format.Bold(usr), Format.Bold(amount.ToString())));
}
[NadekoCommand]
[Aliases]
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.Administrator)]
public Task XpAdd(int amount, [Leftover] IGuildUser user)
public partial Task XpAdd(int amount, [Leftover] IGuildUser user)
=> XpAdd(amount, user.Id);
[NadekoCommand]
[Aliases]
[Cmd]
[RequireContext(ContextType.Guild)]
[OwnerOnly]
public async Task XpTemplateReload()
public async partial Task XpTemplateReload()
{
_service.ReloadXpTemplate();
await Task.Delay(1000);