flashii/sharp-chat
1
0
Fork 0
Code Pull requests Releases Activity

Fixed issues relating to event_sender_name being nullable for some reason.

Browse source
This commit is contained in:
flash 2023-11-04 23:37:02 +00:00
parent a7a05f04bd
commit 05fcbcb0f8
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SharpChat/EventStorage/MariaDBEventStorage.cs
View file

@ -62,7 +62,7 @@ namespace SharpChat.EventStorage
new MySqlParameter("flags", (byte)flags), new MySqlParameter("flags", (byte)flags),
new MySqlParameter("data", data == null ? "{}" : JsonSerializer.SerializeToUtf8Bytes(data)), new MySqlParameter("data", data == null ? "{}" : JsonSerializer.SerializeToUtf8Bytes(data)),
new MySqlParameter("sender", senderId < 1 ? null : senderId), new MySqlParameter("sender", senderId < 1 ? null : senderId),
new MySqlParameter("sender_name", string.IsNullOrWhiteSpace(senderName) ? null : senderName), new MySqlParameter("sender_name", senderName),
new MySqlParameter("sender_colour", senderColour.ToMisuzu()), new MySqlParameter("sender_colour", senderColour.ToMisuzu()),
new MySqlParameter("sender_rank", senderRank), new MySqlParameter("sender_rank", senderRank),
new MySqlParameter("sender_nick", string.IsNullOrWhiteSpace(senderNick) ? null : senderNick), new MySqlParameter("sender_nick", string.IsNullOrWhiteSpace(senderNick) ? null : senderNick),
@ -80,7 +80,7 @@ namespace SharpChat.EventStorage
id, type, id, type,
channel?.Name, channel?.Name,
user?.UserId ?? 0, user?.UserId ?? 0,
user?.UserName, user?.UserName ?? string.Empty,
user?.Colour ?? ChatColour.None, user?.Colour ?? ChatColour.None,
user?.Rank ?? 0, user?.Rank ?? 0,
user?.NickName, user?.NickName,
@ -122,7 +122,7 @@ namespace SharpChat.EventStorage
Encoding.ASCII.GetString((byte[])reader["event_type"]), Encoding.ASCII.GetString((byte[])reader["event_type"]),
reader.IsDBNull(reader.GetOrdinal("event_sender")) ? null : new ChatUser( reader.IsDBNull(reader.GetOrdinal("event_sender")) ? null : new ChatUser(
reader.GetInt64("event_sender"), reader.GetInt64("event_sender"),
reader.GetString("event_sender_name"), reader.IsDBNull(reader.GetOrdinal("event_sender_name")) ? string.Empty : reader.GetString("event_sender_name"),
ChatColour.FromMisuzu(reader.GetInt32("event_sender_colour")), ChatColour.FromMisuzu(reader.GetInt32("event_sender_colour")),
reader.GetInt32("event_sender_rank"), reader.GetInt32("event_sender_rank"),
(ChatUserPermissions)reader.GetInt32("event_sender_perms"), (ChatUserPermissions)reader.GetInt32("event_sender_perms"),