mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed ;mp

Browse Source
This commit is contained in:
Kwoth 2016-10-07 21:52:56 +02:00
parent 0a8f998b32
commit ccb287c238
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/NadekoBot/Modules/Permissions/Permissions.cs
View File

@ -69,9 +69,8 @@ namespace NadekoBot.Modules.Permissions
using (var uow = DbHandler.UnitOfWork()) using (var uow = DbHandler.UnitOfWork())
{ {
var perms = uow.GuildConfigs.PermissionsFor(channel.Guild.Id).RootPermission; var perms = uow.GuildConfigs.PermissionsFor(channel.Guild.Id).RootPermission;
var i = 1; var i = 1;
toSend = String.Join("\n", perms.AsEnumerable().Select(p => $"`{(i++)}.` {p.GetCommand(channel.Guild)}")); toSend = String.Join("\n", perms.AsEnumerable().Select(p => $"`{(i++)}.` {(p.Next == null ? Format.Bold(p.GetCommand(channel.Guild) + " [uneditable]") : (p.GetCommand(channel.Guild)))}"));
} }
if (string.IsNullOrWhiteSpace(toSend)) if (string.IsNullOrWhiteSpace(toSend))
@ -144,7 +143,6 @@ namespace NadekoBot.Modules.Permissions
var index = 0; var index = 0;
var fromFound = false; var fromFound = false;
var toFound = false; var toFound = false;
var isLast = true;
while ((!toFound || !fromFound) && perms != null) while ((!toFound || !fromFound) && perms != null)
{ {
if (index == from) if (index == from)
@ -156,7 +154,6 @@ namespace NadekoBot.Modules.Permissions
{ {
toPerm = perms; toPerm = perms;
toFound = true; toFound = true;
isLast = false;
} }
if (!toFound) if (!toFound)
{ {
@ -185,38 +182,38 @@ namespace NadekoBot.Modules.Permissions
var pre = fromPerm.Previous; var pre = fromPerm.Previous;
if (pre != null) if (pre != null)
pre.Next = next; pre.Next = next;
if (next != null) if (fromPerm.Next == null || toPerm.Next == null)
{ {
next.Previous = pre; throw new IndexOutOfRangeException();
} }
next.Previous = pre;
if (from == 0) if (from == 0)
{ {
root = next; root = next;
} }
await uow.CompleteAsync().ConfigureAwait(false); await uow.CompleteAsync().ConfigureAwait(false);
//Inserting //Inserting
pre = toPerm.Previous; if (to > from)
if (isLast)
{ {
toPerm.Next = fromPerm;
fromPerm.Previous = toPerm; fromPerm.Previous = toPerm;
fromPerm.Next = null; fromPerm.Next = toPerm.Next;
toPerm.Next.Previous = fromPerm;
toPerm.Next = fromPerm;
} }
else else
{ {
pre = toPerm.Previous;
fromPerm.Next = toPerm; fromPerm.Next = toPerm;
fromPerm.Previous = pre; fromPerm.Previous = pre;
toPerm.Previous = fromPerm;
if (pre != null) if (pre != null)
{
pre.Next = fromPerm; pre.Next = fromPerm;
} }
else
{ config.RootPermission = fromPerm.GetRoot();
root = fromPerm;
}
toPerm.Previous = fromPerm;
}
config.RootPermission = root;
await uow.CompleteAsync().ConfigureAwait(false); await uow.CompleteAsync().ConfigureAwait(false);
} }
await channel.SendMessageAsync($"`Moved permission:` \"{fromPerm.GetCommand(channel.Guild)}\" `from #{++from} to #{++to}.`").ConfigureAwait(false); await channel.SendMessageAsync($"`Moved permission:` \"{fromPerm.GetCommand(channel.Guild)}\" `from #{++from} to #{++to}.`").ConfigureAwait(false);
@ -478,7 +475,7 @@ namespace NadekoBot.Modules.Permissions
[NadekoCommand, Usage, Description, Aliases] [NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)] [RequireContext(ContextType.Guild)]
public async Task AllSrvrMdls(IUserMessage imsg, PermissionAction action, [Remainder] IUser user) public async Task AllSrvrMdls(IUserMessage imsg, PermissionAction action)
{ {
var channel = (ITextChannel)imsg.Channel; var channel = (ITextChannel)imsg.Channel;