Merge branch 'rewrite/main' of https://github.com/UWPCommunity/Quarrel …

…into rewrite/main
WindowsAppCommunity · May 24, 2022 · 1911211 · 1911211
2 parents 0ea356f + 8ff6a05
commit 1911211
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/API/Discord.API/Rest/IChannelService.cs b/src/API/Discord.API/Rest/IChannelService.cs
@@ -9,7 +9,8 @@ namespace Discord.API.Rest
     internal interface IChannelService
     {
         [Get("/v9/channels/{channelId}/messages/{messageId}/ack")]
-        Task MarkRead([AliasAs("channelId")] ulong channelId, [AliasAs("messageId")] ulong messageId);
+        [Headers("Content-Type: application/json;")]
+        Task MarkRead([AliasAs("channelId")] ulong channelId, [AliasAs("messageId")] ulong messageId, [Body] string body = "{token: null}");
 
         [Get("/v9/channels/{channelId}/messages?limit={limit}")]
         Task<JsonMessage[]> GetChannelMessages([AliasAs("channelId")] ulong channelId, [AliasAs("limit")] int limit = 50);

diff --git a/src/Quarrel/DataTemplates/ChannelTemplates.xaml b/src/Quarrel/DataTemplates/ChannelTemplates.xaml
@@ -11,6 +11,14 @@
 
     <DataTemplate x:Key="TextChannelTemplate" x:DataType="bindablechannels:BindableTextChannel">
         <Grid Height="40">
+
+            <Grid.ContextFlyout>
+                <MenuFlyout>
+                    <MenuFlyoutItem x:Uid="Channel/MarkAsRead" Text="Mark as Read"
+                                    Icon="View" Command="{x:Bind MarkAsReadCommand}"/>
+                </MenuFlyout>
+            </Grid.ContextFlyout>
+
             <Grid Visibility="{x:Bind IsSelected, Mode=OneWay}" Opacity=".2" Background="{ThemeResource SystemControlBackgroundAccentBrush}"/>
 
             <Border x:Name="UnreadIndicator"

diff --git a/src/Quarrel/DataTemplates/MessageTemplates.xaml b/src/Quarrel/DataTemplates/MessageTemplates.xaml
@@ -105,11 +105,7 @@
                 <Grid.ContextFlyout>
                     <MenuFlyout>
                         <MenuFlyoutItem x:Uid="Message/CopyLink" Text="Copy Message Link"
-                                        Command="{x:Bind CopyLinkCommand}">
-                            <MenuFlyoutItem.Icon>
-                                <SymbolIcon Symbol="Link"/>
-                            </MenuFlyoutItem.Icon>
-                        </MenuFlyoutItem>
+                                        Icon="Link" Command="{x:Bind CopyLinkCommand}"/>
                         <MenuFlyoutItem x:Uid="Message/CopyId" Text="Copy ID"
                                         Command="{x:Bind CopyIdCommand}">
                             <MenuFlyoutItem.Icon>