CHANSERV: fix issue where chanserv_relay doesn't wait for db to be loaded before...

[irc/quakenet/newserv.git] / newsearch / ns-channel.c

diff --git a/newsearch/ns-channel.c b/newsearch/ns-channel.c
index 934698de8b4e0e9e1086df7e932885d76da28676..0d3647751e3af7336a46dee486eb681424009a73 100644 (file)
--- a/newsearch/ns-channel.c
+++ b/newsearch/ns-channel.c
@@ -12,24 +12,21 @@
 void *channel_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput);
 void channel_free(searchCtx *ctx, struct searchNode *thenode);
 
-struct searchNode *channel_parse(searchCtx *ctx, int type, int argc, char **argv) {
-  struct searchNode *thenode;
-  channel *cp;
-
-  if (type != SEARCHTYPE_NICK) {
-    parseError = "channel: this function is only valid for nick searches.";
-    return NULL;
-  }
-
+struct searchNode *channel_parse(searchCtx *ctx, int argc, char **argv) {
+  struct searchNode *thenode, *convsn;
+  chanindex *cip;
+  char *p;
+  
   if (argc<1) {
     parseError = "channel: usage: channel <channel name>";
     return NULL;
   }
 
-  if (!(cp=findchannel(argv[0]))) {
-    parseError = "channel: unknown channel";
+  if (!(convsn=argtoconststr("channel", ctx, argv[0], &p)))
     return NULL;
-  }
+
+  cip=findorcreatechanindex(p);
+  convsn->free(ctx, convsn);
 
   if (!(thenode=(struct searchNode *)malloc(sizeof (struct searchNode)))) {
     parseError = "malloc: could not allocate memory for this search.";
@@ -37,7 +34,7 @@ struct searchNode *channel_parse(searchCtx *ctx, int type, int argc, char **argv
   }
 
   thenode->returntype = RETURNTYPE_BOOL;
-  thenode->localdata = cp;
+  thenode->localdata = cip;
   thenode->exe = channel_exe;
   thenode->free = channel_free;
 
@@ -46,16 +43,32 @@ struct searchNode *channel_parse(searchCtx *ctx, int type, int argc, char **argv
 
 void *channel_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput) {
   nick *np = (nick *)theinput;
-  channel *cp = thenode->localdata;
+  chanindex *cip = thenode->localdata;
+  channel *cp;
+  whowas *ww;
+  int i;
+
+  if (ctx->searchcmd == reg_nicksearch) {
+    cp = cip->channel;
 
-  if (getnumerichandlefromchanhash(cp->users, np->numeric)) {
-    return (void *)1;
+    if (!cp)
+      return (void *)0;
+
+    if (getnumerichandlefromchanhash(cp->users, np->numeric))
+      return (void *)1;
   } else {
-    return (void *)0;
+    ww = (whowas *)np->next; /* Eww. */
+
+    for (i = 0; i < WW_MAXCHANNELS; i++)
+      if (ww->channels[i] == cip)
+        return (void *)1;
   }
+
+  return (void *)0;
 }
 
 void channel_free(searchCtx *ctx, struct searchNode *thenode) {
+  releasechanindex(thenode->localdata);
   free(thenode);
 }