Alex/KittyBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

=Fixed role case issue

Browse Source
This commit is contained in:
Alex
2019-08-13 16:11:35 -04:00
parent 5972408627
commit c29fb1dd1f
4 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/commands/guildrole/SubCommandAdd.java
+4 -4
View File
@@ -22,21 +22,21 @@ public class SubCommandAdd extends SubCommand
String formatted = "";
for(int i = 0; i < roles.length; i++)
{
role = roles[i].trim();
role = roles[i].trim().toLowerCase();
if(guild.roleList.contains(role))
{
if(guild.control.addRole(user.discordID, role))
{
formatted += String.format(LocStrings.stub("GuildRoleAddSuccess"), role, user.name);
formatted += String.format(LocStrings.stub("GuildRoleAddSuccess"), role, user.name) + "\n";
}
else
{
formatted += String.format(LocStrings.stub("GuildRoleAddFailure"), role, user.name);
formatted += String.format(LocStrings.stub("GuildRoleAddFailure"), role, user.name) + "\n";
}
}
else
{
formatted += String.format(LocStrings.stub("GuildRoleAddNotAllowed"), role);
formatted += String.format(LocStrings.stub("GuildRoleAddNotAllowed"), role) + "\n";
}
}
return new SubCommandFormattable(formatted);
src/commands/guildrole/SubCommandList.java
+1 -1
View File
@@ -29,6 +29,6 @@ public class SubCommandList extends SubCommand
roles += "\n";
roles += guild.roleList.get(i);
}
return new SubCommandFormattable(String.format(LocStrings.stub("GuildRoleListOutput"), roles));
return new SubCommandFormattable(String.format(LocStrings.stub("GuildRoleListOutput") + "\n", roles));
}
}
src/commands/guildrole/SubCommandRemove.java
+15 -9
View File
@@ -12,23 +12,29 @@ public class SubCommandRemove extends SubCommand
@Override
public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input)
{
String role = input.args.split(" ")[0];
String [] roles = input.args.split(",");
String role;
String formatted = "";
if(guild.roleList.contains(role))
for(int i = 0; i < roles.length; i ++)
{
if(guild.control.removeRole(user.discordID, role))
role = roles[i].trim().toLowerCase();
if(guild.roleList.contains(role))
{
formatted += (String.format(LocStrings.stub("GuildRoleRemoveSuccess"), role, user.name));
if(guild.control.removeRole(user.discordID, role))
{
formatted += (String.format(LocStrings.stub("GuildRoleRemoveSuccess"), role, user.name)) + "\n";
}
else
{
formatted += (String.format(LocStrings.stub("GuildRoleRemoveFailure"), role, user.name)) + "\n";
}
}
else
{
formatted += (String.format(LocStrings.stub("GuildRoleRemoveFailure"), role, user.name));
formatted += (String.format(LocStrings.stub("GuildRoleRemoveNotAllowed"), role)) + "\n";
}
}
else
{
formatted += (String.format(LocStrings.stub("GuildRoleRemoveNotAllowed"), role));
}
return new SubCommandFormattable(formatted);
}