Added the ability to recieve messages

Channels/ChannelObj.cs

@@ -50,10 +50,13 @@ namespace Discord_Client_Custom.Channels
         private static string? cownerId;
         private string lastSent;
         private static System.Threading.Timer typingTimer;
+        private int msgIndex;
+        private RichTextBox txtbx;
 
 
         public ChannelObj() { }
 
+
         //For displaying information
         public ChannelObj(JsonNode contents)
         {
@@ -173,8 +176,10 @@ namespace Discord_Client_Custom.Channels
                 return;
             }
 
+            msgIndex = i;
+
             //Add the text box
-            var txtbx = new RichTextBox();
+            txtbx = new RichTextBox();
             txtbx.AutoWordSelection = true;
             txtbx.Size = new Size(dmFlowContent.Width - 50, 50);
             txtbx.KeyDown += async (object o, KeyEventArgs k) =>
@@ -185,7 +190,8 @@ namespace Discord_Client_Custom.Channels
                     if (ctype == 1)
                     {
                         ep = "https://discord.com/api/channels/" + cid2 + "/messages";
-                    } else
+                    }
+                    else
                     {
                         //Deal with group message stuff here.....
                         Debug.WriteLine("Message Sending has not been implemented for group DMs (yet)");
@@ -203,16 +209,9 @@ namespace Discord_Client_Custom.Channels
                     //arr[0] = response;
 
                     //Add the message to chat in the app
-                    groupedMsgs.Add(new ChannelMsgGroup(response, dmFlowContent, uMainIcon, i + 1));
-                    txtbx.Clear();
-                    typingTimer.Dispose();
-
-                    i++;
-                    dmFlowContent.Controls.Remove(txtbx);
-                    dmFlowContent.Controls.Add(txtbx, 1, i + 1);
-                    dmFlowContent.SetColumnSpan(txtbx, 2);
-                    dmFlowContent.ScrollControlIntoView(txtbx);
-                } else
+                    insertMessage(dmFlowContent, uMainIcon, response);
+                }
+                else
                 {
                     //Do typing intent stuff here
                     string ep;
@@ -244,6 +243,36 @@ namespace Discord_Client_Custom.Channels
         }
 
 
