script/build-minimal-static-toxic.sh

@@ -114,6 +114,7 @@ apk add \
     libsodium-dev \
     libsodium-static \
     linux-headers \
+    msgpack-c-dev \
     ncurses-dev \
     ncurses-static \
     ncurses-terminfo \
@@ -136,27 +137,20 @@ mkdir -p "$BUILD_DIR"
 cd "$BUILD_DIR"
 
 # The git hash of the c-toxcore version we're using
-TOXCORE_VERSION="02996f06850fb565fa5520cb4e1daa8c616b41c1"
+TOXCORE_VERSION="v0.2.16"
 
-TOXCORE_FILENAME="toxcore-$TOXCORE_VERSION.tar.gz"
+# The sha256sum of the c-toxcore tarball for TOXCORE_VERSION
+TOXCORE_HASH="653aa42654b607f0940cecfac873e9ce55605119a90d1dc454d1090ff6ca29c0"
 
-wget --timeout=10 -O "$TOXCORE_FILENAME" "https://github.com/JFreegman/toxcore/archive/$TOXCORE_VERSION.tar.gz"
+TOXCORE_FILENAME="c-toxcore-$TOXCORE_VERSION.tar.gz"
+
+wget --timeout=10 -O "$TOXCORE_FILENAME" "https://github.com/TokTok/c-toxcore/archive/$TOXCORE_VERSION.tar.gz"
+check_sha256 "$TOXCORE_HASH" "$TOXCORE_FILENAME"
 tar -o -xf "$TOXCORE_FILENAME"
 rm "$TOXCORE_FILENAME"
-
-cd toxcore*
-mkdir -p "third_party" && cd "third_party"
-
-CMP_VERSION="074e0df43e8a61ea938c4f77f65d1fbccc0c3bf9"
-CMP_FILENAME="cmp-$CMP_VERSION.tar.gz"
-wget --timeout=10 -O "$CMP_FILENAME" "https://github.com/TokTok/cmp/archive/$CMP_VERSION.tar.gz"
-tar -o -xf "$CMP_FILENAME"
-
-mv cmp\-*/* "cmp/"
-cd ..
+cd c-toxcore*
 
 cmake -B_build -H. \
-      -DUSE_TEST_NETWORK=ON \
       -DENABLE_STATIC=ON \
       -DENABLE_SHARED=OFF \
       -DCMAKE_BUILD_TYPE=Release \

src/groupchats.c

@@ -1029,16 +1029,17 @@ void groupchat_onGroupPeerExit(ToxWindow *self, Tox *m, uint32_t groupnumber, ui
         if (length > 0) {
             line_info_add(self, true, name, NULL, DISCONNECTION, 0, RED, "[Quit]: %s", part_message);
             snprintf(log_str, sizeof(log_str), "has left the room (%s)", part_message);
-            write_to_log(log_str, name, self->chatwin->log, true);
-            sound_notify(self, silent, NT_WNDALERT_2, NULL);
         } else if (user_settings->show_group_connection_msg == SHOW_GROUP_CONNECTION_MSG_ON) {
             const char *exit_string = get_group_exit_string(exit_type);
             line_info_add(self, true, name, NULL, DISCONNECTION, 0, RED, "[%s]", exit_string);
             snprintf(log_str, sizeof(log_str), "[%s]", exit_string);
-            write_to_log(log_str, name, self->chatwin->log, true);
-            sound_notify(self, silent, NT_WNDALERT_2, NULL);
         }
 
+        if (user_settings->show_group_connection_msg == SHOW_GROUP_CONNECTION_MSG_ON) {
+            write_to_log(log_str, name, self->chatwin->log, true);
+        }
+
+        sound_notify(self, silent, NT_WNDALERT_2, NULL);
     }
 
     int peer_index = get_peer_index(groupnumber, peer_id);