aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

/NOTIFY -idle fixes.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@515 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-07-23 11:55:16 +00:00 committed by cras
parent 1a655f3575
commit e322876342
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fe-common/irc/notifylist/fe-notifylist.c
View File

@ -144,7 +144,7 @@ static void notifylist_print(NOTIFYLIST_REC *rec)
if (rec->idle_check_time <= 0) if (rec->idle_check_time <= 0)
idle[0] = '\0'; idle[0] = '\0';
else else
g_snprintf(idle, sizeof(idle), "-idle %d", rec->idle_check_time); g_snprintf(idle, sizeof(idle), "-idle %d", rec->idle_check_time/60);
ircnets = rec->ircnets == NULL ? NULL : ircnets = rec->ircnets == NULL ? NULL :
g_strjoinv(",", rec->ircnets); g_strjoinv(",", rec->ircnets);

2
src/irc/notifylist/module.h
View File

@ -7,7 +7,7 @@
typedef struct { typedef struct {
char *nick; char *nick;
char *user, *host, *realname, *awaymsg; char *user, *host, *realname, *awaymsg;
time_t idle_time; int idle_time;
int host_ok:1; /* host matches the one in notifylist = this is the right person*/ int host_ok:1; /* host matches the one in notifylist = this is the right person*/
int away_ok:1; /* not away, or we don't care about it */ int away_ok:1; /* not away, or we don't care about it */

15
src/irc/notifylist/notify-whois.c
View File

@ -78,16 +78,15 @@ static void event_whois_idle(const char *data, IRC_SERVER_REC *server)
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
params = event_get_params(data, 3, NULL, &nick, &secstr); params = event_get_params(data, 3, NULL, &nick, &secstr);
secs = atoi(secstr); secs = atol(secstr);
notify = notifylist_find(nick, server->connrec->ircnet); notify = notifylist_find(nick, server->connrec->ircnet);
nickrec = notify_nick_find(server, nick); nickrec = notify_nick_find(server, nick);
if (notify != NULL && nickrec != NULL) { if (notify != NULL && nickrec != NULL) {
time_t now = time(NULL); nickrec->idle_changed = secs < nickrec->idle_time &&
nickrec->idle_changed = secs < now-nickrec->idle_time && nickrec->idle_time > notify->idle_check_time;
now-nickrec->idle_time > notify->idle_check_time;
nickrec->idle_time = now-secs; nickrec->idle_time = secs;
} }
g_free(params); g_free(params);
@ -120,9 +119,7 @@ static void event_whois_end(const char *data, IRC_SERVER_REC *server)
GSList *tmp; GSList *tmp;
const char *event; const char *event;
int away_ok; int away_ok;
time_t now;
now = time(NULL);
mserver = MODULE_DATA(server); mserver = MODULE_DATA(server);
for (tmp = mserver->notify_users; tmp != NULL; tmp = tmp->next) { for (tmp = mserver->notify_users; tmp != NULL; tmp = tmp->next) {
rec = tmp->data; rec = tmp->data;
@ -138,7 +135,7 @@ static void event_whois_end(const char *data, IRC_SERVER_REC *server)
event = NULL; event = NULL;
if (!rec->join_announced) { if (!rec->join_announced) {
rec->join_announced = TRUE; rec->join_announced = TRUE;
rec->idle_time = now; rec->idle_time = 0;
if (away_ok) event = "notifylist joined"; if (away_ok) event = "notifylist joined";
} else if (notify->away_check && rec->away_ok == rec->away) } else if (notify->away_check && rec->away_ok == rec->away)
event = "notifylist away changed"; event = "notifylist away changed";
@ -151,7 +148,7 @@ static void event_whois_end(const char *data, IRC_SERVER_REC *server)
rec->realname, rec->awaymsg); rec->realname, rec->awaymsg);
} }
rec->idle_ok = notify->idle_check_time <= 0 || rec->idle_ok = notify->idle_check_time <= 0 ||
now-rec->idle_time <= notify->idle_check_time; rec->idle_time <= notify->idle_check_time;
rec->idle_changed = FALSE; rec->idle_changed = FALSE;
rec->away_ok = away_ok; rec->away_ok = away_ok;
} }

6
src/irc/notifylist/notifylist.c
View File

@ -231,8 +231,8 @@ static void notifylist_idle_reset(IRC_SERVER_REC *server, const char *nick)
rec = notify_nick_find(server, nick); rec = notify_nick_find(server, nick);
if (notify != NULL && rec != NULL && notify->idle_check_time > 0 && if (notify != NULL && rec != NULL && notify->idle_check_time > 0 &&
time(NULL)-rec->idle_time > notify->idle_check_time) { rec->idle_time > notify->idle_check_time) {
rec->idle_time = time(NULL); rec->idle_time = 0;
signal_emit("notifylist unidle", 6, signal_emit("notifylist unidle", 6,
server, rec->nick, server, rec->nick,
rec->user, rec->host, rec->user, rec->host,
@ -289,7 +289,7 @@ static void notifylist_check_join(IRC_SERVER_REC *server, const char *nick,
if (away != -1) rec->away = away; if (away != -1) rec->away = away;
rec->host_ok = TRUE; rec->host_ok = TRUE;
rec->join_announced = TRUE; rec->join_announced = TRUE;
rec->idle_time = time(NULL); rec->idle_time = 0;
signal_emit("notifylist joined", 6, signal_emit("notifylist joined", 6,
server, rec->nick, rec->user, rec->host, realname, NULL); server, rec->nick, rec->user, rec->host, realname, NULL);