+        public async void insertMessage(TableLayoutPanel dmFlowContent, string iconUrl, JsonNode? response)
+        {
+            Image avatar = (Image)(new Bitmap(await ChannelObj.getIconStream(iconUrl), new Size(32, 32)));
+            avatar.Tag = iconUrl;
+
+            insertMessage(dmFlowContent, avatar, response, true);
+        }
+
+        //Response is the new message in Json format
+        public void insertMessage(TableLayoutPanel dmFlowContent, Image uMainIcon, JsonNode? response, bool isCalledFromHelper = true)
+        {
+            groupedMsgs.Add(new ChannelMsgGroup(response, dmFlowContent, uMainIcon, msgIndex + 1));
+            txtbx.Clear();
+
+            if (typingTimer != null) typingTimer.Dispose();
+
+            msgIndex += 2;
+
+            var temptxtbxtxt = "";
+            if (isCalledFromHelper) temptxtbxtxt = new string(txtbx.Text);
+
+
+            dmFlowContent.Controls.Remove(txtbx);
+            dmFlowContent.Controls.Add(txtbx, 1, msgIndex);
+            dmFlowContent.SetColumnSpan(txtbx, 2);
+            txtbx.AppendText(temptxtbxtxt);
+            dmFlowContent.ScrollControlIntoView(txtbx);
+        }
+
+
         public string getName()
         {
             if (cname != null)
@@ -291,7 +320,7 @@ namespace Discord_Client_Custom.Channels
 
             var imgRaw = await getIconStream(iconUrl);
             imgRaw.Tag = iconUrl;
-            return (Image)(new Bitmap(imgRaw, new Size(32, 32))); ;
+            return (Image)(new Bitmap(imgRaw, new Size(32, 32)));
 
             //string rootPath = @"C:\DownloadedImageFromUrl";
             //string fileName = System.IO.Path.Combine(rootPath, "test.gif");

Connections/Connection.cs

@@ -4,8 +4,8 @@ using System.Reactive.Linq;
 using System.Text.Json.Nodes;
 using Websocket.Client;
 using Discord_Client_Custom.client_internals;
-
-
+using Discord_Client_Custom.Channels;
+using System.ComponentModel;
 
 namespace Discord_Client_Custom.Connections
 {
@@ -19,6 +19,8 @@ namespace Discord_Client_Custom.Connections
         private WebsocketClient WS;
         private GateWayIntents intents;
         public JsonNode uInfoRaw;
+        private object gateWayProperties;
+        private readonly mainPage pageRef;
 
 
         private async void heartBeat(object o)
@@ -28,6 +30,7 @@ namespace Discord_Client_Custom.Connections
 
             WS.Send(toSend);
             heartBeatCounter++;
+            Debug.WriteLine("PING");
         }
 
 
@@ -37,6 +40,13 @@ namespace Discord_Client_Custom.Connections
             heartBeatInterval = (int)confObj["d"]["heartbeat_interval"];
             Debug.WriteLine("INTERVAL SET TO: " + heartBeatInterval.ToString());
 
+            gateWayProperties = new
+            {
+                os = "linux",
+                browser = "ion_",
+                device = "my_library"
+            };
+
             var idObj = new
             {
                 op = 2,
@@ -44,12 +54,7 @@ namespace Discord_Client_Custom.Connections
                 {
                     token = MsgRequests.userToken,
                     intents = intents.value, //61440,
-                    properties = new
-                    {
-                        os = "linux",
-                        browser = "my_library",
-                        device = "my_library"
-                    }
+                    properties = gateWayProperties
                 }
             };
 
@@ -60,18 +65,49 @@ namespace Discord_Client_Custom.Connections
         }
 
 
-        private static void statusUpdate(object statusObj)
+        private void getStatusUpdate(object statusObj)
         {
             //Console.WriteLine(statusObj.ToString() + "\n\n");
         }
 
 
-        private static void messageEvent(object msgObj)
+        //{"t":"MESSAGE_CREATE","s":3,"op":0,"d":{"type":0,"tts":false,"timestamp":"2023-03-12T16:13:52.238000+00:00","referenced_message":null,"pinned":false,"nonce":"1084509575685603328","mentions":[],"mention_roles":[],"mention_everyone":false,"id":"1084509576445042838","flags":0,"embeds":[],"edited_timestamp":null,"content":"ping","components":[],"channel_id":"907088809169158164","author":{"username":"1.1.5","public_flags":0,"id":"720349017829015633","display_name":null,"discriminator":"4592","avatar_decoration":null,"avatar":null},"attachments":[]}}
+        private void messageEvent(object msgObj)
         {
-            Console.WriteLine(msgObj.ToString() + "\n\n");
+            pageRef.insertMessageObj(msgObj);
         }
 
