diff --git a/Geekbot.net/Commands/CheckEm.cs b/Geekbot.net/Commands/CheckEm.cs index 11d0cef..61de091 100644 --- a/Geekbot.net/Commands/CheckEm.cs +++ b/Geekbot.net/Commands/CheckEm.cs @@ -12,11 +12,9 @@ namespace Geekbot.net.Commands { private readonly IMediaProvider _checkEmImages; private readonly IErrorHandler _errorHandler; - private readonly Random _rnd; - public CheckEm(Random RandomClient, IMediaProvider mediaProvider, IErrorHandler errorHandler) + public CheckEm(IMediaProvider mediaProvider, IErrorHandler errorHandler) { - _rnd = RandomClient; _checkEmImages = mediaProvider; _errorHandler = errorHandler; } @@ -28,7 +26,7 @@ namespace Geekbot.net.Commands { try { - var number = _rnd.Next(10000000, 99999999); + var number = new Random().Next(10000000, 99999999); var dubtriqua = ""; var ns = GetIntArray(number); diff --git a/Geekbot.net/Commands/Choose.cs b/Geekbot.net/Commands/Choose.cs index 214a1a8..a726741 100644 --- a/Geekbot.net/Commands/Choose.cs +++ b/Geekbot.net/Commands/Choose.cs @@ -8,12 +8,10 @@ namespace Geekbot.net.Commands public class Choose : ModuleBase { private readonly IErrorHandler _errorHandler; - private readonly Random _rnd; private readonly ITranslationHandler _translation; - public Choose(Random RandomClient, IErrorHandler errorHandler, ITranslationHandler translation) + public Choose(IErrorHandler errorHandler, ITranslationHandler translation) { - _rnd = RandomClient; _errorHandler = errorHandler; _translation = translation; } @@ -28,7 +26,7 @@ namespace Geekbot.net.Commands { var transDict = _translation.GetDict(Context); var choicesArray = choices.Split(';'); - var choice = _rnd.Next(choicesArray.Length); + var choice = new Random().Next(choicesArray.Length); await ReplyAsync(string.Format(transDict["Choice"], choicesArray[choice])); } catch (Exception e) diff --git a/Geekbot.net/Commands/Dice.cs b/Geekbot.net/Commands/Dice.cs index 9195be8..774f8b9 100644 --- a/Geekbot.net/Commands/Dice.cs +++ b/Geekbot.net/Commands/Dice.cs @@ -10,13 +10,6 @@ namespace Geekbot.net.Commands { public class Dice : ModuleBase { - private readonly Random _rnd; - - public Dice(Random RandomClient) - { - _rnd = RandomClient; - } - [Command("dice", RunMode = RunMode.Async)] [Remarks(CommandCategories.Randomness)] [Summary("Roll a dice.")] @@ -75,7 +68,7 @@ namespace Geekbot.net.Commands var results = new List(); for (var i = 0; i < dice.times; i++) { - var roll = _rnd.Next(1, dice.sides); + var roll = new Random().Next(1, dice.sides); total += roll; results.Add(roll); if (roll == dice.sides) extraText = "**Critical Hit!**"; diff --git a/Geekbot.net/Commands/EightBall.cs b/Geekbot.net/Commands/EightBall.cs index 5cadee5..94b01a1 100644 --- a/Geekbot.net/Commands/EightBall.cs +++ b/Geekbot.net/Commands/EightBall.cs @@ -9,11 +9,9 @@ namespace Geekbot.net.Commands public class EightBall : ModuleBase { private readonly IErrorHandler _errorHandler; - private readonly Random _rnd; - public EightBall(Random RandomClient, IErrorHandler errorHandler) + public EightBall(IErrorHandler errorHandler) { - _rnd = RandomClient; _errorHandler = errorHandler; } @@ -48,7 +46,7 @@ namespace Geekbot.net.Commands "Very doubtful" }; - var answer = _rnd.Next(replies.Count); + var answer = new Random().Next(replies.Count); await ReplyAsync(replies[answer]); } catch (Exception e) diff --git a/Geekbot.net/Commands/Quote.cs b/Geekbot.net/Commands/Quote.cs index c3bb235..fc4e2ce 100644 --- a/Geekbot.net/Commands/Quote.cs +++ b/Geekbot.net/Commands/Quote.cs @@ -15,7 +15,7 @@ namespace Geekbot.net.Commands private readonly IErrorHandler _errorHandler; private readonly IDatabase _redis; - public Quote(IDatabase redis, IErrorHandler errorHandler, Random random) + public Quote(IDatabase redis, IErrorHandler errorHandler) { _redis = redis; _errorHandler = errorHandler; diff --git a/Geekbot.net/Commands/Roll.cs b/Geekbot.net/Commands/Roll.cs index 33cdf67..8d4854c 100644 --- a/Geekbot.net/Commands/Roll.cs +++ b/Geekbot.net/Commands/Roll.cs @@ -10,13 +10,11 @@ namespace Geekbot.net.Commands { private readonly IErrorHandler _errorHandler; private readonly IDatabase _redis; - private readonly Random _rnd; private readonly ITranslationHandler _translation; - public Roll(IDatabase redis, Random RandomClient, IErrorHandler errorHandler, ITranslationHandler translation) + public Roll(IDatabase redis, IErrorHandler errorHandler, ITranslationHandler translation) { _redis = redis; - _rnd = RandomClient; _translation = translation; _errorHandler = errorHandler; } @@ -28,7 +26,7 @@ namespace Geekbot.net.Commands { try { - var number = _rnd.Next(1, 100); + var number = new Random().Next(1, 100); var guess = 1000; int.TryParse(stuff, out guess); var transDict = _translation.GetDict(Context); diff --git a/Geekbot.net/Commands/Ship.cs b/Geekbot.net/Commands/Ship.cs index 7b85eb0..4727bc8 100644 --- a/Geekbot.net/Commands/Ship.cs +++ b/Geekbot.net/Commands/Ship.cs @@ -11,12 +11,10 @@ namespace Geekbot.net.Commands { private readonly IErrorHandler _errorHandler; private readonly IDatabase _redis; - private readonly Random _rnd; - public Ship(IDatabase redis, Random randomClient, IErrorHandler errorHandler) + public Ship(IDatabase redis, IErrorHandler errorHandler) { _redis = redis; - _rnd = randomClient; _errorHandler = errorHandler; } @@ -37,7 +35,7 @@ namespace Geekbot.net.Commands var shippingRate = 0; if (dbval.IsNullOrEmpty) { - shippingRate = _rnd.Next(1, 100); + shippingRate = new Random().Next(1, 100); _redis.HashSet($"{Context.Guild.Id}:Ships", dbstring, shippingRate); } else diff --git a/Geekbot.net/Commands/Slap.cs b/Geekbot.net/Commands/Slap.cs index 134752c..24ba835 100644 --- a/Geekbot.net/Commands/Slap.cs +++ b/Geekbot.net/Commands/Slap.cs @@ -11,13 +11,11 @@ namespace Geekbot.net.Commands public class Slap : ModuleBase { private readonly IErrorHandler _errorHandler; - private readonly Random _random; private readonly IDatabase _redis; - public Slap(IErrorHandler errorHandler, Random random, IDatabase redis) + public Slap(IErrorHandler errorHandler, IDatabase redis) { _errorHandler = errorHandler; - _random = random; _redis = redis; } @@ -61,7 +59,7 @@ namespace Geekbot.net.Commands _redis.HashIncrement($"{Context.Guild.Id}:SlapsRecieved", user.Id.ToString()); _redis.HashIncrement($"{Context.Guild.Id}:SlapsGiven", Context.User.Id.ToString()); - await ReplyAsync($"{Context.User.Username} slapped {user.Username} with a {things[_random.Next(things.Count - 1)]}"); + await ReplyAsync($"{Context.User.Username} slapped {user.Username} with a {things[new Random().Next(things.Count - 1)]}"); } catch (Exception e) { diff --git a/Geekbot.net/Lib/Media/FortunesProvider.cs b/Geekbot.net/Lib/Media/FortunesProvider.cs index f536074..8a9b6f0 100644 --- a/Geekbot.net/Lib/Media/FortunesProvider.cs +++ b/Geekbot.net/Lib/Media/FortunesProvider.cs @@ -7,10 +7,9 @@ namespace Geekbot.net.Lib.Media internal class FortunesProvider : IFortunesProvider { private readonly string[] fortuneArray; - private readonly Random rnd; private readonly int totalFortunes; - public FortunesProvider(Random rnd, IGeekbotLogger logger) + public FortunesProvider(IGeekbotLogger logger) { var path = Path.GetFullPath("./Storage/fortunes"); if (File.Exists(path)) @@ -18,7 +17,6 @@ namespace Geekbot.net.Lib.Media var rawFortunes = File.ReadAllText(path); fortuneArray = rawFortunes.Split("%"); totalFortunes = fortuneArray.Length; - this.rnd = rnd; logger.Debug("Geekbot", "Loaded {totalFortunes} Fortunes"); } else @@ -29,7 +27,7 @@ namespace Geekbot.net.Lib.Media public string GetRandomFortune() { - return fortuneArray[rnd.Next(0, totalFortunes)]; + return fortuneArray[new Random().Next(0, totalFortunes)]; } } diff --git a/Geekbot.net/Lib/Media/MediaProvider.cs b/Geekbot.net/Lib/Media/MediaProvider.cs index ce5a0cd..0a3ff6c 100644 --- a/Geekbot.net/Lib/Media/MediaProvider.cs +++ b/Geekbot.net/Lib/Media/MediaProvider.cs @@ -17,9 +17,9 @@ namespace Geekbot.net.Lib.Media private string[] _pumpkinImages; private string[] _turtlesImages; - public MediaProvider(Random rnd, IGeekbotLogger logger) + public MediaProvider(IGeekbotLogger logger) { - _random = rnd; + _random = new Random(); _logger = logger; logger.Information("Geekbot", "Loading Media Files"); diff --git a/Geekbot.net/Program.cs b/Geekbot.net/Program.cs index da74508..c47fdb4 100755 --- a/Geekbot.net/Program.cs +++ b/Geekbot.net/Program.cs @@ -94,9 +94,8 @@ namespace Geekbot.net services = new ServiceCollection(); userRepository = new UserRepository(redis, logger); - var randomClient = new Random(); - var fortunes = new FortunesProvider(randomClient, logger); - var mediaProvider = new MediaProvider(randomClient, logger); + var fortunes = new FortunesProvider(logger); + var mediaProvider = new MediaProvider(logger); var malClient = new MalClient(redis, logger); var levelCalc = new LevelCalc(); var emojiConverter = new EmojiConverter(); @@ -108,7 +107,6 @@ namespace Geekbot.net services.AddSingleton(levelCalc); services.AddSingleton(emojiConverter); services.AddSingleton(audioUtils); - services.AddSingleton(randomClient); services.AddSingleton(fortunes); services.AddSingleton(mediaProvider); services.AddSingleton(malClient);