Fixed removeReaction() endpoints, use correct endpoint for deleting own reactions

Author: MinnDevelopment

src/main/java/net/dv8tion/jda/core/entities/MessageChannel.java

@@ -2049,9 +2049,8 @@ default RestAction<Void> removeReactionById(String messageId, String unicode)
         Checks.noWhitespace(messageId, "Message ID");
         Checks.noWhitespace(unicode, "Emoji");
 
-        final String selfId = getJDA().getSelfUser().getId();
         final String code = MiscUtil.encodeUTF8(unicode);
-        final Route.CompiledRoute route = Route.Messages.REMOVE_REACTION.compile(getId(), messageId, code, selfId);
+        final Route.CompiledRoute route = Route.Messages.REMOVE_OWN_REACTION.compile(getId(), messageId, code);
         return new RestAction<Void>(getJDA(), route)
         {
             @Override

src/main/java/net/dv8tion/jda/core/entities/MessageReaction.java

@@ -377,7 +377,11 @@ public RestAction<Void> removeReaction(User user)
         String code = emote.isEmote()
                     ? emote.getName() + ":" + emote.getId()
                     : MiscUtil.encodeUTF8(emote.getName());
-        Route.CompiledRoute route = Route.Messages.REMOVE_REACTION.compile(channel.getId(), getMessageId(), code, user.getId());
+        Route.CompiledRoute route;
+        if (user.equals(getJDA().getSelfUser()))
+            route = Route.Messages.REMOVE_OWN_REACTION.compile(channel.getId(), getMessageId(), code);
+        else
+            route = Route.Messages.REMOVE_REACTION.compile(channel.getId(), getMessageId(), code, user.getId());
         return new RestAction<Void>(getJDA(), route)
         {
             @Override

src/main/java/net/dv8tion/jda/core/entities/impl/TextChannelImpl.java

@@ -26,16 +26,19 @@
 import net.dv8tion.jda.core.requests.Route;
 import net.dv8tion.jda.core.requests.restaction.AuditableRestAction;
 import net.dv8tion.jda.core.requests.restaction.ChannelAction;
-import net.dv8tion.jda.core.requests.restaction.WebhookAction;
 import net.dv8tion.jda.core.requests.restaction.MessageAction;
-import net.dv8tion.jda.core.utils.MiscUtil;
+import net.dv8tion.jda.core.requests.restaction.WebhookAction;
 import net.dv8tion.jda.core.utils.Checks;
+import net.dv8tion.jda.core.utils.MiscUtil;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import java.util.stream.Collectors;
 
 public class TextChannelImpl extends AbstractChannelImpl<TextChannelImpl> implements TextChannel
@@ -400,7 +403,11 @@ public RestAction<Void> removeReactionById(String messageId, String unicode, Use
         if (!getJDA().getSelfUser().equals(user))
             checkPermission(Permission.MESSAGE_MANAGE);
         final String code = MiscUtil.encodeUTF8(unicode);
-        final Route.CompiledRoute route = Route.Messages.REMOVE_REACTION.compile(getId(), messageId, code, user.getId());
+        Route.CompiledRoute route;
+        if (user.equals(getJDA().getSelfUser()))
+            route = Route.Messages.REMOVE_OWN_REACTION.compile(getId(), messageId, code);
+        else
+            route = Route.Messages.REMOVE_REACTION.compile(getId(), messageId, code, user.getId());
         return new RestAction<Void>(getJDA(), route)
         {
             @Override

src/main/java/net/dv8tion/jda/core/requests/Route.java

@@ -198,6 +198,7 @@ public static class Messages
 
         public static final Route ADD_REACTION =             new Route(PUT,    new RateLimit(1, 250),
                                                                                "channels/{channel_id}/messages/{message_id}/reactions/{reaction_code}/@me",       "channel_id");
+        public static final Route REMOVE_OWN_REACTION =      new Route(DELETE, "channels/{channel_id}/messages/{message_id}/reactions/{reaction_code}/@me",       "channel_id");
         public static final Route REMOVE_REACTION =          new Route(DELETE, "channels/{channel_id}/messages/{message_id}/reactions/{reaction_code}/{user_id}", "channel_id");
         public static final Route REMOVE_ALL_REACTIONS =     new Route(DELETE, "channels/{channel_id}/messages/{message_id}/reactions",                           "channel_id");
         public static final Route GET_REACTION_USERS =       new Route(GET,    "channels/{channel_id}/messages/{message_id}/reactions/{reaction_code}",           "channel_id");