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

Release v1.0.0 #345

Merged
greg6775 merged 68 commits from greg-dev into master 2020-01-24 17:49:10 +01:00
Conversation 0 Commits 68 Files changed 95 +27 -16
2 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6b09db43d9 - Show all commits

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

@ -1,13 +1,14 @@
package com.bbn.hadder.commands.fun; package com.bbn.hadder.commands.fun;
/*
* @author Skidder / GregTCLTK
*/
import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor; import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.User;
/**
* @author Skidder / GregTCLTK
*/
public class AvatarCommand implements Command { public class AvatarCommand implements Command {
@ -37,18 +38,26 @@ public class AvatarCommand implements Command {
.setImage(member.getUser().getAvatarUrl()) .setImage(member.getUser().getAvatarUrl())
.setFooter(member.getUser().getAsTag()) .setFooter(member.getUser().getAsTag())
.build()).queue(); .build()).queue();
} else if (args[0].length() == 18){ } else if (args[0].length() == 18) {
Member member = event.getGuild().getMemberById(args[0]); try {
User u = event.getGuild().getMemberById(args[0]).getUser();
event.getTextChannel().sendMessage( event.getTextChannel().sendMessage(
event.getMessageEditor().getMessage( event.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO, MessageEditor.MessageType.INFO,
"commands.fun.avatar.success.title", "commands.fun.avatar.success.title",
member.getUser().getAsTag(), u.getAsTag(),
"", "",
"") "")
.setImage(member.getUser().getAvatarUrl()) .setImage(u.getAvatarUrl())
.setFooter(member.getUser().getAsTag()) .setFooter(u.getAsTag())
.build()).queue(); .build()).queue();
} catch (NullPointerException e) {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
"commands.fun.avatar.error.title",
"commands.fun.avatar.error.description"
).build()).queue();
}
} else { } else {
event.getHelpCommand().sendHelp(this, event); event.getHelpCommand().sendHelp(this, event);
} }

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

@ -9,6 +9,8 @@ none = None
success\! = Success\! success\! = Success\!
commands.fun.avatar.success.title = Avatar of %extra% commands.fun.avatar.success.title = Avatar of %extra%
commands.fun.avatar.error.title = User not found
commands.fun.avatar.error.description = I can not find a user with this id!
commands.fun.avatar.help.description = Sends the avatar of the specified member. commands.fun.avatar.help.description = Sends the avatar of the specified member.
commands.fun.gif.error.description = Please try again with another term. commands.fun.gif.error.description = Please try again with another term.
commands.fun.gif.help.description = Looks for a GIF on Giphy. commands.fun.gif.help.description = Looks for a GIF on Giphy.