Skip to content

fixes thread creation warns in media only channels #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 6, 2022
Merged

fixes thread creation warns in media only channels #556

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a7f1102
fixed thread creation warns in media only channels
Taz03 Sep 2, 2022
2b83fa7
made methods
Taz03 Sep 3, 2022
d3a7b7d
used proper method
Taz03 Sep 4, 2022
8ee6ae1
== instead of 'equals'
Taz03 Sep 4, 2022
06678b2
removed comment
Taz03 Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions ...ion/src/main/java/org/togetherjava/tjbot/commands/mediaonly/MediaOnlyChannelListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import net.dv8tion.jda.api.MessageBuilder;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.MessageEmbed;
import net.dv8tion.jda.api.entities.MessageType;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.requests.RestAction;
import net.dv8tion.jda.api.requests.restaction.AuditableRestAction;
import org.togetherjava.tjbot.commands.MessageReceiverAdapter;
import org.togetherjava.tjbot.config.Config;

Expand Down Expand Up @@ -37,27 +37,23 @@ public void onMessageReceived(MessageReceivedEvent event) {
return;
}

if (messageHasNoMediaAttached(event)) {
deleteMessage(event).flatMap(any -> dmUser(event)).queue();
Message message = event.getMessage();
if (message.getType() == MessageType.THREAD_CREATED) {
return;
}

if (messageHasNoMediaAttached(message)) {
message.delete().flatMap(any -> dmUser(message)).queue();
}
}

private static boolean messageHasNoMediaAttached(MessageReceivedEvent event) {
Message message = event.getMessage();
private boolean messageHasNoMediaAttached(Message message) {
return message.getAttachments().isEmpty() && message.getEmbeds().isEmpty()
&& !message.getContentRaw().contains("http");
}

private AuditableRestAction<Void> deleteMessage(MessageReceivedEvent event) {
return event.getMessage().delete();
}

private RestAction<Message> dmUser(MessageReceivedEvent event) {
return dmUser(event.getMessage());
}

private RestAction<Message> dmUser(Message originalMessage) {
String originalMessageContent = originalMessage.getContentRaw();
private RestAction<Message> dmUser(Message message) {
String originalMessageContent = message.getContentRaw();
MessageEmbed originalMessageEmbed =
new EmbedBuilder().setDescription(originalMessageContent)
.setColor(Color.ORANGE)
Expand All @@ -68,7 +64,7 @@ private RestAction<Message> dmUser(Message originalMessage) {
.setEmbeds(originalMessageEmbed)
.build();

return originalMessage.getAuthor()
return message.getAuthor()
.openPrivateChannel()
.flatMap(channel -> channel.sendMessage(dmMessage));
}
Expand Down