Allow forwarding of media, to media channels #1266
Open
+54
−7
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Great job, I'll code review this in the morning. |
Zabuzard
requested changes
Jun 29, 2025
Comment on lines
34
to
35
| private final ConcurrentHashMap<Long, Long> lastValidForwardedMediaMessageTime = | ||
| new ConcurrentHashMap<>(); |
There was a problem hiding this comment.
please use Instant instead of raw Longs
| } | ||
|
|
||
| private MessageCreateData createNotificationMessage(Message message) { | ||
| String originalMessageContent = message.getContentRaw(); | ||
| if (originalMessageContent.trim().isEmpty()) { | ||
| originalMessageContent = "(Original message had no visible text content)"; |
There was a problem hiding this comment.
that text is written with a developer as target audience, not the user. id rewrite it as See image: or similar.
There was a problem hiding this comment.
Not sure what you mean by that. It checks for .isEmpty() meaning I cannot return "See image:" Since there is not one
Comment on lines
57
to
103
| long userId = event.getAuthor().getIdLong(); | ||
|
|
||
| boolean isForwardedWithMedia = | ||
| !message.getMessageSnapshots().isEmpty() && !messageHasNoMediaAttached(message); | ||
|
|
||
| if (isForwardedWithMedia) { | ||
| lastValidForwardedMediaMessageTime.put(userId, System.currentTimeMillis()); | ||
| return; | ||
| } | ||
|
|
||
| boolean isNormalMediaUpload = | ||
| message.getMessageSnapshots().isEmpty() && !messageHasNoMediaAttached(message); | ||
| if (isNormalMediaUpload) { | ||
| return; | ||
| } | ||
|
|
||
| Long lastForwardedMediaTime = lastValidForwardedMediaMessageTime.get(userId); | ||
| long gracePeriodMillis = TimeUnit.SECONDS.toMillis(1); | ||
|
|
||
| if (lastForwardedMediaTime != null | ||
| && (System.currentTimeMillis() - lastForwardedMediaTime) <= gracePeriodMillis) { | ||
| lastValidForwardedMediaMessageTime.remove(userId); | ||
| return; | ||
| } | ||
|
|
||
| message.delete().queue(deleteSuccess -> dmUser(message).queue(dmSuccess -> { | ||
| }, dmFailure -> tempNotifyUserInChannel(message)), | ||
| deleteFailure -> tempNotifyUserInChannel(message)); | ||
| } | ||
|
|
||
| private boolean messageHasNoMediaAttached(Message message) { | ||
| return message.getAttachments().isEmpty() && message.getEmbeds().isEmpty() | ||
| && !message.getContentRaw().contains("http"); | ||
| if (!message.getAttachments().isEmpty() || !message.getEmbeds().isEmpty() | ||
| || MEDIA_URL_PATTERN.matcher(message.getContentRaw()).matches()) { | ||
| return false; | ||
| } | ||
|
|
||
| if (!message.getMessageSnapshots().isEmpty()) { | ||
| for (MessageSnapshot snapshot : message.getMessageSnapshots()) { | ||
| if (!snapshot.getAttachments().isEmpty() || !snapshot.getEmbeds().isEmpty() | ||
| || MEDIA_URL_PATTERN.matcher(snapshot.getContentRaw()).matches()) { | ||
| return false; | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| return true; |
There was a problem hiding this comment.
im not happy with how this logic is currently structured.
the main structure should be:
if (!is there any media?) {
delete it
} else {
forward it
}the details of detecting media should be in a helper method. and the details of that cache handling as well.
i also dont quite get the point of the cache thing. what is it used for? and how does the UX look like if they run into it?
for the cache topic u should use high level classes like Duration and Instant instead.
- Changed TimeUnit implementation to java.time.Instant for grace period. - Cleaned up and improved readability of the onMessageReceived method.
billpapat
force-pushed
the
fix/forward-to-media-channel
branch
from
810b1d5 to
2742573
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix: Media forwarding #1243