detach group names from global name

Group names are now set on a per-group basis and are not affected
by the global /nick command.

apidoc/python/source/conf.py

@@ -55,9 +55,9 @@ author = 'Jakob Kreuze'
 # built documents.
 #
 # The short X.Y version.
-version = '0.11.3'
+version = '0.12.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.11.3'
+release = '0.12.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

cfg/global_vars.mk

@@ -1,5 +1,5 @@
 # Version
-TOXIC_VERSION = 0.11.3
+TOXIC_VERSION = 0.12.0
 REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error")
 ifneq (, $(findstring error, $(REV)))
     VERSION = $(TOXIC_VERSION)

doc/toxic.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: toxic
 .\"    Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2021-05-24
+.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
+.\"      Date: 2021-12-05
 .\"    Manual: Toxic Manual
 .\"    Source: toxic __VERSION__
 .\"  Language: English
 .\"
-.TH "TOXIC" "1" "2021\-05\-24" "toxic __VERSION__" "Toxic Manual"
+.TH "TOXIC" "1" "2021\-12\-05" "toxic __VERSION__" "Toxic Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -156,14 +156,14 @@ Configuration example\&.
 \-Screen flickering sometimes occurs on certain terminals\&.
 .sp
 \-Resizing the terminal window when a game window is open will break things\&.
+.SH "LINKS"
+.sp
+Project page: https://github\&.com/JFreegman/toxic
+.sp
+Tox development group public key: 360497DA684BCE2A500C1AF9B3A5CE949BBB9F6FB1F91589806FB04CA039E313
 .SH "AUTHORS"
 .sp
 JFreegman <JFreegman@gmail\&.com>
 .SH "SEE ALSO"
 .sp
 \fBtoxic\&.conf\fR(5)
-.SH "LINKS"
-.sp
-Project page: https://github\&.com/JFreegman/toxic
-.sp
-IRC channel: irc\&.libera\&.chat#tox

doc/toxic.1.asc

@@ -93,6 +93,12 @@ behaviour.
 
 -Resizing the terminal window when a game window is open will break things.
 
+LINKS
+-----
+Project page: <https://github.com/JFreegman/toxic>
+
+Tox development group public key: 360497DA684BCE2A500C1AF9B3A5CE949BBB9F6FB1F91589806FB04CA039E313
+
 AUTHORS
 -------
 JFreegman <JFreegman@gmail.com>
@@ -100,9 +106,3 @@ JFreegman <JFreegman@gmail.com>
 SEE ALSO
 --------
 *toxic.conf*(5)
-
-LINKS
------
-Project page: <https://github.com/JFreegman/toxic>
-
-IRC channel: irc.libera.chat#tox

doc/toxic.conf.5

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: toxic.conf
 .\"    Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2020-11-12
+.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
+.\"      Date: 2022-06-27
 .\"    Manual: Toxic Manual
 .\"    Source: toxic __VERSION__
 .\"  Language: English
 .\"
-.TH "TOXIC\&.CONF" "5" "2020\-11\-12" "toxic __VERSION__" "Toxic Manual"
+.TH "TOXIC\&.CONF" "5" "2022\-06\-27" "toxic __VERSION__" "Toxic Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -417,14 +417,14 @@ __DATADIR__/toxic\&.conf\&.example
 .RS 4
 Configuration example\&.
 .RE
-.SH "SEE ALSO"
-.sp
-\fBtoxic\fR(1)
 .SH "RESOURCES"
 .sp
 Project page: https://github\&.com/JFreegman/toxic
 .sp
-IRC channel: irc\&.libera\&.chat#tox
+Tox development group public key: 360497DA684BCE2A500C1AF9B3A5CE949BBB9F6FB1F91589806FB04CA039E313
 .SH "AUTHORS"
 .sp
 JFreegman <JFreegman@gmail\&.com>
+.SH "SEE ALSO"
+.sp
+\fBtoxic\fR(1)

doc/toxic.conf.5.asc

@@ -263,19 +263,19 @@ FILES
 {datadir}/toxic.conf.example::
     Configuration example.
 
+RESOURCES
+---------
+Project page: <https://github.com/JFreegman/toxic>
+
+Tox development group public key: 360497DA684BCE2A500C1AF9B3A5CE949BBB9F6FB1F91589806FB04CA039E313
+
+AUTHORS
+-------
+JFreegman <JFreegman@gmail.com>
 
 SEE ALSO
 --------
 *toxic*(1)
 
 
-RESOURCES
----------
-Project page: <https://github.com/JFreegman/toxic>
 
-IRC channel:  irc.libera.chat#tox
-
-
-AUTHORS
--------
-JFreegman <JFreegman@gmail.com>

script/build-minimal-static-toxic.sh

@@ -136,10 +136,10 @@ mkdir -p "$BUILD_DIR"
 cd "$BUILD_DIR"
 
 # The git hash of the c-toxcore version we're using
-TOXCORE_VERSION="0a277b52ea22fe297a8487ac05a0c507a74c6480"
+TOXCORE_VERSION="172f279dc0647a538b30e62c96bab8bb1b0c8960"
 
 # The sha256sum of the c-toxcore tarball for TOXCORE_VERSION
