LUA: add function for channel chanop notice

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

diff --git a/newsearch/ns-topic.c b/newsearch/ns-topic.c
index 91c1a266dd66de91acabe8c4fb7b74578b33b8fa..4bb44f5c72c4a64db6ad9cd95540b46efe209704 100644 (file)
--- a/newsearch/ns-topic.c
+++ b/newsearch/ns-topic.c
@@ -7,63 +7,36 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-struct topic_localdata {
-  const char *pattern;
-};
+void *topic_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput);
+void topic_free(searchCtx *ctx, struct searchNode *thenode);
 
-void *topic_exe(struct searchNode *thenode, int type, void *theinput);
-void topic_free(struct searchNode *thenode);
-
-struct searchNode *topic_parse(int type, int argc, char **argv) {
-  struct topic_localdata *localdata;
+struct searchNode *topic_parse(searchCtx *ctx, int argc, char **argv) {
   struct searchNode *thenode;
 
-  if (type != SEARCHTYPE_CHANNEL) {
-    parseError = "topic: this function is only valid for channel searches.";
-    return NULL;
-  }
-
-  if (argc!=1) {
-    parseError="topic: usage: (topic pattern)";
-    return NULL;
-  }
-
-  if (!(localdata=(struct topic_localdata *)malloc(sizeof(struct topic_localdata)))) {
-    parseError = "malloc: could not allocate memory for this search.";
-    return NULL;
-  }
-
-  localdata->pattern = argv[0];
-
   if (!(thenode=(struct searchNode *)malloc(sizeof(struct searchNode)))) {
     /* couldn't malloc() memory for thenode, so free localdata to avoid leakage */
     parseError = "malloc: could not allocate memory for this search.";
-    free(localdata);
     return NULL;
   }
 
-  thenode->returntype = RETURNTYPE_BOOL;
-  thenode->localdata = localdata;
+  thenode->returntype = RETURNTYPE_STRING;
+  thenode->localdata = NULL;
   thenode->exe = topic_exe;
   thenode->free = topic_free;
 
   return thenode;
 }
 
-void *topic_exe(struct searchNode *thenode, int type, void *theinput) {
+void *topic_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput) {
   chanindex *cip = (chanindex *)theinput;
-  struct topic_localdata *localdata;
-
-  localdata = thenode->localdata;
   
-  if ((cip->channel==NULL) || (cip->channel->topic==NULL) || 
-    !match2strings(localdata->pattern, cip->channel->topic->content))
-    return falseval(type);
-  return trueval(type);
+  if ((cip->channel==NULL) || (cip->channel->topic==NULL))
+    return "";
+  else
+    return cip->channel->topic->content;
 }
 
-void topic_free(struct searchNode *thenode) {
-  free(thenode->localdata);
+void topic_free(searchCtx *ctx, struct searchNode *thenode) {
   free(thenode);
 }