major performance fix

src/Mewdeko/Common/Collections/ConcurrentHashSet.cs

@@ -1,4 +1,3 @@
-using System.Collections.Concurrent;
 using System.Diagnostics;
 
 namespace Mewdeko.Common.Collections;

src/Mewdeko/Common/DownloadTracker.cs

@@ -1,5 +1,4 @@
-using System.Collections.Concurrent;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Mewdeko.Common;

src/Mewdeko/Common/Replacements/ReplacementBuilder.cs

@@ -1,7 +1,6 @@
 using Discord.Commands;
 using Mewdeko.Modules.Administration.Services;
 using NekosBestApiNet;
-using System.Collections.Concurrent;
 using System.Text.RegularExpressions;
 
 namespace Mewdeko.Common.Replacements;

src/Mewdeko/Extensions/IEnumerableExtensions.cs

@@ -1,5 +1,4 @@
 using Mewdeko.Database.Common;
-using System.Collections.Concurrent;
 using System.Security.Cryptography;
 using System.Threading.Tasks;
 

src/Mewdeko/GlobalUsings.cs

@@ -13,5 +13,6 @@
 global using System;
 global using System.Collections;
 global using System.Collections.Generic;
+global using NonBlocking;
 global using System.Linq;
 global using EventHandler = Mewdeko.Services.Impl.EventHandler;

src/Mewdeko/Mewdeko.csproj

@@ -76,6 +76,7 @@
         <PackageReference Include="NekosBestApiNet" Version="1.0.4" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.2-beta1" />
         <PackageReference Include="NHentaiAPI" Version="1.5.0" />
+        <PackageReference Include="NonBlocking" Version="2.1.0" />
         <PackageReference Include="PokeApiNet" Version="3.0.8" />
         <PackageReference Include="Scrutor" Version="4.2.0" />
         <PackageReference Include="Serilog" Version="2.11.1-dev-01397" />

src/Mewdeko/Modules/Administration/Common/ProtectionStats.cs

@@ -1,5 +1,4 @@
 using Mewdeko.Common.Collections;
-using System.Collections.Concurrent;
 using System.Threading;
 
 namespace Mewdeko.Modules.Administration.Common;

src/Mewdeko/Modules/Administration/Services/AdministrationService.cs

@@ -1,7 +1,6 @@
 using Discord.Commands;
 using Mewdeko.Common.Collections;
 using Microsoft.EntityFrameworkCore;
-using System.Collections.Concurrent;
 using System.Threading.Tasks;
 
 namespace Mewdeko.Modules.Administration.Services;

src/Mewdeko/Modules/Administration/Services/DiscordPermOverrideService.cs

@@ -2,7 +2,6 @@
 using Discord.Interactions;
 using Mewdeko.Common.ModuleBehaviors;
 using Microsoft.EntityFrameworkCore;
-using System.Collections.Concurrent;
 using System.Threading.Tasks;
 using PreconditionResult = Discord.Commands.PreconditionResult;
 using RequireUserPermissionAttribute = Discord.Commands.RequireUserPermissionAttribute;

src/Mewdeko/Modules/Administration/Services/GuildTimezoneService.cs

@@ -1,5 +1,4 @@
-using System.Collections.Concurrent;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 namespace Mewdeko.Modules.Administration.Services;
 

src/Mewdeko/Modules/Administration/Services/LogCommandService.cs

@@ -5,7 +5,6 @@
 using Mewdeko.Services.strings;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
-using System.Collections.Concurrent;
 using System.Threading;
 using System.Threading.Tasks;
 

src/Mewdeko/Modules/Administration/Services/ProtectionService.cs

@@ -2,7 +2,6 @@
 using Mewdeko.Modules.Moderation.Services;
 using Microsoft.EntityFrameworkCore;
 using Serilog;
-using System.Collections.Concurrent;
 using System.Threading.Tasks;
 
 namespace Mewdeko.Modules.Administration.Services;

src/Mewdeko/Modules/Administration/Services/RoleCommandsService.cs

@@ -1,7 +1,6 @@
 using Mewdeko.Database.Common;
 using Microsoft.EntityFrameworkCore;
 using Serilog;
-using System.Collections.Concurrent;
 using System.Threading.Tasks;
 
 namespace Mewdeko.Modules.Administration.Services;

src/Mewdeko/Modules/Administration/Services/VcRoleService.cs