-TOXCORE_HASH="a63f3d8c9ee8bf51dd40fd0035914a73b4214e8d314c06f38a366c79c20278fb"
+TOXCORE_HASH="9884d4ad9b80917e22495c2ebe7a76c509fb98c61031824562883225e66684ae"
 
 TOXCORE_FILENAME="c-toxcore-$TOXCORE_VERSION.tar.gz"
 
@@ -180,8 +180,8 @@ cmake --build _build --target install
 # location with SSL_CERT_FILE env variable.
 cd "$BUILD_DIR"
 
-CURL_VERSION="7.81.0"
-CURL_HASH="ac8e1087711084548d788ef18b9b732c8de887457b81f616fc681d1044b32f98"
+CURL_VERSION="7.88.1"
+CURL_HASH="cdb38b72e36bc5d33d5b8810f8018ece1baa29a8f215b4495e495ded82bbf3c7"
 CURL_FILENAME="curl-$CURL_VERSION.tar.gz"
 
 wget --timeout=10 -O "$CURL_FILENAME" "https://curl.haxx.se/download/$CURL_FILENAME"

src/execute.c

@@ -130,6 +130,7 @@ static struct cmd_func groupchat_commands[] = {
     { "/list",      cmd_list           },
     { "/locktopic", cmd_set_topic_lock },
     { "/mod",       cmd_mod            },
+    { "/nick",      cmd_group_nick     },
     { "/passwd",    cmd_set_passwd     },
     { "/peerlimit", cmd_set_peerlimit  },
     { "/privacy",   cmd_set_privacy    },

src/global_commands.c

@@ -777,7 +777,6 @@ void cmd_nick(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
 
     tox_self_set_name(m, (uint8_t *) nick, len, NULL);
     prompt_update_nick(prompt, nick);
-    set_nick_all_groups(m, nick, len);
 
     store_data(m, DATA_FILE);
 }

src/groupchat_commands.c

@@ -76,6 +76,32 @@ void cmd_disconnect(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*ar
     }
 }
 
