Skip to content

Commit 1fa9e39

Browse files
committed
fix: address review comments
1 parent 6397008 commit 1fa9e39

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

application/src/main/java/org/togetherjava/tjbot/features/mediaonly/MediaOnlyChannelListener.java

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ public void onMessageReceived(MessageReceivedEvent event) {
5353
}
5454
}
5555

56-
// private boolean messageHasNoMediaAttached(Message message) {
57-
// return message.getAttachments().isEmpty() && message.getEmbeds().isEmpty()
58-
// && !message.getContentRaw().contains("http");
59-
// }
60-
6156
/**
6257
* Checks whether the given message has no media attached.
6358
* <p>
@@ -72,13 +67,9 @@ private boolean messageHasNoMediaAttached(Message message) {
7267
if (hasMedia(message.getAttachments(), message.getEmbeds(), message.getContentRaw())) {
7368
return false;
7469
}
75-
// checks forwarded snapshots
76-
for (MessageSnapshot snapshot : message.getMessageSnapshots()) {
77-
if (hasMedia(snapshot.getAttachments(), snapshot.getEmbeds(), snapshot.getContentRaw())) {
78-
return false;
79-
}
80-
}
81-
return true;
70+
71+
return message.getMessageSnapshots().stream().noneMatch(snapshot ->
72+
hasMedia(snapshot.getAttachments(), snapshot.getEmbeds(), snapshot.getContentRaw()));
8273
}
8374
/**
8475
* Checks whether the given content contains any media.
@@ -90,7 +81,6 @@ private boolean messageHasNoMediaAttached(Message message) {
9081
* @param embeds the embeds of the message or snapshot
9182
* @param content the raw text content of the message or snapshot
9283
*/
93-
9484
private boolean hasMedia(List<Message.Attachment> attachments,
9585
List<MessageEmbed> embeds, String content) {
9686
return !attachments.isEmpty()

application/src/test/java/org/togetherjava/tjbot/features/mediaonly/MediaOnlyChannelListenerTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ void deletesForwardedMessageWithoutMedia() {
149149
verify(event.getMessage()).delete();
150150
}
151151

152-
// Добавить этот вспомогательный метод рядом с существующим sendMessage():
153152
private MessageReceivedEvent sendMessageWithSnapshots(MessageCreateData message,
154153
List<MessageSnapshot> snapshots) {
155154
MessageReceivedEvent event =

0 commit comments

Comments
 (0)