Changeset 7b8238d

Timestamp:

2015-01-28T17:06:40Z (9 years ago)

Author:

jgeboski <jgeboski@…>

Branches:

master

Children:

7821ee8

Parents:

1fa5109

git-author:

jgeboski <jgeboski@…> (17-12-14 17:57:17)

git-committer:

jgeboski <jgeboski@…> (28-01-15 17:06:40)

Message:

irc-channel: implemented a special mode for show_users

This allows for users to be declared as being special, which does not
have any specific meaning. The meaning of being special is different
from protocol-to-protocol, which many protocols do not even implement.
This functionality is mainly geared towards a special user state which
only some protocols may actually need to define. For example, with the
third-party Steam plugin, this can be used for denoting a user which is
actively playing a game.

By default, this mode will not actually be used by any plugin. However,
it does default to the half-operator user mode.

Files:

• irc.c (modified) (1 diff)
• irc.h (modified) (1 diff)
• irc_channel.c (modified) (4 diffs)
• irc_im.c (modified) (1 diff)
• protocols/bee.h (modified) (1 diff)

irc.c

@@ -953 +953 @@
         
         if( strcmp( set->key, "away_devoice" ) == 0 && !bool2int( value ) )
-                val = "online,away";
+                val = "online,special%,away";
         else if( strcmp( set->key, "show_offline" ) == 0 && bool2int( value ) )
-                val = "online@,away+,offline";
+                val = "online@,special%,away+,offline";
         else
-                val = "online+,away";
+                val = "online+,special%,away";
         
         for( l = irc->channels; l; l = l->next )

irc.h

@@ -224 +224 @@
         struct account *account;
         struct prpl *protocol;
-        char modes[4];
+        char modes[5];
 };
 

irc_channel.c

@@ -642 +642 @@
         
         /* When changing the default, also change it below. */
-        set_add( &ic->set, "show_users", "online+,away", set_eval_show_users, ic );
+        set_add( &ic->set, "show_users", "online+,special%,away", set_eval_show_users, ic );
         
         ic->data = icc = g_new0( struct irc_control_channel, 1 );
@@ -648 +648 @@
         
         /* Have to run the evaluator to initialize icc->modes. */
-        set_setstr( &ic->set, "show_users", "online+,away" );
+        set_setstr( &ic->set, "show_users", "online+,special%,away" );
         
         /* For scripts that care. */
@@ -744 +744 @@
         struct irc_control_channel *icc = ic->data;
         char **parts = g_strsplit( value, ",", 0 ), **part;
-        char modes[4];
-        
-        memset( modes, 0, 4 );
+        char modes[5];
+        
+        memset( modes, 0, 5 );
         for( part = parts; *part; part ++ )
         {
@@ -766 +766 @@
                 else if( strncmp( *part, "away", 4 ) == 0 )
                         modes[1] = modechar;
+                else if( strncmp( *part, "special", 7 ) == 0 )
+                        modes[2] = modechar;
                 else if( strncmp( *part, "online", 6 ) == 0 )
-                        modes[2] = modechar;
+                        modes[3] = modechar;
                 else
                         goto fail;
         }
-        memcpy( icc->modes, modes, 4 );
+        memcpy( icc->modes, modes, 5 );
         bee_irc_channel_update( ic->irc, ic, NULL );
         

irc_im.c

@@ -190 +190 @@
                 else if( iu->bu->flags & BEE_USER_AWAY )
                         mode = icc->modes[1];
+                else if( iu->bu->flags & BEE_USER_SPECIAL )
+                        mode = icc->modes[2];
                 else
-                        mode = icc->modes[2];
+                        mode = icc->modes[3];
                 
                 if( !mode )

protocols/bee.h

@@ -63 +63 @@
         BEE_USER_MOBILE = 8,    /* Compatibility with old OPT_MOBILE flag */
         BEE_USER_LOCAL = 256,   /* Locally-added contacts (not in real contact list) */
+        BEE_USER_SPECIAL = 512, /* Denotes a user as being special */
 } bee_user_flags_t;