-        public async Task<JsonNode> connect(FlowLayoutPanel dmFlowPannel)
+
+        private bool isRunning(bool printToDebug = false)
+        {
+            if (printToDebug) Debug.WriteLine("WEBSOCKET SERVER IS RUNNING? " + WS.IsRunning.ToString());
+            return WS.IsRunning;
+        }
+
+
+        // Setters
+
+        // https://discord.com/developers/docs/topics/gateway-events#update-presence
+        public async void setStatusUpdate(string status)
+        {
+            var idObj = new
+            {
+                op = 3,
+                d = new
+                {
+                    since = 0,
+                    activities = new object[0],
+                    status = status,
+                    afk = false
+                }
+            };
+
+            var objToSend = System.Text.Json.JsonSerializer.Serialize(idObj);
+            WS.Send(objToSend);
+        }
+
+
+        public async void connect(FlowLayoutPanel dmFlowPannel)
         {
             using (var client = new WebsocketClient(gateWayUrl))
             {
@@ -89,6 +125,7 @@ namespace Discord_Client_Custom.Connections
                 {
                     var configs = JsonNode.Parse(msg.Text);
                     //var c = new Client(configs["d"], dmFlowPannel);
+                    Debug.WriteLine("\n\nlhkdsfgjhdsgfhsjdgf\n\n");
                     uInfoRaw = configs["d"];
                 });
 
@@ -97,10 +134,18 @@ namespace Discord_Client_Custom.Connections
                 {
                     var msgObj = JsonNode.Parse(msg.Text);
                     return ((string)msgObj["t"] == "PRESENCE_UPDATE");
-                }).Subscribe(statusUpdate);
+                }).Subscribe(getStatusUpdate);
 
 
-                // client.MessageReceived.Subscribe(msg => Debug.WriteLine($"Message received: {msg}"));
+                //client.MessageReceived.Subscribe(msg => Console.WriteLine($"Message received: {msg}"));
+
+                /*client.MessageReceived.Where(msg =>
+                {
+                    var msgObj = JsonNode.Parse(msg.Text);
+                    if (msgObj["t"] != null) return msgObj["t"].ToString() != "READY";
+                    else return true;
+                }).Subscribe((msg) => Debug.WriteLine($"Message received: {msg}"));*/
+
 
                 client.MessageReceived.Where((msg) =>
                 {
@@ -118,29 +163,33 @@ namespace Discord_Client_Custom.Connections
                 {
                     var msgObj = JsonNode.Parse(msg.Text);
                     return ((string)msgObj["t"] == "PRESENCE_UPDATE");
-                }).Subscribe(statusUpdate);
+                }).Subscribe(getStatusUpdate);
+
 
                 client.MessageReceived.Where((msg) =>
                 {
                     var msgObj = JsonNode.Parse(msg.Text);
-                    return ((int)msgObj["op"] == 0) && (string)msgObj["t"] == "MESSAGE_CREATE";
+                    return ((int)msgObj["op"] == 0) && msgObj["t"].ToString() == "MESSAGE_CREATE";
                 }).Subscribe(messageEvent);
 
 
+                client.DisconnectionHappened.Subscribe((info) => Debug.WriteLine(info.ToString()));
                 client.Start();
 
-                Task.Run(() => client.Send("{ message }"));
                 WS = client;
 
-                //exitEvent.WaitOne();
-                
-                while (uInfoRaw == null) { }
-                return uInfoRaw;
+                await Task.Run(() => client.Send("{ message }"));
+
+                exitEvent.WaitOne();
+
+                //return this.uInfoRaw;
             }
+
         }
 
-        public Connection() {
-            
+        public Connection(mainPage pageRefTemp)
+        {
+            this.pageRef = pageRefTemp;
         }
     }
 }

Connections/GateWayIntents.cs

@@ -46,7 +46,10 @@ namespace Discord_Client_Custom.Connections
         {
             if (isDmOnly)
             {
-                GatewayIntent[] intentsTemp = { GatewayIntent.DirectMessages, GatewayIntent.DirectMessageReactions, GatewayIntent.DirectMessageTyping };
+                GatewayIntent[] intentsTemp = {
+                    GatewayIntent.DirectMessages, GatewayIntent.DirectMessageReactions, GatewayIntent.DirectMessageTyping,
+                    GatewayIntent.GuildPresences, GatewayIntent.MessageContent
+                };
                 this.intents = intentsTemp;
                 this.value = sum(intents);
             } else

Connections/MsgRequests.cs

@@ -142,8 +142,8 @@ namespace Discord_Client_Custom.Connections
 
             return responseJSON;
         }
+        
 
