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

Merge pull request #115 from BigBotNetwork/greg-dev

Browse source 
Greg dev
This commit is contained in:
Skidder 2019-11-30 03:53:11 -08:00 • committed by GitHub
commit 87de7ab82d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/bbn/hadder/listener/GuildListener.java
View file

@ -8,7 +8,6 @@ import com.bbn.hadder.Rethink;
import com.bbn.hadder.core.Config; import com.bbn.hadder.core.Config;
import com.bbn.hadder.utils.BotList; import com.bbn.hadder.utils.BotList;
import com.bbn.hadder.utils.MessageEditor; import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.events.guild.GuildJoinEvent; import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
import net.dv8tion.jda.api.events.guild.GuildLeaveEvent; import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
@ -37,7 +36,6 @@ public class GuildListener extends ListenerAdapter {
}).start(); }).start();
rethink.insertGuild(event.getGuild().getId()); rethink.insertGuild(event.getGuild().getId());
EmbedBuilder builder = new EmbedBuilder();
event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
.setTitle("Joined Server") .setTitle("Joined Server")
.setThumbnail(event.getGuild().getIconUrl()) .setThumbnail(event.getGuild().getIconUrl())
@ -53,7 +51,6 @@ public class GuildListener extends ListenerAdapter {
} }
public void onGuildLeave(GuildLeaveEvent event) { public void onGuildLeave(GuildLeaveEvent event) {
EmbedBuilder builder = new EmbedBuilder();
event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
.setTitle("Left Server") .setTitle("Left Server")
.setThumbnail(event.getGuild().getIconUrl()) .setThumbnail(event.getGuild().getIconUrl())

1
src/main/java/com/bbn/hadder/listener/LinkListener.java
View file

@ -3,7 +3,6 @@ package com.bbn.hadder.listener;
import com.bbn.hadder.Rethink; import com.bbn.hadder.Rethink;
import com.bbn.hadder.core.LinkUtils; import com.bbn.hadder.core.LinkUtils;
import com.bbn.hadder.utils.MessageEditor; import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.entities.MessageEmbed;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.events.message.MessageReceivedEvent;

6
src/main/java/com/bbn/hadder/listener/MentionListener.java
View file

@ -21,14 +21,14 @@ public class MentionListener extends ListenerAdapter {
public void onMessageReceived(@Nonnull MessageReceivedEvent event) { public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
if (event.isFromType(ChannelType.TEXT)) { if (event.isFromType(ChannelType.TEXT)) {
if (event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention())) { if (event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention())) {
EmbedBuilder builder = new EmbedBuilder() event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
.setTitle("Hello I'm Hadder.") .setTitle("Hello I'm Hadder.")
.setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl()) .setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl())
.addField("Users", String.valueOf(event.getJDA().getUsers().size()), false) .addField("Users", String.valueOf(event.getJDA().getUsers().size()), false)
.addField("Guilds", String.valueOf(event.getJDA().getGuilds().size()), false) .addField("Guilds", String.valueOf(event.getJDA().getGuilds().size()), false)
.addField("Prefix (User)", rethink.getUserPrefix(event.getAuthor().getId()), false) .addField("Prefix (User)", rethink.getUserPrefix(event.getAuthor().getId()), false)
.addField("Prefix (Guild)", rethink.getGuildPrefix(event.getGuild().getId()), false); .addField("Prefix (Guild)", rethink.getGuildPrefix(event.getGuild().getId()), false)
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).build()).queue(); .build()).queue();
} }
} }
} }

14
src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
View file

@ -22,14 +22,18 @@ public class PrivateMessageListener extends ListenerAdapter {
PrivateChannel Skidder = event.getJDA().getUserById("477141528981012511").openPrivateChannel().complete(); PrivateChannel Skidder = event.getJDA().getUserById("477141528981012511").openPrivateChannel().complete();
PrivateChannel Hax = event.getJDA().getUserById("261083609148948488").openPrivateChannel().complete(); PrivateChannel Hax = event.getJDA().getUserById("261083609148948488").openPrivateChannel().complete();
EmbedBuilder message = new EmbedBuilder() Skidder.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
.setTitle("New DM by " + event.getAuthor().getAsTag()) .setTitle("New DM by " + event.getAuthor().getAsTag())
.setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl()) .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl())
.setDescription(event.getMessage().getContentRaw()) .setDescription(event.getMessage().getContentRaw())
.setTimestamp(Instant.now()); .setTimestamp(Instant.now())
.build()).queue();
Skidder.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).build()).queue(); Hax.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
Hax.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).build()).queue(); .setTitle("New DM by " + event.getAuthor().getAsTag())
.setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl())
.setDescription(event.getMessage().getContentRaw())
.setTimestamp(Instant.now())
.build()).queue();
} }
} }
} }