Only send TOPIC updates to a channel when the topic actually changed

[ngircd-alex.git] / src / ngircd / irc-channel.c

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 0978a19dfb30f9afcc1c2f937798a44be6f82a89..812429bbf33eadc2a0dbd5174522bb673572f121 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2018 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,13 +16,11 @@
  * IRC channel commands
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "defines.h"
 #include "conn.h"
 #include "channel.h"
 #include "conn-func.h"
@@ -37,7 +35,6 @@
 #include "irc-write.h"
 #include "conf.h"
 
-#include "exp.h"
 #include "irc-channel.h"
 
 /**
@@ -129,7 +126,7 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame,
                return false;
        }
 
-       if (Channel_HasMode(chan, 'O') && !Client_OperByMe(Client)) {
+       if (Channel_HasMode(chan, 'O') && !Client_HasMode(Client, 'o')) {
                /* Only IRC operators are allowed! */
                IRC_WriteErrClient(Client, ERR_OPONLYCHANNEL_MSG,
                                   Client_ID(Client), channame);
@@ -309,8 +306,6 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
        assert (Client != NULL);
        assert (Req != NULL);
 
-       _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1)
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
        _IRC_GET_SENDER_OR_RETURN_(target, Req, Client)
 
        /* Is argument "0"? */
@@ -325,7 +320,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
        channame = strtok_r(channame, ",", &lastchan);
 
        /* Make sure that "channame" is not the empty string ("JOIN :") */
-       if (! channame)
+       if (!channame)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
 
@@ -342,12 +337,6 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
                }
 
                chan = Channel_Search(channame);
-               if (!chan && !strchr(Conf_AllowedChannelTypes, channame[0])) {
-                        /* channel must be created, but forbidden by config */
-                       IRC_WriteErrClient(Client, ERR_NOSUCHCHANNEL_MSG,
-                                          Client_ID(Client), channame);
-                       goto join_next;
-               }
 
                /* Local client? */
                if (Client_Type(Client) == CLIENT_USER) {
@@ -355,6 +344,15 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
                                /* Already existing channel: already member? */
                                if (Channel_IsMemberOf(chan, Client))
                                    goto join_next;
+                       } else {
+                               /* Channel must be created */
+                               if (!strchr(Conf_AllowedChannelTypes, channame[0])) {
+                                       /* ... but channel type is not allowed! */
+                                       IRC_WriteErrClient(Client,
+                                               ERR_NOSUCHCHANNEL_MSG,
+                                               Client_ID(Client), channame);
+                                       goto join_next;
+                               }
                        }
 
                        /* Test if the user has reached the channel limit */
@@ -438,21 +436,19 @@ IRC_PART(CLIENT * Client, REQUEST * Req)
        assert(Client != NULL);
        assert(Req != NULL);
 
-       _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1)
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
        _IRC_GET_SENDER_OR_RETURN_(target, Req, Client)
 
        /* Loop over all the given channel names */
        chan = strtok(Req->argv[0], ",");
 
        /* Make sure that "chan" is not the empty string ("PART :") */
-       if (! chan)
+       if (!chan)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
 
        while (chan) {
                Channel_Part(target, Client, chan,
-                            Req->argc > 1 ? Req->argv[1] : Client_ID(target));
+                            Req->argc > 1 ? Req->argv[1] : "");
                chan = strtok(NULL, ",");
        }
 
@@ -481,10 +477,6 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       IRC_SetPenalty(Client, 1);
-
-       _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1)
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
        chan = Channel_Search(Req->argv[0]);
@@ -505,7 +497,7 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
                topic_power = true;
 
        if (Req->argc == 1) {
-               /* Request actual topic */
+               /* Request current topic */
                topic = Channel_Topic(chan);
                if (*topic) {
                        r = IRC_WriteStrClient(from, RPL_TOPIC_MSG,
@@ -540,8 +532,6 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
                                                  Channel_Name(chan));
        }
 
-       /* Set new topic */
-       Channel_SetTopic(chan, from, Req->argv[1]);
        LogDebug("%s \"%s\" set topic on \"%s\": %s",
                 Client_TypeText(from), Client_Mask(from), Channel_Name(chan),
                 Req->argv[1][0] ? Req->argv[1] : "<none>");
@@ -553,9 +543,17 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
        if (!Channel_IsLocal(chan))
                IRC_WriteStrServersPrefix(Client, from, "TOPIC %s :%s",
                                          Req->argv[0], Req->argv[1]);
-       IRC_WriteStrChannelPrefix(Client, chan, from, false, "TOPIC %s :%s",
-                                 Req->argv[0], Req->argv[1]);
 
+       /* Infrom local clients, but only when the topic really changed. */
+       if (strcmp(Req->argv[1], Channel_Topic(chan)) != 0)
+               IRC_WriteStrChannelPrefix(Client, chan, from, false,
+                                           "TOPIC %s :%s", Req->argv[0],
+                                           Req->argv[1]);
+
+       /* Update topic, setter, and timestamp. */
+       Channel_SetTopic(chan, from, Req->argv[1]);
+
+       /* Send confirmation when the local client is a user. */
        if (Client_Type(Client) == CLIENT_USER)
                return IRC_WriteStrClientPrefix(Client, Client, "TOPIC %s :%s",
                                                Req->argv[0], Req->argv[1]);
@@ -581,9 +579,6 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
        assert(Client != NULL);
        assert(Req != NULL);
 
-       IRC_SetPenalty(Client, 2);
-
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
        if (Req->argc > 0)
@@ -608,6 +603,10 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
                }
        }
 
+       /* Send list head */
+       if (!IRC_WriteStrClient(from, RPL_LISTSTART_MSG, Client_ID(from)))
+               return DISCONNECTED;
+
        while (pattern) {
                /* Loop through all the channels */
                if (Req->argc > 0)
@@ -619,7 +618,8 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
                                /* Gotcha! */
                                if (!Channel_HasMode(chan, 's')
                                    || Channel_IsMemberOf(chan, from)
-                                   || (!Conf_MorePrivacy && Client_OperByMe(Client))) {
+                                   || Client_HasMode(from, 'o'))
+                               {
                                        if ((Conf_MaxListSize > 0)
                                            && IRC_CheckListTooBig(from, count,
                                                                   Conf_MaxListSize,