Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-01 16:06:44 +02:00
Code Issues Projects Releases Wiki Activity

simplify pending groupchat handling

Browse Source
This commit is contained in:
Jfreegman
2013-11-12 17:26:13 -05:00
parent 9b7b401455
commit be88c89e09
5 changed files with 12 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/chat.c
View File

@ -17,22 +17,6 @@
extern char *DATA_FILE;
extern int store_data(Tox *m, char *path);
/* One group chat request slot for each friend; slot is
overwritten on subsequent requests by the same friend. */
extern uint8_t pending_grp_requests[MAX_FRIENDS_NUM][TOX_CLIENT_ID_SIZE];
/* Adds group chat invite to pending group chat requests.
Returns friend number on success, -1 if f_num is out of range. */
static int add_group_request(uint8_t *group_pub_key, int f_num)
{
if (f_num >= 0 && f_num < MAX_FRIENDS_NUM) {
memcpy(pending_grp_requests[f_num], group_pub_key, TOX_CLIENT_ID_SIZE);
return f_num;
}
return -1;
}
static void chat_onMessage(ToxWindow *self, Tox *m, int num, uint8_t *msg, uint16_t len)
{
if (self->num != num)
@ -159,7 +143,7 @@ static void chat_onFileSendRequest(ToxWindow *self, Tox *m, int num, uint8_t fil
strcat(filename, d);
filename[len + strlen(d)] = '\0';
if (count >= 999999) {
if (count > 999999) {
wprintw(ctx->history, "Error saving file to disk.\n");
return;
}
@ -229,7 +213,7 @@ static void chat_onFileData(ToxWindow *self, Tox *m, int num, uint8_t filenum, u
static void chat_onGroupInvite(ToxWindow *self, Tox *m, int friendnumber, uint8_t *group_pub_key)
{
if (friendnumber < 0)
if (self->num != friendnumber)
return;
ChatContext *ctx = (ChatContext *) self->chatwin;
@ -247,14 +231,9 @@ static void chat_onGroupInvite(ToxWindow *self, Tox *m, int friendnumber, uint8_
return;
}
int n = add_group_request(group_pub_key, friendnumber);
memcpy(friends[friendnumber].pending_groupchat, group_pub_key, TOX_CLIENT_ID_SIZE);
if (n == -1) {
wprintw(ctx->history, "Something bad happened. Discarding invite.\n");
return;
}
wprintw(ctx->history, "Type \"/join %d\" to join the chat.\n", n);
wprintw(ctx->history, "Type \"/join\" to join the chat.\n");
self->blink = true;
beep();
}