-        //Returns the 
         public static async Task<JsonNode> getMessages(string cid, string? lastId = null)
         {
             string newUrl = dmGetMsgsBasepath.Replace("{{id}}", cid);

Form1.cs

@@ -5,6 +5,7 @@ using System.Drawing.Imaging;
 using Discord_Client_Custom.Channels;
 using Discord_Client_Custom.Connections;
 using Discord_Client_Custom.client_internals;
+using System.Runtime.CompilerServices;
 
 namespace Discord_Client_Custom
 {
@@ -12,6 +13,7 @@ namespace Discord_Client_Custom
     {
         private Connection con;
         public Client clientMain;
+        internal ChannelObj channelCurrent;
 
         public mainPage()
         {
@@ -27,8 +29,109 @@ namespace Discord_Client_Custom
             //MessageBox.Show(cid);
             var o = await MsgRequests.getMessages(cid);
             var p = (mainPage)((Button)sender).Parent.Parent;
-            
-            ChannelObj c = new ChannelObj(o, cid, p.dmFlowContent, ((Button)sender).Image, p.clientMain.getUserMain());
+            p.dmFlowContent.Tag = cid;
+
+            p.channelCurrent = new ChannelObj(o, cid, p.dmFlowContent, ((Button)sender).Image, p.clientMain.getUserMain());
+        }
+
+
+        private ComboBox createStatusBar()
+        {
+            var cb = new ComboBox();
+
+            cb.Items.Add("online");
+            cb.Items.Add("idle");
+            cb.Items.Add("dnd");
+            cb.Items.Add("offline");
+
+            cb.SelectedIndexChanged += (object o, EventArgs a) =>
+            {
+                Debug.WriteLine("Status updated to " + cb.Text);
+                string s = cb.Text;
+                if (s == "do not disturb") s = "dnd";
+                else if (s == "offline") s = "invisible";
+                con.setStatusUpdate(s);
+            };
+
+            return cb;
+        }
+
+
+        public void insertMessageObj(object msgObj)
+        {
+            // Threading fix
+            this.Invoke(delegate
+            {
+                JsonNode response = JsonNode.Parse(msgObj.ToString());
+                JsonNode msg = JsonNode.Parse(response["d"].ToString());
+
+                if (dmFlowContent.Tag == null || msg["channel_id"].ToString() != dmFlowContent.Tag.ToString())
+                {
+                    //Debug.WriteLine(dmFlowContent.Tag + "\n" + msg["channel_id"].ToString());
+                    //Add a notif icon on the dmFlowPannel or something
+                    Debug.WriteLine(false);
+                }
+                else
+                {
+                    user u = new user(msg["author"]);
+                    string avatarUrl = u.getAvatar();
+                    string iconUrl = "https://cdn.discordapp.com/avatars/" + u.getId() + "/" + u.getAvatar() + ".png?size=32";
+
+                    //null user
+                    if (avatarUrl == null)
+                    {
+                        iconUrl = "https://discord.com/assets/1f0bfc0865d324c2587920a7d80c609b.png";
+                    }
+
+                    channelCurrent.insertMessage(dmFlowContent, iconUrl, msg);
+                }
+            });
+        }
+
+        public async void start(JsonNode uInfoRaw)
+        {
+            clientMain = new Client(uInfoRaw);
+            var dmsRaw = con.uInfoRaw["private_channels"].AsArray().ToArray(); // (await getChannels()).AsArray().ToArray();
+            if (dmsRaw == null) { throw new NotImplementedException(); }
+
+
+            for (int i = 0; i < dmsRaw.Length; i++)
+            {
+                var o = dmsRaw[i];
+                if ((int)o["type"] == 3) { continue; }
+
+
+                var co = new ChannelObj(dmsRaw[i]);
+
+                Label lab = new Label();
+                lab.Text = co.getName();
+                lab.Location = new Point(30, 30 * i);
+                lab.Tag = co.getId();
+
+                //Button
+                Button btn = new Button();
+                btn.Location = new Point(50, 50 + 30 * i);
+                btn.Tag = co.getId();
+
+                var s = new Size(175, 40);
+                btn.Size = s;
+
+                btn.Image = await co.getIcon();
+                btn.Text = co.getName();
+                btn.ImageAlign = ContentAlignment.MiddleLeft;
+                btn.TextImageRelation = TextImageRelation.ImageBeforeText;
+                btn.TextAlign = ContentAlignment.MiddleCenter;
+                btn.Click += dm_btn_click;
+
+                //dmFlowPannel.Controls.Add(lab);
+                dmFlowPannel.Controls.Add(btn);
+            }
+
+            // Add status update menu
+            var cb = createStatusBar();
+            cb.Location = new Point(5, dmFlowContent.Height + 5);
+            cb.SelectedText = clientMain.getUserMain().getStatus()["status"].ToString();
+            this.Controls.Add(cb);
         }
 
 
@@ -53,47 +156,11 @@ namespace Discord_Client_Custom
                 Environment.SetEnvironmentVariable("userToken", promptValue);
            }*/
 
-            var c = new Connection();
-            var uInfoRaw = await c.connect(dmFlowPannel);
+            con = new Connection(this);
+            Task.Run(() => { con.connect(dmFlowPannel); });
+            while (con.uInfoRaw == null) { }
 
-            clientMain = new Client(uInfoRaw);
-            var dmsRaw = c.uInfoRaw["private_channels"].AsArray().ToArray(); // (await getChannels()).AsArray().ToArray();
-            if (dmsRaw == null) { throw new NotImplementedException(); }
-
-
-            for (int i = 0; i < dmsRaw.Length; i++)
-            {
-                var o = dmsRaw[i];
-                if ((int)o["type"] == 3) { continue; }
-
-
-                var co = new ChannelObj(dmsRaw[i]);
-
-                Label lab = new Label();
-                lab.Text = co.getName();
-                lab.Location = new Point(30, 30 * i);
-                lab.Tag = co.getId();
-
-                //Button
-                Button btn = new Button();
-                btn.Location = new Point(50, 50 + 30 * i);
-                btn.Tag = co.getId();
-
-                var s = new Size(175, 40);
-                btn.Size = s;
-                
-                btn.Image = await co.getIcon();
-                btn.Text = co.getName();
-                btn.ImageAlign = ContentAlignment.MiddleLeft;
-                btn.TextImageRelation = TextImageRelation.ImageBeforeText;
-                btn.TextAlign = ContentAlignment.MiddleCenter;
-                btn.Click += dm_btn_click;
-
-                //dmFlowPannel.Controls.Add(lab);
-                dmFlowPannel.Controls.Add(btn);
-            }
-
-            //*/
+            start(con.uInfoRaw);
         }
     }
 }

