X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fu_listmode.h;h=7f2d9fa25ed007e17c7da45ebce399d3d2b18acd;hb=3ec7995bf4981119115d14ce2cfce0cb5795f803;hp=eeda2dd8d5bab2d37c6fe1b0e650566a1d98f049;hpb=8c14f0f530c61fd4875131902937fba9f780adf7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/u_listmode.h b/include/u_listmode.h index eeda2dd8d..7f2d9fa25 100644 --- a/include/u_listmode.h +++ b/include/u_listmode.h @@ -45,7 +45,7 @@ class ListItem : public classbase { public: std::string nick; - std::string mask; + irc::string mask; std::string time; }; @@ -126,17 +126,15 @@ class ListModeBase : public ModeHandler user->WriteServ("%s %s %s %s %s %s", listnumeric.c_str(), user->nick, channel->name, it->mask.c_str(), it->nick.c_str(), it->time.c_str()); } } - user->WriteServ("%s %s %s %s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str()); + user->WriteServ("%s %s %s :%s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str()); } virtual void RemoveMode(chanrec* channel) { - ServerInstance->Log(DEBUG,"Removing listmode base from %s %s",channel->name,infokey.c_str()); modelist* el; channel->GetExt(infokey, el); if (el) { - ServerInstance->Log(DEBUG,"Channel is extended with a list"); irc::modestacker modestack(false); std::deque stackresult; const char* mode_junk[MAXMODES+1]; @@ -145,7 +143,7 @@ class ListModeBase : public ModeHandler n->SetFd(FD_MAGIC_NUMBER); for(modelist::iterator it = el->begin(); it != el->end(); it++) { - modestack.Push(this->GetModeChar(), it->mask); + modestack.Push(this->GetModeChar(), assign(it->mask)); } while (modestack.GetStackedLine(stackresult)) { @@ -252,7 +250,7 @@ class ListModeBase : public ModeHandler { // And now add the mask onto the list... ListItem e; - e.mask = parameter; + e.mask = assign(parameter); e.nick = source->nick; e.time = stringtime(); @@ -338,7 +336,7 @@ class ListModeBase : public ModeHandler { for (modelist::iterator it = list->begin(); it != list->end(); it++) { - modestack.Push(std::string(1, mode)[0], it->mask); + modestack.Push(std::string(1, mode)[0], assign(it->mask)); } } while (modestack.GetStackedLine(stackresult))