@@ -16,8 +16,8 @@ public VcRoleService(DiscordSocketClient client, Mewdeko bot, DbService db, Even
         _client = client;
 
         eventHandler.UserVoiceStateUpdated += ClientOnUserVoiceStateUpdated;
-        VcRoles = new ConcurrentDictionary<ulong, ConcurrentDictionary<ulong, IRole>>();
-        ToAssign = new ConcurrentDictionary<ulong, ConcurrentQueue<(bool, IGuildUser, IRole)>>();
+        VcRoles = new NonBlocking.ConcurrentDictionary<ulong, NonBlocking.ConcurrentDictionary<ulong, IRole>>();
+        ToAssign = new NonBlocking.ConcurrentDictionary<ulong, ConcurrentQueue<(bool, IGuildUser, IRole)>>();
 
         using (var uow = db.GetDbContext())
         {
@@ -81,8 +81,8 @@ public VcRoleService(DiscordSocketClient client, Mewdeko bot, DbService db, Even
         bot.JoinedGuild += Bot_JoinedGuild;
     }
 
-    public ConcurrentDictionary<ulong, ConcurrentDictionary<ulong, IRole>> VcRoles { get; }
-    public ConcurrentDictionary<ulong, ConcurrentQueue<(bool, IGuildUser, IRole)>> ToAssign { get; }
+    public NonBlocking.ConcurrentDictionary<ulong, NonBlocking.ConcurrentDictionary<ulong, IRole>> VcRoles { get; }
+    public NonBlocking.ConcurrentDictionary<ulong, System.Collections.Concurrent.ConcurrentQueue<(bool, IGuildUser, IRole)>> ToAssign { get; }
 
     private async Task Bot_JoinedGuild(GuildConfig arg)
     {
@@ -110,7 +110,7 @@ private async Task InitializeVcRole(GuildConfig gconf)
         if (g == null)
             return;
 
-        var infos = new ConcurrentDictionary<ulong, IRole>();
+        var infos = new NonBlocking.ConcurrentDictionary<ulong, IRole>();
         var missingRoles = new List<VcRoleInfo>();
         VcRoles.AddOrUpdate(gconf.GuildId, infos, delegate { return infos; });
         foreach (var ri in gconf.VcRoleInfos)
@@ -140,7 +140,7 @@ public async Task AddVcRole(ulong guildId, IRole role, ulong vcId)
         if (role == null)
             throw new ArgumentNullException(nameof(role));
 
-        var guildVcRoles = VcRoles.GetOrAdd(guildId, new ConcurrentDictionary<ulong, IRole>());
+        var guildVcRoles = VcRoles.GetOrAdd(guildId, new NonBlocking.ConcurrentDictionary<ulong, IRole>());
 
         guildVcRoles.AddOrUpdate(vcId, role, (_, _) => role);
         await using var uow = _db.GetDbContext();

src/Mewdeko/Modules/Chat Triggers/Services/ChatTriggersService.cs

@@ -10,7 +10,6 @@
 using Mewdeko.Services.strings;
 using Microsoft.EntityFrameworkCore;
 using Serilog;
-using System.Collections.Concurrent;
 using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;

src/Mewdeko/Modules/Gambling/Common/Events/ReactionEvent.cs

@@ -11,7 +11,6 @@ public class ReactionEvent : ICurrencyEvent
     private readonly long _amount;
     private readonly ConcurrentHashSet<ulong> _awardedUsers = new();
     private readonly ITextChannel _channel;
-    private readonly DiscordSocketClient _client;
     private readonly GamblingConfig _config;
     private readonly ICurrencyService _cs;
 
@@ -36,7 +35,6 @@ public ReactionEvent(DiscordSocketClient client, ICurrencyService cs,
         Func<CurrencyEvent.Type, EventOptions, long, EmbedBuilder> embedFunc,
         EventHandler eventHandler)
     {
-        _client = client;
         _guild = g;
         _cs = cs;
         _amount = opt.Amount;

src/Mewdeko/Modules/Gambling/DrawCommands.cs

@@ -3,7 +3,6 @@
 using Mewdeko.Modules.Gambling.Common;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
-using System.Collections.Concurrent;
 using System.IO;
 using System.Threading.Tasks;
 using Image = SixLabors.ImageSharp.Image;

src/Mewdeko/Modules/Gambling/Services/AnimalRaceService.cs

@@ -1,5 +1,4 @@
 using Mewdeko.Modules.Gambling.Common.AnimalRacing;
-using System.Collections.Concurrent;
 using System.Threading.Tasks;
 
 namespace Mewdeko.Modules.Gambling.Services;

src/Mewdeko/Modules/Gambling/Services/BlackJackService.cs

@@ -1,5 +1,4 @@
 using Mewdeko.Modules.Gambling.Common.Blackjack;
-using System.Collections.Concurrent;
 
 namespace Mewdeko.Modules.Gambling.Services;
 

src/Mewdeko/Modules/Gambling/Services/CurrencyEventsService.cs

@@ -1,6 +1,5 @@
 using Mewdeko.Modules.Gambling.Common.Events;
 using Serilog;
-using System.Collections.Concurrent;
 using System.Threading.Tasks;
 
 namespace Mewdeko.Modules.Gambling.Services;

src/Mewdeko/Modules/Gambling/Services/GamblingService.cs

@@ -4,7 +4,6 @@
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 using Serilog;
-using System.Collections.Concurrent;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;

src/Mewdeko/Modules/Gambling/Services/PlantPickService.cs

@@ -7,7 +7,6 @@
 using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using System.Collections.Concurrent;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;

src/Mewdeko/Modules/Games/Common/Trivia/TriviaGame.cs

@@ -1,7 +1,6 @@
 using Discord.Net;
 using Mewdeko.Services.strings;
 using Serilog;
-using System.Collections.Concurrent;
 using System.Net;
 using System.Text;
 using System.Threading;

src/Mewdeko/Modules/Games/Services/ChatterbotService.cs

@@ -3,7 +3,6 @@
 using Mewdeko.Modules.Games.Common.ChatterBot;
 using Mewdeko.Modules.Permissions.Services;
 using Serilog;
-using System.Collections.Concurrent;
 using System.Net.Http;
 using System.Threading.Tasks;
 

src/Mewdeko/Modules/Games/Services/GamesService.cs

@@ -5,7 +5,6 @@
 using Mewdeko.Modules.Games.Common.Trivia;
 using Newtonsoft.Json;
 using Serilog;
-using System.Collections.Concurrent;
 using System.IO;
 using System.Threading.Tasks;
 

src/Mewdeko/Modules/Games/Services/PollService.cs

@@ -1,7 +1,6 @@
 using Mewdeko.Database.Common;
 using Mewdeko.Modules.Games.Common;
 using Serilog;
-using System.Collections.Concurrent;
 using System.Threading.Tasks;
 
 namespace Mewdeko.Modules.Games.Services;

src/Mewdeko/Modules/Moderation/Services/MuteService.cs

@@ -1,7 +1,6 @@
 using Mewdeko.Common.Collections;
 using Microsoft.EntityFrameworkCore;
 using Serilog;
-using System.Collections.Concurrent;
 using System.Threading;
 using System.Threading.Tasks;
 

src/Mewdeko/Modules/Music/Services/MusicService.cs

@@ -3,7 +3,6 @@
 using Lavalink4NET.Rest;
 using Mewdeko.Modules.Music.Common;
 using SpotifyAPI.Web;
-using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Threading.Tasks;
 

src/Mewdeko/Modules/Nsfw/Common/Downloaders/DanbooruImageDownloader.cs

@@ -1,5 +1,4 @@
-using System.Collections.Concurrent;
-using System.Net.Http;
+using System.Net.Http;
 using System.Net.Http.Json;
 using System.Threading;
 using System.Threading.Tasks;

src/Mewdeko/Modules/Nsfw/ISearchImagesService.cs

@@ -1,5 +1,4 @@
-using System.Collections.Concurrent;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Mewdeko.Modules.Nsfw;

src/Mewdeko/Modules/Nsfw/Nsfw.cs

@@ -8,7 +8,6 @@
 using Mewdeko.Common.Collections;
 using Newtonsoft.Json.Linq;
 using NHentaiAPI;
-using NHentaiAPI.Models.Books;
 using Refit;
 using Serilog;
 using System.Net.Http;

src/Mewdeko/Modules/Nsfw/SearchImageCacher.cs

@@ -2,7 +2,6 @@
 using Mewdeko.Modules.Nsfw.Common.Downloaders;
 using Microsoft.Extensions.Caching.Memory;
 using Serilog;
-using System.Collections.Concurrent;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;

src/Mewdeko/Modules/Nsfw/SearchImagesService.cs

@@ -2,7 +2,6 @@
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json.Linq;
 using Serilog;
-using System.Collections.Concurrent;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;

src/Mewdeko/Modules/OwnerOnly/Services/OwnerOnlyService.cs

@@ -5,7 +5,6 @@
 using Newtonsoft.Json;
 using Serilog;
 using StackExchange.Redis;
-using System.Collections.Concurrent;
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Net.Http;

src/Mewdeko/Modules/Permissions/CmdCdsCommands.cs

@@ -4,7 +4,6 @@
 using Mewdeko.Common.TypeReaders;
 using Mewdeko.Modules.Permissions.Services;
 using Microsoft.EntityFrameworkCore;
-using System.Collections.Concurrent;
 using System.Threading.Tasks;
 
 namespace Mewdeko.Modules.Permissions;

src/Mewdeko/Modules/Permissions/Services/CmdCdService.cs

@@ -2,7 +2,6 @@
 using Discord.Interactions;
 using Mewdeko.Common.Collections;
 using Mewdeko.Common.ModuleBehaviors;
-using System.Collections.Concurrent;
 using System.Threading.Tasks;
 
 namespace Mewdeko.Modules.Permissions.Services;

src/Mewdeko/Modules/Permissions/Services/FilterService.cs

@@ -7,7 +7,6 @@
 using Mewdeko.Services.strings;
 using Microsoft.EntityFrameworkCore;
 using Serilog;
-using System.Collections.Concurrent;
 using System.Globalization;
 using System.Threading.Tasks;
 

src/Mewdeko/Modules/Permissions/Services/PermissionsService.cs

@@ -4,7 +4,6 @@
 using Mewdeko.Modules.Permissions.Common;
 using Mewdeko.Services.strings;
 using Microsoft.EntityFrameworkCore;
-using System.Collections.Concurrent;
 using System.Threading.Tasks;
 
 namespace Mewdeko.Modules.Permissions.Services;

src/Mewdeko/Modules/Searches/Common/StreamNotifications/Providers/Provider.cs

@@ -1,5 +1,4 @@
 using Mewdeko.Modules.Searches.Common.StreamNotifications.Models;
-using System.Collections.Concurrent;
 using System.Threading.Tasks;
 
 namespace Mewdeko.Modules.Searches.Common.StreamNotifications.Providers;

src/Mewdeko/Modules/Searches/Searches.cs

@@ -20,7 +20,6 @@
 using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using System.Collections.Concurrent;
 using System.Globalization;
 using System.Net;
 using System.Net.Http;

src/Mewdeko/Modules/Searches/Services/FeedsService.cs

@@ -1,7 +1,6 @@
 using CodeHollow.FeedReader;
 using CodeHollow.FeedReader.Feeds;
 using Microsoft.EntityFrameworkCore;
-using System.Collections.Concurrent;
 using System.Threading.Tasks;
 using Embed = Discord.Embed;
 

src/Mewdeko/Modules/Searches/Services/SearchesService.cs

@@ -12,7 +12,6 @@
 using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.IO;
 using System.Net;

src/Mewdeko/Modules/Server Management/Services/ServerManagementService.cs

@@ -1,4 +1,3 @@
-using System.Collections.Concurrent;
 using System.Threading.Tasks;
 
 namespace Mewdeko.Modules.Server_Management.Services;

src/Mewdeko/Modules/Utility/CommandMapCommands.cs

@@ -4,7 +4,6 @@
 using Mewdeko.Common.Attributes.TextCommands;
 using Mewdeko.Modules.Utility.Services;
 using Microsoft.EntityFrameworkCore;
-using System.Collections.Concurrent;
 using System.Threading.Tasks;
 
 namespace Mewdeko.Modules.Utility;

src/Mewdeko/Modules/Utility/RepeatCommands.cs

@@ -5,7 +5,6 @@
 using Mewdeko.Modules.Utility.Common;
 using Mewdeko.Modules.Utility.Services;
 using Microsoft.EntityFrameworkCore;
-using System.Collections.Concurrent;
 using System.Threading.Tasks;
 
 namespace Mewdeko.Modules.Utility;

src/Mewdeko/Modules/Utility/Services/CommandMapService.cs

@@ -1,6 +1,5 @@
 using Mewdeko.Common.ModuleBehaviors;
 using Microsoft.EntityFrameworkCore;
-using System.Collections.Concurrent;
 using System.Threading.Tasks;
 
 namespace Mewdeko.Modules.Utility.Services;

src/Mewdeko/Modules/Utility/Services/MessageRepeaterService.cs

@@ -1,7 +1,6 @@
 using Mewdeko.Modules.Utility.Common;
 using Microsoft.EntityFrameworkCore;
 using Serilog;
-using System.Collections.Concurrent;
 using System.Threading.Tasks;
 
 namespace Mewdeko.Modules.Utility.Services;