dev: Added argumentoutofrange static methods, no functional change

src/NadekoBot/Db/Extensions/WarningExtensions.cs

@@ -22,8 +22,7 @@ public static class WarningExtensions
         string mod,
         int index)
     {
-        if (index < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(index);
-            throw new ArgumentOutOfRangeException(nameof(index));
 
         var warn = warnings.AsQueryable()
                            .Where(x => x.GuildId == guildId && x.UserId == userId)

src/NadekoBot/Modules/Administration/PlayingRotate/PlayingRotateService.cs

@@ -69,8 +69,7 @@ public sealed class PlayingRotateService : INService, IReadyExecutor
 
     public async Task<string> RemovePlayingAsync(int index)
     {
-        if (index < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(index);
-            throw new ArgumentOutOfRangeException(nameof(index));
 
         await using var uow = _db.GetDbContext();
         var toRemove = await uow.Set<RotatingPlayingStatus>().AsQueryable().AsNoTracking().Skip(index).FirstOrDefaultAsync();

src/NadekoBot/Modules/Administration/Prune/PruneService.cs

@@ -22,8 +22,7 @@ public class PruneService : INService
         ArgumentNullException.ThrowIfNull(channel, nameof(channel));
 
         var originalAmount = amount;
-        if (amount <= 0)
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(amount);
-            throw new ArgumentOutOfRangeException(nameof(amount));
 
         using var cancelSource = new CancellationTokenSource();
         if (!_pruningGuilds.TryAdd(channel.GuildId, cancelSource))

src/NadekoBot/Modules/Administration/Role/ReactionRolesService.cs

@@ -250,11 +250,9 @@ public sealed class ReactionRolesService : IReadyExecutor, INService, IReactionR
         int group = 0,
         int levelReq = 0)
     {
-        if (group < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(group);
-            throw new ArgumentOutOfRangeException(nameof(group));
 
-        if (levelReq < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(levelReq);
-            throw new ArgumentOutOfRangeException(nameof(group));
 
         await using var ctx = _db.GetDbContext();
 

src/NadekoBot/Modules/Administration/UserPunish/UserPunishService.cs

@@ -64,8 +64,7 @@ public class UserPunishService : INService, IReadyExecutor
         long weight,
         string reason)
     {
-        if (weight <= 0)
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(weight);
-            throw new ArgumentOutOfRangeException(nameof(weight));
 
         var modName = mod.ToString();
 

src/NadekoBot/Modules/Gambling/AnimalRacing/AnimalRace.cs

@@ -61,8 +61,7 @@ public sealed class AnimalRace : IDisposable
 
     public async Task<AnimalRacingUser> JoinRace(ulong userId, string userName, long bet = 0)
     {
-        if (bet < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(bet);
-            throw new ArgumentOutOfRangeException(nameof(bet));
 
         var user = new AnimalRacingUser(userName, userId, bet);
 

src/NadekoBot/Modules/Gambling/Bank/BankService.cs

@@ -17,8 +17,7 @@ public sealed class BankService : IBankService, INService
 
     public async Task<bool> AwardAsync(ulong userId, long amount)
     {
-        if (amount <= 0)
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(amount);
-            throw new ArgumentOutOfRangeException(nameof(amount));
 
         await using var ctx = _db.GetDbContext();
         await ctx.GetTable<BankUser>()
@@ -41,8 +40,7 @@ public sealed class BankService : IBankService, INService
     
     public async Task<bool> TakeAsync(ulong userId, long amount)
     {
-        if (amount <= 0)
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(amount);
-            throw new ArgumentOutOfRangeException(nameof(amount));
 
         await using var ctx = _db.GetDbContext();
         var rows = await ctx.Set<BankUser>()
@@ -58,8 +56,7 @@ public sealed class BankService : IBankService, INService
 
     public async Task<bool> DepositAsync(ulong userId, long amount)
     {
-        if (amount <= 0)
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(amount);
-            throw new ArgumentOutOfRangeException(nameof(amount));
 
         if (!await _cur.RemoveAsync(userId, amount, new("bank", "deposit")))
             return false;
@@ -86,8 +83,7 @@ public sealed class BankService : IBankService, INService
 
     public async Task<bool> WithdrawAsync(ulong userId, long amount)
     {
-        if (amount <= 0)
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(amount);
-            throw new ArgumentOutOfRangeException(nameof(amount));
 
         await using var ctx = _db.GetDbContext();
         var rows = await ctx.Set<BankUser>()

src/NadekoBot/Modules/Gambling/BlackJack/Player.cs

@@ -49,8 +49,7 @@ public class User : Player
 
     public User(IUser user, long bet)
     {
-        if (bet <= 0)
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(bet);
-            throw new ArgumentOutOfRangeException(nameof(bet));
 
         Bet = bet;
         DiscordUser = user;

src/NadekoBot/Modules/Gambling/Shop/ShopService.cs

@@ -20,10 +20,8 @@ public class ShopService : IShopService, INService
 
     public async Task<bool> ChangeEntryPriceAsync(ulong guildId, int index, int newPrice)
     {
-        if (index < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(index);
-            throw new ArgumentOutOfRangeException(nameof(index));
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(newPrice);
-        if (newPrice <= 0)
-            throw new ArgumentOutOfRangeException(nameof(newPrice));
 
         await using var uow = _db.GetDbContext();
         var entries = GetEntriesInternal(uow, guildId);
@@ -38,8 +36,8 @@ public class ShopService : IShopService, INService
 
     public async Task<bool> ChangeEntryNameAsync(ulong guildId, int index, string newName)
     {
-        if (index < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(index);
-            throw new ArgumentOutOfRangeException(nameof(index));
+        
         if (string.IsNullOrWhiteSpace(newName))
             throw new ArgumentNullException(nameof(newName));
 
@@ -56,10 +54,8 @@ public class ShopService : IShopService, INService
 
     public async Task<bool> SwapEntriesAsync(ulong guildId, int index1, int index2)
     {
-        if (index1 < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(index1);
-            throw new ArgumentOutOfRangeException(nameof(index1));
+        ArgumentOutOfRangeException.ThrowIfNegative(index2);
-        if (index2 < 0)
-            throw new ArgumentOutOfRangeException(nameof(index2));
 
         await using var uow = _db.GetDbContext();
         var entries = GetEntriesInternal(uow, guildId);
@@ -76,10 +72,8 @@ public class ShopService : IShopService, INService
 
     public async Task<bool> MoveEntryAsync(ulong guildId, int fromIndex, int toIndex)
     {
-        if (fromIndex < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(fromIndex);
-            throw new ArgumentOutOfRangeException(nameof(fromIndex));
+        ArgumentOutOfRangeException.ThrowIfNegative(toIndex);
-        if (toIndex < 0)
-            throw new ArgumentOutOfRangeException(nameof(toIndex));
 
         await using var uow = _db.GetDbContext();
         var entries = GetEntriesInternal(uow, guildId);

src/NadekoBot/Modules/Gambling/Waifus/db/WaifuExtensions.cs

@@ -27,8 +27,8 @@ public static class WaifuExtensions
 
     public static IEnumerable<WaifuLbResult> GetTop(this DbSet<WaifuInfo> waifus, int count, int skip = 0)
     {
-        if (count < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(count);
-            throw new ArgumentOutOfRangeException(nameof(count));
+        
         if (count == 0)
             return new List<WaifuLbResult>();
 

src/NadekoBot/Modules/Gambling/_common/IGamblingService.cs

@@ -14,5 +14,5 @@ public interface IGamblingService
     Task<OneOf<SlotResult, GamblingError>> SlotAsync(ulong userId, long amount);
     Task<FlipResult[]> FlipAsync(int count);
     Task<OneOf<RpsResult, GamblingError>> RpsAsync(ulong userId, long amount, byte pick);
-    Task<OneOf<BetdrawResult, GamblingError>> BetDrawAsync(ulong userId, long amount, byte? guessValue, byte? guessColor);
+    Task<OneOf<BetdrawResult, GamblingError>> BetDrawAsync(ulong userId, long amount, byte? maybeGuessValue, byte? maybeGuessColor);
 }

src/NadekoBot/Modules/Gambling/_common/NewGamblingService.cs

@@ -20,8 +20,7 @@ public sealed class NewGamblingService : IGamblingService, INService
     
     public async Task<OneOf<LuLaResult, GamblingError>> LulaAsync(ulong userId, long amount)
     {
-        if (amount < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(amount);
-            throw new ArgumentOutOfRangeException(nameof(amount));
 
         if (amount > 0)
         {
@@ -47,8 +46,7 @@ public sealed class NewGamblingService : IGamblingService, INService
 
     public async Task<OneOf<BetrollResult, GamblingError>> BetRollAsync(ulong userId, long amount)
     {
-        if (amount < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(amount);
-            throw new ArgumentOutOfRangeException(nameof(amount));
 
         if (amount > 0)
         {
@@ -77,11 +75,9 @@ public sealed class NewGamblingService : IGamblingService, INService
 
     public async Task<OneOf<BetflipResult, GamblingError>> BetFlipAsync(ulong userId, long amount, byte guess)
     {
-        if (amount < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(amount);
-            throw new ArgumentOutOfRangeException(nameof(amount));
 
-        if (guess > 1)
+        ArgumentOutOfRangeException.ThrowIfGreaterThan(guess, 1);
-            throw new ArgumentOutOfRangeException(nameof(guess));
 
         if (amount > 0)
         {
@@ -105,19 +101,18 @@ public sealed class NewGamblingService : IGamblingService, INService
         return result;
     }
     
-    public async Task<OneOf<BetdrawResult, GamblingError>> BetDrawAsync(ulong userId, long amount, byte? guessValue, byte? guessColor)
+    public async Task<OneOf<BetdrawResult, GamblingError>> BetDrawAsync(ulong userId, long amount, byte? maybeGuessValue, byte? maybeGuessColor)
     {
-        if (amount < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(amount);
-            throw new ArgumentOutOfRangeException(nameof(amount));
 
-        if (guessColor is null && guessValue is null)
+        if (maybeGuessColor is null && maybeGuessValue is null)
             throw new ArgumentNullException();
 
-        if (guessColor > 1)
+        if (maybeGuessColor > 1)
-            throw new ArgumentOutOfRangeException(nameof(guessColor));
+            throw new ArgumentOutOfRangeException(nameof(maybeGuessColor));
         
-        if (guessValue > 1)
+        if (maybeGuessValue > 1)
-            throw new ArgumentOutOfRangeException(nameof(guessValue));
+            throw new ArgumentOutOfRangeException(nameof(maybeGuessValue));
 
         if (amount > 0)
         {
@@ -130,7 +125,7 @@ public sealed class NewGamblingService : IGamblingService, INService
         }
 
         var game = new BetdrawGame();
-        var result = game.Draw((BetdrawValueGuess?)guessValue, (BetdrawColorGuess?)guessColor, amount);
+        var result = game.Draw((BetdrawValueGuess?)maybeGuessValue, (BetdrawColorGuess?)maybeGuessColor, amount);
         
         var won = (long)result.Won;
         if (won > 0)
@@ -143,8 +138,7 @@ public sealed class NewGamblingService : IGamblingService, INService
 
     public async Task<OneOf<SlotResult, GamblingError>> SlotAsync(ulong userId, long amount)
     {
-        if (amount < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(amount);
-            throw new ArgumentOutOfRangeException(nameof(amount));
 
         if (amount > 0)
         {
@@ -170,8 +164,7 @@ public sealed class NewGamblingService : IGamblingService, INService
 
     public Task<FlipResult[]> FlipAsync(int count)
     {
-        if (count < 1)
+        ArgumentOutOfRangeException.ThrowIfLessThan(count, 1);
-            throw new ArgumentOutOfRangeException(nameof(count));
 
         var game = new BetflipGame(0);
 
@@ -242,11 +235,8 @@ public sealed class NewGamblingService : IGamblingService, INService
 
     public async Task<OneOf<RpsResult, GamblingError>> RpsAsync(ulong userId, long amount, byte pick)
     {
-        if (amount < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(amount);
-            throw new ArgumentOutOfRangeException(nameof(amount));
+        ArgumentOutOfRangeException.ThrowIfGreaterThan(pick, 2);
-
-        if (pick > 2)
-            throw new ArgumentOutOfRangeException(nameof(pick));
         
         if (amount > 0)
         {

src/NadekoBot/Modules/Music/_common/Impl/MusicQueue.cs

@@ -201,12 +201,9 @@ public sealed partial class MusicQueue : IMusicQueue
 
     public IQueuedTrackInfo? MoveTrack(int from, int to)
     {
-        if (from < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(from);
-            throw new ArgumentOutOfRangeException(nameof(from));
+        ArgumentOutOfRangeException.ThrowIfNegative(to);
-        if (to < 0)
+        ArgumentOutOfRangeException.ThrowIfEqual(to, from);
-            throw new ArgumentOutOfRangeException(nameof(to));
-        if (to == from)
-            throw new ArgumentException($"{nameof(from)} and {nameof(to)} must be different");
 
         lock (_locker)
         {

src/NadekoBot/Modules/Music/_common/db/MusicPlaylistExtensions.cs

@@ -8,8 +8,7 @@ public static class MusicPlaylistExtensions
 {
     public static List<MusicPlaylist> GetPlaylistsOnPage(this DbSet<MusicPlaylist> playlists, int num)
     {
-        if (num < 1)
+        ArgumentOutOfRangeException.ThrowIfLessThan(num, 1);
-            throw new ArgumentOutOfRangeException(nameof(num));
 
         return playlists.AsQueryable().Skip((num - 1) * 20).Take(20).Include(pl => pl.Songs).ToList();
     }

src/NadekoBot/Modules/Permissions/Blacklist/BlacklistCommands.cs

@@ -16,8 +16,7 @@ public partial class Permissions
 
         private async Task ListBlacklistInternal(string title, BlacklistType type, int page = 0)
         {
-            if (page < 0)
+            ArgumentOutOfRangeException.ThrowIfNegative(page);
-                throw new ArgumentOutOfRangeException(nameof(page));
 
             var list = _service.GetBlacklist();
             var allItems = await list.Where(x => x.Type == type)

src/NadekoBot/Modules/Permissions/CommandCooldown/CmdCdService.cs

@@ -112,8 +112,7 @@ public sealed class CmdCdService : IExecPreCommand, IReadyExecutor, INService
 
     public void AddCooldown(ulong guildId, string name, int secs)
     {
-        if (secs <= 0)
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(secs);
-            throw new ArgumentOutOfRangeException(nameof(secs));
 
         var sett = _settings.GetOrAdd(guildId, static _ => new());
         sett[name] = secs;

src/NadekoBot/Modules/Searches/Search/GoogleScrape/PlainGoogleScrapeSearchResult.cs

@@ -2,7 +2,7 @@
 
 public class PlainGoogleScrapeSearchResult : ISearchResult
 {
-    public string? Answer { get; init;  } = null!;
+    public required string? Answer { get; init;  } 
-    public IReadOnlyCollection<ISearchResultEntry> Entries { get; init; } = null!;
+    public required IReadOnlyCollection<ISearchResultEntry> Entries { get; init; }
-    public ISearchResultInformation Info { get; init; } = null!;
+    public required ISearchResultInformation Info { get; init; } 
 }

src/NadekoBot/Modules/Utility/Repeater/RepeaterService.cs

@@ -363,8 +363,7 @@ public sealed class RepeaterService : IReadyExecutor, INService
 
     public async Task<RunningRepeater?> RemoveByIndexAsync(ulong guildId, int index)
     {
-        if (index > MAX_REPEATERS * 2)
+        ArgumentOutOfRangeException.ThrowIfGreaterThan(index, MAX_REPEATERS * 2);
-            throw new ArgumentOutOfRangeException(nameof(index));
 
         await using var uow = _db.GetDbContext();
         var toRemove = await uow.Set<Repeater>()

src/NadekoBot/Modules/Xp/Club/ClubService.cs

@@ -332,8 +332,7 @@ public class ClubService : INService, IClubService
 
     public List<ClubInfo> GetClubLeaderboardPage(int page)
     {
-        if (page < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(page);
-            throw new ArgumentOutOfRangeException(nameof(page));
 
         using var uow = _db.GetDbContext();
         return uow.Set<ClubInfo>().GetClubLeaderboardPage(page);

src/NadekoBot/Services/Impl/GoogleApiService.cs

@@ -43,8 +43,7 @@ public sealed partial class GoogleApiService : IGoogleApiService, INService
         if (string.IsNullOrWhiteSpace(keywords))
             throw new ArgumentNullException(nameof(keywords));
 
-        if (count <= 0)
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(count);
-            throw new ArgumentOutOfRangeException(nameof(count));
 
         var match = _plRegex.Match(keywords);
         if (match.Length > 1)
@@ -62,8 +61,7 @@ public sealed partial class GoogleApiService : IGoogleApiService, INService
         if (string.IsNullOrWhiteSpace(id))
             throw new ArgumentNullException(nameof(id));
 
-        if (count <= 0)
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(count);
-            throw new ArgumentOutOfRangeException(nameof(count));
 
         var query = _yt.Search.List("snippet");
         query.MaxResults = count;
@@ -82,8 +80,7 @@ public sealed partial class GoogleApiService : IGoogleApiService, INService
         if (string.IsNullOrWhiteSpace(keywords))
             throw new ArgumentNullException(nameof(keywords));
 
-        if (count <= 0)
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(count);
-            throw new ArgumentOutOfRangeException(nameof(count));
 
         var query = _yt.Search.List("snippet");
         query.MaxResults = count;
@@ -100,8 +97,7 @@ public sealed partial class GoogleApiService : IGoogleApiService, INService
         if (string.IsNullOrWhiteSpace(keywords))
             throw new ArgumentNullException(nameof(keywords));
 
-        if (count <= 0)
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(count);
-            throw new ArgumentOutOfRangeException(nameof(count));
 
         var query = _yt.Search.List("snippet");
         query.MaxResults = count;
@@ -150,8 +146,7 @@ public sealed partial class GoogleApiService : IGoogleApiService, INService
         if (string.IsNullOrWhiteSpace(playlistId))
             throw new ArgumentNullException(nameof(playlistId));
 
-        if (count <= 0)
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(count);
-            throw new ArgumentOutOfRangeException(nameof(count));
 
         string nextPageToken = null;
 

src/NadekoBot/_common/Abstractions/Collections/ConcurrentHashSet.cs

@@ -46,12 +46,8 @@ public sealed class ConcurrentHashSet<T> : IReadOnlyCollection<T>, ICollection<T
     public void CopyTo(T[] array, int arrayIndex)
     {
         ArgumentNullException.ThrowIfNull(array);
-        
+        ArgumentOutOfRangeException.ThrowIfNegative(arrayIndex);
-        if (arrayIndex < 0)
+        ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual(arrayIndex, array.Length);
-            throw new ArgumentOutOfRangeException(nameof(arrayIndex));
-        
-        if (arrayIndex >= array.Length)
-            throw new ArgumentOutOfRangeException(nameof(arrayIndex));
 
         CopyToInternal(array, arrayIndex);
     }

src/NadekoBot/_common/Abstractions/NadekoRandom.cs

@@ -38,8 +38,8 @@ public sealed class NadekoRandom : Random
 
     public long NextLong(long minValue, long maxValue)
     {
-        if (minValue > maxValue)
+        ArgumentOutOfRangeException.ThrowIfGreaterThan(minValue, maxValue);
-            throw new ArgumentOutOfRangeException(nameof(maxValue));
+        
         if (minValue == maxValue)
             return minValue;
         var bytes = new byte[sizeof(long)];

src/NadekoBot/_common/Abstractions/QueueRunner.cs

@@ -9,8 +9,7 @@ public sealed class QueueRunner
 
     public QueueRunner(int delayMs = 0, int maxCapacity = -1)
     {
-        if (delayMs < 0)
+        ArgumentOutOfRangeException.ThrowIfNegative(delayMs);
-            throw new ArgumentOutOfRangeException(nameof(delayMs));
 
         _delayMs = delayMs;
         _channel = maxCapacity switch

src/NadekoBot/_common/Attributes/RatelimitAttribute.cs

@@ -9,8 +9,7 @@ public sealed class RatelimitAttribute : PreconditionAttribute
 
     public RatelimitAttribute(int seconds)
     {
-        if (seconds <= 0)
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(seconds);
-            throw new ArgumentOutOfRangeException(nameof(seconds));
 
         Seconds = seconds;
     }