Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-13 23:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split steam messages with respect to newlines (#1329)

Browse Source 
* Split steam messages with respect to newlines

* minor fixes and code style

* handle group messages too + code style

* optimize fallback

* dumbest changes in the history of the Earth

* add newline before ...

* handle edge cases properly
This commit is contained in:
Ryzhehvost
2019-07-14 19:30:17 +03:00
committed by Łukasz Domeradzki
parent eec39158c5
commit 5c93be940e
1 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
ArchiSteamFarm/Bot.cs
View File

@@ -1173,16 +1173,34 @@ namespace ArchiSteamFarm {
// We must escape our message prior to sending it
message = Escape(message);
for (int i = 0; i < message.Length; i += maxMessageLength) {
string messagePart = message.Substring(i, Math.Min(maxMessageLength, message.Length - i));
int i = 0;
while (i < message.Length) {
int partLength;
bool copyNewline = false;
if (message.Length - i > maxMessageLength) {
int lastNewLine = message.LastIndexOf(Environment.NewLine, i + maxMessageLength - Environment.NewLine.Length, maxMessageLength - Environment.NewLine.Length, StringComparison.Ordinal);
if (lastNewLine > i) {
partLength = lastNewLine - i + Environment.NewLine.Length;
copyNewline = true;
} else {
partLength = maxMessageLength;
}
} else {
partLength = message.Length - i;
}
// If our message is of max length and ends with a single '\' then we can't split it here, it escapes the next character
if ((messagePart.Length >= maxMessageLength) && (messagePart[messagePart.Length - 1] == '\\') && (messagePart[messagePart.Length - 2] != '\\')) {
if ((partLength >= maxMessageLength) && (message[i + partLength - 1] == '\\') && (message[i + partLength - 2] != '\\')) {
// Instead, we'll cut this message one char short and include the rest in next iteration
messagePart = messagePart.Remove(messagePart.Length - 1);
i--;
partLength--;
}
string messagePart = message.Substring(i, partLength);
messagePart = ASF.GlobalConfig.SteamMessagePrefix + (i > 0 ? "…" : "") + messagePart + (maxMessageLength < message.Length - i ? "…" : "");
await MessagingSemaphore.WaitAsync().ConfigureAwait(false);
@@ -1219,6 +1237,8 @@ namespace ArchiSteamFarm {
} finally {
MessagingSemaphore.Release();
}
i += partLength - (copyNewline ? Environment.NewLine.Length : 0);
}
return true;
@@ -1242,16 +1262,34 @@ namespace ArchiSteamFarm {
// We must escape our message prior to sending it
message = Escape(message);
for (int i = 0; i < message.Length; i += maxMessageLength) {
string messagePart = message.Substring(i, Math.Min(maxMessageLength, message.Length - i));
int i = 0;
while (i < message.Length) {
int partLength;
bool copyNewline = false;
if (message.Length - i > maxMessageLength) {
int lastNewLine = message.LastIndexOf(Environment.NewLine, i + maxMessageLength - Environment.NewLine.Length, maxMessageLength - Environment.NewLine.Length, StringComparison.Ordinal);
if (lastNewLine > i) {
partLength = lastNewLine - i + Environment.NewLine.Length;
copyNewline = true;
} else {
partLength = maxMessageLength;
}
} else {
partLength = message.Length - i;
}
// If our message is of max length and ends with a single '\' then we can't split it here, it escapes the next character
if ((messagePart.Length >= maxMessageLength) && (messagePart[messagePart.Length - 1] == '\\') && (messagePart[messagePart.Length - 2] != '\\')) {
if ((partLength >= maxMessageLength) && (message[i + partLength - 1] == '\\') && (message[i + partLength - 2] != '\\')) {
// Instead, we'll cut this message one char short and include the rest in next iteration
messagePart = messagePart.Remove(messagePart.Length - 1);
i--;
partLength--;
}
string messagePart = message.Substring(i, partLength);
messagePart = ASF.GlobalConfig.SteamMessagePrefix + (i > 0 ? "…" : "") + messagePart + (maxMessageLength < message.Length - i ? "…" : "");
await MessagingSemaphore.WaitAsync().ConfigureAwait(false);
@@ -1288,6 +1326,8 @@ namespace ArchiSteamFarm {
} finally {
MessagingSemaphore.Release();
}
i += partLength - (copyNewline ? Environment.NewLine.Length : 0);
}
return true;