mirror of
https://github.com/Tha14/toxic.git
synced 2024-11-13 02:33:03 +01:00
groupchat keys can sometimes start with a 0
This commit is contained in:
parent
95d09e4b75
commit
0f37e50419
@ -424,10 +424,11 @@ static void chat_onGroupInvite(ToxWindow *self, Tox *m, int32_t friendnumber, ui
|
||||
|
||||
snprintf(msg, sizeof(msg), "%s has invited you to a group chat.", name);
|
||||
line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, 0);
|
||||
snprintf(msg, sizeof(msg), "Type \"/join\" to join the chat.", name);
|
||||
line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, 0);
|
||||
line_info_add(self, NULL, NULL, NULL, "Type \"/join\" to join the chat.", SYS_MSG, 0, 0);
|
||||
|
||||
memcpy(friends[friendnumber].groupchat_key, group_pub_key, TOX_CLIENT_ID_SIZE);
|
||||
friends[friendnumber].groupchat_pending = true;
|
||||
|
||||
memcpy(friends[friendnumber].pending_groupchat, group_pub_key, TOX_CLIENT_ID_SIZE);
|
||||
alert_window(self, WINDOW_ALERT_2, true);
|
||||
}
|
||||
|
||||
|
@ -132,9 +132,9 @@ void cmd_join_group(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*ar
|
||||
return;
|
||||
}
|
||||
|
||||
uint8_t *groupkey = friends[self->num].pending_groupchat;
|
||||
uint8_t *groupkey = friends[self->num].groupchat_key;
|
||||
|
||||
if (groupkey[0] == '\0') {
|
||||
if (!friends[self->num].groupchat_pending) {
|
||||
errmsg = "No pending group chat invite.";
|
||||
line_info_add(self, NULL, NULL, NULL, errmsg, SYS_MSG, 0, 0);
|
||||
return;
|
||||
|
@ -49,7 +49,8 @@ typedef struct {
|
||||
uint16_t namelength;
|
||||
uint8_t statusmsg[TOX_MAX_STATUSMESSAGE_LENGTH];
|
||||
uint16_t statusmsg_len;
|
||||
uint8_t pending_groupchat[TOX_CLIENT_ID_SIZE];
|
||||
uint8_t groupchat_key[TOX_CLIENT_ID_SIZE];
|
||||
bool groupchat_pending;
|
||||
uint8_t pub_key[TOX_CLIENT_ID_SIZE];
|
||||
int32_t num;
|
||||
int chatwin;
|
||||
|
@ -307,7 +307,7 @@ static void groupchat_onGroupNamelistChange(ToxWindow *self, Tox *m, int groupnu
|
||||
groupchats[groupnum].num_peers = tox_group_number_peers(m, groupnum);
|
||||
int num_peers = groupchats[groupnum].num_peers;
|
||||
|
||||
if (peernum >= num_peers)
|
||||
if (peernum > num_peers)
|
||||
return;
|
||||
|
||||
/* get old peer name before updating name list */
|
||||
|
@ -28,7 +28,7 @@
|
||||
|
||||
#define MAX_HISTORY 10000
|
||||
#define MIN_HISTORY 20
|
||||
#define MAX_QUEUE 32
|
||||
#define MAX_QUEUE 128
|
||||
|
||||
enum {
|
||||
SYS_MSG,
|
||||
|
@ -358,7 +358,7 @@ void on_window_resize(void)
|
||||
delwin(w->chatwin->infobox.win);
|
||||
w->chatwin->infobox.win = newwin(INFOBOX_HEIGHT, INFOBOX_WIDTH + 1, 1, x2 - INFOBOX_WIDTH);
|
||||
}
|
||||
#endif /* #ifdef _SUPPORT_AUDIO */
|
||||
#endif /* _SUPPORT_AUDIO */
|
||||
|
||||
scrollok(w->chatwin->history, 0);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user