+void cmd_group_nick(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+{
+    UNUSED_VAR(window);
+
+    if (argc < 1) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Input required.");
+        return;
+    }
+
+    char nick[MAX_STR_SIZE];
+    snprintf(nick, sizeof(nick), "%s", argv[1]);
+    size_t len = strlen(nick);
+
+    if (!valid_nick(nick)) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Invalid name.");
+        return;
+    }
+
+    len = MIN(len, TOXIC_MAX_NAME_LENGTH - 1);
+    nick[len] = '\0';
+
+    set_nick_this_group(self, m, nick, len);
+
+    store_data(m, DATA_FILE);
+}
+
 void cmd_ignore(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
     if (argc < 1) {

src/groupchat_commands.h

@@ -28,6 +28,7 @@
 
 void cmd_chatid(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_disconnect(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_group_nick(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_ignore(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_kick(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_list(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);

src/groupchats.c

@@ -363,40 +363,75 @@ int init_groupchat_win(Tox *m, uint32_t groupnumber, const char *groupname, size
     return -1;
 }
 
-void set_nick_all_groups(Tox *m, const char *new_nick, size_t length)
+void set_nick_this_group(ToxWindow *self, Tox *m, const char *new_nick, size_t length)
 {
-    for (int i = 0; i < max_groupchat_index; ++i) {
-        if (groupchats[i].active) {
-            ToxWindow *self = get_window_ptr(groupchats[i].chatwin);
+    if (self == NULL) {
+        return;
+    }
 
-            if (!self) {
-                continue;
+    char old_nick[TOX_MAX_NAME_LENGTH + 1];
+    size_t old_length = get_group_self_nick_truncate(m, old_nick, self->num);
+
+    Tox_Err_Group_Self_Name_Set err;
+    tox_group_self_set_name(m, self->num, (uint8_t *) new_nick, length, &err);
+
+    GroupChat *chat = get_groupchat(self->num);
+
+    if (chat == NULL) {
+        line_info_add(self, false, NULL, 0, SYS_MSG, 0, RED, "-!- Failed to set nick: invalid groupnumber");
+        return;
+    }
+
+    switch (err) {
+        case TOX_ERR_GROUP_SELF_NAME_SET_OK: {
+            groupchat_onGroupSelfNickChange(self, m, self->num, old_nick, old_length, new_nick, length);
+            break;
+        }
+
+        default: {
+            if (chat->time_connected > 0) {
+                line_info_add(self, false, NULL, 0, SYS_MSG, 0, RED, "-!- Failed to set nick (error %d).", err);
             }
 
-            char old_nick[TOX_MAX_NAME_LENGTH + 1];
-            size_t old_length = get_group_self_nick_truncate(m, old_nick, self->num);
-
-            Tox_Err_Group_Self_Name_Set err;
-            tox_group_self_set_name(m, groupchats[i].groupnumber, (uint8_t *) new_nick, length, &err);
-
-            switch (err) {
-                case TOX_ERR_GROUP_SELF_NAME_SET_OK: {
-                    groupchat_onGroupSelfNickChange(self, m, self->num, old_nick, old_length, new_nick, length);
-                    break;
-                }
-
-                default: {
-                    if (groupchats[i].time_connected > 0) {
-                        line_info_add(self, false, NULL, 0, SYS_MSG, 0, RED, "-!- Failed to set nick (error %d).", err);
-                    }
-
-                    break;
-                }
-            }
+            break;
         }
     }
 }
 
+/* void set_nick_all_groups(Tox *m, const char *new_nick, size_t length) */
+/* { */
+/*     for (int i = 0; i < max_groupchat_index; ++i) { */
+/*         if (groupchats[i].active) { */
+/*             ToxWindow *self = get_window_ptr(groupchats[i].chatwin); */
+
+/*             if (!self) { */
+/*                 continue; */
+/*             } */
+
+/*             char old_nick[TOX_MAX_NAME_LENGTH + 1]; */
+/*             size_t old_length = get_group_self_nick_truncate(m, old_nick, self->num); */
+
+/*             Tox_Err_Group_Self_Name_Set err; */
+/*             tox_group_self_set_name(m, groupchats[i].groupnumber, (uint8_t *) new_nick, length, &err); */
+
+/*             switch (err) { */
+/*                 case TOX_ERR_GROUP_SELF_NAME_SET_OK: { */
+/*                     groupchat_onGroupSelfNickChange(self, m, self->num, old_nick, old_length, new_nick, length); */
+/*                     break; */
+/*                 } */
+
+/*                 default: { */
+/*                     if (groupchats[i].time_connected > 0) { */
+/*                         line_info_add(self, false, NULL, 0, SYS_MSG, 0, RED, "-!- Failed to set nick (error %d).", err); */
+/*                     } */
+
+/*                     break; */
+/*                 } */
+/*             } */
+/*         } */
+/*     } */
+/* } */
+
 void set_status_all_groups(Tox *m, uint8_t status)
 {
     for (int i = 0; i < max_groupchat_index; ++i) {

src/groupchats.h

@@ -68,7 +68,7 @@ typedef struct {
 
 void exit_groupchat(ToxWindow *self, Tox *m, uint32_t groupnumber, const char *partmessage, size_t length);
 int init_groupchat_win(Tox *m, uint32_t groupnumber, const char *groupname, size_t length, Group_Join_Type join_type);
-void set_nick_all_groups(Tox *m, const char *new_nick, size_t length);
+void set_nick_this_group(ToxWindow *self, Tox *m, const char *new_nick, size_t length);
 void set_status_all_groups(Tox *m, uint8_t status);
 int get_peer_index(uint32_t groupnumber, uint32_t peer_id);
 void groupchat_onGroupPeerExit(ToxWindow *self, Tox *m, uint32_t groupnumber, uint32_t peer_id,

src/help.c

@@ -183,7 +183,7 @@ static void help_draw_global(ToxWindow *self)
     wprintw(win, "  /requests                  : List pending friend requests\n");
     wprintw(win, "  /status <type>             : Set status (Online, Busy, Away)\n");
     wprintw(win, "  /note <msg>                : Set a personal note\n");
-    wprintw(win, "  /nick <nick>               : Set your nickname\n");
+    wprintw(win, "  /nick <name>               : Set your global name (doesn't affect groups)\n");
     wprintw(win, "  /nospam <value>            : Change part of your Tox ID to stop spam\n");
     wprintw(win, "  /log <on> or <off>         : Enable/disable logging\n");
     wprintw(win, "  /myid                      : Print your Tox ID\n");
@@ -307,6 +307,7 @@ static void help_draw_groupchats(ToxWindow *self)
     wprintw(win, "  /list                     : Print a list of peers currently in the group\n");
     wprintw(win, "  /locktopic                : Set the topic lock: on | off\n");
     wprintw(win, "  /mod <name>               : Promote a peer to moderator\n");
+    wprintw(win, "  /nick <name>              : Set your name for this group only\n");
     wprintw(win, "  /passwd <s>               : Set a password needed to join the group\n");
     wprintw(win, "  /peerlimit <n>            : Set the maximum number of peers that can join\n");
     wprintw(win, "  /privacy <state>          : Set the privacy state: private | public\n");
@@ -433,18 +434,21 @@ void help_onKey(ToxWindow *self, wint_t key)
             break;
 
         case L'c':
+            height = 12;
 #ifdef VIDEO
-            help_init_window(self, 26, 80);
+            height += 15;
 #elif AUDIO
-            help_init_window(self, 21, 80);
-#else
-            help_init_window(self, 13, 80);
+            height += 5;
 #endif
+#ifdef GAMES
+            height += 1;
+#endif
+            help_init_window(self, height, 80);
             self->help->type = HELP_CHAT;
             break;
 
         case L'g':
-            height = 23;
+            height = 24;
 #ifdef VIDEO
             height += 8;
 #elif AUDIO
@@ -493,7 +497,7 @@ void help_onKey(ToxWindow *self, wint_t key)
             break;
 
         case L'r':
-            help_init_window(self, 26, 80);
+            help_init_window(self, 27, 80);
             self->help->type = HELP_GROUP;
             break;
     }