Added and applied styles for private readonly fields, private fields to Extensions and Common folders.

- Some renamings and code cleanups
- Chained method calls, binary expressions and binary patterns will now break into newlines
- Type param constraints and base constructor calls will be on the new line

src/NadekoBot/Common/PubSub/EventPubSub.cs

@@ -3,22 +3,20 @@
 public class EventPubSub : IPubSub
 {
     private readonly Dictionary<string, Dictionary<Delegate, List<Func<object, ValueTask>>>> _actions = new();
-    private readonly object locker = new();
-        
+    private readonly object _locker = new();
+
     public Task Sub<TData>(in TypedKey<TData> key, Func<TData, ValueTask> action)
     {
-        Func<object, ValueTask> localAction = obj => action((TData) obj);
-        lock(locker)
+        Func<object, ValueTask> localAction = obj => action((TData)obj);
+        lock (_locker)
         {
-            Dictionary<Delegate, List<Func<object, ValueTask>>> keyActions;
-            if (!_actions.TryGetValue(key.Key, out keyActions))
+            if (!_actions.TryGetValue(key.Key, out var keyActions))
             {
                 keyActions = new();
                 _actions[key.Key] = keyActions;
             }
 
-            List<Func<object, ValueTask>> sameActions;
-            if (!keyActions.TryGetValue(action, out sameActions))
+            if (!keyActions.TryGetValue(action, out var sameActions))
             {
                 sameActions = new();
                 keyActions[action] = sameActions;
@@ -29,19 +27,17 @@ public class EventPubSub : IPubSub
             return Task.CompletedTask;
         }
     }
-        
+
     public Task Pub<TData>(in TypedKey<TData> key, TData data)
     {
-        lock (locker)
+        lock (_locker)
         {
-            if(_actions.TryGetValue(key.Key, out var actions))
+            if (_actions.TryGetValue(key.Key, out var actions))
             {
                 // if this class ever gets used, this needs to be properly implemented
                 // 1. ignore all valuetasks which are completed
                 // 2. return task.whenall all other tasks
-                return Task.WhenAll(actions
-                    .SelectMany(kvp => kvp.Value)
-                    .Select(action => action(data).AsTask()));
+                return Task.WhenAll(actions.SelectMany(kvp => kvp.Value).Select(action => action(data).AsTask()));
             }
 
             return Task.CompletedTask;
@@ -50,12 +46,11 @@ public class EventPubSub : IPubSub
 
     public Task Unsub<TData>(in TypedKey<TData> key, Func<TData, ValueTask> action)
     {
-        lock (locker)
+        lock (_locker)
         {
             // get subscriptions for this action
             if (_actions.TryGetValue(key.Key, out var actions))
             {
-                var hashCode = action.GetHashCode();
                 // get subscriptions which have the same action hash code
                 // note: having this as a list allows for multiple subscriptions of
                 //       the same insance's/static method
@@ -63,13 +58,13 @@ public class EventPubSub : IPubSub
                 {
                     // remove last subscription
                     sameActions.RemoveAt(sameActions.Count - 1);
-                        
+
                     // if the last subscription was the only subscription
                     // we can safely remove this action's dictionary entry
                     if (sameActions.Count == 0)
                     {
                         actions.Remove(action);
-                            
+
                         // if our dictionary has no more elements after 
                         // removing the entry
                         // it's safe to remove it from the key's subscriptions

src/NadekoBot/Common/PubSub/JsonSeria.cs

@@ -5,23 +5,19 @@ namespace NadekoBot.Common;
 
 public class JsonSeria : ISeria
 {
-    private readonly JsonSerializerOptions serializerOptions = new()
+    private readonly JsonSerializerOptions _serializerOptions = new()
     {
-        Converters =
-        {
-            new Rgba32Converter(),
-            new CultureInfoConverter(),
-        }
+        Converters = { new Rgba32Converter(), new CultureInfoConverter(), }
     };
-    public byte[] Serialize<T>(T data) 
-        => JsonSerializer.SerializeToUtf8Bytes(data, serializerOptions);
+
+    public byte[] Serialize<T>(T data)
+        => JsonSerializer.SerializeToUtf8Bytes(data, _serializerOptions);
 
     public T Deserialize<T>(byte[] data)
     {
         if (data is null)
             return default;
 
-            
-        return JsonSerializer.Deserialize<T>(data, serializerOptions);
+        return JsonSerializer.Deserialize<T>(data, _serializerOptions);
     }
 }

src/NadekoBot/Common/PubSub/RedisPubSub.cs

@@ -18,13 +18,15 @@ public sealed class RedisPubSub : IPubSub
     public Task Pub<TData>(in TypedKey<TData> key, TData data)
     {
         var serialized = _serializer.Serialize(data);
-        return _multi.GetSubscriber().PublishAsync($"{_creds.RedisKey()}:{key.Key}", serialized, CommandFlags.FireAndForget);
+        return _multi.GetSubscriber()
+            .PublishAsync($"{_creds.RedisKey()}:{key.Key}", serialized, CommandFlags.FireAndForget);
     }
 
     public Task Sub<TData>(in TypedKey<TData> key, Func<TData, ValueTask> action)
     {
         var eventName = key.Key;
-        return _multi.GetSubscriber().SubscribeAsync($"{_creds.RedisKey()}:{eventName}", async (ch, data) =>
+
+        async void OnSubscribeHandler(RedisChannel _, RedisValue data)
         {
             try
             {
@@ -33,8 +35,10 @@ public sealed class RedisPubSub : IPubSub
             }
             catch (Exception ex)
             {
-                Log.Error($"Error handling the event {eventName}: {ex.Message}");
+                Log.Error("Error handling the event {EventName}: {ErrorMessage}", eventName, ex.Message);
             }
-        });
+        }
+
+        return _multi.GetSubscriber().SubscribeAsync($"{_creds.RedisKey()}:{eventName}", OnSubscribeHandler);
     }
 }

src/NadekoBot/Common/PubSub/TypedKey.cs

@@ -9,18 +9,22 @@ public readonly struct TypedKey<TData>
 
     public static implicit operator TypedKey<TData>(in string input)
         => new(input);
+
     public static implicit operator string(in TypedKey<TData> input)
         => input.Key;
 
     public static bool operator ==(in TypedKey<TData> left, in TypedKey<TData> right)
         => left.Key == right.Key;
+
     public static bool operator !=(in TypedKey<TData> left, in TypedKey<TData> right)
         => !(left == right);
 
     public override bool Equals(object obj)
         => obj is TypedKey<TData> o && o == this;
 
-    public override int GetHashCode() => Key?.GetHashCode() ?? 0;
+    public override int GetHashCode()
+        => Key?.GetHashCode() ?? 0;
 
-    public override string ToString() => Key;
+    public override string ToString()
+        => Key;
 }

src/NadekoBot/Common/PubSub/YamlSeria.cs

@@ -10,28 +10,31 @@ public class YamlSeria : IConfigSeria
     private readonly ISerializer _serializer;
     private readonly IDeserializer _deserializer;
 
-    private static readonly Regex CodePointRegex
-        = new(@"(\\U(?<code>[a-zA-Z0-9]{8})|\\u(?<code>[a-zA-Z0-9]{4})|\\x(?<code>[a-zA-Z0-9]{2}))",
-            RegexOptions.Compiled);
+    private static readonly Regex _codePointRegex =
+        new(@"(\\U(?<code>[a-zA-Z0-9]{8})|\\u(?<code>[a-zA-Z0-9]{4})|\\x(?<code>[a-zA-Z0-9]{2}))",
+            RegexOptions.Compiled
+        );
 
     public YamlSeria()
     {
         _serializer = Yaml.Serializer;
         _deserializer = Yaml.Deserializer;
     }
-        
+
     public string Serialize<T>(T obj)
     {
         var escapedOutput = _serializer.Serialize(obj);
-        var output = CodePointRegex.Replace(escapedOutput, me =>
-        {
-            var str = me.Groups["code"].Value;
-            var newString = YamlHelper.UnescapeUnicodeCodePoint(str);
-            return newString;
-        });
+        var output = _codePointRegex.Replace(escapedOutput,
+            me =>
+            {
+                var str = me.Groups["code"].Value;
+                var newString = YamlHelper.UnescapeUnicodeCodePoint(str);
+                return newString;
+            }
+        );
         return output;
     }
 
-    public T Deserialize<T>(string data) 
+    public T Deserialize<T>(string data)
         => _deserializer.Deserialize<T>(data);
 }