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"? */
}
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) {
/* 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 */
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 */
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]);
IRC_SetPenalty(Client, 2);
- _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
if (Req->argc > 0)
return CONNECTED;
if (Req->argv[1][0] == '+') {
- if (!Channel_Modes(chan)) {
+ if (!*Channel_Modes(chan)) {
/* OK, this channel doesn't have modes yet,
* set the received ones: */
Channel_SetModes(chan, &Req->argv[1][1]);
if (arg_topic > 0) {
/* We got a topic */
- if (!Channel_Topic( chan ) && Req->argv[arg_topic][0]) {
+ if (!*Channel_Topic(chan) && Req->argv[arg_topic][0]) {
/* OK, there is no topic jet */
Channel_SetTopic(chan, Client, Req->argv[arg_topic]);
IRC_WriteStrChannelPrefix(Client, chan, from, false,