From 5c09a593072914336dcec3e8e92b28a1d4f03fa0 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Wed, 16 Nov 2005 00:16:39 +0100 Subject: Got rid of raw ^B's in source, Replaced most irc_usermsg() calls in nogaim.c with serv_got_crap(), Slightly clearer handling of buddy add requests. Thanks to timing for the patch. --- irc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'irc.c') diff --git a/irc.c b/irc.c index c1d91ad2..1ac277b3 100644 --- a/irc.c +++ b/irc.c @@ -1068,7 +1068,7 @@ void irc_login( irc_t *irc ) // u->send_handler = msg_echo; irc_spawn( irc, u ); - irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\nIf you've never used BitlBee before, please do read the help information using the help command. Lots of FAQ's are answered there." ); + irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\nIf you've never used BitlBee before, please do read the help information using the \x02help\x02 command. Lots of FAQ's are answered there." ); irc->status = USTATUS_LOGGED_IN; } -- cgit v1.2.3 From 834ff442d1b413fb4eaabcf03bbf6ab78eafdc1e Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Thu, 17 Nov 2005 15:37:59 +0100 Subject: Closing #14: Milisecond precision is now possible for the buddy_sendbuffer. --- irc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'irc.c') diff --git a/irc.c b/irc.c index 1ac277b3..c2199f57 100644 --- a/irc.c +++ b/irc.c @@ -114,7 +114,7 @@ irc_t *irc_new( int fd ) set_add( irc, "auto_reconnect", "false", set_eval_bool ); set_add( irc, "auto_reconnect_delay", "300", set_eval_int ); set_add( irc, "buddy_sendbuffer", "false", set_eval_bool ); - set_add( irc, "buddy_sendbuffer_delay", "1", set_eval_int ); + set_add( irc, "buddy_sendbuffer_delay", "200", set_eval_int ); set_add( irc, "charset", "iso8859-1", set_eval_charset ); set_add( irc, "debug", "false", set_eval_bool ); set_add( irc, "default_target", "root", NULL ); @@ -1427,6 +1427,8 @@ int buddy_send_handler( irc_t *irc, user_t *u, char *msg, int flags ) if( set_getint( irc, "buddy_sendbuffer" ) && set_getint( irc, "buddy_sendbuffer_delay" ) > 0 ) { + int delay; + if( u->sendbuf_len > 0 && u->sendbuf_flags != flags) { //Flush the buffer @@ -1450,10 +1452,13 @@ int buddy_send_handler( irc_t *irc, user_t *u, char *msg, int flags ) strcat( u->sendbuf, msg ); strcat( u->sendbuf, "\n" ); + delay = set_getint( irc, "buddy_sendbuffer_delay" ); + if( delay <= 5 ) + delay *= 1000; + if( u->sendbuf_timer > 0 ) g_source_remove( u->sendbuf_timer ); - u->sendbuf_timer = g_timeout_add( set_getint( irc, "buddy_sendbuffer_delay" ) * 1000, - buddy_send_handler_delayed, u ); + u->sendbuf_timer = g_timeout_add( delay, buddy_send_handler_delayed, u ); return( 1 ); } -- cgit v1.2.3 From c572dd67167c0365a5bf62899c31efd4f223acaa Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Fri, 18 Nov 2005 13:41:58 +0100 Subject: HTML stripping is optional again (but still safer than before 0.93), but now enabled by default. --- irc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'irc.c') diff --git a/irc.c b/irc.c index c2199f57..a716fe9e 100644 --- a/irc.c +++ b/irc.c @@ -120,12 +120,12 @@ irc_t *irc_new( int fd ) set_add( irc, "default_target", "root", NULL ); set_add( irc, "display_namechanges", "false", set_eval_bool ); set_add( irc, "handle_unknown", "root", NULL ); - /* set_add( irc, "html", "nostrip", NULL ); */ set_add( irc, "lcnicks", "true", set_eval_bool ); set_add( irc, "ops", "both", set_eval_ops ); set_add( irc, "private", "true", set_eval_bool ); set_add( irc, "query_order", "lifo", NULL ); set_add( irc, "save_on_quit", "true", set_eval_bool ); + set_add( irc, "strip_html", "true", NULL ); set_add( irc, "to_char", ": ", set_eval_to_char ); set_add( irc, "typing_notice", "false", set_eval_bool ); -- cgit v1.2.3 From 22d41a26f53527adacc5b314fcdaea0c46a7723d Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Fri, 18 Nov 2005 20:10:20 +0100 Subject: Quit messages should appear again, at least on crashes. (And when running in inetd mode.) The logging system needs some more work to complete this, maybe. --- irc.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'irc.c') diff --git a/irc.c b/irc.c index a716fe9e..60fe77f8 100644 --- a/irc.c +++ b/irc.c @@ -930,19 +930,31 @@ void irc_vawrite( irc_t *irc, char *format, va_list params ) return; } -void irc_write_all( char *format, ... ) +void irc_write_all( int now, char *format, ... ) { va_list params; GSList *temp; - + va_start( params, format ); - + temp = irc_connection_list; - while( temp!=NULL ) { + while( temp != NULL ) + { + irc_t *irc = temp->data; + + if( now ) + { + g_free( irc->sendbuffer ); + irc->sendbuffer = g_strdup( "\r\n" ); + } irc_vawrite( temp->data, format, params ); + if( now ) + { + bitlbee_io_current_client_write( irc->io_channel, G_IO_OUT, irc ); + } temp = temp->next; } - + va_end( params ); return; } -- cgit v1.2.3 From 94281efa4280bd3ef1cecb7cd22deca03ecb5935 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sat, 19 Nov 2005 12:54:01 +0100 Subject: Oops, even BitlBee didn't know yet that channel names can start with &. Now it should. --- irc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'irc.c') diff --git a/irc.c b/irc.c index 60fe77f8..f0007344 100644 --- a/irc.c +++ b/irc.c @@ -485,7 +485,7 @@ int irc_exec( irc_t *irc, char **cmd ) { irc_reply( irc, 461, "%s :Need more parameters", cmd[0] ); } - else if( *cmd[1] == '#' ) + else if( *cmd[1] == '#' || *cmd[1] == '&' ) { if( cmd[2] ) { @@ -556,7 +556,7 @@ int irc_exec( irc_t *irc, char **cmd ) RFC doesn't have any reply for that though? */ else if( cmd[1] ) { - if( cmd[1][0] == '#' && cmd[1][1] ) + if( ( cmd[1][0] == '#' || cmd[1][0] == '&' ) && cmd[1][1] ) { user_t *u = user_find( irc, cmd[1] + 1 ); @@ -1324,7 +1324,7 @@ int irc_send( irc_t *irc, char *nick, char *s, int flags ) struct conversation *c = NULL; user_t *u = NULL; - if( *nick == '#' ) + if( *nick == '#' || *nick == '&' ) { if( !( c = conv_findchannel( nick ) ) ) { -- cgit v1.2.3