Changeset 1c8e5f7

Timestamp:

2010-06-11T15:12:27Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

12b29db

Parents:

70ac477

Message:

Added away_reply_timeout setting so BitlBee will suppress away messages sent
in response to PRIVMSG if one was sent recently - some IRC clients including
irssi don't do this very well (when talking to >1 people who are away for
example).

Files:

• doc/user-guide/commands.xml (modified) (1 diff)
• irc.c (modified) (1 diff)
• irc.h (modified) (2 diffs)
• irc_im.c (modified) (2 diffs)

doc/user-guide/commands.xml

@@ -484 +484 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="away_reply_timeout" type="integer" scope="global">
+                <default>3600</default>
+
+                <description>
+                        <para>
+                                Most IRC servers send a user's away message every time s/he gets a private message, to inform the sender that they may not get a response immediately. With this setting set to 0, BitlBee will also behave like this.
+                        </para>
+
+                        <para>
+                                Since not all IRC clients do an excellent job at suppressing these messages, this setting lets BitlBee do it instead. BitlBee will wait this many seconds (or until the away state/message changes) before re-informing you that the person's away.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="buddy_sendbuffer" type="boolean" scope="global">
                 <default>false</default>

irc.c

@@ -101 +101 @@
         
         s = set_add( &b->set, "away_devoice", "true", set_eval_away_devoice, irc );
+        s = set_add( &b->set, "away_reply_timeout", "3600", set_eval_int, irc );
         s = set_add( &b->set, "charset", "utf-8", set_eval_charset, irc );
         s = set_add( &b->set, "default_target", "root", NULL, irc );

irc.h

@@ -109 +109 @@
         irc_user_flags_t flags;
         
-        GString *pastebuf;
+        GString *pastebuf; /* Paste buffer (combine lines into a multiline msg). */
         guint pastebuf_timer;
+        time_t away_reply_timeout; /* Only send a 301 if this time passed. */
         
         struct bee_user *bu;
@@ -146 +147 @@
         time_t topic_time;
         
-        GSList *users;
+        GSList *users; /* struct irc_channel_user */
         struct set *set;
         
-        GString *pastebuf;
+        GString *pastebuf; /* Paste buffer (combine lines into a multiline msg). */
         guint pastebuf_timer;
         

irc_im.c

@@ -114 +114 @@
         }
         
+        /* Reset this one since the info may have changed. */
+        iu->away_reply_timeout = 0;
+        
         bee_irc_channel_update( irc, NULL, iu );
         
@@ -320 +323 @@
 static gboolean bee_irc_user_privmsg( irc_user_t *iu, const char *msg )
 {
+        const char *away;
+        
         if( iu->bu == NULL )
                 return FALSE;
-        else if( set_getbool( &iu->irc->b->set, "paste_buffer" ) )
+        
+        if( ( away = irc_user_get_away( iu ) ) &&
+            time( NULL ) >= iu->away_reply_timeout )
+        {
+                irc_send_num( iu->irc, 301, "%s :%s", iu->nick, away );
+                iu->away_reply_timeout = time( NULL ) +
+                        set_getint( &iu->irc->b->set, "away_reply_timeout" );
+        }
+        
+        if( set_getbool( &iu->irc->b->set, "paste_buffer" ) )
         {
                 int delay;