Merge pull request #610 from UWPCommunity/rewrite/main

Alpha update

samples/Quarrel.Samples.RichPresence/MainPage.xaml.cs

@@ -43,7 +43,7 @@ private async void Connect(object sender, RoutedEventArgs e)
  private async void SetActivity(object sender, RoutedEventArgs e)
  {
  Activity activity = new Activity(ActivityName.Text);
- bool success = await _connection.SetActivity(activity);
+ await _connection.SetActivity(activity);
  }
  }
 }

src/API/Discord.API.Status/Discord.API.Status.csproj

@@ -3,6 +3,7 @@
  <PropertyGroup>
  <TargetFramework>netstandard2.0</TargetFramework>
  <Configurations>Debug;Insider;Alpha;Release</Configurations>
+ <GenerateDocumentationFile>false</GenerateDocumentationFile>
  </PropertyGroup>
 
  <ItemGroup>

src/API/Discord.API.Status/Models/Datum.cs

@@ -2,6 +2,9 @@
 
 using System.Text.Json.Serialization;
 
+// JSON models don't need to respect standard nullable rules.
+#pragma warning disable CS8618
+
 namespace Discord.API.Status.Models
 {
  /// <summary>

src/API/Discord.API.Status/Models/Summary.cs

@@ -2,13 +2,25 @@
 
 using System.Text.Json.Serialization;
 
+// JSON models don't need to respect standard nullable rules.
+#pragma warning disable CS8618
+
 namespace Discord.API.Status.Models
 {
+ /// <summary>
+ /// A summary of a data set.
+ /// </summary>
  public partial class Summary
  {
+ /// <summary>
+ /// The sum of the data.
+ /// </summary>
  [JsonPropertyName("sum")]
  public double Sum { get; set; }
 
+ /// <summary>
+ /// The mean of the data.
+ /// </summary>
  [JsonPropertyName("mean")]
  public double Mean { get; set; }
  }

src/API/Discord.API/Discord.API.csproj

@@ -10,4 +10,8 @@
  <PackageReference Include="Refit" Version="6.3.2" />
  </ItemGroup>
 
+ <ItemGroup>
+ <ProjectReference Include="..\..\Libs\Quarrel.Common\Quarrel.Common.csproj" />
+ </ItemGroup>
+
 </Project>

src/API/Discord.API/Gateways/Gateway.Requests.cs

@@ -1,6 +1,7 @@
 // Quarrel © 2022
 
 using Discord.API.Gateways.Models;
+using Discord.API.Models.Enums.Users;
 using System;
 using System.Threading.Tasks;
 
@@ -43,19 +44,19 @@ public void SubscribeToGuildAsync(ulong[] channelIds)
  throw new NotImplementedException();
  }
 
- public async Task UpdateStatusAsync(string status, int? idleSince, bool isAfk)
+ public async Task UpdateStatusAsync(UserStatus status, int? idleSince = null, bool isAfk = false)
  {
  var payload = new StatusUpdate()
  {
- Status = status,
+ Status = status.GetStringValue(),
  IdleSince = idleSince,
  IsAFK = isAfk,
  };
 
  await UpdateStatusAsync(payload);
  }
 
- public async Task UpdateStatusAsync(StatusUpdate payload)
+ private async Task UpdateStatusAsync(StatusUpdate payload)
  {
  var frame = new SocketFrame<StatusUpdate>()
  {

src/API/Discord.API/Models/Enums/Messages/ComponentType.cs

@@ -1,9 +1,5 @@
 // Quarrel © 2022
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace Discord.API.Models.Enums.Messages
 {
  public enum ComponentType

src/API/Discord.API/Models/Enums/Messages/MessageFlags.cs

@@ -1,9 +1,5 @@
 // Quarrel © 2022
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace Discord.API.Models.Enums.Messages
 {
  public enum MessageFlags

src/API/Discord.API/Models/Enums/Users/UserStatus.cs

@@ -1,5 +1,7 @@
 // Quarrel © 2022
 
+using Quarrel.Attributes;
+
 namespace Discord.API.Models.Enums.Users
 {
  /// <summary>
@@ -10,31 +12,37 @@ public enum UserStatus
  /// <summary>
  /// The user is offline.
  /// </summary>
+ [StringValue("offline")]
  Offline,
 
  /// <summary>
  /// The user is online.
  /// </summary>
+ [StringValue("online")]
  Online,
 
  /// <summary>
  /// The user is idle.
  /// </summary>
+ [StringValue("idle")]
  Idle,
 
  /// <summary>
  /// The user is AFK.
  /// </summary>
+ [StringValue("afk")]
  AFK,
 
  /// <summary>
  /// The user is on do not disturb.
  /// </summary>
+ [StringValue("dnd")]
  DoNotDisturb,
 
  /// <summary>
  /// The user is marked offline.
  /// </summary>
+ [StringValue("invisible")]
  Invisible,
  }
 }

src/API/Discord.API/Models/Json/Applications/JsonApplication.cs

@@ -1,11 +1,12 @@
 // Quarrel © 2022
 
 using Discord.API.Models.Json.Users;
-using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Text.Json.Serialization;
 
+// JSON models don't need to respect standard nullable rules.
+#pragma warning disable CS8618
+
 namespace Discord.API.Models.Json.Applications
 {
  internal class JsonApplication

src/API/Discord.API/Models/Json/Messages/JsonMessageComponent.cs

@@ -1,11 +1,12 @@
 // Quarrel © 2022
 
 using Discord.API.Models.Enums.Messages;
-using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Text.Json.Serialization;
 
+// JSON models don't need to respect standard nullable rules.
+#pragma warning disable CS8618
+
 namespace Discord.API.Models.Json.Messages
 {
  internal class JsonMessageComponent

src/API/Discord.API/Models/Json/Messages/JsonMessageInteraction.cs

@@ -4,6 +4,9 @@
 using Discord.API.Models.Json.Users;
 using System.Text.Json.Serialization;
 
+// JSON models don't need to respect standard nullable rules.
+#pragma warning disable CS8618
+
 namespace Discord.API.Models.Json.Messages
 {
  internal class JsonMessageInteraction

src/API/Discord.API/Models/Json/Messages/JsonMessageStickerItem.cs

@@ -3,6 +3,9 @@
 using Discord.API.Models.Enums.Stickers;
 using System.Text.Json.Serialization;
 
+// JSON models don't need to respect standard nullable rules.
+#pragma warning disable CS8618
+
 namespace Discord.API.Models.Json.Messages
 {
  internal class JsonMessageStickerItem

src/API/Discord.API/Models/Json/Settings/JsonModifyUserSettings.cs

@@ -0,0 +1,15 @@
+// Quarrel © 2022
+
+using System.Text.Json.Serialization;
+
+// JSON models don't need to respect standard nullable rules.
+#pragma warning disable CS8618
+
+namespace Discord.API.Models.Json.Settings
+{
+ internal class JsonModifyUserSettings
+ {
+ [JsonPropertyName("status")]
+ public string Status { get; set; }
+ }
+}

src/API/Discord.API/Rest/DiscordRestFactory.cs

@@ -46,6 +46,14 @@ internal IChannelService GetChannelService()
  {
  return RestService.For<IChannelService>(GetHttpClient(), _settings);
  }
+
+ /// <summary>
+ /// Gets an instance of the <see cref="IUserService"/>.
+ /// </summary>
+ internal IUserService GetUserService()
+ {
+ return RestService.For<IUserService>(GetHttpClient(), _settings);
+ }
 
  private HttpClient GetHttpClient(bool authenticated = true)
  {

src/API/Discord.API/Rest/IChannelService.cs

@@ -16,5 +16,8 @@ internal interface IChannelService
 
  [Post("/v9/channels/{channelId}/messages")]
  Task<JsonMessage> CreateMessage([AliasAs("channelId")] ulong channelId, [Body] JsonMessageUpsert message);
+
+ [Delete("/v9/channels/{channelId}/messages/{messageId}")]
+ Task DeleteMessage([AliasAs("channelId")] ulong channelId, [AliasAs("messageId")] ulong messageId);
  }
 }

src/API/Discord.API/Rest/IUserService.cs

@@ -0,0 +1,15 @@
+// Quarrel © 2022
+
+using Discord.API.Models.Json.Settings;
+using Refit;
+using System.Threading.Tasks;
+
+namespace Discord.API.Rest
+{
+ internal interface IUserService
+ {
+ [Patch("/v6/users/@me/settings")]
+ [Headers("Content-Type: application/json;")]
+ Task UpdateSettings([Body] JsonModifyUserSettings settings);
+ }
+}

src/Libs/Quarrel.Common/Quarrel.Common.csproj

@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>netstandard2.0</TargetFramework>
+ <AssemblyName>Quarrel.Common</AssemblyName>
+ <RootNamespace>Quarrel</RootNamespace>
+ <Configurations>Debug;Insider;Alpha;Release</Configurations>
+ </PropertyGroup>
+
+</Project>

src/Libs/Quarrel.Markdown/Quarrel.Markdown.csproj

@@ -3814,11 +3814,6 @@
  <Content Include="Assets\Emoji\ae.svg" />
  <Content Include="Assets\Emoji\e50a.svg" />
  </ItemGroup>
- <ItemGroup>
- <Reference Include="Microsoft.Xaml.Interactivity">
- <HintPath>..\..\..\..\..\..\.nuget\packages\microsoft.xaml.behaviors.uwp.managed\2.0.1\lib\uap10.0\Microsoft.Xaml.Interactivity.dll</HintPath>
- </Reference>
- </ItemGroup>
  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
  <VisualStudioVersion>14.0</VisualStudioVersion>
  </PropertyGroup>

src/Libs/Quarrel.Markdown/Rendering/Elements/TimestampElement.cs

@@ -14,11 +14,11 @@ internal TimestampElement(Timestamp timestamp) : base(timestamp)
  {
  "F" or "" => timestamp.Time.ToString("F"),
  "D" => timestamp.Time.ToString("d MMMM yyyy"),
- "R" => timestamp.Time.Humanize(),
  "T" => timestamp.Time.ToString("T"),
  "d" => timestamp.Time.ToString("d"),
  "f" => timestamp.Time.ToString("MMMM yyyy HH:mm"),
  "t" => timestamp.Time.ToString("t"),
+ "R" or _ => timestamp.Time.Humanize(),
  };
  }
  }

src/Quarrel.Client/Models/Messages/Embeds/Attachment.cs

@@ -5,29 +5,51 @@
 
 namespace Quarrel.Client.Models.Messages.Embeds
 {
+ /// <summary>
+ /// An attachment in a message.
+ /// </summary>
  public class Attachment : SnowflakeItem
  {
  internal Attachment(JsonAttachment jsonAttachment, QuarrelClient context) :
  base(context)
  {
  Id = jsonAttachment.Id;
  Filename = jsonAttachment.Filename;
+ Size = jsonAttachment.Size;
  Url = jsonAttachment.Url;
  ProxyUrl = jsonAttachment.ProxyUrl;
  Height = jsonAttachment.Height;
  Width = jsonAttachment.Width;
  }
 
+ /// <summary>
+ /// Gets the name of the attached file.
+ /// </summary>
  public string Filename { get; }
 
+ /// <summary>
+ /// Gets the size of the attached file.
+ /// </summary>
  public ulong Size { get; }
 
+ /// <summary>
+ /// Gets the url of the attached file.
+ /// </summary>
  public string Url { get; }
 
+ /// <summary>
+ /// Gets the proxy url of the attached file.
+ /// </summary>
  public string ProxyUrl { get; }
 
+ /// <summary>
+ /// Gets the height of the attached file if the file is an image or video.
+ /// </summary>
  public int? Height { get; }
 
+ /// <summary>
+ /// Gets the width of the attached file if the file is an image or video.
+ /// </summary>
  public int? Width { get; }
  }
 }

src/Quarrel.Client/Models/Messages/Message.cs

@@ -8,6 +8,9 @@
 using Quarrel.Client.Models.Users;
 using System;
 
+// JSON models don't need to respect standard nullable rules.
+#pragma warning disable CS8618
+
 namespace Quarrel.Client.Models.Messages
 {
  /// <summary>
@@ -66,8 +69,10 @@ internal Message(JsonMessage jsonMessage, QuarrelClient context) :
  Interaction = jsonMessage.Interaction;
  }
 
- public ulong? ChannelId { get; private set; }
+ /// <inheritdoc/>
+ public ulong ChannelId { get; private set; }
 
+ /// <inheritdoc/>
  public ulong? GuildId { get; private set; }
 
  /// <inheritdoc/>
@@ -92,7 +97,10 @@ internal Message(JsonMessage jsonMessage, QuarrelClient context) :
  public DateTimeOffset? EditedTimestamp { get; private set; }
 
  /// <inheritdoc/>
- public User? Author { get; private set; }
+ public User Author { get; private set; }
+
+ /// <inheritdoc/>
+ public bool IsOwn => Author.Id == Context.CurrentUser?.Id;
 
  /// <inheritdoc/>
  public User[] Mentions { get; private set; }
@@ -108,5 +116,11 @@ internal Message(JsonMessage jsonMessage, QuarrelClient context) :
 
  /// <inheritdoc/>
  public ulong? WebhookId { get; private set; }
+
+ /// <inheritdoc/>
+ public Uri MessageUri
+ => new Uri($"https://discord.com/channels/{GuildDisplayId}/{ChannelId}/{Id}");
+
+ private string GuildDisplayId => GuildId.HasValue ? $"{GuildId.Value}" : "@me";
  }
 }