From 172f279dc0647a538b30e62c96bab8bb1b0c8960 Mon Sep 17 00:00:00 2001
From: jfreegman <jfreegman@gmail.com>
Date: Fri, 3 Mar 2023 15:53:22 -0500
Subject: [PATCH] Increase max group message length by four bytes

The max message length was reduced by 4 bytes to account for the pseudo message ID, which had unintended effects on clients. It makes more sense to increase the raw packet length by four and keep the max group message length the same as the max message length for friend chats.
---
 appveyor.yml                                        | 2 +-
 other/bootstrap_daemon/docker/tox-bootstrapd.sha256 | 2 +-
 toxcore/group_common.h                              | 2 +-
 toxcore/tox.h                                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 609753a3..6929217f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,7 +11,7 @@ environment:
 
 install:
   - set PATH=C:\Python311-x64\Scripts;%PATH%
-  - py -3 -m pip install conan
+  - py -3 -m pip install conan==1.59.0
   - git submodule update --init --recursive
 
 for:
diff --git a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
index a302ee38..c4ec0dc5 100644
--- a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
+++ b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
@@ -1 +1 @@
-b0fafb30bffe21889f06a95edd3867f29a2203d30c2d7e7bf3ef646267f08d64  /usr/local/bin/tox-bootstrapd
+62d2c7ab2a14d1f9b00acaf13813b3ea916ccfb2173c9ba95ac82a843a258119  /usr/local/bin/tox-bootstrapd
diff --git a/toxcore/group_common.h b/toxcore/group_common.h
index 86cfdefa..ef901e8a 100644
--- a/toxcore/group_common.h
+++ b/toxcore/group_common.h
@@ -21,7 +21,7 @@
 #define MAX_GC_TOPIC_SIZE 512
 #define MAX_GC_GROUP_NAME_SIZE 48
 #define GC_MESSAGE_PSEUDO_ID_SIZE 4
-#define GROUP_MAX_MESSAGE_LENGTH  1368
+#define GROUP_MAX_MESSAGE_LENGTH  1372
 
 /* Max size of a packet chunk. Packets larger than this must be split up.
  *
diff --git a/toxcore/tox.h b/toxcore/tox.h
index b9dbae0d..05134c2b 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -3301,7 +3301,7 @@ uint32_t tox_group_max_part_length(void);
 /**
  * Maximum length of a group text message.
  */
-#define TOX_GROUP_MAX_MESSAGE_LENGTH    1368
+#define TOX_GROUP_MAX_MESSAGE_LENGTH    1372
 
 /**
  * Maximum length of a group custom lossy packet.