StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5761

Browse Source 
jenli669 (2):
      fix(groups): remove logic that blocks parseConferenceSendMessageError
      fix(groups): reduce group message size limit by 50
This commit is contained in:
sudden6 2019-08-03 09:11:23 +02:00
commit 4430883152
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/core.cpp
View File

@ -723,9 +723,8 @@ void Core::sendGroupMessageWithType(int groupId, const QString& message, Tox_Mes
ToxString cMsg(message); ToxString cMsg(message);
Tox_Err_Conference_Send_Message error; Tox_Err_Conference_Send_Message error;
bool ok = tox_conference_send_message(tox.get(), groupId, type, cMsg.data(), cMsg.size(), &error);
tox_conference_send_message(tox.get(), groupId, type, cMsg.data(), cMsg.size(), &error); if (!parseConferenceSendMessageError(error)) {
if (!ok || !parseConferenceSendMessageError(error)) {
emit groupSentFailed(groupId); emit groupSentFailed(groupId);
return; return;
} }
@ -1451,7 +1450,17 @@ QStringList Core::splitMessage(const QString& message)
QStringList splittedMsgs; QStringList splittedMsgs;
QByteArray ba_message{message.toUtf8()}; QByteArray ba_message{message.toUtf8()};
const auto maxLen = tox_max_message_length(); /*
* TODO: Remove this hack; the reported max message length we receive from c-toxcore
* as of 08-02-2019 is inaccurate, causing us to generate too large messages when splitting
* them up.
*
* The inconsistency lies in c-toxcore group.c:2480 using MAX_GROUP_MESSAGE_DATA_LEN to verify
* message size is within limit, but tox_max_message_length giving a different size limit to us.
*
* (uint32_t tox_max_message_length(void); declared in tox.h, unable to see explicit definition)
*/
const auto maxLen = tox_max_message_length() - 50;
while (ba_message.size() > maxLen) { while (ba_message.size() > maxLen) {
int splitPos = ba_message.lastIndexOf('\n', maxLen - 1); int splitPos = ba_message.lastIndexOf('\n', maxLen - 1);