From fb11647a0dc92198488c709e0444c2aacbf15505 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 1 Oct 2011 16:55:24 +0200 Subject: factor making a message appear from a specific nick out of bee_irc_user_msg --- irc_im.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) (limited to 'irc_im.c') diff --git a/irc_im.c b/irc_im.c index 6add08dd..4c43add3 100644 --- a/irc_im.c +++ b/irc_im.c @@ -192,16 +192,14 @@ void bee_irc_channel_update( irc_t *irc, irc_channel_t *ic, irc_user_t *iu ) } } -static gboolean bee_irc_user_msg( bee_t *bee, bee_user_t *bu, const char *msg_, time_t sent_at ) +void bee_irc_msg_from_user( irc_user_t *iu, const char *msg, time_t sent_at ) { - irc_t *irc = bee->ui_data; - irc_user_t *iu = (irc_user_t *) bu->ui_data; + irc_t *irc = iu->irc; + bee_t *bee = irc->b; + irc_channel_t *ic = NULL; char *dst, *prefix = NULL; char *wrapped, *ts = NULL; - irc_channel_t *ic = NULL; - char *msg = g_strdup( msg_ ); - GSList *l; - + if( sent_at > 0 && set_getbool( &irc->b->set, "display_timestamps" ) ) ts = irc_format_timestamp( irc, sent_at ); @@ -226,6 +224,20 @@ static gboolean bee_irc_user_msg( bee_t *bee, bee_user_t *bu, const char *msg_, ts = NULL; } + wrapped = word_wrap( msg, 425 ); + irc_send_msg( iu, "PRIVMSG", dst, wrapped, prefix ); + + g_free( wrapped ); + g_free( prefix ); + g_free( ts ); +} + +static gboolean bee_irc_user_msg( bee_t *bee, bee_user_t *bu, const char *msg_, time_t sent_at ) +{ + irc_user_t *iu = (irc_user_t *) bu->ui_data; + char *msg = g_strdup( msg_ ); + GSList *l; + for( l = irc_plugins; l; l = l->next ) { irc_plugin_t *p = l->data; @@ -255,14 +267,9 @@ static gboolean bee_irc_user_msg( bee_t *bee, bee_user_t *bu, const char *msg_, msg = s; } - wrapped = word_wrap( msg, 425 ); - irc_send_msg( iu, "PRIVMSG", dst, wrapped, prefix ); - - g_free( wrapped ); - g_free( prefix ); + bee_irc_msg_from_user( iu, msg, sent_at ); + g_free( msg ); - g_free( ts ); - return TRUE; } -- cgit v1.2.3 From e67e513a16f3e545fd71eb176aac83d41a1dc271 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Oct 2011 16:56:58 +0200 Subject: rename irc_usermsg to irc_rootmsg. add new irc_usermsg, irc_usernotice. deliver user-specific messages from libotr as notices to that user. --- irc_im.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) (limited to 'irc_im.c') diff --git a/irc_im.c b/irc_im.c index 4c43add3..372b1cb3 100644 --- a/irc_im.c +++ b/irc_im.c @@ -192,38 +192,26 @@ void bee_irc_channel_update( irc_t *irc, irc_channel_t *ic, irc_user_t *iu ) } } -void bee_irc_msg_from_user( irc_user_t *iu, const char *msg, time_t sent_at ) +static void bee_irc_msg_from_user( irc_user_t *iu, const char *msg, time_t sent_at ) { - irc_t *irc = iu->irc; + irc_t *irc = iu->irc; bee_t *bee = irc->b; - irc_channel_t *ic = NULL; - char *dst, *prefix = NULL; + const char *dst; + char *prefix = NULL; char *wrapped, *ts = NULL; if( sent_at > 0 && set_getbool( &irc->b->set, "display_timestamps" ) ) ts = irc_format_timestamp( irc, sent_at ); - /* Too similar to irc_usermsg()... */ - if( iu->last_channel ) - { - if( iu->last_channel->flags & IRC_CHANNEL_JOINED ) - ic = iu->last_channel; - else - ic = irc_channel_with_user( irc, iu ); - } - - if( ic ) - { - dst = ic->name; + dst = irc_user_msgdest(iu); + if(dst != irc->user->nick) { + /* if not messaging directly, call user by name */ prefix = g_strdup_printf( "%s%s%s", irc->user->nick, set_getstr( &bee->set, "to_char" ), ts ? : "" ); - } - else - { - dst = irc->user->nick; + } else { prefix = ts; - ts = NULL; + ts = NULL; /* don't doulbe-free */ } - + wrapped = word_wrap( msg, 425 ); irc_send_msg( iu, "PRIVMSG", dst, wrapped, prefix ); @@ -999,7 +987,7 @@ static char *set_eval_room_account( set_t *set, char *value ) return SET_INVALID; else if( !acc->prpl->chat_join ) { - irc_usermsg( ic->irc, "Named chatrooms not supported on that account." ); + irc_rootmsg( ic->irc, "Named chatrooms not supported on that account." ); return SET_INVALID; } -- cgit v1.2.3