devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-21 11:16:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1110 from profanity-im/feature/704-ui-behaviour-reconnect

Browse Source 
Feature/704 ui behaviour reconnect
This commit is contained in:
Michael Vetter
2019-06-11 07:00:34 +02:00
committed by GitHub
parent da54eaf42b 47e55cc112
commit 5dd6ba73f4
5 changed files with 57 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/event/server_events.c
View File

@@ -66,6 +66,8 @@
#include "ui/ui.h"
gint _success_connections_counter = 0;
void
sv_ev_login_account_success(char *account_name, gboolean secured)
{
@@ -100,6 +102,15 @@ sv_ev_login_account_success(char *account_name, gboolean secured)
log_info("%s logged in successfully", account->jid);
// if we have been connected before
if (_success_connections_counter > 0)
{
cons_show("Connection re-established.");
wins_reestablished_connection();
}
_success_connections_counter++;
if (account->startscript) {
scripts_exec(account->startscript);
}
@@ -249,7 +260,7 @@ sv_ev_room_subject(const char *const room, const char *const nick, const char *c
{
muc_set_subject(room, subject);
ProfMucWin *mucwin = wins_get_muc(room);
if (mucwin && muc_roster_complete(room)) {
if (mucwin && muc_roster_complete(room) && _success_connections_counter == 1) {
mucwin_subject(mucwin, nick, subject);
}
}
@@ -260,7 +271,20 @@ sv_ev_room_history(const char *const room_jid, const char *const nick,
{
ProfMucWin *mucwin = wins_get_muc(room_jid);
if (mucwin) {
mucwin_history(mucwin, nick, timestamp, message);
// if this is the first successful connection
if (_success_connections_counter == 1) {
// save timestamp of last received muc message
// so we dont display, if there was no activity in channel, once we reconnect
if (mucwin->last_msg_timestamp) {
g_date_time_unref(mucwin->last_msg_timestamp);
}
mucwin->last_msg_timestamp = g_date_time_new_now_local();
}
gboolean younger = g_date_time_compare(mucwin->last_msg_timestamp, timestamp) < 0 ? TRUE : FALSE;
if (_success_connections_counter == 1 || younger ) {
mucwin_history(mucwin, nick, timestamp, message);
}
}
}
@@ -336,6 +360,12 @@ sv_ev_room_message(const char *const room_jid, const char *const nick, const cha
}
}
// save timestamp of last received muc message
if (mucwin->last_msg_timestamp) {
g_date_time_unref(mucwin->last_msg_timestamp);
}
mucwin->last_msg_timestamp = g_date_time_new_now_local();
if (prefs_do_room_notify(is_current, mucwin->roomjid, mynick, nick, new_message, mention, triggers != NULL)) {
Jid *jidp = jid_create(mucwin->roomjid);
notify_room_message(nick, jidp->localpart, num, new_message);