mirror of
				https://gitlab.com/Kwoth/nadekobot.git
				synced 2025-11-03 16:24:27 -05:00 
			
		
		
		
	Merge branch 'perm-patch' into 'v3'
Replace `RequireUserPemission` with `UserPerm` See merge request Kwoth/nadekobot!196
This commit is contained in:
		@@ -763,7 +763,7 @@ namespace NadekoBot.Modules.Music
 | 
			
		||||
 | 
			
		||||
         [NadekoCommand, Aliases]
 | 
			
		||||
         [RequireContext(ContextType.Guild)]
 | 
			
		||||
         [RequireUserPermission(GuildPermission.Administrator)]
 | 
			
		||||
         [UserPerm(GuildPerm.Administrator)]
 | 
			
		||||
         public async Task MusicQuality()
 | 
			
		||||
         {
 | 
			
		||||
             var quality = await _service.GetMusicQualityAsync(ctx.Guild.Id);
 | 
			
		||||
@@ -772,7 +772,7 @@ namespace NadekoBot.Modules.Music
 | 
			
		||||
         
 | 
			
		||||
         [NadekoCommand, Aliases]
 | 
			
		||||
         [RequireContext(ContextType.Guild)]
 | 
			
		||||
         [RequireUserPermission(GuildPermission.Administrator)]
 | 
			
		||||
         [UserPerm(GuildPerm.Administrator)]
 | 
			
		||||
         public async Task MusicQuality(QualityPreset preset)
 | 
			
		||||
         {
 | 
			
		||||
             await _service.SetMusicQualityAsync(ctx.Guild.Id, preset);
 | 
			
		||||
 
 | 
			
		||||
@@ -288,7 +288,7 @@ namespace NadekoBot.Modules.Utility
 | 
			
		||||
            
 | 
			
		||||
            [NadekoCommand, Aliases]
 | 
			
		||||
            [RequireContext(ContextType.Guild)]
 | 
			
		||||
            [RequireUserPermission(GuildPermission.Administrator)]
 | 
			
		||||
            [UserPerm(GuildPerm.Administrator)]
 | 
			
		||||
            public async Task QuotesExport()
 | 
			
		||||
            {
 | 
			
		||||
                IEnumerable<Quote> quotes;
 | 
			
		||||
@@ -313,7 +313,7 @@ namespace NadekoBot.Modules.Utility
 | 
			
		||||
 | 
			
		||||
            [NadekoCommand, Aliases]
 | 
			
		||||
            [RequireContext(ContextType.Guild)]
 | 
			
		||||
            [RequireUserPermission(GuildPermission.Administrator)]
 | 
			
		||||
            [UserPerm(GuildPerm.Administrator)]
 | 
			
		||||
            [Ratelimit(300)]
 | 
			
		||||
#if GLOBAL_NADEKO
 | 
			
		||||
            [OwnerOnly]
 | 
			
		||||
 
 | 
			
		||||
@@ -90,7 +90,7 @@ namespace NadekoBot.Modules.Utility
 | 
			
		||||
 | 
			
		||||
            [NadekoCommand, Aliases]
 | 
			
		||||
            [RequireContext(ContextType.Guild)]
 | 
			
		||||
            [RequireUserPermission(GuildPermission.Administrator)]
 | 
			
		||||
            [UserPerm(GuildPerm.Administrator)]
 | 
			
		||||
            [Priority(0)]
 | 
			
		||||
            public Task RemindList(Server _, int page = 1)
 | 
			
		||||
                => RemindList(page, true);
 | 
			
		||||
@@ -151,7 +151,7 @@ namespace NadekoBot.Modules.Utility
 | 
			
		||||
 | 
			
		||||
            [NadekoCommand, Aliases]
 | 
			
		||||
            [RequireContext(ContextType.Guild)]
 | 
			
		||||
            [RequireUserPermission(GuildPermission.Administrator)]
 | 
			
		||||
            [UserPerm(GuildPerm.Administrator)]
 | 
			
		||||
            [Priority(0)]
 | 
			
		||||
            public Task RemindDelete(Server _, int index)
 | 
			
		||||
                => RemindDelete(index, true);
 | 
			
		||||
 
 | 
			
		||||
@@ -284,24 +284,24 @@ namespace NadekoBot.Modules.Utility
 | 
			
		||||
 | 
			
		||||
        [NadekoCommand, Aliases]
 | 
			
		||||
        [RequireContext(ContextType.Guild)]
 | 
			
		||||
        [RequireBotPermission(GuildPermission.ManageEmojis)]
 | 
			
		||||
        [RequireUserPermission(GuildPermission.ManageEmojis)]
 | 
			
		||||
        [BotPerm(GuildPerm.ManageEmojis)]
 | 
			
		||||
        [UserPerm(GuildPerm.ManageEmojis)]
 | 
			
		||||
        [Priority(2)]
 | 
			
		||||
        public Task EmojiAdd(string name, Emote emote)
 | 
			
		||||
            => EmojiAdd(name, emote.Url);
 | 
			
		||||
        
 | 
			
		||||
        [NadekoCommand, Aliases]
 | 
			
		||||
        [RequireContext(ContextType.Guild)]
 | 
			
		||||
        [RequireBotPermission(GuildPermission.ManageEmojis)]
 | 
			
		||||
        [RequireUserPermission(GuildPermission.ManageEmojis)]
 | 
			
		||||
        [BotPerm(GuildPerm.ManageEmojis)]
 | 
			
		||||
        [UserPerm(GuildPerm.ManageEmojis)]
 | 
			
		||||
        [Priority(1)]
 | 
			
		||||
        public Task EmojiAdd(Emote emote)
 | 
			
		||||
            => EmojiAdd(emote.Name, emote.Url);
 | 
			
		||||
        
 | 
			
		||||
        [NadekoCommand, Aliases]
 | 
			
		||||
        [RequireContext(ContextType.Guild)]
 | 
			
		||||
        [RequireBotPermission(GuildPermission.ManageEmojis)]
 | 
			
		||||
        [RequireUserPermission(GuildPermission.ManageEmojis)]
 | 
			
		||||
        [BotPerm(GuildPerm.ManageEmojis)]
 | 
			
		||||
        [UserPerm(GuildPerm.ManageEmojis)]
 | 
			
		||||
        [Priority(0)]
 | 
			
		||||
        public async Task EmojiAdd(string name, string url = null)
 | 
			
		||||
        {
 | 
			
		||||
 
 | 
			
		||||
@@ -40,7 +40,7 @@ namespace NadekoBot.Modules.Xp
 | 
			
		||||
 | 
			
		||||
        [NadekoCommand, Aliases]
 | 
			
		||||
        [RequireContext(ContextType.Guild)]
 | 
			
		||||
        [RequireUserPermission(GuildPermission.Administrator)]
 | 
			
		||||
        [UserPerm(GuildPerm.Administrator)]
 | 
			
		||||
        public async Task XpRewsReset()
 | 
			
		||||
        {
 | 
			
		||||
            var reply = await PromptUserConfirmAsync(_eb.Create()
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user