Merge pull request #610 from UWPCommunity/rewrite/main

Alpha update

Author: Avid29

Quarrel.sln

@@ -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);
         }
     }
 }

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

@@ -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/Discord.API.Status.csproj

@@ -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/Datum.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.Status/Models/Summary.cs

@@ -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/Discord.API.csproj

@@ -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/Gateways/Gateway.Requests.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/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 MessageFlags

src/API/Discord.API/Models/Enums/Messages/MessageFlags.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,
     }
 }