client_internals/Client.cs

@@ -48,6 +48,8 @@ namespace Discord_Client_Custom.client_internals
 
             public userMain(JsonNode uConfigs, JsonNode uObj, JsonNode[] chnls, user[] relshnshps) {
                 customStatus = uConfigs["custom_status"];
+                customStatus["status"] = JsonNode.Parse(uConfigs["status"].ToJsonString());
+
                 locale = uConfigs["locale"].ToString();
                 theme = uConfigs["theme"].ToString();
 
@@ -71,6 +73,7 @@ namespace Discord_Client_Custom.client_internals
 
             public Image getAvatar() { return avatar; }
             public string getId() { return id; }
+            public JsonNode getStatus() { return this.customStatus; }
         }
 
         userMain uMain;

mainPage.Designer.cs

@@ -86,6 +86,9 @@
             
             //this.dmFlowContent.WrapContents = true;
             this.Controls.Add(this.dmFlowContent);
+
+            this.statusbox = new ComboBox();
+            this.statusbox.Location = new System.Drawing.Point(1, this.dmFlowContent.Bottom + 1);
         }
 
         #endregion
@@ -94,5 +97,7 @@
 
         //FFS find a way to fix this ASAP
         public TableLayoutPanel dmFlowContent;
+
+        private ComboBox statusbox;
     }
 }