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

.h command show now properly show both channel and server user permission requirements

Browse Source
This commit is contained in:
Kwoth
2023-01-15 00:50:25 +01:00
parent 9841d72622
commit e71708f5e8
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NadekoBot/Common/Attributes/UserPerm.cs
View File

@@ -3,7 +3,7 @@ using NadekoBot.Modules.Administration.Services;
namespace Discord; namespace Discord;
[AttributeUsage(AttributeTargets.Method)] [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
public class UserPermAttribute : RequireUserPermissionAttribute public class UserPermAttribute : RequireUserPermissionAttribute
{ {
public UserPermAttribute(GuildPerm permission) public UserPermAttribute(GuildPerm permission)

24
src/NadekoBot/Modules/Help/HelpService.cs
View File

@@ -152,18 +152,22 @@ public class HelpService : IExecNoCommand, INService
.Any(x => x is OnlyPublicBotAttribute)) .Any(x => x is OnlyPublicBotAttribute))
toReturn.Add("Only Public Bot"); toReturn.Add("Only Public Bot");
var userPerm = (UserPermAttribute)cmd.Preconditions.FirstOrDefault(ca => ca is UserPermAttribute); var userPermString = cmd.Preconditions
.Where(ca => ca is UserPermAttribute)
.Cast<UserPermAttribute>()
.Select(userPerm =>
{
if (userPerm.ChannelPermission is { } cPerm)
return GetPreconditionString(cPerm);
var userPermString = string.Empty; if (userPerm.GuildPermission is { } gPerm)
if (userPerm is not null) return GetPreconditionString(gPerm);
{
if (userPerm.ChannelPermission is { } cPerm)
userPermString = GetPreconditionString(cPerm);
if (userPerm.GuildPermission is { } gPerm)
userPermString = GetPreconditionString(gPerm);
}
return string.Empty;
})
.Where(x => !string.IsNullOrWhiteSpace(x))
.Join('\n');
if (overrides is null) if (overrides is null)
{ {
if (!string.IsNullOrWhiteSpace(userPermString)) if (!string.IsNullOrWhiteSpace(userPermString))