Fix static build script

doc/toxic.conf.5

@@ -2,12 +2,12 @@
 .\"     Title: toxic.conf
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2021-05-24
+.\"      Date: 2020-11-12
 .\"    Manual: Toxic Manual
 .\"    Source: toxic __VERSION__
 .\"  Language: English
 .\"
-.TH "TOXIC\&.CONF" "5" "2021\-05\-24" "toxic __VERSION__" "Toxic Manual"
+.TH "TOXIC\&.CONF" "5" "2020\-11\-12" "toxic __VERSION__" "Toxic Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -138,6 +138,11 @@ Show welcome message on startup\&. true or false
 Enable friend connection change notifications\&. true or false
 .RE
 .PP
+\fBshow_group_connection_msg\fR
+.RS 4
+Enable group connection change notifications (does not include quit messages)\&. true or false
+.RE
+.PP
 \fBnodelist_update_freq\fR
 .RS 4
 How often in days to update the DHT nodes list\&. (integer; 0 to disable)

doc/toxic.conf.5.asc

@@ -87,6 +87,9 @@ OPTIONS
     *show_connection_msg*;;
         Enable friend connection change notifications. true or false
 
+    *show_group_connection_msg*;;
+        Enable group connection change notifications (does not include quit messages). true or false
+
     *nodelist_update_freq*;;
         How often in days to update the DHT nodes list. (integer; 0 to disable)
 

misc/toxic.conf.example

@@ -56,6 +56,9 @@ ui = {
   // true to show friend connection change messages on the home screen
   show_connection_msg=true;
 
+  // true to show peer connection change messages in groups (setting to false does not include user quit messages)
+  show_group_connection_msg=true;
+
   // How often in days to update the DHT nodes list. (0 to disable updates)
   nodeslist_update_freq=7;
 

script/build-minimal-static-toxic.sh

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

src/bootstrap.c

@@ -601,6 +601,7 @@ int load_DHT_nodeslist(void)
     Nodes.count = 2;
 
 #if 0
+
     if (thread_data.active) {
         return -1;
     }
@@ -623,6 +624,7 @@ int load_DHT_nodeslist(void)
         thread_data.active = false;
         return -5;
     }
+
 #endif
 
     return 0;

src/groupchats.c

@@ -991,7 +991,9 @@ static void groupchat_onGroupPeerJoin(ToxWindow *self, Tox *m, uint32_t groupnum
             ++chat->max_idx;
         }
 
-        if (timed_out(chat->time_connected, 60)) {   /* ignore join messages when we first connect to the group */
+        if (timed_out(chat->time_connected, 60)
+                && user_settings->show_group_connection_msg ==
+                SHOW_GROUP_CONNECTION_MSG_ON) {   /* ignore join messages when we first connect to the group */
             line_info_add(self, true, peer->name, NULL, CONNECTION, 0, GREEN, "has joined the room");
 
             write_to_log("has joined the room", peer->name, self->chatwin->log, true);
@@ -1027,14 +1029,16 @@ 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);
-        } else {
+            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);
         }
 
-        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);

src/settings.c

@@ -63,6 +63,7 @@ static struct ui_strings {
     const char *show_typing_other;
     const char *show_welcome_msg;
     const char *show_connection_msg;
+    const char *show_group_connection_msg;
     const char *nodeslist_update_freq;
     const char *autosave_freq;
 
@@ -99,6 +100,7 @@ static struct ui_strings {
     "show_typing_other",
     "show_welcome_msg",
     "show_connection_msg",
+    "show_group_connection_msg",
     "nodeslist_update_freq",
     "autosave_freq",
     "line_join",
@@ -136,6 +138,7 @@ static void ui_defaults(struct user_settings *settings)
     settings->show_typing_other = SHOW_TYPING_ON;
     settings->show_welcome_msg = SHOW_WELCOME_MSG_ON;
     settings->show_connection_msg = SHOW_CONNECTION_MSG_ON;
+    settings->show_group_connection_msg = SHOW_GROUP_CONNECTION_MSG_ON;
     settings->nodeslist_update_freq = 1;
     settings->autosave_freq = 600;
 
@@ -405,6 +408,7 @@ int settings_load(struct user_settings *s, const char *patharg)
         config_setting_lookup_bool(setting, ui_strings.show_typing_other, &s->show_typing_other);
         config_setting_lookup_bool(setting, ui_strings.show_welcome_msg, &s->show_welcome_msg);
         config_setting_lookup_bool(setting, ui_strings.show_connection_msg, &s->show_connection_msg);
+        config_setting_lookup_bool(setting, ui_strings.show_group_connection_msg, &s->show_group_connection_msg);
 
         config_setting_lookup_int(setting, ui_strings.history_size, &s->history_size);
         config_setting_lookup_int(setting, ui_strings.notification_timeout, &s->notification_timeout);

src/settings.h

@@ -54,6 +54,7 @@ struct user_settings {
     int show_typing_other; /* boolean */
     int show_welcome_msg;  /* boolean */
     int show_connection_msg;  /* boolean */
+    int show_group_connection_msg;  /* boolean */
     int nodeslist_update_freq;  /* int (<= 0 to disable updates) */
     int autosave_freq; /* int (<= 0 to disable autosave) */
 
@@ -122,6 +123,9 @@ enum settings_values {
     SHOW_CONNECTION_MSG_OFF = 0,
     SHOW_CONNECTION_MSG_ON = 1,
 
+    SHOW_GROUP_CONNECTION_MSG_OFF = 0,
+    SHOW_GROUP_CONNECTION_MSG_ON = 1,
+
     DFLT_HST_SIZE = 700,
 
     MPLEX_OFF = 0,

src/toxic.c

@@ -269,13 +269,20 @@ void cb_toxcore_logger(Tox *m, TOX_LOG_LEVEL level, const char *file, uint32_t l
     }
 
     struct timeval tv;
+
     gettimeofday(&tv, NULL);
+
     struct tm tmp;
+
     gmtime_r(&tv.tv_sec, &tmp);
+
     char timestamp[200];
+
     strftime(timestamp, sizeof(timestamp), "%F %T", &tmp);
 
-    fprintf(fp, "%c %s.%06ld %s:%u(%s) - %s\n", tox_log_level_show(level)[0], timestamp, tv.tv_usec, file, line, func, message);
+    fprintf(fp, "%c %s.%06ld %s:%u(%s) - %s\n", tox_log_level_show(level)[0], timestamp, tv.tv_usec, file, line, func,
+            message);
+
     fflush(fp);
 }