ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1179 from SaberUK/insp20+fix-buildprefixes

Browse Source 
[2.0] Fix 005 not showing some modes with the same rank as others.
This commit is contained in:
Attila Molnar 2016-05-30 15:42:52 +02:00
commit acf0493627
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mode.cpp
View File

@ -837,11 +837,19 @@ std::string ModeParser::GiveModeList(ModeMasks m)
return type1 + "," + type2 + "," + type3 + "," + type4;
}
struct PrefixModeSorter
{
bool operator()(ModeHandler* lhs, ModeHandler* rhs)
{
return lhs->GetPrefixRank() < rhs->GetPrefixRank();
}
};
std::string ModeParser::BuildPrefixes(bool lettersAndModes)
{
std::string mletters;
std::string mprefixes;
std::map<int,std::pair<char,char> > prefixes;
std::vector<ModeHandler*> prefixes;
for (unsigned char mode = 'A'; mode <= 'z'; mode++)
{
@ -849,15 +857,15 @@ std::string ModeParser::BuildPrefixes(bool lettersAndModes)
if ((modehandlers[pos]) && (modehandlers[pos]->GetPrefix()))
{
prefixes[modehandlers[pos]->GetPrefixRank()] = std::make_pair(
modehandlers[pos]->GetPrefix(), modehandlers[pos]->GetModeChar());
prefixes.push_back(modehandlers[pos]);
}
}
for(std::map<int,std::pair<char,char> >::reverse_iterator n = prefixes.rbegin(); n != prefixes.rend(); n++)
std::sort(prefixes.begin(), prefixes.end(), PrefixModeSorter());
for (std::vector<ModeHandler*>::const_reverse_iterator n = prefixes.rbegin(); n != prefixes.rend(); ++n)
{
mletters = mletters + n->second.first;
mprefixes = mprefixes + n->second.second;
mletters += (*n)->GetPrefix();
mprefixes += (*n)->GetModeChar();
}
return lettersAndModes ? "(" + mprefixes + ")" + mletters : mletters;