Merge branch 'master' into 38-reminder-text-limit

frc5183 · Jan 5, 2024 · c300c00 · c300c00
2 parents 208540d + 8aa3fd1
commit c300c00
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/wtf/triplapeeck/oatmeal/events/GuildEmojiAddEvent.java b/src/main/java/wtf/triplapeeck/oatmeal/events/GuildEmojiAddEvent.java
@@ -57,7 +57,7 @@ public void run() {
                         if (messageReaction.getEmoji().asUnicode().getAsCodepoints().equalsIgnoreCase("U+2b50")) {
                             for (Iterator<User> it = messageReaction.retrieveUsers().stream().iterator(); count >= guildEntity.getStarboardLimit() || it.hasNext(); ) {
                                 User user = it.next();
-                                if (user.getIdLong()!= event.getUserIdLong()) {
+                                if (user.getIdLong()!= event.retrieveMessage().complete().getIdLong()) {
                                     count++;
                                 }
 
@@ -78,7 +78,7 @@ public void run() {
                 int height = 0;
                 int width = 0;
                 for (Message.Attachment a : message.getAttachments()) {
-                    if (url == "") {
+                    if (url.isBlank()) {
                         url = a.getUrl();
                         height = a.getHeight();
                         width = a.getWidth();

diff --git a/src/main/java/wtf/triplapeeck/oatmeal/events/GuildEmojiRemoveEvent.java b/src/main/java/wtf/triplapeeck/oatmeal/events/GuildEmojiRemoveEvent.java
@@ -54,7 +54,7 @@ public void run() {
                 if (messageReaction.getEmoji().asUnicode().getAsCodepoints().equalsIgnoreCase("U+2b50")) {
                     for (Iterator<User> it = messageReaction.retrieveUsers().stream().iterator(); count >= guildEntity.getStarboardLimit() || it.hasNext(); ) {
                         User user = it.next();
-                        if (user.getIdLong()!= event.getUserIdLong()) {
+                        if (user.getIdLong()!= event.retrieveMessage().complete().getIdLong()) {
                             count++;
                         }