Hopefully fix

Naamloos · Dec 22, 2022 · 98f3122 · 98f3122
1 parent 4985182
commit 98f3122
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/ModCore/Commands/Starboard.cs b/ModCore/Commands/Starboard.cs
@@ -119,10 +119,9 @@ public async Task RandomAsync(InteractionContext ctx)
                 (await ctx.Guild.GetEmojiAsync(settings.Starboard.Emoji.EmojiId)) 
                 : DiscordEmoji.FromUnicode(settings.Starboard.Emoji.EmojiName);
 
-            var channelIds = ctx.Guild.Channels.Select(x => x.Key).ToList();
-            var guildStars = db.StarDatas.Where(x => channelIds.Contains((ulong)x.ChannelId)).ToList();
+            var guildStars = db.StarDatas.Where(x => x.GuildId == (long)ctx.Guild.Id).ToList();
             var totalStars = guildStars.Count();
-            var randomizedStars = guildStars.OrderBy(x => Guid.NewGuid()).Take(5);
+            var randomizedStars = guildStars.OrderBy(x => new Random().Next()).ToList().Take(10);
 
             DatabaseStarData star = null;
             DiscordMessage msg = null;
@@ -137,9 +136,6 @@ public async Task RandomAsync(InteractionContext ctx)
                     star = guildStar;
                 }catch(Exception ex)
                 {
-                    var deletion = guildStars.Where(x => x.ChannelId == guildStar.ChannelId && x.MessageId == guildStar.MessageId);
-                    db.StarDatas.RemoveRange(deletion);
-                    await db.SaveChangesAsync();
                     continue;
                 }
                 break;

diff --git a/ModCore/DataFixer/Fixer.cs b/ModCore/DataFixer/Fixer.cs
@@ -89,7 +89,6 @@ public async Task FixDataAsync()
 
                     long correctChannel = 0;
 
-                    bool saved = false;
                     try
                     {
                         await rest.GetMessageAsync((ulong)msg.ChannelId, (ulong)msg.MessageId);
@@ -100,7 +99,7 @@ public async Task FixDataAsync()
                     catch (Exception) { }
 
                     // channel ID is not valid so we'll try iterating
-                    if (!saved)
+                    if (correctChannel == 0)
                     {
                         foreach (var channel in guild.Item2)
                         {

diff --git a/ModCore/Listeners/Reactions.cs b/ModCore/Listeners/Reactions.cs
@@ -66,7 +66,7 @@ public static async Task ReactionAdd(MessageReactionAddEventArgs eventargs, Data
                         if (message.Author.Id == user.Id || user.IsBot)
                             return;
 
-                        if (db.StarDatas.Any(x => (ulong)x.MessageId == eventargs.Message.Id))
+                        if (db.StarDatas.Any(x => (ulong)x.MessageId == eventargs.Message.Id && (ulong)x.ChannelId == eventargs.Channel.Id))
                         {
                             var count = db.StarDatas.Count(x => x.ChannelId == (long)eventargs.Channel.Id && (ulong)x.MessageId == eventargs.Message.Id);
 
@@ -135,6 +135,7 @@ public static async Task ReactionRemove(MessageReactionRemoveEventArgs eventargs
 						await member.RevokeRoleAsync(reactionrole);
 				}
 
+                //SB
 				var emoji = config.Starboard.Emoji;
                 DiscordEmoji discordemoji = null;
                 if (emoji.EmojiId != 0)