/*
* 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"
/**
* and MODE commands.
*
* @param To Forward JOIN (and MODE) command to this peer server
- * @param Prefix Client used to prefix the genrated commands
+ * @param Prefix Client used to prefix the generated commands
* @param Data Parameters of JOIN command to forward, probably
* containing channel modes separated by ASCII 7.
*/
* This function calls cb_join_forward(), which differentiates between
* protocol implementations (e.g. RFC 2812, RFC 1459).
*
- * @param Client Client used to prefix the genrated commands
+ * @param Client Client used to prefix the generated commands
* @param target Forward JOIN (and MODE) command to this peer server
* @param chan Channel structure
* @param channame Channel name
} /* join_forward */
/**
- * Acknowledge user JOIN request and send "channel info" numerics.
+ * Send channel TOPIC and NAMES list to a newly (N)JOIN'ed client.
*
- * @param Client Client used to prefix the genrated commands
- * @param target Forward commands/numerics to this user
- * @param chan Channel structure
- * @param channame Channel name
+ * @param Client Client used to prefix the generated commands
+ * @param Chan Channel structure
*/
-static bool
-join_send_topic(CLIENT *Client, CLIENT *target, CHANNEL *chan,
- const char *channame)
+GLOBAL bool
+IRC_Send_Channel_Info(CLIENT *Client, CHANNEL *Chan)
{
const char *topic;
- if (Client_Type(Client) != CLIENT_USER)
- return true;
- /* acknowledge join */
- if (!IRC_WriteStrClientPrefix(Client, target, "JOIN :%s", channame))
- return false;
-
- /* Send topic to client, if any */
- topic = Channel_Topic(chan);
+ /* Send the topic (if any) to the new client: */
+ topic = Channel_Topic(Chan);
assert(topic != NULL);
if (*topic) {
if (!IRC_WriteStrClient(Client, RPL_TOPIC_MSG,
- Client_ID(Client), channame, topic))
+ Client_ID(Client), Channel_Name(Chan), topic))
return false;
#ifndef STRICT_RFC
if (!IRC_WriteStrClient(Client, RPL_TOPICSETBY_MSG,
- Client_ID(Client), channame,
- Channel_TopicWho(chan),
- Channel_TopicTime(chan)))
+ Client_ID(Client), Channel_Name(Chan),
+ Channel_TopicWho(Chan),
+ Channel_TopicTime(Chan)))
return false;
#endif
}
- /* send list of channel members to client */
- if (!IRC_Send_NAMES(Client, chan))
+
+ /* Send list of channel members to the new client: */
+ if (!IRC_Send_NAMES(Client, Chan))
return false;
- return IRC_WriteStrClient(Client, RPL_ENDOFNAMES_MSG, Client_ID(Client),
- Channel_Name(chan));
-} /* join_send_topic */
+ return IRC_WriteStrClient(Client, RPL_ENDOFNAMES_MSG,
+ Client_ID(Client), Channel_Name(Chan));
+}
/**
* Handler for the IRC "JOIN" command.
channame = strtok_r(channame, ",", &lastchan);
/* Make sure that "channame" is not the empty string ("JOIN :") */
- if (!channame) {
- IRC_SetPenalty(Client, 2);
+ if (!channame)
return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
Client_ID(Client), Req->command);
- }
while (channame) {
flags = NULL;
join_forward(Client, target, chan, channame);
- if (!join_send_topic(Client, target, chan, channame))
- break; /* write error */
+ if (Client_Type(Client) == CLIENT_USER) {
+ /* Acknowledge join ... */
+ if (!IRC_WriteStrClientPrefix(Client, target,
+ "JOIN :%s", channame))
+ break; /* write error */
+ /* ... and greet new user: */
+ if (!IRC_Send_Channel_Info(Client, chan))
+ break; /* write error */
+ }
join_next:
/* next channel? */
chan = strtok(Req->argv[0], ",");
/* Make sure that "chan" is not the empty string ("PART :") */
- if (!chan) {
- IRC_SetPenalty(Client, 2);
+ 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_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_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_HasMode(Client, 'o')
- && Client_Conn(Client) > NONE))
+ || Client_HasMode(from, 'o'))
{
if ((Conf_MaxListSize > 0)
&& IRC_CheckListTooBig(from, count,
assert( Req != NULL );
/* Bad number of parameters? */
- if (Req->argc < 2 || Req->argc == 4 || Req->argc > 5) {
- IRC_SetPenalty(Client, 2);
+ if (Req->argc < 2 || Req->argc == 4 || Req->argc > 5)
return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
Client_ID(Client), Req->command);
- }
/* Compatibility kludge */
if (Req->argc == 5)
projects / ngircd-alex.git / blobdiff