From e3c27d7dbde007efbb19d1dc34f0581fd4ca1778 Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Fri, 26 Jun 2020 14:20:52 -0600 Subject: [PATCH] Revert "invite: rework the way can_invite hook is called" This reverts commit ed06fed70a67b0cdd4e53aad575fca7b9d046061. --- modules/m_invite.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/modules/m_invite.c b/modules/m_invite.c index e097930c..71bd0ab6 100644 --- a/modules/m_invite.c +++ b/modules/m_invite.c @@ -145,27 +145,28 @@ m_invite(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source return; } - hdata.chptr = chptr; - hdata.msptr = msptr; - hdata.client = source_p; - hdata.target = target_p; - hdata.approved = !(is_chanop(msptr) || (chptr->mode.mode & MODE_FREEINVITE)); - - call_hook(can_invite_hook, &hdata); - if (hdata.approved) + if (MyClient(source_p)) { - if (MyClient(target_p)) + hdata.chptr = chptr; + hdata.msptr = msptr; + hdata.client = source_p; + hdata.target = target_p; + hdata.approved = !(is_chanop(msptr) || (chptr->mode.mode & MODE_FREEINVITE)); + + call_hook(can_invite_hook, &hdata); + if (hdata.approved) { if (hdata.error) sendto_one_numeric(source_p, hdata.approved, "%s", hdata.error); else if (hdata.approved == ERR_CHANOPRIVSNEEDED) sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED), - me.name, source_p->name, parv[2]); + me.name, source_p->name, parv[2]); - add_reply_target(target_p, source_p); + if (MyClient(target_p)) + add_reply_target(target_p, source_p); + + return; } - - return; } /* store invites when they could affect the ability to join