Clean up comments and channel prefix list in a test file.

[ircu2.10.12-pk.git] / ircd / m_topic.c

diff --git a/ircd/m_topic.c b/ircd/m_topic.c
index b8cfc82822d0616b4af43318a33c5de8b28a0842..072e2a79ea6feccc36d5e7d5c2bfd8198dcf2ab9 100644 (file)
--- a/ircd/m_topic.c
+++ b/ircd/m_topic.c
@@ -85,6 +85,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_features.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -93,17 +94,28 @@
 #include "send.h"
 
 #include <assert.h>
+#include <stdlib.h> /* for atoi() */
 
 static void do_settopic(struct Client *sptr, struct Client *cptr, 
-                       struct Channel *chptr,char *topic)
+                       struct Channel *chptr, char *topic, time_t ts)
 {
+   struct Membership *member;
+   struct Client *from;
    int newtopic;
+
+   if (feature_bool(FEAT_HIS_BANWHO) && IsServer(sptr))
+       from = &me;
+   else
+       from = sptr;
+   member = find_channel_member(sptr, chptr);
    /* if +n and not @'d, return an error and ignore the topic */
-   if ((chptr->mode.mode & MODE_TOPICLIMIT) != 0 && !is_chan_op(sptr, chptr)) 
+   if ((chptr->mode.mode & MODE_TOPICLIMIT) != 0 && (!member || !IsChanOp(member)))
    {
       send_reply(sptr, ERR_CHANOPRIVSNEEDED, chptr->chname);
       return;
    }
+   if (member && IsDelayedJoin(member))
+     RevealDelayedJoin(member);
    /* Note if this is just a refresh of an old topic, and don't
     * send it to all the clients to save bandwidth.  We still send
     * it to other servers as they may have split and lost the topic.
@@ -111,14 +123,14 @@ static void do_settopic(struct Client *sptr, struct Client *cptr,
    newtopic=ircd_strncmp(chptr->topic,topic,TOPICLEN)!=0;
    /* setting a topic */
    ircd_strncpy(chptr->topic, topic, TOPICLEN);
-   ircd_strncpy(chptr->topic_nick, cli_name(sptr), NICKLEN);
-   chptr->topic_time = CurrentTime;
+   ircd_strncpy(chptr->topic_nick, cli_name(from), NICKLEN);
+   chptr->topic_time = ts ? ts : TStime();
    /* Fixed in 2.10.11: Don't propergate local topics */
    if (!IsLocalChannel(chptr->chname))
-     sendcmdto_serv_butone(sptr, CMD_TOPIC, cptr, "%H :%s", chptr,
-                          chptr->topic);
+     sendcmdto_serv_butone(sptr, CMD_TOPIC, cptr, "%H %Tu %Tu :%s", chptr,
+                          chptr->creationtime, chptr->topic_time, chptr->topic);
    if (newtopic)
-      sendcmdto_channel_butserv_butone(sptr, CMD_TOPIC, chptr, NULL,
+     sendcmdto_channel_butserv_butone(sptr, CMD_TOPIC, chptr, NULL, 0,
                                       "%H :%s", chptr, chptr->topic);
       /* if this is the same topic as before we send it to the person that
        * set it (so they knew it went through ok), but don't bother sending
@@ -161,14 +173,9 @@ int m_topic(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
       send_reply(sptr, ERR_NOTONCHANNEL, chptr->chname);
       continue;
     }
-    /* Modeless Channels don't have topics */
-    if (IsModelessChannel(name))
-    {
-      send_reply(sptr, ERR_CHANOPRIVSNEEDED, chptr->chname);
-      continue;
-    }
 
-    if (!topic)                 /* only asking for topic */
+    /* only asking for topic */
+    if (!topic)
     {
       if (chptr->topic[0] == '\0')
        send_reply(sptr, RPL_NOTOPIC, chptr->chname);
@@ -180,22 +187,25 @@ int m_topic(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
       }
     }
     else 
-     do_settopic(sptr,cptr,chptr,topic);
+      do_settopic(sptr,cptr,chptr,topic,0);
   }
   return 0;
 }
 
 /*
- * ms_topic - generic message handler
+ * ms_topic - server message handler
  *
  * parv[0]        = sender prefix
  * parv[1]        = channel
+ * parv[2]        = channel timestamp (optional)
+ * parv[3]        = topic timestamp (optional)
  * parv[parc - 1] = topic
  */
 int ms_topic(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 {
   struct Channel *chptr;
   char *topic = 0, *name, *p = 0;
+  time_t ts = 0;
 
   if (parc < 3)
     return need_more_params(sptr, "TOPIC");
@@ -211,13 +221,6 @@ int ms_topic(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
        send_reply(sptr,ERR_NOSUCHCHANNEL,name);
        continue;
     }
-    /* Modeless Channels don't have topics */
-    if (IsModelessChannel(name))
-    {
-      protocol_violation(sptr,"Attempted to topic modeless channel");
-      send_reply(sptr, ERR_CHANOPRIVSNEEDED, chptr->chname);
-      continue;
-    }
 
     /* Ignore requests for topics from remote servers */
     if (IsLocalChannel(name) && !MyUser(sptr))
@@ -226,7 +229,14 @@ int ms_topic(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
       continue;
     }
 
-    do_settopic(sptr,cptr,chptr,topic);
+    /* If existing channel is older or has newer topic, ignore */
+    if (parc > 3 && (ts = atoi(parv[2])) && chptr->creationtime < ts)
+      continue;
+
+    if (parc > 4 && (ts = atoi(parv[3])) && chptr->topic_time > ts)
+      continue;
+
+    do_settopic(sptr,cptr,chptr,topic, ts);
   }
   return 0;
 }