diff options
| -rw-r--r-- | src/commands/cmd_list.cpp | 9 | ||||
| -rw-r--r-- | src/modules/m_safelist.cpp | 40 | ||||
| -rw-r--r-- | src/modules/m_spy.cpp | 4 |
3 files changed, 33 insertions, 20 deletions
diff --git a/src/commands/cmd_list.cpp b/src/commands/cmd_list.cpp index f0e1a143e..9ecbea6a6 100644 --- a/src/commands/cmd_list.cpp +++ b/src/commands/cmd_list.cpp @@ -58,15 +58,18 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User } // if the channel is not private/secret, OR the user is on the channel anyway - bool n = (i->second->HasUser(user) || IS_OPER(user)); - if (!IS_OPER(user) && (i->second->IsModeSet('p')) && (!n)) + bool n = (i->second->HasUser(user) || user->HasPrivPermission("channels/auspex")); + + if (!n && i->second->IsModeSet('p')) { + /* Channel is +p and user is outside/not privileged */ user->WriteNumeric(322, "%s * %ld :",user->nick.c_str(), users); } else { - if (IS_OPER(user) || (((!(i->second->IsModeSet('p'))) && (!(i->second->IsModeSet('s')))) || (n))) + if (n || !i->second->IsModeSet('s')) { + /* User is in the channel/privileged, channel is not +s */ user->WriteNumeric(322, "%s %s %ld :[+%s] %s",user->nick.c_str(),i->second->name.c_str(),users,i->second->ChanModes(n),i->second->topic.c_str()); } } diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp index 1f73a7bf2..b75390a42 100644 --- a/src/modules/m_safelist.cpp +++ b/src/modules/m_safelist.cpp @@ -170,7 +170,7 @@ class ModuleSafeList : public Module do { chan = ServerInstance->GetChannelIndex(ld->list_position); - bool has_user = (chan && chan->HasUser(user)); + bool is_special = (chan && (chan->HasUser(user) || user->HasPrivPermission("channels/auspex"))); long users = chan ? chan->GetUserCounter() : 0; bool too_few = (ld->minusers && (users <= ld->minusers)); @@ -182,37 +182,47 @@ class ModuleSafeList : public Module continue; } - if ((chan) && (chan->modes[CM_PRIVATE]) && (!IS_OPER(user))) + if (chan) { bool display = (InspIRCd::Match(chan->name, ld->glob) || (!chan->topic.empty() && InspIRCd::Match(chan->topic, ld->glob))); - if ((users) && (display)) + + if (!users || !display) + { + ld->list_position++; + continue; + } + + /* +s, not in chan / not got channels/auspex */ + if (chan->IsModeSet('s') && !is_special) { + ld->list_position++; + continue; + } + + if (chan->IsModeSet('p') && !is_special) + { + /* Channel is +p and user is outside/not privileged */ int counter = snprintf(buffer, MAXBUF, "322 %s * %ld :", user->nick.c_str(), users); amount_sent += counter + ServerNameSize; user->WriteServ(std::string(buffer)); } - } - else if ((chan) && ((((!(chan->IsModeSet('p'))) && (!(chan->IsModeSet('s'))))) || (has_user) || IS_OPER(user))) - { - bool display = (InspIRCd::Match(chan->name, ld->glob) || (!chan->topic.empty() && InspIRCd::Match(chan->topic, ld->glob))); - if ((users) && (display)) + else { - int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s", user->nick.c_str(), chan->name.c_str(), users, chan->ChanModes(has_user || IS_OPER(user)), chan->topic.c_str()); + /* User is in the channel/privileged, channel is not +s */ + int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s", user->nick.c_str(), chan->name.c_str(), users, chan->ChanModes(is_special), chan->topic.c_str()); amount_sent += counter + ServerNameSize; user->WriteServ(std::string(buffer)); } } else { - if (!chan) + if (!ld->list_ended) { - if (!ld->list_ended) - { - ld->list_ended = true; - user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str()); - } + ld->list_ended = true; + user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str()); } } + ld->list_position++; } while ((chan != NULL) && (amount_sent < (user->MyClass->GetSendqMax() / 4))); diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp index 54d2983b0..75fe2b367 100644 --- a/src/modules/m_spy.cpp +++ b/src/modules/m_spy.cpp @@ -25,8 +25,8 @@ class ModuleSpy : public Module virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist) { - /* User is an oper and is NOT on the channel */ - if (IS_OPER(user) && !Ptr->HasUser(user)) + /* User has priv and is NOT on the channel */ + if (user->HasPrivPermission("channels/auspex") && !Ptr->HasUser(user)) return -1; return 0; |