pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-12 14:14:48 +02:00
Code Activity

Fixed away after server disconnection (now away is set again when reconnecting) (bug #16359)

Browse Source
This commit is contained in:
Sebastien Helleu
2006-08-05 18:44:55 +00:00
parent 22b80dec65
commit b2183ee3ed
14 changed files with 78 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2
View File
@@ -4,6 +4,8 @@ WeeChat - Wee Enhanced Environment for Chat
ChangeLog - 2006-08-05
Version 0.2.0 (under dev!):
* fixed away after server disconnection (now away is set again when
reconnecting) (bug #16359)
* fixed DCC file connection problem (connection from receiver to sender)
* improved DCC speed (up to x5 on LAN) by forking for DCC files and a
new option "dcc_fast_send" (does not wait for ACK) (task #5758)
src/common/session.c
+4
View File
@@ -258,6 +258,7 @@ session_save_servers (FILE *file)
rc = rc && (session_write_buf (file, SESSION_SERV_RECONNECT_START, &(ptr_server->reconnect_start), sizeof (time_t)));
rc = rc && (session_write_int (file, SESSION_SERV_RECONNECT_JOIN, ptr_server->reconnect_join));
rc = rc && (session_write_int (file, SESSION_SERV_IS_AWAY, ptr_server->is_away));
rc = rc && (session_write_str (file, SESSION_SERV_AWAY_MESSAGE, ptr_server->away_message));
rc = rc && (session_write_buf (file, SESSION_SERV_AWAY_TIME, &(ptr_server->away_time), sizeof (time_t)));
rc = rc && (session_write_int (file, SESSION_SERV_LAG, ptr_server->lag));
rc = rc && (session_write_buf (file, SESSION_SERV_LAG_CHECK_TIME, &(ptr_server->lag_check_time), sizeof (struct timeval)));
@@ -948,6 +949,9 @@ session_load_server (FILE *file)
case SESSION_SERV_IS_AWAY:
rc = rc && (session_read_int (file, &(session_current_server->is_away)));
break;
case SESSION_SERV_AWAY_MESSAGE:
rc = rc && (session_read_str (file, &(session_current_server->away_message)));
break;
case SESSION_SERV_AWAY_TIME:
rc = rc && (session_read_buf (file, &(session_current_server->away_time), sizeof (time_t)));
break;
src/common/session.h
+2 -1
View File
@@ -90,7 +90,8 @@ enum t_session_server
SESSION_SERV_CHARSET_DECODE_UTF,
SESSION_SERV_CHARSET_ENCODE,
SESSION_SERV_HOSTNAME,
SESSION_SERV_NICK_MODES
SESSION_SERV_NICK_MODES,
SESSION_SERV_AWAY_MESSAGE
};
enum t_session_channel
src/irc/irc-recv.c
+14 -2
View File
@@ -2857,7 +2857,8 @@ irc_cmd_recv_001 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
char **commands, **ptr;
t_irc_channel *ptr_channel;
t_irc_channel *ptr_channel;
char *away_msg;
pos = strchr (arguments, ' ');
if (pos)
@@ -2876,7 +2877,7 @@ irc_cmd_recv_001 (t_irc_server *server, char *host, char *nick, char *arguments)
gui_status_draw (server->buffer, 1);
gui_input_draw (server->buffer, 1);
/* execute command once connected */
/* execute command when connected */
if (server->command && server->command[0])
{
/* splitting command on ';' which can be escaped with '\;' */
@@ -2916,6 +2917,17 @@ irc_cmd_recv_001 (t_irc_server *server, char *host, char *nick, char *arguments)
if (server->autojoin && server->autojoin[0])
return irc_cmd_send_join (server, NULL, server->autojoin);
}
/* set away message if user was away (before disconnection for example) */
if (server->away_message && server->away_message[0])
{
away_msg = strdup (server->away_message);
if (away_msg)
{
irc_send_away (server, away_msg);
free (away_msg);
}
}
return 0;
}
src/irc/irc-send.c
+10
View File
@@ -244,6 +244,11 @@ irc_send_away (t_irc_server *server, char *arguments)
if (arguments)
{
server->is_away = 1;
if (server->away_message)
free (server->away_message);
server->away_message = (char *) malloc (strlen (arguments) + 1);
if (server->away_message)
strcpy (server->away_message, arguments);
server->away_time = time (NULL);
server_sendf (server, "AWAY :%s\r\n", arguments);
if (cfg_irc_display_away != CFG_IRC_DISPLAY_AWAY_OFF)
@@ -272,6 +277,11 @@ irc_send_away (t_irc_server *server, char *arguments)
{
server_sendf (server, "AWAY\r\n");
server->is_away = 0;
if (server->away_message)
{
free (server->away_message);
server->away_message = NULL;
}
if (server->away_time != 0)
{
time_now = time (NULL);
src/irc/irc-server.c
+4
View File
@@ -108,6 +108,7 @@ server_init (t_irc_server *server)
server->reconnect_start = 0;
server->reconnect_join = 0;
server->is_away = 0;
server->away_message = NULL;
server->away_time = 0;
server->lag = 0;
server->lag_check_time.tv_sec = 0;
@@ -323,6 +324,8 @@ server_destroy (t_irc_server *server)
free (server->nick);
if (server->nick_modes)
free (server->nick_modes);
if (server->away_message)
free (server->away_message);
if (server->channels)
channel_free_all (server);
}
@@ -1980,6 +1983,7 @@ server_print_log (t_irc_server *server)
weechat_log_printf (" reconnect_start . . : %ld\n", server->reconnect_start);
weechat_log_printf (" reconnect_join. . . : %d\n", server->reconnect_join);
weechat_log_printf (" is_away . . . . . . : %d\n", server->is_away);
weechat_log_printf (" away_message. . . . : '%s'\n", server->away_message);
weechat_log_printf (" away_time . . . . . : %ld\n", server->away_time);
weechat_log_printf (" lag . . . . . . . . : %d\n", server->lag);
weechat_log_printf (" lag_check_time. . . : tv_sec:%d, tv_usec:%d\n",
src/irc/irc.h
+3 -1
View File
@@ -184,7 +184,8 @@ struct t_irc_server
char *nick_modes; /* nick modes */
time_t reconnect_start; /* this time + delay = reconnect time */
int reconnect_join; /* 1 if channels opened to rejoin */
int is_away; /* 1 is user is marker as away */
int is_away; /* 1 is user is marked as away */
char *away_message; /* away message, NULL if not away */
time_t away_time; /* time() when user marking as away */
int lag; /* lag (in milliseconds) */
struct timeval lag_check_time; /* last time lag was checked (ping sent) */
@@ -468,6 +469,7 @@ extern void irc_login (t_irc_server *);
extern int irc_cmd_send_admin (t_irc_server *, t_irc_channel *, char *);
extern int irc_cmd_send_ame (t_irc_server *, t_irc_channel *, char *);
extern int irc_cmd_send_amsg (t_irc_server *, t_irc_channel *, char *);
extern void irc_send_away (t_irc_server *, char *);
extern int irc_cmd_send_away (t_irc_server *, t_irc_channel *, char *);
extern int irc_cmd_send_ban (t_irc_server *, t_irc_channel *, char *);
extern int irc_cmd_send_ctcp (t_irc_server *, t_irc_channel *, char *);
weechat/ChangeLog
+2
View File
@@ -4,6 +4,8 @@ WeeChat - Wee Enhanced Environment for Chat
ChangeLog - 2006-08-05
Version 0.2.0 (under dev!):
* fixed away after server disconnection (now away is set again when
reconnecting) (bug #16359)
* fixed DCC file connection problem (connection from receiver to sender)
* improved DCC speed (up to x5 on LAN) by forking for DCC files and a
new option "dcc_fast_send" (does not wait for ACK) (task #5758)
weechat/src/common/session.c
+4
View File
@@ -258,6 +258,7 @@ session_save_servers (FILE *file)
rc = rc && (session_write_buf (file, SESSION_SERV_RECONNECT_START, &(ptr_server->reconnect_start), sizeof (time_t)));
rc = rc && (session_write_int (file, SESSION_SERV_RECONNECT_JOIN, ptr_server->reconnect_join));
rc = rc && (session_write_int (file, SESSION_SERV_IS_AWAY, ptr_server->is_away));
rc = rc && (session_write_str (file, SESSION_SERV_AWAY_MESSAGE, ptr_server->away_message));
rc = rc && (session_write_buf (file, SESSION_SERV_AWAY_TIME, &(ptr_server->away_time), sizeof (time_t)));
rc = rc && (session_write_int (file, SESSION_SERV_LAG, ptr_server->lag));
rc = rc && (session_write_buf (file, SESSION_SERV_LAG_CHECK_TIME, &(ptr_server->lag_check_time), sizeof (struct timeval)));
@@ -948,6 +949,9 @@ session_load_server (FILE *file)
case SESSION_SERV_IS_AWAY:
rc = rc && (session_read_int (file, &(session_current_server->is_away)));
break;
case SESSION_SERV_AWAY_MESSAGE:
rc = rc && (session_read_str (file, &(session_current_server->away_message)));
break;
case SESSION_SERV_AWAY_TIME:
rc = rc && (session_read_buf (file, &(session_current_server->away_time), sizeof (time_t)));
break;
weechat/src/common/session.h
+2 -1
View File
@@ -90,7 +90,8 @@ enum t_session_server
SESSION_SERV_CHARSET_DECODE_UTF,
SESSION_SERV_CHARSET_ENCODE,
SESSION_SERV_HOSTNAME,
SESSION_SERV_NICK_MODES
SESSION_SERV_NICK_MODES,
SESSION_SERV_AWAY_MESSAGE
};
enum t_session_channel
weechat/src/irc/irc-recv.c
+14 -2
View File
@@ -2857,7 +2857,8 @@ irc_cmd_recv_001 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
char **commands, **ptr;
t_irc_channel *ptr_channel;
t_irc_channel *ptr_channel;
char *away_msg;
pos = strchr (arguments, ' ');
if (pos)
@@ -2876,7 +2877,7 @@ irc_cmd_recv_001 (t_irc_server *server, char *host, char *nick, char *arguments)
gui_status_draw (server->buffer, 1);
gui_input_draw (server->buffer, 1);
/* execute command once connected */
/* execute command when connected */
if (server->command && server->command[0])
{
/* splitting command on ';' which can be escaped with '\;' */
@@ -2916,6 +2917,17 @@ irc_cmd_recv_001 (t_irc_server *server, char *host, char *nick, char *arguments)
if (server->autojoin && server->autojoin[0])
return irc_cmd_send_join (server, NULL, server->autojoin);
}
/* set away message if user was away (before disconnection for example) */
if (server->away_message && server->away_message[0])
{
away_msg = strdup (server->away_message);
if (away_msg)
{
irc_send_away (server, away_msg);
free (away_msg);
}
}
return 0;
}
weechat/src/irc/irc-send.c
+10
View File
@@ -244,6 +244,11 @@ irc_send_away (t_irc_server *server, char *arguments)
if (arguments)
{
server->is_away = 1;
if (server->away_message)
free (server->away_message);
server->away_message = (char *) malloc (strlen (arguments) + 1);
if (server->away_message)
strcpy (server->away_message, arguments);
server->away_time = time (NULL);
server_sendf (server, "AWAY :%s\r\n", arguments);
if (cfg_irc_display_away != CFG_IRC_DISPLAY_AWAY_OFF)
@@ -272,6 +277,11 @@ irc_send_away (t_irc_server *server, char *arguments)
{
server_sendf (server, "AWAY\r\n");
server->is_away = 0;
if (server->away_message)
{
free (server->away_message);
server->away_message = NULL;
}
if (server->away_time != 0)
{
time_now = time (NULL);
weechat/src/irc/irc-server.c
+4
View File
@@ -108,6 +108,7 @@ server_init (t_irc_server *server)
server->reconnect_start = 0;
server->reconnect_join = 0;
server->is_away = 0;
server->away_message = NULL;
server->away_time = 0;
server->lag = 0;
server->lag_check_time.tv_sec = 0;
@@ -323,6 +324,8 @@ server_destroy (t_irc_server *server)
free (server->nick);
if (server->nick_modes)
free (server->nick_modes);
if (server->away_message)
free (server->away_message);
if (server->channels)
channel_free_all (server);
}
@@ -1980,6 +1983,7 @@ server_print_log (t_irc_server *server)
weechat_log_printf (" reconnect_start . . : %ld\n", server->reconnect_start);
weechat_log_printf (" reconnect_join. . . : %d\n", server->reconnect_join);
weechat_log_printf (" is_away . . . . . . : %d\n", server->is_away);
weechat_log_printf (" away_message. . . . : '%s'\n", server->away_message);
weechat_log_printf (" away_time . . . . . : %ld\n", server->away_time);
weechat_log_printf (" lag . . . . . . . . : %d\n", server->lag);
weechat_log_printf (" lag_check_time. . . : tv_sec:%d, tv_usec:%d\n",
weechat/src/irc/irc.h
+3 -1
View File
@@ -184,7 +184,8 @@ struct t_irc_server
char *nick_modes; /* nick modes */
time_t reconnect_start; /* this time + delay = reconnect time */
int reconnect_join; /* 1 if channels opened to rejoin */
int is_away; /* 1 is user is marker as away */
int is_away; /* 1 is user is marked as away */
char *away_message; /* away message, NULL if not away */
time_t away_time; /* time() when user marking as away */
int lag; /* lag (in milliseconds) */
struct timeval lag_check_time; /* last time lag was checked (ping sent) */
@@ -468,6 +469,7 @@ extern void irc_login (t_irc_server *);
extern int irc_cmd_send_admin (t_irc_server *, t_irc_channel *, char *);
extern int irc_cmd_send_ame (t_irc_server *, t_irc_channel *, char *);
extern int irc_cmd_send_amsg (t_irc_server *, t_irc_channel *, char *);
extern void irc_send_away (t_irc_server *, char *);
extern int irc_cmd_send_away (t_irc_server *, t_irc_channel *, char *);
extern int irc_cmd_send_ban (t_irc_server *, t_irc_channel *, char *);
extern int irc_cmd_send_ctcp (t_irc_server *, t_irc_channel *, char *);