pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-08-29 08:38:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More UCS refactoring

Browse Source
This commit is contained in:
Michael Cook (mackal)
2016-05-17 16:52:04 -04:00
parent 29da15f38c
commit 1a7a5aa8c8
3 changed files with 26 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ucs/chatchannel.cpp
+19 -36
View File
@@ -23,6 +23,7 @@
#include "clientlist.h"
#include "database.h"
#include <cstdlib>
#include <algorithm>
extern Database database;
extern uint32 ChatMessagesSent;
@@ -307,17 +308,15 @@ bool ChatChannel::RemoveClient(Client *c) {
return true;
}
void ChatChannel::SendOPList(Client *c) {
if(!c) return;
void ChatChannel::SendOPList(Client *c)
{
if (!c)
return;
c->GeneralChannelMessage("Channel " + Name + " op-list: (Owner=" + Owner + ")");
std::list<std::string>::iterator Iterator;
for(Iterator = Moderators.begin(); Iterator != Moderators.end(); ++Iterator)
c->GeneralChannelMessage((*Iterator));
for (auto &&m : Moderators)
c->GeneralChannelMessage(m);
}
void ChatChannel::SendChannelMembers(Client *c) {
@@ -607,10 +606,9 @@ bool ChatChannel::IsInvitee(std::string Invitee) {
return false;
}
void ChatChannel::AddModerator(std::string Moderator) {
if(!IsModerator(Moderator)) {
void ChatChannel::AddModerator(const std::string &Moderator)
{
if (!IsModerator(Moderator)) {
Moderators.push_back(Moderator);
Log.Out(Logs::Detail, Logs::UCS_Server, "Added %s as moderator to channel %s", Moderator.c_str(), Name.c_str());
@@ -618,34 +616,19 @@ void ChatChannel::AddModerator(std::string Moderator) {
}
void ChatChannel::RemoveModerator(std::string Moderator) {
void ChatChannel::RemoveModerator(const std::string &Moderator)
{
auto it = std::find(std::begin(Moderators), std::end(Moderators), Moderator);
std::list<std::string>::iterator Iterator;
for(Iterator = Moderators.begin(); Iterator != Moderators.end(); ++Iterator) {
if((*Iterator) == Moderator) {
Moderators.erase(Iterator);
Log.Out(Logs::Detail, Logs::UCS_Server, "Removed %s as moderator to channel %s", Moderator.c_str(), Name.c_str());
return;
}
if (it != std::end(Moderators)) {
Moderators.erase(it);
Log.Out(Logs::Detail, Logs::UCS_Server, "Removed %s as moderator to channel %s", Moderator.c_str(), Name.c_str());
}
}
bool ChatChannel::IsModerator(std::string Moderator) {
std::list<std::string>::iterator Iterator;
for(Iterator = Moderators.begin(); Iterator != Moderators.end(); ++Iterator) {
if((*Iterator) == Moderator)
return true;
}
return false;
bool ChatChannel::IsModerator(std::string Moderator)
{
return std::find(std::begin(Moderators), std::end(Moderators), Moderator) != std::end(Moderators);
}
void ChatChannel::AddVoice(std::string inVoiced) {