v2.0.0 - Proper cache and gateway models

Fluxer.Net/Data/Apps/Application.cs

@@ -16,14 +16,14 @@
 
     }
 
     public static Application Create(FluxerBaseClient client, ApplicationJson json)
     {
         Application data = new Application(client);
         data.Update(client, json);
         return data;
     }
 
-    internal void Update(FluxerBaseClient client, ApplicationJson json)
+    internal virtual void Update(FluxerBaseClient client, ApplicationJson json)
     {
         base.Update(client, json);
         RedirectUrls = json.RedirectUrls;

Fluxer.Net/Data/Channels/Channel.cs

@@ -106,7 +106,7 @@ public static Channel Create(FluxerBaseClient client, ChannelJson json)
                 break;
             case ChannelType.DmPersonalNotes:
                 {
-                    data = new SavedMessagesChannel(client);
+                    data = new SavedNotesChannel(client);
                     data.IsTextable = true;
                 }
                 break;
@@ -128,7 +128,10 @@ public static Channel Create(FluxerBaseClient client, ChannelJson json)
                 break;
             default:
                 {
-                    data = new Channel(client);
+                    if (data.GuildId.HasValue)
+                        data = new GuildChannel(client);
+                    else
+                        data = new Channel(client);
                     data.IsTextable = true;
                 }
                 break;
@@ -137,7 +140,7 @@ public static Channel Create(FluxerBaseClient client, ChannelJson json)
         return data;
     }
 
-    internal void Update(FluxerBaseClient client, ChannelJson json)
+    internal virtual void Update(FluxerBaseClient client, ChannelJson json)
     {
         Id = json.Id;
         GuildId = json.GuildId;

Fluxer.Net/Data/Channels/GuildChannel.cs

@@ -6,16 +6,4 @@ internal GuildChannel(FluxerBaseClient client) : base(client)
     {
 
     }
-
-    public static GuildChannel Create(FluxerBaseClient client, ChannelJson json)
-    {
-        var data = new GuildChannel(client);
-        data.Update(client, json);
-        return data;
-    }
-
-    internal void Update(FluxerBaseClient client, ChannelJson json)
-    {
-        base.Update(client, json);
-    }
 }

Fluxer.Net/Data/Channels/IPermissionOverwrite.cs

@@ -15,10 +15,10 @@ public interface IPermissionOverwrite
     /// <summary>
     /// The bitwise value of allowed permissions.
     /// </summary>
-    ulong Allow { get; }
+    ChannelPermissions Allow { get; }
 
     /// <summary>
     /// The bitwise value of denied permissions.
     /// </summary>
-    ulong Deny { get; }
+    ChannelPermissions Deny { get; }
 }

Fluxer.Net/Data/Channels/PermissionOverwrite.cs

@@ -10,10 +10,10 @@ public class PermissionOverwrite : Entity, IPermissionOverwrite
     public int Type { get; internal set; }
 
     /// <inheritdoc />
-    public ulong Allow { get; internal set; }
+    public ChannelPermissions Allow { get; internal set; }
 
     /// <inheritdoc />
-    public ulong Deny { get; internal set; }
+    public ChannelPermissions Deny { get; internal set; }
 
     internal PermissionOverwrite(FluxerBaseClient client) : base(client)
     {

Fluxer.Net/Data/Channels/PermissionOverwriteJson.cs

@@ -18,9 +18,9 @@ public class PermissionOverwriteJson : IPermissionOverwrite
 
     /// <inheritdoc />
     [JsonProperty("allow")]
-    public ulong Allow { get; set; }
+    public ChannelPermissions Allow { get; set; }
 
     /// <inheritdoc />
     [JsonProperty("deny")]
-    public ulong Deny { get; set; }
+    public ChannelPermissions Deny { get; set; }
 }

Fluxer.Net/Data/Channels/SavedNotesChannel.cs

@@ -0,0 +1,9 @@
+namespace Fluxer.Net;
+
+public class SavedNotesChannel : Channel, ITextable
+{
+    internal SavedNotesChannel(FluxerBaseClient client) : base(client)
+    {
+
+    }
+}

