Changeset 52e6e17

Timestamp:

2008-02-10T13:36:43Z (17 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

8521b02

Parents:

f55cfe9

Message:

Support halfops for 'notaway' status etc.

Files:

• irc.c (modified) (1 diff)
• otr.c (modified) (1 diff)
• protocols/nogaim.c (modified) (1 diff)
• set.c (modified) (1 diff)
• set.h (modified) (1 diff)

irc.c

@@ -113 +113 @@
         set_add( &irc->set, "display_namechanges", "false", set_eval_bool, irc );
         set_add( &irc->set, "handle_unknown", "root", NULL, irc );
+        set_add( &irc->set, "halfop_buddies", "false", set_eval_halfop_buddies, irc );
         set_add( &irc->set, "lcnicks", "true", set_eval_bool, irc );
         set_add( &irc->set, "op_buddies", "false", set_eval_op_buddies, irc );

otr.c

@@ -982 +982 @@
 int otr_update_modeflags(irc_t *irc, user_t *u)
 {
-        char *vo = set_getstr(&irc->set, "voice_buddies");
-        char *oo = set_getstr(&irc->set, "op_buddies");
-        char eflag=0, tflag=0;
-        int e = u->encrypted;
-        int t = (u->encrypted > 1);
-        
-        if(!strcmp(vo, "encrypted"))
-                eflag='v';
-        else if(!strcmp(oo, "encrypted"))
-                eflag='o';
-        if(!strcmp(vo, "trusted"))
-                tflag='v';
-        else if(!strcmp(oo, "trusted"))
-                tflag='o';
-        
-        if(!eflag)
+        char *vb = set_getstr(&irc->set, "voice_buddies");
+        char *hb = set_getstr(&irc->set, "halfop_buddies");
+        char *ob = set_getstr(&irc->set, "op_buddies");
+        int encrypted = u->encrypted;
+        int trusted = u->encrypted > 1;
+        char flags[7];
+        int nflags;
+        char *p = flags;
+        int i;
+        
+        if(!strcmp(vb, "encrypted")) {
+                *(p++) = encrypted ? '+' : '-';
+                *(p++) = 'v';
+                nflags++;
+        } else if(!strcmp(vb, "trusted")) {
+                *(p++) = trusted ? '+' : '-';
+                *(p++) = 'v';
+                nflags++;
+        }
+        if(!strcmp(hb, "encrypted")) {
+                *(p++) = encrypted ? '+' : '-';
+                *(p++) = 'h';
+                nflags++;
+        } else if(!strcmp(hb, "trusted")) {
+                *(p++) = trusted ? '+' : '-';
+                *(p++) = 'h';
+                nflags++;
+        }
+        if(!strcmp(ob, "encrypted")) {
+                *(p++) = encrypted ? '+' : '-';
+                *(p++) = 'o';
+                nflags++;
+        } else if(!strcmp(ob, "trusted")) {
+                *(p++) = trusted ? '+' : '-';
+                *(p++) = 'o';
+                nflags++;
+        }
+        *p = '\0';
+        
+        p = g_malloc(nflags * (strlen(u->nick)+1) + 1);
+        *p = '\0';
+        if(!p)
                 return 0;
-        
-        if(tflag) {
-                irc_write( irc, ":%s!%s@%s MODE %s %c%c%c%c %s %s", irc->mynick, irc->mynick, irc->myhost,
-                        irc->channel, e?'+':'-', eflag, t?'+':'-', tflag, u->nick, u->nick );
-        } else {
-                irc_write( irc, ":%s!%s@%s MODE %s %c%c %s", irc->mynick, irc->mynick, irc->myhost,
-                        irc->channel, e?'+':'-', eflag, u->nick );
-        }
+        for(i=0; i<nflags; i++) {
+                strcat(p, " ");
+                strcat(p, u->nick);
+        }
+        irc_write( irc, ":%s!%s@%s MODE %s %s%s", irc->mynick, irc->mynick, irc->myhost,
+                irc->channel, flags, p );
+        g_free(p);
                 
         return 1;

protocols/nogaim.c

@@ -620 +620 @@
                 if(!strcmp(set_getstr(&ic->irc->set, "voice_buddies"), "notaway")) {
                         irc_write( ic->irc, ":%s MODE %s %cv %s", from, ic->irc->channel,
+                                                                 u->away?'-':'+', u->nick );
+                }
+                if(!strcmp(set_getstr(&ic->irc->set, "halfop_buddies"), "notaway")) {
+                        irc_write( ic->irc, ":%s MODE %s %ch %s", from, ic->irc->channel,
                                                                  u->away?'-':'+', u->nick );
                 }

set.c

@@ -345 +345 @@
 }
 
+char *set_eval_halfop_buddies( set_t *set, char *value )
+{
+        return set_eval_mode_buddies(set, value, 'h');
+}
+
 char *set_eval_voice_buddies( set_t *set, char *value )
 {

set.h

@@ -99 +99 @@
 char *set_eval_op_user( set_t *set, char *value );
 char *set_eval_op_buddies( set_t *set, char *value );
+char *set_eval_halfop_buddies( set_t *set, char *value );
 char *set_eval_voice_buddies( set_t *set, char *value );
 char *set_eval_charset( set_t *set, char *value );