diff options
| author | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-03-17 02:55:46 +0000 |
|---|---|---|
| committer | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-03-17 02:55:46 +0000 |
| commit | 0892ef136192bf9b6ad1e3c329f3f4b2b59cfa3e (patch) | |
| tree | 2d597139b90490c3b83f8617f014f3f852268c18 | |
| parent | adca908bcea587c19959a0a0f7ff427b07a8831a (diff) | |
Fix bug #1040, patch from Adam, CS INVITE not displays messages for successful invites and failed invite due to being in the channel already.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2172 5417fbe8-f217-4b02-8779-1006273d7864
| -rw-r--r-- | lang/cat.l | 4 | ||||
| -rw-r--r-- | lang/de.l | 4 | ||||
| -rw-r--r-- | lang/en_us.l | 5 | ||||
| -rw-r--r-- | lang/es.l | 4 | ||||
| -rw-r--r-- | lang/fr.l | 4 | ||||
| -rw-r--r-- | lang/gr.l | 4 | ||||
| -rw-r--r-- | lang/hun.l | 4 | ||||
| -rw-r--r-- | lang/it.l | 4 | ||||
| -rw-r--r-- | lang/nl.l | 4 | ||||
| -rw-r--r-- | lang/pl.l | 4 | ||||
| -rw-r--r-- | lang/pt.l | 4 | ||||
| -rw-r--r-- | lang/ru.l | 4 | ||||
| -rw-r--r-- | lang/tr.l | 4 | ||||
| -rw-r--r-- | src/core/cs_invite.c | 9 |
14 files changed, 60 insertions, 2 deletions
diff --git a/lang/cat.l b/lang/cat.l index 1d9180fcc..5761c87cc 100644 --- a/lang/cat.l +++ b/lang/cat.l @@ -1650,6 +1650,10 @@ CHAN_LIST_END # CLIST responses CHAN_INVITE_SYNTAX INVITE canal +CHAN_INVITE_ALREADY_IN + You are already in %s! +CHAN_INVITE_SUCCESS + You have been invited to %s. # UNBAN responses CHAN_UNBAN_SYNTAX @@ -1654,6 +1654,10 @@ CHAN_LIST_END # CLIST responses CHAN_INVITE_SYNTAX INVITE Channel +CHAN_INVITE_ALREADY_IN + You are already in %s! +CHAN_INVITE_SUCCESS + You have been invited to %s. # UNBAN responses CHAN_UNBAN_SYNTAX diff --git a/lang/en_us.l b/lang/en_us.l index 2c44a2629..32dd938da 100644 --- a/lang/en_us.l +++ b/lang/en_us.l @@ -1619,6 +1619,11 @@ CHAN_LIST_END # INVITE responses CHAN_INVITE_SYNTAX INVITE channel +CHAN_INVITE_ALREADY_IN + You are already in %s! +CHAN_INVITE_SUCCESS + You have been invited to %s. + # UNBAN responses CHAN_UNBAN_SYNTAX @@ -1648,6 +1648,10 @@ CHAN_LIST_END # INVITE responses CHAN_INVITE_SYNTAX INVITE canal +CHAN_INVITE_ALREADY_IN + You are already in %s! +CHAN_INVITE_SUCCESS + You have been invited to %s. # UNBAN responses CHAN_UNBAN_SYNTAX @@ -1659,6 +1659,10 @@ CHAN_LIST_END # CLIST responses CHAN_INVITE_SYNTAX INVITE canal +CHAN_INVITE_ALREADY_IN + You are already in %s! +CHAN_INVITE_SUCCESS + You have been invited to %s. # UNBAN responses CHAN_UNBAN_SYNTAX @@ -1652,6 +1652,10 @@ CHAN_LIST_END # CLIST responses CHAN_INVITE_SYNTAX INVITE êáíÜëé +CHAN_INVITE_ALREADY_IN + You are already in %s! +CHAN_INVITE_SUCCESS + You have been invited to %s. # UNBAN responses CHAN_UNBAN_SYNTAX diff --git a/lang/hun.l b/lang/hun.l index b1153c098..dec2d83e4 100644 --- a/lang/hun.l +++ b/lang/hun.l @@ -1647,6 +1647,10 @@ CHAN_LIST_END # INVITE válaszok CHAN_INVITE_SYNTAX INVITE #szoba +CHAN_INVITE_ALREADY_IN + You are already in %s! +CHAN_INVITE_SUCCESS + You have been invited to %s. # UNBAN válaszok CHAN_UNBAN_SYNTAX @@ -1629,6 +1629,10 @@ CHAN_LIST_END # INVITE responses CHAN_INVITE_SYNTAX INVITE canale +CHAN_INVITE_ALREADY_IN + You are already in %s! +CHAN_INVITE_SUCCESS + You have been invited to %s. # UNBAN responses CHAN_UNBAN_SYNTAX @@ -1645,6 +1645,10 @@ CHAN_LIST_END # INVITE responses CHAN_INVITE_SYNTAX INVITE kanaal +CHAN_INVITE_ALREADY_IN + You are already in %s! +CHAN_INVITE_SUCCESS + You have been invited to %s. # UNBAN responses CHAN_UNBAN_SYNTAX @@ -2151,6 +2151,10 @@ CHAN_LIST_END # INVITE responses CHAN_INVITE_SYNTAX INVITE kana³ +CHAN_INVITE_ALREADY_IN + You are already in %s! +CHAN_INVITE_SUCCESS + You have been invited to %s. # UNBAN responses CHAN_UNBAN_SYNTAX @@ -1639,6 +1639,10 @@ CHAN_LIST_END # INVITE responses CHAN_INVITE_SYNTAX INVITE canal +CHAN_INVITE_ALREADY_IN + You are already in %s! +CHAN_INVITE_SUCCESS + You have been invited to %s. # UNBAN responses CHAN_UNBAN_SYNTAX @@ -1619,6 +1619,10 @@ CHAN_LIST_END # INVITE responses CHAN_INVITE_SYNTAX INVITE #êàíàë +CHAN_INVITE_ALREADY_IN + You are already in %s! +CHAN_INVITE_SUCCESS + You have been invited to %s. # UNBAN responses CHAN_UNBAN_SYNTAX @@ -1647,6 +1647,10 @@ CHAN_LIST_END # CLIST responses CHAN_INVITE_SYNTAX INVITE kanaladý +CHAN_INVITE_ALREADY_IN + You are already in %s! +CHAN_INVITE_SUCCESS + You have been invited to %s. # UNBAN responses CHAN_UNBAN_SYNTAX diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c index 2ce12508e..6d6d19a26 100644 --- a/src/core/cs_invite.c +++ b/src/core/cs_invite.c @@ -64,8 +64,13 @@ class CommandCSInvite : public Command return MOD_CONT; } - ircdproto->SendInvite(whosends(ci), chan, u->nick); - // XXX: maybe send a message about it succeeding. + if (is_on_chan(c, u)) + notice_lang(s_ChanServ, u, CHAN_INVITE_ALREADY_IN, c->name); + else + { + ircdproto->SendInvite(whosends(ci), chan, u->nick); + notice_lang(s_ChanServ, u, CHAN_INVITE_SUCCESS, c->name); + } return MOD_CONT; } |