Started converting websocket and rpc classes

src/Discord.Net.Rpc/Entities/IRemoteUserGuild.cs

@@ -1,8 +0,0 @@
-namespace Discord.Rpc
-{
-    /*public interface IRemoteUserGuild : ISnowflakeEntity
-    {
-        /// <summary> Gets the name of this guild. </summary>
-        string Name { get; }
-    }*/
-}

src/Discord.Net.Rpc/Entities/Messages/RpcMessage.cs

@@ -0,0 +1,10 @@
+namespace Discord.Rpc
+{
+    /*internal class RpcMessage : RpcEntity<ulong>, IMessage
+    {
+        internal RpcMessage(DiscordRpcClient discord, API.Message model)
+            : base(dicsord, model.Id)
+        {
+        }
+    }*/
+}

src/Discord.Net.Rpc/Entities/RpcEntity.cs

@@ -0,0 +1,19 @@
+using System;
+
+namespace Discord.Rpc
+{
+    public abstract class RpcEntity<T> : IEntity<T>
+        where T : IEquatable<T>
+    {
+        public DiscordRpcClient Discord { get; }
+        public T Id { get; }
+
+        internal RpcEntity(DiscordRpcClient discord, T id)
+        {
+            Discord = discord;
+            Id = id;
+        }
+
+        IDiscordClient IEntity<T>.Discord => Discord;
+    }
+}

src/Discord.Net.Rpc/Entities/RpcGuild.cs

@@ -4,7 +4,7 @@ using Model = Discord.API.Rpc.RpcUserGuild;
 
 namespace Discord.Rpc
 {
-    /*internal class RemoteUserGuild : IRemoteUserGuild, ISnowflakeEntity
+    /*internal class RemoteUserGuild : RpcEntity, IRemoteUserGuild, ISnowflakeEntity
     {
         public ulong Id { get; }
         public DiscordRestClient Discord { get; }
@@ -12,7 +12,7 @@ namespace Discord.Rpc
 
         public DateTimeOffset CreatedAt => DateTimeUtils.FromSnowflake(Id);
 
-        public RemoteUserGuild(DiscordRestClient discord, Model model)
+        internal RemoteUserGuild(DiscordRestClient discord, Model model)
         {
             Id = model.Id;
             Discord = discord;

src/Discord.Net.Rpc/Entities/RpcMessage.cs

@@ -1,15 +0,0 @@
-using Discord.Rest;
-
-namespace Discord.Rpc
-{
-    internal class RpcMessage : Message
-    {
-        public override DiscordRestClient Discord { get; }
-
-        public RpcMessage(DiscordRpcClient discord, API.Message model)
-            : base(null, model.Author.IsSpecified ? new User(model.Author.Value) : null, model)
-        {
-            Discord = discord;
-        }
-    }
-}