GenericCap cap;
ModuleNamesX() : cap(this, "multi-prefix")
{
- Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent };
- ServerInstance->Modules->Attach(eventlist, this, 4);
+ }
+
+ void init()
+ {
+ Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent, I_OnSendWhoLine };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
ModResult OnPreCommand(std::string &command, std::vector<std::string> ¶meters, LocalUser *user, bool validated, const std::string &original_line)
{
- irc::string c = command.c_str();
/* We don't actually create a proper command handler class for PROTOCTL,
* because other modules might want to have PROTOCTL hooks too.
* Therefore, we just hook its as an unvalidated command therefore we
* can capture it even if it doesnt exist! :-)
*/
- if (c == "PROTOCTL")
+ if (command == "PROTOCTL")
{
if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX")))
{
prefixes = memb->chan->GetAllPrefixChars(memb->user);
}
+ void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line)
+ {
+ if (!cap.ext.get(source))
+ return;
+
+ // Channel names can contain ":", and ":" as a 'start-of-token' delimiter is
+ // only ever valid after whitespace, so... find the actual delimiter first!
+ // Thanks to FxChiP for pointing this out.
+ std::string::size_type pos = line.find(" :");
+ if (pos == std::string::npos || pos == 0)
+ return;
+ pos--;
+ // Don't do anything if the user has no prefixes
+ if ((line[pos] == 'H') || (line[pos] == 'G') || (line[pos] == '*'))
+ return;
+
+ // 352 21DAAAAAB #chan ident localhost insp21.test 21DAAAAAB H@ :0 a
+ // a b pos
+ std::string::size_type a = 4 + source->nick.length() + 1;
+ std::string::size_type b = line.find(' ', a);
+ if (b == std::string::npos)
+ return;
+
+ // Try to find this channel
+ std::string channame = line.substr(a, b-a);
+ Channel* chan = ServerInstance->FindChan(channame);
+ if (!chan)
+ return;
+
+ // Don't do anything if the user has only one prefix
+ std::string prefixes = chan->GetAllPrefixChars(user);
+ if (prefixes.length() <= 1)
+ return;
+
+ line.erase(pos, 1);
+ line.insert(pos, prefixes);
+ }
+
void OnEvent(Event& ev)
{
cap.HandleEvent(ev);