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

Some stuff #53

Merged
greg6775 merged 2 commits from greg-dev into master 2019-11-10 20:49:10 +01:00
Conversation 0 Commits 2 Files changed 6 +5 -9
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8d0aabb09c - Show all commits

8
src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java
View file

@ -33,14 +33,10 @@ public class GitHubCommand implements Command {
String website = "None";
try {
bio = json.getString("bio");
} catch (JSONException e) {
}
} catch (JSONException ignored) {}
try {
location = json.getString("location");
} catch (JSONException e) {
}
} catch (JSONException ignored) {}
if(!json.getString("blog").equals("")) website = json.getString("blog");

6
src/main/java/com/bbn/hadder/commands/misc/ScreenshareCommand.java
View file

@ -33,7 +33,7 @@ public class ScreenshareCommand implements Command {
List<VoiceChannel> vcs = event.getGuild().getVoiceChannelsByName(String.join(" ", args), true);
if (vcs.size() > 1) {
EmbedBuilder eb = new EmbedBuilder()
.setTitle("Please Choose a Voicechannel")
.setTitle("Please Choose a Voice Channel")
.setDescription("There is more than one channel with this name");
for (int i = 0; i < vcs.size(); i++) {
VoiceChannel voiceChannel = vcs.get(i);
@ -54,14 +54,14 @@ public class ScreenshareCommand implements Command {
}
} catch (NumberFormatException e) {
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.ERROR, new EmbedBuilder()
.setTitle("Wait, thats illegal")
.setTitle("Wait, that's illegal")
.setDescription("This isn't a Number.")).build()).queue();
}
}, event.getJDA(), event.getAuthor());
} else if (vcs.size()==0) {
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.ERROR, new EmbedBuilder()
.setTitle("Hol' up")
.setDescription("There is no Voicechannel named like this. \n\nNote: Make sure the Voicechannel is on this Guild.")).build()).queue();
.setDescription("There is no Voice Channel named like this. \n\nNote: Make sure the Voice Channel is on this Guild.")).build()).queue();
} else {
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, new EmbedBuilder()
.setTitle("Here's your Url to share your Screen")