Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2025-12-16 14:30:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc cleanup

Browse Source
This commit is contained in:
Archi
2021-06-30 13:10:05 +02:00
parent 807db7f365
commit ef0509998e
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ArchiSteamFarm.Tests/SteamChatMessage.cs
View File

@@ -50,9 +50,6 @@ namespace ArchiSteamFarm.Tests {
[TestMethod] [TestMethod]
public void ContinuationCharacterSizeIsProperlyCalculated() => Assert.AreEqual(ContinuationCharacterBytes, Encoding.UTF8.GetByteCount(ContinuationCharacter.ToString())); public void ContinuationCharacterSizeIsProperlyCalculated() => Assert.AreEqual(ContinuationCharacterBytes, Encoding.UTF8.GetByteCount(ContinuationCharacter.ToString()));
[TestMethod]
public void ParagraphCharacterSizeIsLessOrEqualToContinuationCharacterSize() => Assert.IsTrue(ContinuationCharacterBytes >= Encoding.UTF8.GetByteCount(ParagraphCharacter.ToString()));
[TestMethod] [TestMethod]
public async Task DoesntSkipEmptyNewlines() { public async Task DoesntSkipEmptyNewlines() {
string message = "asdf" + Environment.NewLine + Environment.NewLine + "asdf"; string message = "asdf" + Environment.NewLine + Environment.NewLine + "asdf";
@@ -148,6 +145,9 @@ namespace ArchiSteamFarm.Tests {
Assert.AreEqual(message, output.First()); Assert.AreEqual(message, output.First());
} }
[TestMethod]
public void ParagraphCharacterSizeIsLessOrEqualToContinuationCharacterSize() => Assert.IsTrue(ContinuationCharacterBytes >= Encoding.UTF8.GetByteCount(ParagraphCharacter.ToString()));
[TestMethod] [TestMethod]
public async Task ProperlyEscapesCharacters() { public async Task ProperlyEscapesCharacters() {
const string message = @"[b]bold[/b] \n"; const string message = @"[b]bold[/b] \n";

9
ArchiSteamFarm/Steam/Integration/SteamChatMessage.cs
View File

@@ -33,11 +33,11 @@ namespace ArchiSteamFarm.Steam.Integration {
internal static class SteamChatMessage { internal static class SteamChatMessage {
internal const char ContinuationCharacter = '…'; // A character used for indicating that the next newline part is a continuation of the previous line internal const char ContinuationCharacter = '…'; // A character used for indicating that the next newline part is a continuation of the previous line
internal const byte ContinuationCharacterBytes = 3; // The continuation character specified above uses 3 bytes in UTF-8 internal const byte ContinuationCharacterBytes = 3; // The continuation character specified above uses 3 bytes in UTF-8
internal const char ParagraphCharacter = '¶'; // A character used for indicating that this is not the last part of message (2 bytes, so it fits in ContinuationCharacterBytes)
internal const ushort MaxMessageBytesForLimitedAccounts = 1945; // This is a limitation enforced by Steam internal const ushort MaxMessageBytesForLimitedAccounts = 1945; // This is a limitation enforced by Steam
internal const ushort MaxMessageBytesForUnlimitedAccounts = 6340; // This is a limitation enforced by Steam internal const ushort MaxMessageBytesForUnlimitedAccounts = 6340; // This is a limitation enforced by Steam
internal const ushort MaxMessagePrefixBytes = MaxMessageBytesForLimitedAccounts - ReservedContinuationMessageBytes - ReservedEscapeMessageBytes; // Simplified calculation, nobody should be using prefixes even close to that anyway internal const ushort MaxMessagePrefixBytes = MaxMessageBytesForLimitedAccounts - ReservedContinuationMessageBytes - ReservedEscapeMessageBytes; // Simplified calculation, nobody should be using prefixes even close to that anyway
internal const byte NewlineWeight = 61; // This defines how much weight a newline character is adding to the output, limitation enforced by Steam internal const byte NewlineWeight = 61; // This defines how much weight a newline character is adding to the output, limitation enforced by Steam
internal const char ParagraphCharacter = '¶'; // A character used for indicating that this is not the last part of message (2 bytes, so it fits in ContinuationCharacterBytes)
internal const byte ReservedContinuationMessageBytes = ContinuationCharacterBytes * 2; // Up to 2 optional continuation characters internal const byte ReservedContinuationMessageBytes = ContinuationCharacterBytes * 2; // Up to 2 optional continuation characters
internal const byte ReservedEscapeMessageBytes = 5; // 2 characters total, escape one '\' of 1 byte and real one of up to 4 bytes internal const byte ReservedEscapeMessageBytes = 5; // 2 characters total, escape one '\' of 1 byte and real one of up to 4 bytes
@@ -108,6 +108,7 @@ namespace ArchiSteamFarm.Steam.Integration {
if (messagePart.Length > prefixLength) { if (messagePart.Length > prefixLength) {
if (messagePartBytes + NewlineWeight + lineBytes.Length > maxMessageBytes) { if (messagePartBytes + NewlineWeight + lineBytes.Length > maxMessageBytes) {
messagePart.Append(ParagraphCharacter); messagePart.Append(ParagraphCharacter);
yield return messagePart.ToString(); yield return messagePart.ToString();
messagePartBytes = prefixBytes; messagePartBytes = prefixBytes;
@@ -156,7 +157,11 @@ namespace ArchiSteamFarm.Steam.Integration {
charPool.Return(lineChunk); charPool.Return(lineChunk);
} }
bool midLineSplitting = false;
if (lineBytesRead < lineBytes.Length) { if (lineBytesRead < lineBytes.Length) {
midLineSplitting = true;
messagePartBytes += ContinuationCharacterBytes; messagePartBytes += ContinuationCharacterBytes;
messagePart.Append(ContinuationCharacter); messagePart.Append(ContinuationCharacter);
} }
@@ -166,7 +171,7 @@ namespace ArchiSteamFarm.Steam.Integration {
continue; continue;
} }
if (stringReader.Peek() != -1 && messagePart[messagePart.Length-1] != ContinuationCharacter) { if ((stringReader.Peek() != -1) && !midLineSplitting) {
messagePart.Append(ParagraphCharacter); messagePart.Append(ParagraphCharacter);
} }