feat: upgrade to .NET 6, refactor everything

2021-11-26 21:10:56 -05:00
parent d28e99ba43
commit 1918c56937
314 changed files with 27954 additions and 27966 deletions
--- a/PluralKit.Core/Database/Functions/ProxyMember.cs
+++ b/PluralKit.Core/Database/Functions/ProxyMember.cs
@@ -1,48 +1,46 @@
 #nullable enable
-using System.Collections.Generic;
+namespace PluralKit.Core;

-namespace PluralKit.Core
+/// <summary>
+///  Model for the `proxy_members` PL/pgSQL function in `functions.sql`
+/// </summary>
+public class ProxyMember
 {
-    /// <summary>
-    /// Model for the `proxy_members` PL/pgSQL function in `functions.sql`
-    /// </summary>
-    public class ProxyMember
+    public ProxyMember() { }
+
+    public ProxyMember(string name, params ProxyTag[] tags)
    {
-        public MemberId Id { get; }
-        public IReadOnlyCollection<ProxyTag> ProxyTags { get; } = new ProxyTag[0];
-        public bool KeepProxy { get; }
-
-        public string? ServerName { get; }
-        public string? DisplayName { get; }
-        public string Name { get; } = "";
-
-        public string? ServerAvatar { get; }
-        public string? Avatar { get; }
-
-
-        public bool AllowAutoproxy { get; }
-        public string? Color { get; }
-
-        public string ProxyName(MessageContext ctx)
-        {
-            var memberName = ServerName ?? DisplayName ?? Name;
-            if (!ctx.TagEnabled)
-                return memberName;
-
-            if (ctx.SystemGuildTag != null)
-                return $"{memberName} {ctx.SystemGuildTag}";
-            else if (ctx.SystemTag != null)
-                return $"{memberName} {ctx.SystemTag}";
-            else return memberName;
-        }
-        public string? ProxyAvatar(MessageContext ctx) => ServerAvatar ?? Avatar ?? ctx.SystemAvatar;
-
-        public ProxyMember() { }
-
-        public ProxyMember(string name, params ProxyTag[] tags)
-        {
-            Name = name;
-            ProxyTags = tags;
-        }
+        Name = name;
+        ProxyTags = tags;
    }
+
+    public MemberId Id { get; }
+    public IReadOnlyCollection<ProxyTag> ProxyTags { get; } = new ProxyTag[0];
+    public bool KeepProxy { get; }
+
+    public string? ServerName { get; }
+    public string? DisplayName { get; }
+    public string Name { get; } = "";
+
+    public string? ServerAvatar { get; }
+    public string? Avatar { get; }
+
+
+    public bool AllowAutoproxy { get; }
+    public string? Color { get; }
+
+    public string ProxyName(MessageContext ctx)
+    {
+        var memberName = ServerName ?? DisplayName ?? Name;
+        if (!ctx.TagEnabled)
+            return memberName;
+
+        if (ctx.SystemGuildTag != null)
+            return $"{memberName} {ctx.SystemGuildTag}";
+        if (ctx.SystemTag != null)
+            return $"{memberName} {ctx.SystemTag}";
+        return memberName;
+    }
+
+    public string? ProxyAvatar(MessageContext ctx) => ServerAvatar ?? Avatar ?? ctx.SystemAvatar;
 }