Merge pull request #607 from UWPCommunity/rewrite/main

Alpha update

Author: Avid29

azure-pipelines-package-alpha.yml

@@ -142,8 +142,3 @@ steps:
     git push origin HEAD:refs/heads/master
   displayName: Push to QuarrelInstaller repo
   workingDirectory: $(installerDirectory)
-
-- task: PublishBuildArtifacts@1
-  displayName: 'Publish Artifact: drop'
-  inputs:
-    PathtoPublish: '$(build.artifactStagingDirectory)'

src/Libs/Quarrel.Markdown/Parsing/Parser.cs

@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -92,8 +93,18 @@ internal static IList<IAST> ParseAST(string text, bool inlineState, bool inQuote
                 }
                 else if (url.Match(text) is { Success: true } urlMatch && inlineState)
                 {
-                    inline = new Url(urlMatch.Groups[1].Value);
-                    text = text.Substring(urlMatch.Length);
+                    string urlContent = urlMatch.Groups[1].Value;
+                    for (int i = urlContent.Length - 1; i >= 0; i--)
+                    {
+                        if (urlContent[i] != ')')
+                        {
+                            int count = urlContent.Count(c => c == '(');
+                            urlContent = urlContent.Substring(0, Math.Min(i + count + 1, urlContent.Length));
+                            break;
+                        }
+                    }
+                    inline = new Url(urlContent);
+                    text = text.Substring(urlContent.Length);
                 }
                 else if (strong.Match(text) is { Success: true } strongMatch && inlineState)
                 {

src/Libs/Quarrel.Markdown/Rendering/MessageRenderer.cs

@@ -281,7 +281,11 @@ private void RenderMarkdown(IList<ASTRoot> tree)
                             }
                             break;
                         case Url url:
-                            inlineCollection.Add(new Hyperlink() { NavigateUri = new Uri(url.Content), Inlines = { new Run() { Text = url.Content } } });
+                            inlineCollection.Add(new Hyperlink()
+                            {
+                                NavigateUri = Uri.TryCreate(url.Content, UriKind.RelativeOrAbsolute, out Uri uri) ? uri : null,
+                                Inlines = { new Run() { Text = url.Content } }
+                            });
                             break;
                         case IEmojiAST emoji:
                             {

src/Quarrel.ViewModels/Bindables/Messages/BindableMessage.cs

@@ -20,6 +20,7 @@ namespace Quarrel.Bindables.Messages
     public class BindableMessage : SelectableItem
     {
         private Message _message;
+        private bool _isDeleted;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="BindableMessage"/> class.
@@ -68,6 +69,14 @@ internal BindableMessage(
                     Message = e.Message;
                 }
             });
+
+            _messenger.Register<MessageDeletedMessage>(this, (_, e) =>
+            {
+                if (Id == e.MessageId)
+                {
+                    _dispatcherService.RunOnUIThread(() => IsDeleted = true);
+                }
+            });
         }
 
         /// <inheritdoc/>
@@ -85,6 +94,12 @@ public Message Message
 
         public string Content => Message.Content;
 
+        public bool IsDeleted
+        {
+            get => _isDeleted;
+            set => SetProperty(ref _isDeleted, value);
+        }
+
         /// <summary>
         /// Gets the author of the message as a bindable user.
         /// </summary>

src/Quarrel.ViewModels/Messages/Discord/Messages/MessageCreatedMessage.cs

@@ -1,6 +1,5 @@
 // Quarrel © 2022
 
-using Quarrel.Bindables.Messages;
 using Quarrel.Client.Models.Messages;
 
 namespace Quarrel.Messages.Discord.Messages

src/Quarrel.ViewModels/Messages/Discord/Messages/MessageDeletedMessage.cs

@@ -0,0 +1,17 @@
+// Quarrel © 2022
+
+namespace Quarrel.Messages.Discord.Messages
+{
+    public class MessageDeletedMessage
+    {
+        public MessageDeletedMessage(ulong channelId, ulong messageId)
+        {
+            ChannelId = channelId;
+            MessageId = messageId;
+        }
+
+        public ulong ChannelId { get; }
+
+        public ulong MessageId { get; }
+    }
+}

src/Quarrel.ViewModels/Services/Discord/DiscordService.Events.cs

@@ -1,7 +1,6 @@
 // Quarrel © 2022
 
 using Microsoft.Toolkit.Mvvm.Messaging;
