Merge pull request 'Merging dev into main' (#19) from dev into main

Reviewed-on: #19

Luski/GUI/MainScreen/UI/LuskiControls/ProfileView.cs

@@ -0,0 +1,39 @@
+using GraphicsManager.Interfaces;
+using GraphicsManager.Objects;
+using Luski.net.Structures.Public;
+using OpenTK.Mathematics;
+
+namespace Luski.GUI.MainScreen.UI.LuskiControls;
+
+public class ProfileView : UserControl
+{
+    public SocketUser User { get; set; }
+
+    private ProfileView(IRenderObject user, SocketUser u, ServerProfile p, Role r, Color? c = null)
+    {
+        this.User = u;
+        base.Size = new(244.ScaleInt(), 44.ScaleInt());
+        base.BackgroundColor = new(34, 34, 34, 255);
+        user.Location = new(8.ScaleInt(), 6.ScaleInt(), 0);
+        user.ForceDistanceUpdate(this);
+        user.IgnoreHover = true;
+        Color4 col = r.Color.ToColor4();
+        if (c is not null) col = c.ToColor4();
+        Label uname = new(Globals.DefaultFont)
+        {
+            Text = p.DisplayName,
+            Color = col,
+            IgnoreHover = true
+        };
+        uname.Location = new(user.Location.X + user.Size.X + 8.ScaleInt(),
+            (user.Location.Y + (user.Size.Y / 2) - (uname.Size.Y / 2)), 0);
+        Controls.Add(uname);
+        Controls.Add(user);
+    }
+    
+    public static async Task<ProfileView> Make(SocketUser u, ServerProfile p, Role r)
+    {
+        ProfileView m = new(await p.MakeRct(u, new(32.ScaleInt())), u, p, r);
+        return m;
+    }
+}

Luski/GUI/MainScreen/UI/LuskiControls/RoleView.cs

@@ -28,12 +28,14 @@ public class RoleView : FlowLayout
     
     public async Task AddUser(SocketUser user, Role TopRole)
     {
-        UserView f = await UserView.Make(user, TopRole, r is null);
+        ServerProfile DefaultProfile = await user.Server.GetProfile(user.ServerProfile, CancellationToken.None);
+        UserView f = await UserView.Make(user, DefaultProfile, TopRole, r is null);
+        
         uuu.Add(user.Id, f);
         bool ff = false;
         for (int j = 0; j < Users.Count; j++)
         {
-            if (string.Compare(Users[j].DisplayName, user.DisplayName) > 0)
+            if (string.Compare(DefaultProfile.DisplayName, DefaultProfile.DisplayName) > 0)
             {
                 Users.Insert(j, user);
                 Controls.Insert(j+1, f);

Luski/GUI/MainScreen/UI/LuskiControls/TextBox.cs

@@ -236,6 +236,13 @@ public class TextBox : UserControl
 					_label.Location = _label.Location;
 				}
 			}
+
+			if (_label.Text.Length < CursorLocation)
+			{
+				CursorLocation = _label.Text.Length;
+				var xy = _label.GetCharLocation(CursorLocation);
+				Pointer.Location = new(_label.Location.X + xy.X, _label.Location.Y + xy.Y, Pointer.Location.Z);
+			}
 		}
 	}
     public string WatermarkText
@@ -283,8 +290,8 @@ public class TextBox : UserControl
 			    Size = new(Size.X, Size.Y - (int)_label.Font.PixelHeight);
 			    if (OnRemoveLine is not null) OnRemoveLine.Invoke();
 		    }
-		    Text = Text.Remove(CursorLocation - 1, 1);
 		    CursorLocation--;
+		    Text = Text.Remove(CursorLocation, 1);
 		    var f = _label.GetCharLocation(CursorLocation);
 		    Pointer.Location = _label.Location + new Vector3i(f.X, f.Y, 0);
 		    Pointer.Visible = true;

Luski/GUI/MainScreen/UI/LuskiControls/UserView.cs

