Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-06-29 11:46:45 +02:00
Code Issues Projects Releases Wiki Activity

Refactor unread message flagging

Browse Source 
This fixes an issue where the interface wasn't able to update
when the unread message flag changed. It also cleans up some
ugly code
This commit is contained in:
jfreegman
2021-11-19 22:54:35 -05:00
parent f3f81111c8
commit 1803da85c1
6 changed files with 85 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/message_queue.c
View File

@ -59,6 +59,7 @@ void cqueue_add(struct chat_queue *q, const char *msg, size_t len, uint8_t type,
new_m->type = type;
new_m->line_id = line_id;
new_m->last_send_try = 0;
new_m->time_added = get_unix_time();
new_m->receipt = -1;
new_m->next = NULL;
@ -76,23 +77,19 @@ void cqueue_add(struct chat_queue *q, const char *msg, size_t len, uint8_t type,
/* update line to show receipt was received after queue removal */
static void cqueue_mark_read(ToxWindow *self, struct cqueue_msg *msg)
{
struct line_info *line = self->chatwin->hst->line_end;
while (line) {
if (line->id != msg->line_id) {
line = line->prev;
continue;
}
line->type = msg->type == OUT_ACTION ? OUT_ACTION_READ : OUT_MSG_READ;
if (line->noread_flag) {
line->noread_flag = false;
line->read_flag = true;
}
struct line_info *line = line_info_get(self, msg->line_id);
if (line == NULL) {
return;
}
line->type = msg->type == OUT_ACTION ? OUT_ACTION_READ : OUT_MSG_READ;
if (line->noread_flag) {
line->noread_flag = false;
line->read_flag = true;
flag_interface_refresh();
}
}
/* removes message with matching receipt from queue, writes to log and updates line to show the message was received. */
@ -158,6 +155,36 @@ static void cqueue_check_timeouts(struct cqueue_msg *msg)
}
}
/*
* Sets the noread flag for messages sent to the peer associated with `self` which have not
* received a receipt after a period of time.
*/
#define NOREAD_TIMEOUT 5
void cqueue_check_unread(ToxWindow *self)
{
struct chat_queue *q = self->chatwin->cqueue;
struct cqueue_msg *msg = q->root;
while (msg) {
if (msg->noread_flag) {
msg = msg->next;
continue;
}
struct line_info *line = line_info_get(self, msg->line_id);
if (line != NULL) {
if (timed_out(msg->time_added, NOREAD_TIMEOUT)) {
line->noread_flag = true;
msg->noread_flag = true;
flag_interface_refresh();
}
}
msg = msg->next;
}
}
/*
* Tries to send all messages in the send queue in sequential order.
* If a message fails to send the function will immediately return.