]> jfr.im git - irc/rizon/plexus4.git/commitdiff
extban_format: fix acting extban to always be first
authorAdam <redacted>
Mon, 3 Feb 2020 19:22:09 +0000 (14:22 -0500)
committerAdam <redacted>
Mon, 3 Feb 2020 19:22:09 +0000 (14:22 -0500)
src/extban.c

index 2d15f629e92b479a0320662b49468ba5190d0a87..2e6c32e2d4a20244cd73cc8b548e500a9ab15301 100644 (file)
@@ -187,12 +187,33 @@ extban_format(unsigned int e, char *buf)
   {
     struct Extban *extban = ptr->data;
 
+    if (extban->type != EXTBAN_ACTING)
+      continue;
+
+    if (e & extban->flag)
+    {
+      *buf++ = extban->character;
+      *buf++ = ':';
+
+      written += 2;
+      break;
+    }
+  }
+
+  DLINK_FOREACH(ptr, extbans.head)
+  {
+    struct Extban *extban = ptr->data;
+
+    if (extban->type != EXTBAN_MATCHING)
+      continue;
+
     if (e & extban->flag)
     {
       *buf++ = extban->character;
       *buf++ = ':';
 
       written += 2;
+      break;
     }
   }