Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ecd5370

Browse files
R3alCl0udR3alCl0ud
committed
Still trying to figure out the wonky behavior
1 parent 22c9550 commit ecd5370

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

‎src/main/java/codemonkeys/bots/codekey/main/Listener.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import codemonkeys.bots.codekey.level.PlayerUtils;
1515
import io.discloader.discloader.common.event.DisconnectEvent;
1616
import io.discloader.discloader.common.event.EventListenerAdapter;
17+
import io.discloader.discloader.common.event.RawEvent;
1718
import io.discloader.discloader.common.event.ReadyEvent;
1819
import io.discloader.discloader.common.event.guild.member.GuildMemberRoleAddEvent;
1920
import io.discloader.discloader.common.event.message.GuildMessageCreateEvent;
@@ -163,7 +164,7 @@ public void GuildMessageCreate(GuildMessageCreateEvent e) {
163164
public void Ready(ReadyEvent e) {
164165
Main.logger.info("Codekey is now ready to communicate with Discord");
165166
Main.logger.info("Connecting to the DataBase if not already connected");
166-
e.getLoader().getSelfUser().setListening("with a typewriter");
167+
e.getLoader().getSelfUser().setListening("a typewriter");
167168
DataBase.connect();
168169
IGuild guild = EntityRegistry.getGuildByID(Main.config.modLogs.guildID);
169170
if (Main.players == null || Main.players.size() == 0) {
@@ -173,20 +174,18 @@ public void Ready(ReadyEvent e) {
173174
} else if (Main.players != null) {
174175
DataBase.savePlayers(guild);
175176
}
176-
// this.r
177177
}
178178

179-
// @Override
180-
// public void RawPacket(RawEvent e) {
181-
// if (e.isGateway()) {
182-
// if (e.getFrame().getPayloadText().contains("MESSAGE_CREATE")) {
183-
// new Thread(() -> {
184-
// // UserJSON userData;
185-
// System.out.println(e.getFrame().getPayloadText());
186-
// }).start();
187-
// }
188-
// }
189-
// }
179+
@Override
180+
public void RawPacket(RawEvent e) {
181+
if (e.isGateway()) {
182+
if (e.getFrame().getPayloadText().contains("GUILD_BAN") || e.getFrame().getPayloadText().contains("GUILD_MEMBER")) {
183+
new Thread(() -> {
184+
System.out.println(e.getFrame().getPayloadText());
185+
}).start();
186+
}
187+
}
188+
}
190189

191190
protected void writeToCSV() throws IOException {
192191
BufferedWriter writer = new BufferedWriter(new FileWriter(Main.DATABASE));

‎src/main/java/codemonkeys/bots/codekey/modlog/ModLogListener.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public void GuildBanAdd(GuildBanAddEvent e) {
3737
e.getGuild().getAuditLog(ActionTypes.MEMBER_BAN_ADD, 1).thenAcceptAsync(aLogs -> {
3838
if (aLogs.getEntries().size() > 0) {
3939
IAuditLogEntry entry = aLogs.getEntries().get(0);
40+
if (entry.getTargetID() != e.getBannedUser().getID()) { // make sure that the member was actually kicked
41+
return; // and return early if they weren't
42+
}
4043
long caseNumber = getNextCaseNumber();
4144
final String reason = entry.getReason() == null ? String.format("No reason provided. Use `!reason <%d> <reason>` to change the reason.", caseNumber) : entry.getReason();
4245
RichEmbed embed = new RichEmbed().setAuthor("Member Banned", "", e.getBannedUser().getAvatar().toString());
@@ -59,10 +62,12 @@ public void GuildBanRemove(GuildBanRemoveEvent e) {
5962
e.getGuild().getAuditLog(ActionTypes.MEMBER_BAN_REMOVE, 1).thenAcceptAsync(aLogs -> {
6063
if (aLogs.getEntries().size() > 0) {
6164
IAuditLogEntry entry = aLogs.getEntries().get(0);
65+
if (entry.getTargetID() != e.getUnbannedUser().getID()) { // make sure that the member was actually kicked
66+
return; // and return early if they weren't
67+
}
6268
long caseNumber = getNextCaseNumber();
6369
final String reason = entry.getReason() == null ? String.format("No reason provided. Use `!reason <%d> <reason>` to change the reason.", caseNumber) : entry.getReason();
6470
RichEmbed embed = new RichEmbed().setAuthor("Member Unbanned", "", e.getUnbannedUser().getAvatar().toString());
65-
System.out.println(e.getUnbannedUser().getAvatar());
6671
embed.setColor(0x00ff00).setFooter("Case #" + caseNumber).setTimestamp();
6772
embed.addField("Member", String.format("%s (%d)", e.getUnbannedUser(), e.getUnbannedUser().getID()));
6873
embed.addField("Reason", reason);
@@ -83,12 +88,11 @@ public void GuildMemberRemove(GuildMemberRemoveEvent e) {
8388
cf.thenAcceptAsync(aLogs -> {
8489
if (aLogs.getEntries().size() > 0) {
8590
IAuditLogEntry entry = aLogs.getEntries().get(0);
86-
System.out.println(entry.getTargetID());
91+
System.out.println(entry.getTargetID() + ":" + e.getMember().getID());
8792
if (entry.getTargetID() != e.getMember().getID()) { // make sure that the member was actually kicked
8893
return; // and return early if they weren't
8994
}
9095
long caseNumber = getNextCaseNumber();
91-
System.out.println(entry.getReason());
9296
final String reason = entry.getReason() == null ? String.format("No reason provided. Use `!reason %d <reason>` to change the reason.", caseNumber) : entry.getReason();
9397
RichEmbed embed = new RichEmbed().setAuthor("Member Kicked", "", e.getMember().getUser().getAvatar().toString());
9498
embed.setColor(0x77a3ea).setFooter("Case #" + caseNumber).setTimestamp();

0 commit comments

Comments
 (0)