-using Quarrel.Bindables.Messages;
 using Quarrel.Client.Models.Channels.Abstract;
 using Quarrel.Client.Models.Messages;
 using Quarrel.Messages.Discord.Channels;
@@ -15,6 +14,7 @@ public void RegisterChannelEvents()
         {
             _quarrelClient.MessageCreated += OnMessageCreate;
             _quarrelClient.MessageUpdated += OnMessageUpdated;
+            _quarrelClient.MessageDeleted += OnMessageDeleted;
             _quarrelClient.ChannelUpdated += OnChannelUpdated;
         }
 
@@ -28,6 +28,11 @@ private void OnMessageUpdated(object sender, Message e)
             _messenger.Send(new MessageUpdatedMessage(e));
         }
 
+        private void OnMessageDeleted(object sender, MessageDeleted e)
+        {
+            _messenger.Send(new MessageDeletedMessage(e.ChannelId, e.MessageId));
+        }
+
         private void OnChannelUpdated(object sender, Channel e)
         {
             _messenger.Send(new ChannelUpdatedMessage(e));

src/Quarrel/Controls/Panels/Channels/ChannelPanel.xaml

@@ -5,6 +5,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:bindablechannel="using:Quarrel.Bindables.Channels.Abstract"
+    xmlns:convert="using:Quarrel.Converters.Common.Visible"
     xmlns:bindablechannels="using:Quarrel.Bindables.Channels"
     xmlns:cselectors="using:Quarrel.Selectors.Channels"
     xmlns:wuxdata="using:Windows.UI.Xaml.Data"
@@ -49,12 +50,44 @@
                     <GroupStyle HidesIfEmpty="False">
                         <GroupStyle.HeaderTemplate>
                             <DataTemplate x:DataType="bindablechannels:BindableChannelGroup">
-                                <ContentControl Content="{x:Bind Key}"
-                                                ContentTemplate="{StaticResource CategoryZoomInChannelTemplate}"/>
+                                <StackPanel Visibility="{x:Bind convert:VisibleWhenNotNullConverter.Convert(Key)}">
+                                    <ContentControl Content="{x:Bind Key}"
+                                                    ContentTemplate="{StaticResource CategoryZoomInChannelTemplate}"/>
+                                    <Rectangle Stroke="{ThemeResource SystemControlForegroundBaseLowBrush}"
+                                               StrokeThickness="0.5"
+                                               Height="1"
+                                               VerticalAlignment="Bottom"
+                                               HorizontalAlignment="Stretch"
+                                               Margin="12,8,12,0"/>
+                                </StackPanel>
                             </DataTemplate>
                         </GroupStyle.HeaderTemplate>
+                        <GroupStyle.HeaderContainerStyle>
+                            <Style TargetType="ListViewHeaderItem">
+                                <Setter Property="MinHeight" Value="0"/>
+                                <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="ListViewHeaderItem">
+                                            <ContentPresenter x:Name="ContentPresenter"
+                                                              Margin="{TemplateBinding Padding}"
+                                                              Content="{TemplateBinding Content}"
+                                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                              ContentTransitions="{TemplateBinding ContentTransitions}"
+                                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                        </GroupStyle.HeaderContainerStyle>
                     </GroupStyle>
                 </ListView.GroupStyle>
+                <ListView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <ItemsStackPanel AreStickyGroupHeadersEnabled="False"/>
+                    </ItemsPanelTemplate>
+                </ListView.ItemsPanel>
                 <ListView.Footer>
                     <Grid Height="{x:Bind BottomMargin, Mode=OneWay}"/>
                 </ListView.Footer>

src/Quarrel/Converters/Common/Visible/VisibleWhenNullConverter.cs

@@ -0,0 +1,14 @@
+// Quarrel © 2022
+
+using Windows.UI.Xaml;
+
+namespace Quarrel.Converters.Common.Visible
+{
+    public class VisibleWhenNullConverter
+    {
+        public static Visibility Convert(object? item)
+        {
+            return item is null ? Visibility.Visible : Visibility.Collapsed;
+        }
+    }
+}

src/Quarrel/Converters/Discord/Messages/IsDeletedToOpacityConverter.cs

@@ -0,0 +1,13 @@
+// Quarrel © 2022
+
+namespace Quarrel.Converters.Discord.Messages
+{
+    public class IsDeletedToOpacityConverter
+    {
+        public static double Convert(bool isDeleted)
+        {
+            if (isDeleted) return 0.5;
+            return 1;
+        }
+    }
+}