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

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

diff --git a/newsearch/ns-timestamp.c b/newsearch/ns-timestamp.c
index 7ad4d70fdcdb87f1fedc5bc6a85cdd652915622f..433c26a0567f2be1676d9940333b5e5aba54e0e0 100644 (file)
--- a/newsearch/ns-timestamp.c
+++ b/newsearch/ns-timestamp.c
@@ -10,20 +10,17 @@
 #include "../irc/irc_config.h"
 #include "../lib/irc_string.h"
 
-void *timestamp_exe(struct searchNode *thenode, int type, void *theinput);
-void *timestamp_exe_real(struct searchNode *thenode, int type, void *theinput);
-void timestamp_free(struct searchNode *thenode);
+void *timestamp_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput);
+void timestamp_free(searchCtx *ctx, struct searchNode *thenode);
 
-struct searchNode *timestamp_parse(int type, int argc, char **argv) {
+struct searchNode *timestamp_parse(searchCtx *ctx, int argc, char **argv) {
   struct searchNode *thenode;
 
-  if (type != SEARCHTYPE_NICK) {
-    parseError = "timestamp: this function is only valid for nick searches.";
+  if (!(thenode=(struct searchNode *)malloc(sizeof (struct searchNode)))) {
+    parseError = "malloc: could not allocate memory for this search.";
     return NULL;
   }
 
-  thenode=(struct searchNode *)malloc(sizeof (struct searchNode));
-
   thenode->returntype = RETURNTYPE_INT;
   thenode->localdata = NULL;
   thenode->exe = timestamp_exe;
@@ -32,15 +29,20 @@ struct searchNode *timestamp_parse(int type, int argc, char **argv) {
   return thenode;
 }
 
-void *timestamp_exe(struct searchNode *thenode, int type, void *theinput) {
+void *timestamp_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput) {
   nick *np = (nick *)theinput;
-
-  if (type != RETURNTYPE_INT)
-    return (void *)1;
-
-  return (void *)np->timestamp;
+  chanindex *cip = (chanindex *)theinput;
+
+  if (ctx->searchcmd == reg_nicksearch || ctx->searchcmd == reg_whowassearch) {
+    return (void *)np->timestamp;
+  } else {
+    if (cip->channel)
+      return (void *)cip->channel->timestamp;
+    else
+      return 0;
+  }
 }
 
-void timestamp_free(struct searchNode *thenode) {
+void timestamp_free(searchCtx *ctx, struct searchNode *thenode) {
   free(thenode);
 }