Skip to content

Commit 18b5abf

Browse files
JFreegmanJFreegman
committed
Make some improvements and clarifications to help menu
1 parent 635410b commit 18b5abf

File tree

3 files changed

+22
-20
lines changed

3 files changed

+22
-20
lines changed

Diff for: ‎src/groupchat_commands.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ void cmd_set_topic(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*arg
808808
void cmd_unignore(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
809809
{
810810
if (argc < 1) {
811-
line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Peer must be specified.");
811+
line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Peer name or public key must be specified.");
812812
return;
813813
}
814814

@@ -851,7 +851,7 @@ void cmd_unignore(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
851851
void cmd_whois(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
852852
{
853853
if (argc < 1) {
854-
line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Peer must be specified.");
854+
line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Peer name or public key must be specified.");
855855
return;
856856
}
857857

Diff for: ‎src/groupchats.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,9 @@ int group_get_peer_id_of_identifier(ToxWindow *self, const char *identifier, uin
608608

609609
case -2: {
610610
line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,
611-
"More than one peer is using this name. Specify the target's public key.");
611+
"More than one peer is using this name; specify the target's public key.");
612+
line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,
613+
"Use the /whois or /list command to determine the key.");
612614
*peer_id = (uint32_t) -1;
613615
return -1;
614616
}

Diff for: ‎src/help.c

+17-17
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ static void help_draw_global(ToxWindow *self)
188188
wprintw(win, " /log <on>|<off> : Enable/disable logging\n");
189189
wprintw(win, " /myid : Print your Tox ID\n");
190190
wprintw(win, " /group <name> : Create a new group chat\n");
191-
wprintw(win, " /join <chatid> : Join a groupchat using a Chat ID\n");
191+
wprintw(win, " /join <chatid> : Join a public groupchat using a Chat ID\n");
192192
#ifdef GAMES
193193
wprintw(win, " /game : Play a game\n");
194194
#endif /* GAMES */
@@ -302,25 +302,25 @@ static void help_draw_groupchats(ToxWindow *self)
302302
wprintw(win, " /chatid : Print this group's ID\n");
303303
wprintw(win, " /close <m> : Leave the group with an optional part message\n");
304304
wprintw(win, " /disconnect : Disconnect from the group (credentials retained)\n");
305-
wprintw(win, " /ignore <name> : Ignore a peer\n");
306-
wprintw(win, " /unignore <name> : Unignore an ignored peer\n");
307-
wprintw(win, " /kick <name> : Remove a peer from the group\n");
305+
wprintw(win, " /ignore <name>|<key> : Ignore a peer\n");
306+
wprintw(win, " /unignore <name>|<key> : Unignore a peer\n");
307+
wprintw(win, " /kick <name>|<key> : Remove a peer from the group\n");
308308
wprintw(win, " /list : Print a list of peers currently in the group\n");
309309
wprintw(win, " /locktopic : Set the topic lock: on | off\n");
310-
wprintw(win, " /mod <name> : Promote a peer to moderator\n");
311-
wprintw(win, " /nick <name> : Set your name for this group only\n");
312-
wprintw(win, " /passwd <s> : Set a password needed to join the group\n");
310+
wprintw(win, " /mod <name>|<key> : Promote a peer to moderator\n");
311+
wprintw(win, " /nick <name> : Set your name (for this group only)\n");
312+
wprintw(win, " /passwd <s> : Set a password to join the group\n");
313313
wprintw(win, " /peerlimit <n> : Set the maximum number of peers that can join\n");
314314
wprintw(win, " /privacy <state> : Set the privacy state: private | public\n");
315-
wprintw(win, " /rejoin : Reconnect to the groupchat\n");
316-
wprintw(win, " /silence <name> : Silence a peer for the entire group\n");
317-
wprintw(win, " /unsilence <name> : Unsilence a silenced peer\n");
318-
wprintw(win, " /status <type> : Set your status\n");
319-
wprintw(win, " /topic <m> : Set the group topic\n");
320-
wprintw(win, " /unmod <name> : Demote a moderator\n");
315+
wprintw(win, " /rejoin : Reconnect to the group\n");
316+
wprintw(win, " /silence <name>|<key> : Silence a peer for the entire group\n");
317+
wprintw(win, " /unsilence <name>|<key> : Unsilence a silenced peer\n");
318+
wprintw(win, " /status <type> : Set your status (client-wide)\n");
319+
wprintw(win, " /topic <m> : Set the topic\n");
320+
wprintw(win, " /unmod <name>|<key> : Demote a moderator\n");
321321
wprintw(win, " /voice <state> : Set the voice state: all | mod | founder\n");
322-
wprintw(win, " /whisper <name> <m> : Send a private message to a peer\n");
323-
wprintw(win, " /whois <name> : Print whois info for a peer\n");
322+
wprintw(win, " /whisper <name>|<key> <m> : Send a private message to a peer\n");
323+
wprintw(win, " /whois <name>|<key> : Display whois info for a peer\n");
324324

325325
help_draw_bottom_menu(win);
326326

@@ -342,8 +342,8 @@ static void help_draw_keys(ToxWindow *self)
342342
wprintw(win, " Page Up and Page Down : Scroll window history one line\n");
343343
wprintw(win, " Ctrl+F and Ctrl+V : Scroll window history half a page\n");
344344
wprintw(win, " Ctrl+H : Move to the bottom of window history\n");
345-
wprintw(win, " Ctrl+up and Ctrl+down : Scroll peer list in conference\n");
346-
wprintw(win, " Ctrl+B : Toggle the conference peerlist\n");
345+
wprintw(win, " Ctrl+up and Ctrl+down : Scroll groupchat/conference peer list\n");
346+
wprintw(win, " Ctrl+B : Toggle groupchat/conference peer list\n");
347347
wprintw(win, " Ctrl+J : Insert new line\n");
348348
wprintw(win, " Ctrl+T : Toggle paste mode\n\n");
349349
wprintw(win, " (Note: Custom keybindings override these defaults.)\n\n");

0 commit comments

Comments
 (0)