@@ -9,7 +9,7 @@ public class UserView : UserControl
 {
     public SocketUser User { get; set; }
 
-    private UserView(IRenderObject user, SocketUser u, Role r, bool offline)
+    private UserView(IRenderObject user, SocketUser u, ServerProfile p, Role r, bool offline)
     {
         this.User = u;
         base.Size = new(244.ScaleInt(), 44.ScaleInt());
@@ -18,7 +18,7 @@ public class UserView : UserControl
         user.ForceDistanceUpdate(this);
         Label uname = new(Globals.DefaultFont)
         {
-            Text = u.DisplayName,
+            Text = p.DisplayName,
             Color = r.Color.ToColor4()
         };
         if (offline) uname.Color = new(uname.Color.R, uname.Color.G, uname.Color.B, uname.Color.A * 0.6f);
@@ -28,9 +28,9 @@ public class UserView : UserControl
         Controls.Add(user);
     }
     
-    public static async Task<UserView> Make(SocketUser u, Role r, bool offline)
+    public static async Task<UserView> Make(SocketUser u, ServerProfile p, Role r, bool offline)
     {
-        UserView m = new(await u.MakeRct(new(32.ScaleInt()), true), u, r, offline);
+        UserView m = new(await p.MakeRct(u, new(32.ScaleInt())), u, p, r, offline);
         return m;
     }
 }

Luski/GUI/MainScreen/UI/PublicServers/ChatMessage.cs

@@ -1,9 +1,7 @@
 using System.Diagnostics;
-using System.Runtime.CompilerServices;
 using GraphicsManager.Enums;
 using GraphicsManager.Interfaces;
 using GraphicsManager.Objects;
-using Luski.net.Interfaces;
 using Luski.net.Structures.Main;
 using Luski.net.Structures.Public;
 using OpenTK.Mathematics;
@@ -31,14 +29,16 @@ public class ChatMessage : UserControl
 
     public static async Task<ChatMessage> MakeChatMessage(PublicChat p, SocketMessage message)
     {
-        IUser auth = await message.GetAuthor(CancellationToken.None);
+        SocketUser auth = (SocketUser)(await message.GetAuthor(CancellationToken.None));
-        Color c = await auth.GetColor();
+        ServerProfile prof = await message.GetProfile(CancellationToken.None);
+        Color? c = await prof.GetColor();
+        if (c is null) c = await auth.GetColor();
         Color4 c4 = new(c.R, c.G, c.B, c.A);
-        return new ChatMessage(p, message, await message.GetParent(CancellationToken.None), auth, await auth.MakeRct(new(40.ScaleInt()), message.IsProfile), c4);
+        return new ChatMessage(p, message, await message.GetParent(CancellationToken.None), prof, await prof.MakeRct(auth, new(40.ScaleInt())), c4);
     }
 
 
-    private ChatMessage(PublicChat p, SocketMessage message, SocketChannel chan, IUser Author, IRenderObject UserIcon, Color4 UserNameColor)
+    private ChatMessage(PublicChat p, SocketMessage message, SocketChannel chan, ServerProfile Author, IRenderObject UserIcon, Color4 UserNameColor)
     {
         pc = p;
         Label label1;
@@ -87,7 +87,6 @@ public class ChatMessage : UserControl
         Controls.Add(label1 = new Label(Globals.DefaultFont) { Color = UserNameColor, Text = Author.DisplayName });
         label1.Location = new(
             54.ScaleInt(),
-            //(int)(UserIcon.Location.Y + (UserIcon.Size.Y / 2) - (label1.Font.CurrentFonts[0].Face.Size.Metrics.NominalHeight / 2) - label1.Size.Y + label1.Font.PixelHeight),
             UserIcon.Location.Y,
             0);
         Label label2;

Luski/GUI/MainScreen/UI/PublicServers/PublicChat.cs

@@ -174,7 +174,7 @@ public class PublicChat : UserControl
         if (arg.Key == Keys.Enter && !arg.Shift)
         {
             
-            await Channel!.SendMessage(tb.Text);
+            await Channel!.SendMessage(tb.Text, FakeProfile: Globals.ServerProfile);
             tb.Text = string.Empty;
             tb.CursorLocation = 0;
         }
@@ -355,7 +355,6 @@ public class PublicChat : UserControl
 
     private SocketMessage? lastm;
     private long? lastUser;
-    private bool fake = false;
     public ChatMessage? LastChatMessage;
     
     private SocketMessage? lastmIndex;
@@ -447,16 +446,14 @@ public class PublicChat : UserControl
         bool hasbeentenmin = false;
         if (lastm is not null)
         {
-            DateTime chan = Channel!.Epoch.AddMilliseconds(lastm.ID >> 22).ToLocalTime();
             hasbeentenmin =
-                Channel!.Epoch.AddMilliseconds(lastm.ID >> 22).ToLocalTime().AddMinutes(10) <
+                Channel!.Epoch.AddMilliseconds(lastm.TimeStamp).ToLocalTime().AddMinutes(10) <
-                Channel!.Epoch.AddMilliseconds(Message.ID >> 22).ToLocalTime();
+                Channel!.Epoch.AddMilliseconds(Message.TimeStamp).ToLocalTime();
         }
             
         lastm = Message;
-        if (lastUser is null || lastUser != Message.AuthorID || hasbeentenmin || fake != Message.IsProfile)
+        if (lastUser is null || lastUser != Message.ProfileID || hasbeentenmin)
         {
-            
             if (Window is null || !Globals.ms.InvokeRequired)
             {
                 MessageFlow.Controls.Add(LastChatMessage = await ChatMessage.MakeChatMessage(this, Message));
@@ -490,8 +487,7 @@ public class PublicChat : UserControl
                 });
             }
         }
