v1.9.0

Fluxer.Net/Data/Gifs/FavouriteGif.cs → Fluxer.Net/Data/Gifs/FavoriteGif.cs

@@ -1,7 +1,7 @@
 namespace Fluxer.Net;
 
 /// <inheritdoc />
-public class FavouriteGif : Entity, IFavouriteGif
+public class FavoriteGif : Entity, IFavoriteGif
 {
     /// <inheritdoc />
     public string Id { get; internal set; }
@@ -54,19 +54,19 @@ public class FavouriteGif : Entity, IFavouriteGif
     /// <inheritdoc />
     public string? TenorSlugId { get; internal set; }
 
-    internal FavouriteGif(FluxerBaseClient client) : base(client)
+    internal FavoriteGif(FluxerBaseClient client) : base(client)
     {
 
     }
 
-    public static FavouriteGif Create(FluxerBaseClient client, FavouriteGifJson json)
+    public static FavoriteGif Create(FluxerBaseClient client, FavoriteGifJson json)
     {
-        FavouriteGif data = new FavouriteGif(client);
+        FavoriteGif data = new FavoriteGif(client);
         data.Update(client, json);
         return data;
     }
 
-    internal void Update(FluxerBaseClient client, FavouriteGifJson json)
+    internal void Update(FluxerBaseClient client, FavoriteGifJson json)
     {
         Id = json.Id;
         UserId = json.UserId;

Fluxer.Net/Data/Gifs/FavouriteGifJson.cs → Fluxer.Net/Data/Gifs/FavoriteGifJson.cs

@@ -3,7 +3,7 @@
 namespace Fluxer.Net;
 
 /// <inheritdoc />
-public class FavouriteGifJson : IFavouriteGif
+public class FavoriteGifJson : IFavoriteGif
 {
     /// <inheritdoc />
     [JsonProperty("id")]

Fluxer.Net/Data/Gifs/IFavouriteGif.cs → Fluxer.Net/Data/Gifs/IFavoriteGif.cs

@@ -1,6 +1,6 @@
 namespace Fluxer.Net;
 
-public interface IFavouriteGif
+public interface IFavoriteGif
 {
     /// <summary>
     /// Unique identifier for the favorite gif.

Fluxer.Net/Data/Guilds/Settings/MuteConfigurationJson.cs

@@ -5,8 +5,8 @@ namespace Fluxer.Net;
 public class MuteConfigurationJson
 {
     [JsonProperty("end_time")]
-    public DateTime? EndTime { get; set; }
+    public DateTime? EndAt { get; set; }
 
     [JsonProperty("selected_time_window")]
-    public int? SelectedTimeWindow { get; set; }
+    public int? SelectedTimeSeconds { get; set; }
 }

Fluxer.Net/Data/Users/IUserGuildFolder.cs

@@ -0,0 +1,12 @@
+namespace Fluxer.Net;
+
+public interface IUserGuildFolder
+{
+    int Id { get; }
+
+    string? Name { get; }
+
+    int? Color { get; }
+
+    List<ulong>? GuildIds { get; }
+}

Fluxer.Net/Data/Users/IUserGuildSettings.cs

@@ -0,0 +1,24 @@
+namespace Fluxer.Net;
+
+public interface IUserGuildSettings
+{
+    Dictionary<ulong, GuildChannelOverrideJson>? ChannelOverrides { get; }
+
+    ulong GuildId { get; }
+
+    bool HideMutedChannels { get; }
+
+    NotificationType MessageNotifications { get; }
+
+    bool MobilePush { get; }
+
+    MuteConfigurationJson? MuteConfig { get; }
+
+    bool Muted { get; }
+
+    bool SuppressEveryone { get; }
+
+    bool SuppressRoles { get; }
+
+    int Version { get; }
+}

Fluxer.Net/Data/Users/IUserSettings.cs

@@ -106,7 +106,7 @@ public interface IUserSettings
     /// <summary>
     /// The folder structure for organizing guilds in the sidebar.
     /// </summary>
-    List<UserGuildFolder>? GuildFolders { get; }
+    List<UserGuildFolderJson>? GuildFolders { get; }
 
     /// <summary>
     /// The idle timeout in seconds before going AFK.

Fluxer.Net/Data/Users/NotificationType.cs

@@ -0,0 +1,9 @@
+namespace Fluxer.Net;
+
+public enum NotificationType
+{
+    AllMessages = 0,
+    MentionsOnly = 1,
+    NoMessages = 2,
+    InheritParent = 3,
+}

Fluxer.Net/Data/Users/RelationshipJson.cs

@@ -4,18 +4,15 @@ namespace Fluxer.Net;
 
 public class RelationshipJson
 {
-    [JsonProperty("source_user_id")]
-    public ulong SourceUserId { get; set; }
-
-    [JsonProperty("target_user_id")]
-    public ulong TargetUserId { get; set; }
+    [JsonProperty("id")]
+    public ulong Id { get; set; }
 
     [JsonProperty("type")]
-    public int Type { get; set; }
+    public RelationshipType Type { get; set; }
 
     [JsonProperty("nickname")]
     public string? Nickname { get; set; }
 
     [JsonProperty("since")]
-    public DateTime? Since { get; set; }
+    public DateTime? SinceAt { get; set; }
 }

Fluxer.Net/Data/Users/UserGuildFolder.cs → Fluxer.Net/Data/Users/UserGuildFolderJson.cs

@@ -2,17 +2,22 @@
 
 namespace Fluxer.Net;
 
-public class UserGuildFolder
+/// <inheritdoc />
+public class UserGuildFolderJson : IUserGuildFolder
 {
-    [JsonProperty("folder_id")]
-    public int FolderId { get; set; }
+    /// <inheritdoc />
+    [JsonProperty("id")]
+    public int Id { get; set; }
 
+    /// <inheritdoc />
     [JsonProperty("name")]
     public string? Name { get; set; }
 
+    /// <inheritdoc />
     [JsonProperty("color")]
     public int? Color { get; set; }
 
+    /// <inheritdoc />
     [JsonProperty("guild_ids")]
     public List<ulong>? GuildIds { get; set; }
 }

Fluxer.Net/Data/Users/UserGuildSettings.cs → Fluxer.Net/Data/Users/UserGuildSettingsJson.cs

@@ -2,38 +2,46 @@
 
 namespace Fluxer.Net;
 
-public class UserGuildSettings
+/// <inheritdoc />
+public class UserGuildSettingsJson : IUserGuildSettings
 {
-    [JsonProperty("user_id")]
-    public ulong UserId { get; set; }
+    /// <inheritdoc />
+    [JsonProperty("channel_overrides")]
+    public Dictionary<ulong, GuildChannelOverrideJson>? ChannelOverrides { get; set; }
 
+    /// <inheritdoc />
     [JsonProperty("guild_id")]
     public ulong GuildId { get; set; }
 
+    /// <inheritdoc />
+    [JsonProperty("hide_muted_channels")]
+    public bool HideMutedChannels { get; set; }
+
+    /// <inheritdoc />
     [JsonProperty("message_notifications")]
-    public int? MessageNotifications { get; set; }
+    public NotificationType MessageNotifications { get; set; }
 
-    [JsonProperty("muted")]
-    public bool Muted { get; set; }
+    /// <inheritdoc />
+    [JsonProperty("mobile_push")]
+    public bool MobilePush { get; set; }
 
+    /// <inheritdoc />
     [JsonProperty("mute_config")]
     public MuteConfigurationJson? MuteConfig { get; set; }
 
-    [JsonProperty("mobile_push")]
-    public bool MobilePush { get; set; }
+    /// <inheritdoc />
+    [JsonProperty("muted")]
+    public bool Muted { get; set; }
 
+    /// <inheritdoc />
     [JsonProperty("suppress_everyone")]
     public bool SuppressEveryone { get; set; }
 
+    /// <inheritdoc />
     [JsonProperty("suppress_roles")]
     public bool SuppressRoles { get; set; }
 
-    [JsonProperty("hide_muted_channels")]
-    public bool HideMutedChannels { get; set; }
-
-    [JsonProperty("channel_overrides")]
-    public Dictionary<ulong, GuildChannelOverrideJson>? ChannelOverrides { get; set; }
-
+    /// <inheritdoc />
     [JsonProperty("version")]
     public int Version { get; set; }
 }

Fluxer.Net/Data/Users/UserSettings.cs

@@ -70,7 +70,7 @@ public class UserSettings : Entity, IUserSettings
     public List<ulong>? GuildPositions { get; set; }
 
     /// <inheritdoc />
-    public List<UserGuildFolder>? GuildFolders { get; set; }
+    public List<UserGuildFolderJson>? GuildFolders { get; set; }
 
     /// <inheritdoc />
     public int AfkTimeout { get; set; }

Fluxer.Net/Data/Users/UserSettingsJson.cs

@@ -95,7 +95,7 @@ public class UserSettingsJson : IUserSettings
 
     /// <inheritdoc />
     [JsonProperty("guild_folders")]
-    public List<UserGuildFolder>? GuildFolders { get; set; }
+    public List<UserGuildFolderJson>? GuildFolders { get; set; }
 
     /// <inheritdoc />
     [JsonProperty("afk_timeout")]