/*
* 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
* 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"
#include "irc-write.h"
#include "conf.h"
-#include "exp.h"
#include "irc-channel.h"
/**
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);
assert (Client != NULL);
assert (Req != NULL);
- _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2)
_IRC_GET_SENDER_OR_RETURN_(target, Req, Client)
/* Is argument "0"? */
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);
assert(Client != NULL);
assert(Req != NULL);
- _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 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, ",");
}
assert( Client != NULL );
assert( Req != NULL );
- IRC_SetPenalty(Client, 1);
-
- _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2)
_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
chan = Channel_Search(Req->argv[0]);
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,
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>");
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]);
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)
}
}
+ /* 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)
/* 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,