Salastil/KfChatDotNet
1
0
Fork 0
mirror of https://github.com/barelyprofessional/KfChatDotNet.git synced 2026-05-02 04:22:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Big update. Replaced Newtonsoft with System.Text.Json where possible, removed Spectre, tried to suppress the pile of compiler warnings I get on the GUI project, and tried to correct an issue where sometimes the session token retrieved is not usable.

Browse Source
This commit is contained in:
barelyprofessional
2024-06-14 23:03:05 +08:00
parent 98f7b2b27e
commit cdad1d6549
21 changed files with 281 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
KfChatDotNetWsClient/Models/Json/DeleteMessagesJsonModel.cs
View File

@@ -1,9 +1,9 @@
using Newtonsoft.Json;
using System.Text.Json.Serialization;
namespace KfChatDotNetWsClient.Models.Json;
public class DeleteMessagesJsonModel
{
[JsonProperty("delete")]
[JsonPropertyName("delete")]
public List<int> MessageIdsToDelete { get; set; }
}

6
KfChatDotNetWsClient/Models/Json/EditMessageJsonModel.cs
View File

@@ -1,12 +1,12 @@
using Newtonsoft.Json;
using System.Text.Json.Serialization;
namespace KfChatDotNetWsClient.Models.Json;
public class EditMessageJsonModel
{
[JsonProperty("id")]
[JsonPropertyName("id")]
public int Id { get; set; }
[JsonProperty("message")]
[JsonPropertyName("message")]
public string Message { get; set; }
}

25
KfChatDotNetWsClient/Models/Json/MessagesJsonModel.cs
View File

@@ -1,5 +1,4 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using System.Text.Json.Serialization;
namespace KfChatDotNetWsClient.Models.Json;
@@ -28,32 +27,32 @@ public class MessagesJsonModel
{
public class AuthorModel
{
[JsonProperty("id")]
[JsonPropertyName("id")]
public int Id { get; set; }
[JsonProperty("username")]
[JsonPropertyName("username")]
public string Username { get; set; }
[JsonProperty("avatar_url")]
[JsonPropertyName("avatar_url")]
public Uri AvatarUrl { get; set; }
}
public class MessageModel
{
[JsonProperty("author")]
[JsonPropertyName("author")]
public AuthorModel Author { get; set; }
[JsonProperty("message")]
[JsonPropertyName("message")]
public string Message { get; set; }
[JsonProperty("message_id")]
[JsonPropertyName("message_id")]
public int MessageId { get; set; }
[JsonProperty("message_edit_date")]
[JsonPropertyName("message_edit_date")]
public int MessageEditDate { get; set; }
[JsonProperty("message_date")]
[JsonPropertyName("message_date")]
public int MessageDate { get; set; }
[JsonProperty("message_raw")]
[JsonPropertyName("message_raw")]
public string MessageRaw { get; set; }
[JsonProperty("room_id")]
[JsonPropertyName("room_id")]
public int RoomId { get; set; }
}
[JsonProperty("messages")]
[JsonPropertyName("messages")]
public List<MessageModel> Messages { get; set; }
}

13
KfChatDotNetWsClient/Models/Json/UsersJsonModel.cs
View File

@@ -1,5 +1,4 @@
using Newtonsoft.Json;
using System.Text.Json.Serialization;
namespace KfChatDotNetWsClient.Models.Json;
// {
@@ -17,16 +16,16 @@ public class UsersJsonModel
{
public class UserModel
{
[JsonProperty("id")]
[JsonPropertyName("id")]
public int Id { get; set; }
[JsonProperty("username")]
[JsonPropertyName("username")]
public string Username { get; set; }
[JsonProperty("avatar_url")]
[JsonPropertyName("avatar_url")]
public Uri AvatarUrl { get; set; }
[JsonProperty("last_activity")]
[JsonPropertyName("last_activity")]
public int LastActivity { get; set; }
}
[JsonProperty("users")]
[JsonPropertyName("users")]
public Dictionary<string, UserModel> Users { get; set; }
}