* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
- *
- * $Id: m_invite.c 3438 2007-05-06 14:46:45Z jilles $
*/
#include "stdinc.h"
-#include "common.h"
#include "channel.h"
#include "client.h"
#include "hash.h"
#include "packet.h"
#include "tgchange.h"
-static int m_invite(struct Client *, struct Client *, int, const char **);
+static const char invite_desc[] = "Provides facilities for invite and related notifications";
+
+static void m_invite(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static unsigned int CAP_INVITE_NOTIFY = 0;
struct Message invite_msgtab = {
- "INVITE", 0, 0, 0, MFLG_SLOW,
+ "INVITE", 0, 0, 0, 0,
{mg_unreg, {m_invite, 3}, {m_invite, 3}, mg_ignore, mg_ignore, {m_invite, 3}}
};
+
mapi_clist_av1 invite_clist[] = { &invite_msgtab, NULL };
-DECLARE_MODULE_AV1(invite, NULL, NULL, invite_clist, NULL, NULL, "$Revision: 3438 $");
-static void add_invite(struct Channel *, struct Client *);
+mapi_cap_list_av2 invite_cap_list[] = {
+ { MAPI_CAP_CLIENT, "invite-notify", NULL, &CAP_INVITE_NOTIFY },
+ { 0, NULL, NULL, NULL }
+};
+
+DECLARE_MODULE_AV2(invite, NULL, NULL, invite_clist, NULL, NULL, invite_cap_list, NULL, invite_desc);
+
+static bool add_invite(struct Channel *, struct Client *);
/* m_invite()
* parv[1] - user to invite
* parv[2] - channel name
*/
-static int
-m_invite(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_invite(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct Client *target_p;
struct Channel *chptr;
if(target_p == NULL)
{
if(!MyClient(source_p) && IsDigit(parv[1][0]))
- sendto_one_numeric(source_p, ERR_NOSUCHNICK,
- "* :Target left IRC. Failed to invite to %s",
+ sendto_one_numeric(source_p, ERR_NOSUCHNICK,
+ "* :Target left IRC. Failed to invite to %s",
parv[2]);
else
- sendto_one_numeric(source_p, ERR_NOSUCHNICK,
- form_str(ERR_NOSUCHNICK),
+ sendto_one_numeric(source_p, ERR_NOSUCHNICK,
+ form_str(ERR_NOSUCHNICK),
parv[1]);
- return 0;
+ return;
}
if(check_channel_name(parv[2]) == 0)
sendto_one_numeric(source_p, ERR_BADCHANNAME,
form_str(ERR_BADCHANNAME),
parv[2]);
- return 0;
+ return;
}
/* Do not send local channel invites to users if they are not on the
- * same server as the person sending the INVITE message.
+ * same server as the person sending the INVITE message.
*/
if(parv[2][0] == '&' && !MyConnect(target_p))
{
sendto_one(source_p, form_str(ERR_USERNOTONSERV),
me.name, source_p->name, target_p->name);
- return 0;
+ return;
}
if(((MyConnect(source_p) && !IsExemptResv(source_p)) ||
sendto_one_numeric(source_p, ERR_BADCHANNAME,
form_str(ERR_BADCHANNAME),
parv[2]);
- return 0;
+ return;
}
if((chptr = find_channel(parv[2])) == NULL)
{
sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
form_str(ERR_NOSUCHCHANNEL), parv[2]);
- return 0;
+ return;
}
msptr = find_channel_membership(chptr, source_p);
{
sendto_one_numeric(source_p, ERR_NOTONCHANNEL,
form_str(ERR_NOTONCHANNEL), parv[2]);
- return 0;
+ return;
}
if(IsMember(target_p, chptr))
sendto_one_numeric(source_p, ERR_USERONCHANNEL,
form_str(ERR_USERONCHANNEL),
target_p->name, parv[2]);
- return 0;
+ return;
}
/* unconditionally require ops, unless the channel is +g */
{
sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
me.name, source_p->name, parv[2]);
- return 0;
+ return;
}
/* store invites when they could affect the ability to join
{
sendto_one(source_p, form_str(ERR_TARGCHANGE),
me.name, source_p->name, target_p->name);
- return 0;
+ return;
}
- sendto_one(source_p, form_str(RPL_INVITING),
+ sendto_one(source_p, form_str(RPL_INVITING),
me.name, source_p->name,
target_p->name, parv[2]);
if(target_p->user->away)
{
/* this should never be less than */
if(atol(parv[3]) > chptr->channelts)
- return 0;
+ return;
}
if(MyConnect(target_p))
sendto_one_numeric(source_p, ERR_NONONREG,
form_str(ERR_NONONREG),
target_p->name);
- return 0;
+ return;
}
else
{
sendto_one_numeric(source_p, ERR_TARGUMODEG,
form_str(ERR_TARGUMODEG),
target_p->name);
- return 0;
+ return;
}
target_p->localClient->last_caller_id_time = rb_current_time();
}
}
add_reply_target(target_p, source_p);
- sendto_one(target_p, ":%s!%s@%s INVITE %s :%s",
- source_p->name, source_p->username, source_p->host,
+ sendto_one(target_p, ":%s!%s@%s INVITE %s :%s",
+ source_p->name, source_p->username, source_p->host,
target_p->name, chptr->chname);
if(store_invite)
- add_invite(chptr, target_p);
- }
- else if(target_p->from != client_p)
- {
- sendto_one_prefix(target_p, source_p, "INVITE", "%s %lu",
- chptr->chname, (unsigned long) chptr->channelts);
+ {
+ if (!add_invite(chptr, target_p))
+ return;
+
+ sendto_channel_local_with_capability(source_p, CHFL_CHANOP, 0, CAP_INVITE_NOTIFY, chptr,
+ ":%s NOTICE %s :%s is inviting %s to %s.",
+ me.name, chptr->chname, source_p->name, target_p->name, chptr->chname);
+ sendto_channel_local_with_capability(source_p, CHFL_CHANOP, CAP_INVITE_NOTIFY, 0, chptr,
+ ":%s!%s@%s INVITE %s %s", source_p->name, source_p->username,
+ source_p->host, target_p->name, chptr->chname);
+ }
}
- return 0;
+ sendto_server(source_p, chptr, CAP_TS6, 0, ":%s INVITE %s %s %lu",
+ use_id(source_p), use_id(target_p),
+ chptr->chname, (unsigned long) chptr->channelts);
}
/* add_invite()
*
* input - channel to add invite to, client to add
- * output -
+ * output - true if it is a new invite, else false
* side effects - client is added to invite list.
*/
-static void
+static bool
add_invite(struct Channel *chptr, struct Client *who)
{
rb_dlink_node *ptr;
RB_DLINK_FOREACH(ptr, who->user->invited.head)
{
if(ptr->data == chptr)
- return;
+ return false;
}
/* ok, if their invite list is too long, remove the tail */
- if((int)rb_dlink_list_length(&who->user->invited) >=
+ if((int)rb_dlink_list_length(&who->user->invited) >=
ConfigChannel.max_chans_per_user)
{
ptr = who->user->invited.tail;
/* add channel to user invite list */
rb_dlinkAddAlloc(chptr, &who->user->invited);
-}
-
+ return true;
+}