add back link funcs in login page, fix message send issue partially, …

…new design lang
Naticord · Dec 6, 2024 · be8c2ee · be8c2ee
1 parent 552a454
commit be8c2ee
Show file tree

Hide file tree

Showing 11 changed files with 246 additions and 271 deletions.
diff --git a/Naticord/Forms/DM.cs b/Naticord/Forms/DM.cs
@@ -10,6 +10,7 @@
 using System.Drawing;
 using System.Net;
 using System.IO;
+using System.Linq;
 
 namespace Naticord
 {
@@ -25,6 +26,7 @@ public partial class DM : Form
         public long FriendID { get; }
         private readonly string userPFP;
         private string lastMessageAuthor = "";
+        private Image _lastUploadedImage = null;
 
         public DM(long chatid, long friendid, string token, string userpfp)
         {
@@ -284,9 +286,14 @@ private async Task SendMessage()
 
                         if (Clipboard.ContainsImage())
                         {
-                            Image image = Clipboard.GetImage();
-                            byte[] imageBytes = ImageToBytes(image);
-                            await UploadImage(imageBytes);
+                            Image currentImage = Clipboard.GetImage();
+
+                            if (_lastUploadedImage == null || !ImagesAreEqual(_lastUploadedImage, currentImage))
+                            {
+                                byte[] imageBytes = ImageToBytes(currentImage);
+                                await UploadImage(imageBytes);
+                                _lastUploadedImage = currentImage;
+                            }
                         }
                     }
 
@@ -299,6 +306,21 @@ private async Task SendMessage()
             }
         }
 
+        private bool ImagesAreEqual(Image img1, Image img2)
+        {
+            if (img1 == null || img2 == null)
+                return false;
+
+            using (MemoryStream ms1 = new MemoryStream(), ms2 = new MemoryStream())
+            {
+                img1.Save(ms1, System.Drawing.Imaging.ImageFormat.Png);
+                img2.Save(ms2, System.Drawing.Imaging.ImageFormat.Png);
+                byte[] bytes1 = ms1.ToArray();
+                byte[] bytes2 = ms2.ToArray();
+                return bytes1.SequenceEqual(bytes2);
+            }
+        }
+
         protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
         {
             if (keyData == (Keys.Control | Keys.V))

diff --git a/Naticord/Forms/Group.Designer.cs b/Naticord/Forms/Group.Designer.cs
diff --git a/Naticord/Forms/Group.cs b/Naticord/Forms/Group.cs
@@ -9,6 +9,7 @@
 using System.Drawing;
 using System.Net;
 using System.IO;
+using System.Linq;
 
 namespace Naticord
 {
@@ -23,6 +24,7 @@ public partial class Group : Form
         public long ChatID { get; }
         private readonly string userPFP;
         private string lastMessageAuthor = "";
+        private Image _lastUploadedImage = null;
 
         public Group(long chatid, string token, string userpfp)
         {
@@ -261,9 +263,14 @@ private async Task SendMessage()
 
                         if (Clipboard.ContainsImage())
                         {
-                            Image image = Clipboard.GetImage();
-                            byte[] imageBytes = ImageToBytes(image);
-                            await UploadImage(imageBytes);
+                            Image currentImage = Clipboard.GetImage();
+
+                            if (_lastUploadedImage == null || !ImagesAreEqual(_lastUploadedImage, currentImage))
+                            {
+                                byte[] imageBytes = ImageToBytes(currentImage);
+                                await UploadImage(imageBytes);
+                                _lastUploadedImage = currentImage;
+                            }
                         }
                     }
 
@@ -276,6 +283,22 @@ private async Task SendMessage()
             }
         }
 
+        private bool ImagesAreEqual(Image img1, Image img2)
+        {
+            if (img1 == null || img2 == null)
+                return false;
+
+            using (MemoryStream ms1 = new MemoryStream(), ms2 = new MemoryStream())
+            {
+                img1.Save(ms1, System.Drawing.Imaging.ImageFormat.Png);
+                img2.Save(ms2, System.Drawing.Imaging.ImageFormat.Png);
+                byte[] bytes1 = ms1.ToArray();
+                byte[] bytes2 = ms2.ToArray();
+                return bytes1.SequenceEqual(bytes2);
+            }
+        }
+
+
         protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
         {
             if (keyData == (Keys.Control | Keys.V))

diff --git a/Naticord/Forms/Login.Designer.cs b/Naticord/Forms/Login.Designer.cs
diff --git a/Naticord/Forms/Login.cs b/Naticord/Forms/Login.cs
@@ -285,7 +285,35 @@ private void githubLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
 
         private void discordStatusLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-            System.Diagnostics.Process.Start("https://discord.gg/naticord");
+            System.Diagnostics.Process.Start("https://discordstatus.com");
+        }
+
+        private void tokenLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            this.Hide();
+            TokenLogin token = new TokenLogin(this);
+            token.Show();
+        }
+
+        private void proxyLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+
+            using (var form = new Form())
+            using (var label = new Label() { Text = "Enter Proxy Address:" })
+            using (var inputBox = new TextBox())
+            using (var buttonOk = new Button() { Text = "OK", DialogResult = DialogResult.OK })
+            {
+                inputBox.Text = proxyAddress;
+                ConfigureFormControls(form, label, inputBox, buttonOk);
+                form.Text = "Proxy";
+                form.FormBorderStyle = FormBorderStyle.Sizable;
+                if (form.ShowDialog() == DialogResult.OK)
+                {
+                    Properties.Settings.Default.proxy = inputBox.Text.Trim();
+                    Properties.Settings.Default.Save();
+                    proxyAddress = Properties.Settings.Default.proxy;
+                }
+            }
         }
     }
 }
diff --git a/Naticord/Forms/Login.resx b/Naticord/Forms/Login.resx
@@ -121,7 +121,7 @@
   <data name="$this.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAARgAAAIcCAYAAAAt97EHAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        DwAACw8BkvkDpQAA0RxJREFUeF7E/YmWJUtTnIHW+7/R1XSZJyEmMYOQBAgQiEliHrrvitzpkeZfmntE
+        DgAACw4BQL7hQQAA0RxJREFUeF7E/YmWJUtTnIHW+7/R1XSZJyEmMYOQBAgQiEliHrrvitzpkeZfmntE
         7qrDtbVCEW5uPkXm3qqu7vPz8e9+9Pu3/8+PfP8eu1v/7kcuX6X/dz+adUmLeMkRq6ptedcDclx8kYP5
         2IOrQe3o/az1bdQ57Vvu0KLfShf5Wb+a49BrPsb/O8SHlrNBQx/zz145i+vV9KezTk1X9+lz3dGivj1z
         LZ7J4Ox86mOumN3cqa01487njx7SXcp7mmJR/5Zjakws9dXn/yM+5Eqe4uP878N2GvHF+dBfBa/iGEpz