greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Merge pull request #262 from BigBotNetwork/greg-dev

Browse source 
Merged!
This commit is contained in:
Skidder 2019-12-26 23:28:13 +01:00 • committed by GitHub
commit 90a5283549
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java
View file

@ -66,6 +66,6 @@ public class AvatarCommand implements Command {
@Override @Override
public String usage() { public String usage() {
return "[@User]/[ID]"; return "user/id";
} }
} }

2
src/main/java/com/bbn/hadder/commands/fun/GifCommand.java
View file

@ -58,6 +58,6 @@ public class GifCommand implements Command {
@Override @Override
public String usage() { public String usage() {
return "<SearchTerm>"; return "searchterm";
} }
} }

2
src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java
View file

@ -12,7 +12,7 @@ import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Member;
@Perms(Perm.CHANGE_NICKNAME) @Perms(Perm.MANAGE_NICKNAMES)
public class NickCommand implements Command { public class NickCommand implements Command {
@Override @Override

4
src/main/java/com/bbn/hadder/core/Perm.java
View file

@ -52,10 +52,10 @@ public enum Perm {
return event.getMember().hasPermission(Permission.MANAGE_ROLES) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); return event.getMember().hasPermission(Permission.MANAGE_ROLES) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
} }
}, },
CHANGE_NICKNAME { MANAGE_NICKNAMES {
@Override @Override
public boolean check(CommandEvent event) { public boolean check(CommandEvent event) {
return event.getMember().hasPermission(Permission.NICKNAME_CHANGE) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); return event.getMember().hasPermission(Permission.NICKNAME_MANAGE) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
} }
}, },
ADMINISTRATOR { ADMINISTRATOR {

1
src/main/resources/Translations/Translations_en.properties
View file

@ -16,6 +16,7 @@ region = <region>
guildid = <Guild-ID> guildid = <Guild-ID>
content = <Message-content> content = <Message-content>
song = <Song> song = <Song>
user/id= [@User]/[ID]
error = Error error = Error
none = None none = None