Fluxer.Net/Data/Channels/SocketCategoryChannel.cs

@@ -0,0 +1,16 @@
+namespace Fluxer.Net;
+
+public class SocketCategoryChannel : CategoryChannel
+{
+    internal SocketCategoryChannel(FluxerBaseClient client) : base(client)
+    {
+
+    }
+
+    public static SocketCategoryChannel Create(FluxerBaseClient client, ChannelJson json)
+    {
+        var data = new SocketCategoryChannel(client);
+        data.Update(client, json);
+        return data;
+    }
+}

Fluxer.Net/Data/Channels/SocketDMChannel.cs

@@ -0,0 +1,9 @@
+namespace Fluxer.Net;
+
+public class SocketDMChannel : DMChannel
+{
+    internal SocketDMChannel(FluxerBaseClient client) : base(client)
+    {
+
+    }
+}

Fluxer.Net/Data/Channels/SocketGroupChannel.cs

@@ -0,0 +1,16 @@
+namespace Fluxer.Net;
+
+public class SocketGroupChannel : GroupChannel
+{
+    internal SocketGroupChannel(FluxerBaseClient client) : base(client)
+    {
+
+    }
+
+    public static SocketGroupChannel Create(FluxerBaseClient client, ChannelJson json)
+    {
+        var data = new SocketGroupChannel(client);
+        data.Update(client, json);
+        return data;
+    }
+}

Fluxer.Net/Data/Channels/SocketLinkChannel.cs

@@ -0,0 +1,16 @@
+namespace Fluxer.Net;
+
+public class SocketLinkChannel : LinkChannel
+{
+    internal SocketLinkChannel(FluxerBaseClient client) : base(client)
+    {
+
+    }
+
+    public static SocketLinkChannel Create(FluxerBaseClient client, ChannelJson json)
+    {
+        var data = new SocketLinkChannel(client);
+        data.Update(client, json);
+        return data;
+    }
+}

Fluxer.Net/Data/Channels/SocketSavedNotesChannel.cs

@@ -0,0 +1,16 @@
+namespace Fluxer.Net;
+
+public class SocketSavedNotesChannel : SavedNotesChannel
+{
+    internal SocketSavedNotesChannel(FluxerBaseClient client) : base(client)
+    {
+
+    }
+
+    public static SocketSavedNotesChannel Create(FluxerBaseClient client, ChannelJson json)
+    {
+        var data = new SocketSavedNotesChannel(client);
+        data.Update(client, json);
+        return data;
+    }
+}

Fluxer.Net/Data/Channels/SocketTextChannel.cs

@@ -0,0 +1,9 @@
+namespace Fluxer.Net;
+
+public class SocketTextChannel : TextChannel
+{
+    internal SocketTextChannel(FluxerBaseClient client) : base(client)
+    {
+
+    }
+}

Fluxer.Net/Data/Channels/SocketUnknownChannel.cs

@@ -0,0 +1,84 @@
+namespace Fluxer.Net;
+
+public class SocketUnknownChannel : Channel
+{
+    /// <summary>
+    /// Permissions for the channel.
+    /// </summary>
+    public ChannelPermissions Permissions { get; internal set; }
+
+    internal SocketUnknownChannel(FluxerBaseClient client) : base(client)
+    {
+
+    }
+
+    public static Channel Create(FluxerBaseClient client, ChannelJson json, ulong guildId)
+    {
+        Channel data = null;
+
+        switch (json.Type)
+        {
+            case ChannelType.GuildText:
+                {
+                    data = new SocketTextChannel(client);
+                    data.IsTextable = true;
+                }
+                break;
+            case ChannelType.GuildVoice:
+                {
+                    data = new SocketVoiceChannel(client);
+                }
+                break;
+            case ChannelType.Dm:
+                {
+                    data = new SocketDMChannel(client);
+                    data.IsTextable = true;
+                }
+                break;
+            case ChannelType.DmPersonalNotes:
+                {
+                    data = new SocketSavedNotesChannel(client);
+                    data.IsTextable = true;
+                }
+                break;
+            case ChannelType.GroupDm:
+                {
+                    data = new SocketGroupChannel(client);
+                    data.IsTextable = true;
+                }
+                break;
+            case ChannelType.GuildCategory:
+                {
+                    data = new SocketCategoryChannel(client);
+                }
+                break;
+            case ChannelType.GuildLink:
+                {
+                    data = new SocketLinkChannel(client);
+                }
+                break;
+            default:
+                {
+                    if (data.GuildId.HasValue)
+                        data = new SocketUnknownGuildChannel(client);
+                    else
+                        data = new SocketUnknownChannel(client);
+                    data.IsTextable = true;
+                }
+                break;
+        }
+        data.GuildId = guildId;
+        data.Update(client, json);
+        return data;
+    }
+
+    internal override void Update(FluxerBaseClient client, ChannelJson json)
+    {
+        base.Update(client, json);
+        PermissionOverwriteJson? overwrite = json.PermissionOverwrites.FirstOrDefault(x => x.Id == Id);
+        if (overwrite != null)
+            Permissions = overwrite.Allow;
+        else
+            Permissions = new ChannelPermissions(0);
+    }
+}

