minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-11-03 16:24:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'perm-patch' into 'v3'

Browse Source 
Replace `RequireUserPemission` with `UserPerm`

See merge request Kwoth/nadekobot!196
This commit is contained in:
Kwoth
2021-12-13 13:06:28 +00:00
parent fcc49dbbdb 1c24f95efa
commit 8eaaa35c7a
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/NadekoBot/Modules/Music/Music.cs
View File

@@ -763,7 +763,7 @@ namespace NadekoBot.Modules.Music
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
[RequireContext(ContextType.Guild)] [RequireContext(ContextType.Guild)]
[RequireUserPermission(GuildPermission.Administrator)] [UserPerm(GuildPerm.Administrator)]
public async Task MusicQuality() public async Task MusicQuality()
{ {
var quality = await _service.GetMusicQualityAsync(ctx.Guild.Id); var quality = await _service.GetMusicQualityAsync(ctx.Guild.Id);
@@ -772,7 +772,7 @@ namespace NadekoBot.Modules.Music
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
[RequireContext(ContextType.Guild)] [RequireContext(ContextType.Guild)]
[RequireUserPermission(GuildPermission.Administrator)] [UserPerm(GuildPerm.Administrator)]
public async Task MusicQuality(QualityPreset preset) public async Task MusicQuality(QualityPreset preset)
{ {
await _service.SetMusicQualityAsync(ctx.Guild.Id, preset); await _service.SetMusicQualityAsync(ctx.Guild.Id, preset);

4
src/NadekoBot/Modules/Utility/QuoteCommands.cs
View File

@@ -288,7 +288,7 @@ namespace NadekoBot.Modules.Utility
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
[RequireContext(ContextType.Guild)] [RequireContext(ContextType.Guild)]
[RequireUserPermission(GuildPermission.Administrator)] [UserPerm(GuildPerm.Administrator)]
public async Task QuotesExport() public async Task QuotesExport()
{ {
IEnumerable<Quote> quotes; IEnumerable<Quote> quotes;
@@ -313,7 +313,7 @@ namespace NadekoBot.Modules.Utility
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
[RequireContext(ContextType.Guild)] [RequireContext(ContextType.Guild)]
[RequireUserPermission(GuildPermission.Administrator)] [UserPerm(GuildPerm.Administrator)]
[Ratelimit(300)] [Ratelimit(300)]
#if GLOBAL_NADEKO #if GLOBAL_NADEKO
[OwnerOnly] [OwnerOnly]

4
src/NadekoBot/Modules/Utility/RemindCommands.cs
View File

@@ -90,7 +90,7 @@ namespace NadekoBot.Modules.Utility
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
[RequireContext(ContextType.Guild)] [RequireContext(ContextType.Guild)]
[RequireUserPermission(GuildPermission.Administrator)] [UserPerm(GuildPerm.Administrator)]
[Priority(0)] [Priority(0)]
public Task RemindList(Server _, int page = 1) public Task RemindList(Server _, int page = 1)
=> RemindList(page, true); => RemindList(page, true);
@@ -151,7 +151,7 @@ namespace NadekoBot.Modules.Utility
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
[RequireContext(ContextType.Guild)] [RequireContext(ContextType.Guild)]
[RequireUserPermission(GuildPermission.Administrator)] [UserPerm(GuildPerm.Administrator)]
[Priority(0)] [Priority(0)]
public Task RemindDelete(Server _, int index) public Task RemindDelete(Server _, int index)
=> RemindDelete(index, true); => RemindDelete(index, true);

12
src/NadekoBot/Modules/Utility/Utility.cs
View File

@@ -284,24 +284,24 @@ namespace NadekoBot.Modules.Utility
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
[RequireContext(ContextType.Guild)] [RequireContext(ContextType.Guild)]
[RequireBotPermission(GuildPermission.ManageEmojis)] [BotPerm(GuildPerm.ManageEmojis)]
[RequireUserPermission(GuildPermission.ManageEmojis)] [UserPerm(GuildPerm.ManageEmojis)]
[Priority(2)] [Priority(2)]
public Task EmojiAdd(string name, Emote emote) public Task EmojiAdd(string name, Emote emote)
=> EmojiAdd(name, emote.Url); => EmojiAdd(name, emote.Url);
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
[RequireContext(ContextType.Guild)] [RequireContext(ContextType.Guild)]
[RequireBotPermission(GuildPermission.ManageEmojis)] [BotPerm(GuildPerm.ManageEmojis)]
[RequireUserPermission(GuildPermission.ManageEmojis)] [UserPerm(GuildPerm.ManageEmojis)]
[Priority(1)] [Priority(1)]
public Task EmojiAdd(Emote emote) public Task EmojiAdd(Emote emote)
=> EmojiAdd(emote.Name, emote.Url); => EmojiAdd(emote.Name, emote.Url);
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
[RequireContext(ContextType.Guild)] [RequireContext(ContextType.Guild)]
[RequireBotPermission(GuildPermission.ManageEmojis)] [BotPerm(GuildPerm.ManageEmojis)]
[RequireUserPermission(GuildPermission.ManageEmojis)] [UserPerm(GuildPerm.ManageEmojis)]
[Priority(0)] [Priority(0)]
public async Task EmojiAdd(string name, string url = null) public async Task EmojiAdd(string name, string url = null)
{ {

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

@@ -40,7 +40,7 @@ namespace NadekoBot.Modules.Xp
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
[RequireContext(ContextType.Guild)] [RequireContext(ContextType.Guild)]
[RequireUserPermission(GuildPermission.Administrator)] [UserPerm(GuildPerm.Administrator)]
public async Task XpRewsReset() public async Task XpRewsReset()
{ {
var reply = await PromptUserConfirmAsync(_eb.Create() var reply = await PromptUserConfirmAsync(_eb.Create()