-        fake = Message.IsProfile;
+        lastUser = Message.ProfileID;
-        lastUser = Message.AuthorID;
     }
 
     private int index = 0;
@@ -501,10 +497,10 @@ public class PublicChat : UserControl
         bool hasbeentenmin = false;
         if (lastmIndex is not null)
             hasbeentenmin =
-                Channel!.Epoch.AddMilliseconds(lastmIndex.ID >> 22).ToLocalTime().AddMinutes(10) <
+                Channel!.Epoch.AddMilliseconds(lastmIndex.TimeStamp).ToLocalTime().AddMinutes(10) <
-                Channel!.Epoch.AddMilliseconds(Message.ID >> 22).ToLocalTime();
+                Channel!.Epoch.AddMilliseconds(Message.TimeStamp).ToLocalTime();
         lastmIndex = Message;
-        if (lastUserIndex is null || lastUserIndex != Message.AuthorID || hasbeentenmin || fake != Message.IsProfile)
+        if (lastUserIndex is null || lastUserIndex != Message.ProfileID || hasbeentenmin)
         {
             if (Window is null || !Globals.ms.InvokeRequired)
             {
@@ -539,7 +535,6 @@ public class PublicChat : UserControl
                 });
             }
         }
-        fakeIndex = Message.IsProfile;
+        lastUserIndex = Message.ProfileID;
-        lastUserIndex = Message.AuthorID;
     }
 }

Luski/GUI/MainScreen/UI/ServerIcon.cs

@@ -5,6 +5,7 @@ using GraphicsManager.Objects;
 using GraphicsManager.Objects.Core;
 using Luski.net;
 using OpenTK.Graphics.OpenGL4;
+using OpenTK.Mathematics;
 
 namespace Luski.GUI.MainScreen.UI;
 
@@ -45,15 +46,30 @@ public class ServerIcon<TServer> : UserControl where TServer : Server
         }
     }
     
