JonKazama-Hellion/HellionChat
1
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 28 Activity

Merge pull request #45

Browse Source 
fix: allow emotes in ExtraChat
This commit is contained in:
Infi
2024-05-13 02:57:35 +02:00
committed by GitHub
parent dba01de388 63bf253129
commit 2595f96d9c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChatTwo/Message.cs
+7 -6
View File
@@ -74,16 +74,17 @@ internal class Message
internal Message(ulong receiver, ulong contentId, ChatCode code, List<Chunk> sender, List<Chunk> content, SeString senderSource, SeString contentSource) internal Message(ulong receiver, ulong contentId, ChatCode code, List<Chunk> sender, List<Chunk> content, SeString senderSource, SeString contentSource)
{ {
var extraChatChannel = ExtractExtraChatChannel(contentSource);
Receiver = receiver; Receiver = receiver;
ContentId = contentId; ContentId = contentId;
Date = DateTimeOffset.UtcNow; Date = DateTimeOffset.UtcNow;
Code = code; Code = code;
Sender = sender; Sender = sender;
Content = CheckMessageContent(content); Content = CheckMessageContent(content, extraChatChannel);
SenderSource = senderSource; SenderSource = senderSource;
ContentSource = contentSource; ContentSource = contentSource;
SortCode = new SortCode(Code.Type, Code.Source); SortCode = new SortCode(Code.Type, Code.Source);
ExtraChatChannel = ExtractExtraChatChannel(); ExtraChatChannel = extraChatChannel;
Hash = GenerateHash(); Hash = GenerateHash();
foreach (var chunk in sender.Concat(content)) foreach (var chunk in sender.Concat(content))
@@ -119,9 +120,9 @@ internal class Message
^ string.Join("", Content.Select(c => c.StringValue())).GetHashCode(); ^ string.Join("", Content.Select(c => c.StringValue())).GetHashCode();
} }
private Guid ExtractExtraChatChannel() private static Guid ExtractExtraChatChannel(SeString contentSource)
{ {
if (ContentSource.Payloads.Count > 0 && ContentSource.Payloads[0] is RawPayload raw) if (contentSource.Payloads.Count > 0 && contentSource.Payloads[0] is RawPayload raw)
{ {
// this does an encode and clone every time it's accessed, so cache // this does an encode and clone every time it's accessed, so cache
var data = raw.Data; var data = raw.Data;
@@ -132,7 +133,7 @@ internal class Message
return Guid.Empty; return Guid.Empty;
} }
private List<Chunk> CheckMessageContent(List<Chunk> oldChunks) private List<Chunk> CheckMessageContent(List<Chunk> oldChunks, Guid extraChatChannel)
{ {
var newChunks = new List<Chunk>(); var newChunks = new List<Chunk>();
void AddChunkWithMessage(TextChunk chunk) void AddChunkWithMessage(TextChunk chunk)
@@ -181,7 +182,7 @@ internal class Message
} }
} }
var checkForEmotes = Code.IsPlayerMessage() && Plugin.Config.ShowEmotes; var checkForEmotes = (Code.IsPlayerMessage() || extraChatChannel != Guid.Empty) && Plugin.Config.ShowEmotes;
foreach (var chunk in oldChunks) foreach (var chunk in oldChunks)
{ {
// Use as is if it's not a text chunk or it already has a payload. // Use as is if it's not a text chunk or it already has a payload.