From 6dc2335df9b31e32c135120a1d3a969bdec7d3c9 Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Tue, 23 Sep 2014 13:59:03 +0000 Subject: [PATCH] The /mv command shouldn't send +v for already-voiced users. The logic in the massop function to exclude already-voiced users from massvoice was faulty - it was equivalent to just !nick_isop(). git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@500 13b04d17-f746-0410-82c6-800466cd88b0 --- Changelog | 2 ++ source/banlist.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index bb91143..7023f28 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,7 @@ [Changes 1.2c01] +* /MV (massvoice) shouldn't send +v for already-voiced users. (caf) + * Fix lag check on recent 32 bit OpenBSD / NetBSD (reported by DJ). (caf) * Fix key bindings that terminate with ^. (caf) diff --git a/source/banlist.c b/source/banlist.c index c442b39..c141358 100644 --- a/source/banlist.c +++ b/source/banlist.c @@ -615,7 +615,7 @@ BUILT_IN_COMMAND(massop) sprintf(buffer, "%s!%s", nicks->nick, nicks->host); if ((my_stricmp(nicks->nick, get_server_nickname(from_server)) && wild_match(spec, buffer))) { - if ((massvoice && !nick_isvoice(nicks) && !nick_isop(nicks)) || !nick_isop(nicks)) + if (!(nick_isop(nicks) || (massvoice && nick_isvoice(nicks)))) { add_mode(chan, massvoice?"v":"o", 1, nicks->nick, NULL, maxmodes); count++;