Merge 4bfd3be573 into c4dcb9dc17

src/Discord.Net.Rest/DiscordRestApiClient.cs

@@ -577,7 +577,8 @@ namespace Discord.API
 
             options = RequestOptions.CreateOrClone(options);
 
-            var ids = new BucketIds(channelId: channelId);
+            var id = new Random().Next(0, int.MaxValue);
+            var ids = new BucketIds(channelId: (ulong)id);
 
             await SendAsync("PUT", () => $"channels/{channelId}/messages/{messageId}/reactions/{emoji}/@me", ids, options: options).ConfigureAwait(false);
         }
@@ -589,7 +590,8 @@ namespace Discord.API
 
             options = RequestOptions.CreateOrClone(options);
 
-            var ids = new BucketIds(channelId: channelId);
+            var id = new Random().Next(0, int.MaxValue);
+            var ids = new BucketIds(channelId: (ulong)id);
 
             await SendAsync("DELETE", () => $"channels/{channelId}/messages/{messageId}/reactions/{emoji}/{userId}", ids, options: options).ConfigureAwait(false);
         }

src/Discord.Net.WebSocket/DiscordSocketClient.cs

@@ -1631,7 +1631,9 @@ namespace Discord.WebSocket
 
         internal ISocketPrivateChannel AddPrivateChannel(API.Channel model, ClientState state)
         {
-            var channel = SocketChannel.CreatePrivate(this, state, model);
+            if (state.GetChannel(model.Id) is ISocketPrivateChannel channel)
+                return channel;
+            channel = SocketChannel.CreatePrivate(this, state, model);
             state.AddChannel(channel as SocketChannel);
             if (channel is SocketDMChannel dm)
                 dm.Recipient.GlobalUser.DMChannel = dm;