-    public ServerIcon(TServer Server)
+    public ServerIcon(TServer Server, bool Failed = false)
     {
-        Rectangle r = new(Globals.ms.TextureManager.GetTextureResource("rc.png"))
+        Rectangle r;
+        if (Server is PublicServer ps)
+        {
+            var rpre = ps.MakeRct(new(32.ScaleInt()));
+            Task.WaitAll(rpre);
+            r = (Rectangle)rpre.Result;
+        }
+        else
+        {
+            r = new(Globals.ms.TextureManager.GetTextureResource("rc.png"))
             {
-            Location = new(18.ScaleInt(), 8.ScaleInt(), 0),
                 Size = new(32.ScaleInt()),
                 Shader = Rectangle.DefaultAlphaTextureShader[Globals.ms.Context],
                 IgnoreHover = true
             };
+            Texture t = Globals.ms.TextureManager.AddTexture(Server.GetAvatar(CancellationToken.None).Result);
+            t.Unit = TextureUnit.Texture1;
+            r.Textures.Add(t);
+        }
+
+        r.Location = new(18.ScaleInt(), 8.ScaleInt(), 0);
+        r.IgnoreHover = true;
         Rectangle rr = new(r.Textures[0])
         {
             Location = new(17.ScaleInt(), 7.ScaleInt(), 0),
@@ -70,10 +86,9 @@ public class ServerIcon<TServer> : UserControl where TServer : Server
             BackgroundColor = new(26, 26, 26, 255),
             IgnoreHover = true
         };
+        if (Failed) SelectedRect.BackgroundColor = Color4.DarkRed;
         this.Server = Server;
-        Texture t = Globals.ms.TextureManager.AddTexture(Server.GetAvatar(CancellationToken.None).Result);
+        
-        t.Unit = TextureUnit.Texture1;
-        r.Textures.Add(t);
         Controls.Add(SelectedRect);
         Controls.Add(rr);
         Controls.Add(r);

Luski/GUI/MainScreenWindow.cs

@@ -7,6 +7,7 @@ using GraphicsManager.Interfaces;
 using GraphicsManager.Objects;
 using GraphicsManager.Objects.Core;
 using Luski.GUI.MainScreen.UI;
+using Luski.GUI.MainScreen.UI.LuskiControls;
 using Luski.GUI.MainScreen.UI.PublicServers;
 using Luski.net;
 using Luski.net.Structures.Public;
@@ -259,7 +260,8 @@ public class MainScreenWindow : Window
             Role[] ra = await Server.User.GetRoles();
             Color c = ra[0].Color;
             Color4 c4 = new(c.R, c.G, c.B, c.A);
-            IRenderObject u = await Server.User.MakeRct(new(46.ScaleInt()), false);
+            ServerProfile DefaultProfile = await Server.GetProfile(Server.User.ServerProfile, CancellationToken.None);
+            IRenderObject u = await DefaultProfile.MakeRct(Server.User, new(46.ScaleInt()));
             int ii = 4.ScaleInt();
             u.Location = new(ii, cs.Size.Y + ii, 0);
             u.Anchor = ObjectAnchor.Bottom | ObjectAnchor.Left;
@@ -269,12 +271,35 @@ public class MainScreenWindow : Window
             Label ul = new Label(Globals.DefaultFont)
             {
                 Anchor = u.Anchor,
-                Text = Server.User.DisplayName,
+                Text = DefaultProfile.DisplayName,
                 Color = c4
             };
 
             ul.Location = new(u.Location.X + u.Size.X + 5.ScaleInt(),
                 (u.Location.Y + ((u.Size.Y - ul.Size.Y) / 2)), 0);
+            Rectangle Expand = new(TextureManager.GetTextureResource("Expand.png"))
+            {
+                Size = new(20.ScaleInt()),
+                Shader = Rectangle.DefaultAlphaShader[Context],
+                BackgroundColor = Color4.Gray,
+                Tag = new Tuple<SocketAppUser, IRenderObject, Label>(Server.User, u, ul),
+                Anchor = u.Anchor
+            };
+            Expand.Clicked += ExpandOnClicked;
+            Expand.MouseEnter += _ =>
+            {
+                Expand.BackgroundColor = Color4.White;
+                return Task.CompletedTask;
+            };
+            Expand.MouseLeave += _ =>
+            {
+                Expand.BackgroundColor = Color4.Gray;
+                return Task.CompletedTask;
+            };
+            Expand.Location = new(ul.Location.X + ul.Size.X + 5.ScaleInt(),
+                u.Location.Y + ((u.Size.Y - Expand.Size.Y) / 2), 0);
+            Expand.ForceDistanceUpdate(SerBox);
+            SerBox.Controls.Add(Expand);
             SerBox.Controls.Add(ul);
             Rectangle setting = new(TextureManager.GetTextureResource("settings.png"))
             {
@@ -309,6 +334,53 @@ public class MainScreenWindow : Window
         BlockDraw = false;
     }
 
+    private FlowLayout? ProfileFlow = null;
+
+    private async Task ExpandOnClicked(IRenderObject arg)
+    {
+        if (ProfileFlow is null)
+        {
+            ProfileFlow = new();
+            Tuple<SocketAppUser, IRenderObject, Label> s = (Tuple<SocketAppUser, IRenderObject, Label>)arg.Tag!;
+            var role = (await s.Item1.GetRoles())[0];
+            foreach (var prof in await s.Item1.GetProfiles(CancellationToken.None))
+            {
+                ProfileView con = await ProfileView.Make(s.Item1, prof, role);
+                con.Clicked += async o =>
+                {
+                    IRenderObject iro = await prof.MakeRct(s.Item1, s.Item2.Size);
+                    iro.Location = s.Item2.Location;
+                    iro.Distance = s.Item2.Distance;
+                    iro.Anchor = s.Item2.Anchor;
+                    int oldx = s.Item3.Size.X;
+                    s.Item2.Parent!.Controls.Add(iro);
+                    s.Item2.Parent!.Controls.Remove(s.Item2);
+                    s.Item3.Text = prof.DisplayName;
+                    Controls.Remove(ProfileFlow);
+                    ProfileFlow = null;
+                    arg.Location = new(arg.Location.X - oldx + s.Item3.Size.X, arg.Location.Y, arg.Location.Z);
+                    arg.ForceDistanceUpdate(arg.Parent!);
+                    Globals.ServerProfile = prof;
+                    arg.Tag = new Tuple<SocketAppUser, IRenderObject, Label>(s.Item1, iro, s.Item3);
+                    TryDraw();
+                };
+                ProfileFlow.Controls.Add(con);
+                ProfileFlow.Size = new((int)arg.SizeAsFloat.X, ProfileFlow.Size.Y + con.Size.Y);
+            }
+
+            ProfileFlow.Location = new(ser.Size.X + 5.ScaleInt(),
+                CS.Y - 54.ScaleInt() - ProfileFlow.Size.Y,
+                0);
+            Controls.Add(ProfileFlow);
+        }
+        else
+        {
+            Controls.Remove(ProfileFlow);
+            ProfileFlow = null;
+        }
+        DrawFrame();
+    }
+
     private Task SettingOnClicked(IRenderObject arg)
     {
         SettingsMenu sm = new();
@@ -370,6 +442,14 @@ public class MainScreenWindow : Window
             si.LoadToParent(ser, this);
         }
 
+        foreach (PublicServer pser in Globals.Luski.FailedServers)
+        {
+            Console.WriteLine(pser.Name);
+            ServerIcon<PublicServer> si = new ServerIcon<PublicServer>(pser, true);
+            ser.Controls.Add(si);
+            si.LoadToParent(ser, this);
+        }
+
         AddServerIcon asi = new();
         asi.Clicked += AddButtonClicked;
         ser.Controls.Add(asi);

Luski/Globals.cs

@@ -266,21 +266,12 @@ public static class Globals
     public static Dictionary<long, Texture> UserTextureMap = new();
     public static Dictionary<long, Texture> ProfileTextureMap = new();
 
-    private static async Task<Texture> GetIcon(this SocketUser User)
+    public static ServerProfile? ServerProfile = null;
-    {
-        if (UserTextureMap.TryGetValue(User.Id, out Texture? t)) return t;
-        Stream UserStream = await User.GetAvatar(CancellationToken.None);
-        t = Globals.ms.TextureManager.AddTexture(UserStream);
-        UserTextureMap.Add(User.Id, t);
-        UserStream.Dispose();
-        t.Unit = TextureUnit.Texture1;
-        return t;
-    }
 
-    public static async Task<IRenderObject> MakeRct<TUser>(this TUser User, Vector2i Size, bool IsProfile) where TUser : IUser
+    public static async Task<IRenderObject> MakeRct<TUser>(this ServerProfile Profile, TUser User, Vector2i Size) where TUser : SocketUser
     {
         Texture t = ms.TextureManager.GetTextureResource("Status.png");
-        if (User.PictureType == PictureType.none)
+        if (Profile.PictureType == PictureType.none)
         {
             UserControl r = new(t);
             r.Size = Size;
@@ -291,7 +282,7 @@ public static class Globals
             {
                 Color = c.ToColor4()
             };
-            l.Text = User.DisplayName[0].ToString();
+            l.Text = Profile.DisplayName[0].ToString();
             var y = l.GetSizeOfChar(0);
             l.Location = new((r.Size.X - l.Size.X)/2,
                 (int)(r.Size.Y - (l.Font.PixelHeight - y.Y) - (r.Size.Y / 2) - (y.Y/2)),
@@ -304,33 +295,60 @@ public static class Globals
             Rectangle r = new(t);
             r.Size = Size;
             r.Shader = Rectangle.DefaultAlphaTextureShader[ms.Context];
-            r.Textures.Add(await User.GetIcon(IsProfile));
+            r.Textures.Add(await Profile.GetIcon());
             return r;
         }
     }
     
-    private static async Task<Texture> GetIcon(this IUser User, bool IsProfile)
+    public static async Task<IRenderObject> MakeRct(this PublicServer Server, Vector2i Size)
     {
-        if (IsProfile)
+        Texture t = ms.TextureManager.GetTextureResource("rc.png");
+        if (Server.PictureType == PictureType.none)
         {
-            if (ProfileTextureMap.TryGetValue(User.Id, out Texture? t)) return t;
+            UserControl r = new(t);
-            Stream UserStream = await User.GetAvatar(CancellationToken.None);
+            r.Size = Size;
-            t = Globals.ms.TextureManager.AddTexture(UserStream);
+            r.Shader = Rectangle.DefaultAlphaShader[ms.Context];
-            ProfileTextureMap.Add(User.Id, t);
+            r.BackgroundColor = new(25, 25, 25, 255);
-            UserStream.Dispose();
+            Label l = new(DefaultFont)
-            t.Unit = TextureUnit.Texture1;
+            {
-            return t;
+                Color = new(255,255,255,255)
+            };
+            l.Text = Server.Name[0].ToString();
+            var y = l.GetSizeOfChar(0);
+            l.Location = new((r.Size.X - l.Size.X)/2,
+                (int)(r.Size.Y - (l.Font.PixelHeight - y.Y) - (r.Size.Y / 2) - (y.Y/2)),
+                0);
+            r.Controls.Add(l);
+            return r;
         }
         else
         {
-            if (UserTextureMap.TryGetValue(User.Id, out Texture? t)) return t;
+            Rectangle r = new(t);
-            Stream UserStream = await User.GetAvatar(CancellationToken.None);
+            r.Size = Size;
-            t = Globals.ms.TextureManager.AddTexture(UserStream);
+            r.Shader = Rectangle.DefaultAlphaTextureShader[ms.Context];
-            UserTextureMap.Add(User.Id, t);
+            r.Textures.Add(await Server.GetIcon());
+            return r;
+        }
+    }
+    
+    private static async Task<Texture> GetIcon<TServer>(this TServer Server) where TServer : Server
+    {
+        Stream UserStream = await Server.GetAvatar(CancellationToken.None);
+        Texture t = Globals.ms.TextureManager.AddTexture(UserStream);
         UserStream.Dispose();
         t.Unit = TextureUnit.Texture1;
         return t;
     }
+    
+    private static async Task<Texture> GetIcon(this ServerProfile User)
+    {
+        if (ProfileTextureMap.TryGetValue(User.ID, out Texture? t)) return t;
+        Stream UserStream = await User.GetAvatar(CancellationToken.None);
+        t = Globals.ms.TextureManager.AddTexture(UserStream);
+        ProfileTextureMap.Add(User.ID, t);
+        UserStream.Dispose();
+        t.Unit = TextureUnit.Texture1;
+        return t;
     }
 
     public static Settings Settings { get; set; }

Luski/Luski.csproj

@@ -22,7 +22,7 @@
 
     <ItemGroup>
       <PackageReference Include="GraphicsManager" Version="1.0.9-alpha72" />
-      <PackageReference Include="Luski.net" Version="2.0.0-alpha89" />
+      <PackageReference Include="Luski.net" Version="2.0.0-alpha98" />
     </ItemGroup>
 
     <ItemGroup>