From 95cce5f358e53dfd04a8b76c5bcf264624f4c15a Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Mon, 16 Feb 2015 17:50:51 -0600 Subject: [PATCH] Revert "m_invite: add support for CAP invite-notify" This reverts commit 93eb76cc323f9b1219c86ac9b360e00ea215388f. --- include/client.h | 1 - modules/m_cap.c | 1 - modules/m_invite.c | 5 ----- 3 files changed, 7 deletions(-) diff --git a/include/client.h b/include/client.h index cf738c3be..e91be6b7e 100644 --- a/include/client.h +++ b/include/client.h @@ -449,7 +449,6 @@ struct ListClient #define CLICAP_AWAY_NOTIFY 0x0010 #define CLICAP_TLS 0x0020 #define CLICAP_SASL_REAUTH 0x0040 -#define CLICAP_INVITE_NOTIFY 0x0080 /* * flags macros. diff --git a/modules/m_cap.c b/modules/m_cap.c index adf862556..5004c2171 100644 --- a/modules/m_cap.c +++ b/modules/m_cap.c @@ -77,7 +77,6 @@ static struct clicap _CLICAP("extended-join", CLICAP_EXTENDED_JOIN, 0, 0, 0), _CLICAP("away-notify", CLICAP_AWAY_NOTIFY, 0, 0, 0), _CLICAP("tls", CLICAP_TLS, 0, 0, 0), - _CLICAP("invite-notify", CLICAP_INVITE_NOTIFY, 0, 0, 0), }; #define CLICAP_LIST_LEN (sizeof(clicap_list) / sizeof(struct clicap)) diff --git a/modules/m_invite.c b/modules/m_invite.c index 36d4ad81e..742d63e88 100644 --- a/modules/m_invite.c +++ b/modules/m_invite.c @@ -212,11 +212,6 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char source_p->name, source_p->username, source_p->host, target_p->name, chptr->chname); - sendto_channel_local_with_capability_butone(target_p, ONLY_CHANOPS, CLICAP_INVITE_NOTIFY, NOCAPS, chptr, - ":%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); }