Fluxer.Net/Data/Channels/SocketUnknownGuildChannel.cs

@@ -0,0 +1,9 @@
+namespace Fluxer.Net;
+
+public class SocketUnknownGuildChannel : GuildChannel
+{
+    internal SocketUnknownGuildChannel(FluxerBaseClient client) : base(client)
+    {
+
+    }
+}

Fluxer.Net/Data/Channels/SocketVoiceChannel.cs

@@ -0,0 +1,9 @@
+namespace Fluxer.Net;
+
+public class SocketVoiceChannel : VoiceChannel
+{
+    internal SocketVoiceChannel(FluxerBaseClient client) : base(client)
+    {
+
+    }
+}

Fluxer.Net/Data/Channels/VoiceChannel.cs

@@ -1,6 +1,6 @@
 namespace Fluxer.Net;
 
-internal class VoiceChannel : GuildChannel
+public class VoiceChannel : GuildChannel
 {
     internal VoiceChannel(FluxerBaseClient client) : base(client)
     {

Fluxer.Net/Data/Guilds/Guild.cs

@@ -57,7 +57,7 @@ public static Guild Create(FluxerBaseClient client, GuildJson json)
         return data;
     }
 
-    internal void Update(FluxerBaseClient client, GuildJson json)
+    internal virtual void Update(FluxerBaseClient client, GuildJson json)
     {
         base.Update(client, json);
         OwnerId = json.OwnerId;

Fluxer.Net/Data/Guilds/Members/GuildMember.cs

@@ -86,7 +86,7 @@ public static GuildMember Create(FluxerBaseClient client, GuildMemberJson json)
         return data;
     }
 
-    internal void Update(FluxerBaseClient client, GuildMemberJson json)
+    internal virtual void Update(FluxerBaseClient client, GuildMemberJson json)
     {
         GuildId = json.GuildId;
         User = User.Create(client, json.User);

Fluxer.Net/Data/Guilds/Members/IRole.cs

@@ -20,7 +20,7 @@ public interface IRole
     /// <summary>
     /// The role's permission bitfield. Sent as a quoted string by the gateway (e.g. "8933636165184").
     /// </summary>
-    Permissions Permissions { get; }
+    GuildPermissions Permissions { get; }
 
     /// <summary>
     /// The position of the role in the role hierarchy.

Fluxer.Net/Data/Guilds/Members/Role.cs

@@ -16,7 +16,7 @@ public class Role : Entity, IRole
     public string Name { get; internal set; }
 
     /// <inheritdoc />
-    public Permissions Permissions { get; internal set; }
+    public GuildPermissions Permissions { get; internal set; }
 
     /// <inheritdoc />
     public int Position { get; internal set; }
@@ -46,7 +46,7 @@ public static Role Create(FluxerBaseClient client, RoleJson json, ulong guildId)
         return data;
     }
 
-    internal void Update(FluxerBaseClient client, RoleJson json)
+    internal virtual void Update(FluxerBaseClient client, RoleJson json)
     {
         Id = json.Id;
         Name = json.Name;