aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minor fixes

Browse source
This commit is contained in:
Zach H 2015-09-18 09:56:32 -04:00
parent ead6ab3ad6
commit ccc8ac4826
2 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/tab_message.cpp
View file

@ -116,7 +116,7 @@ void TabMessage::processUserMessageEvent(const Event_UserMessage &event)
soundEngine->playSound("private_message"); soundEngine->playSound("private_message");
if (settingsCache->getShowMessagePopup() && shouldShowSystemPopup(event)) if (settingsCache->getShowMessagePopup() && shouldShowSystemPopup(event))
showSystemPopup(event); showSystemPopup(event);
if (QString::fromStdString(event.sender_name()).simplified() == "Servatrice") if (QString::fromStdString(event.sender_name()).toLower().simplified() == "servatrice")
sayEdit->setDisabled(true); sayEdit->setDisabled(true);
emit userEvent(); emit userEvent();

9
servatrice/src/serversocketinterface.cpp
View file

@ -524,7 +524,9 @@ void ServerSocketInterface::deckDelDirHelper(int basePathId)
void ServerSocketInterface::sendServerMessage(const QString userName, const QString message) void ServerSocketInterface::sendServerMessage(const QString userName, const QString message)
{ {
ServerSocketInterface *user = static_cast<ServerSocketInterface *>(server->getUsers().value(userName)); ServerSocketInterface *user = static_cast<ServerSocketInterface *>(server->getUsers().value(userName));
if (user) { if (!user)
return;
Event_UserMessage event; Event_UserMessage event;
event.set_sender_name("Servatrice"); event.set_sender_name("Servatrice");
event.set_receiver_name(userName.toStdString()); event.set_receiver_name(userName.toStdString());
@ -532,7 +534,6 @@ void ServerSocketInterface::sendServerMessage(const QString userName, const QStr
SessionEvent *se = user->prepareSessionEvent(event); SessionEvent *se = user->prepareSessionEvent(event);
user->sendProtocolItem(*se); user->sendProtocolItem(*se);
delete se; delete se;
}
} }
Response::ResponseCode ServerSocketInterface::cmdDeckDelDir(const Command_DeckDelDir &cmd, ResponseContainer & /*rc*/) Response::ResponseCode ServerSocketInterface::cmdDeckDelDir(const Command_DeckDelDir &cmd, ResponseContainer & /*rc*/)
@ -849,7 +850,7 @@ Response::ResponseCode ServerSocketInterface::cmdBanFromServer(const Command_Ban
QList<QString> moderatorList = server->getOnlineModeratorList(); QList<QString> moderatorList = server->getOnlineModeratorList();
QListIterator<QString> modIterator(moderatorList); QListIterator<QString> modIterator(moderatorList);
foreach(QString moderator, moderatorList) { foreach(QString moderator, moderatorList) {
QString notificationMessage = "A ban has been put in with the following details:"; QString notificationMessage = "A ban has been added:";
if (!userName.isEmpty()) if (!userName.isEmpty())
notificationMessage.append("\n Username: " + userName); notificationMessage.append("\n Username: " + userName);
if (!address.isEmpty()) if (!address.isEmpty())
@ -895,7 +896,7 @@ Response::ResponseCode ServerSocketInterface::cmdRegisterAccount(const Command_R
return Response::RespUsernameInvalid; return Response::RespUsernameInvalid;
} }
if (userName.toLower() == "servatrice") if (userName.toLower().simplified() == "servatrice")
return Response::RespUsernameInvalid; return Response::RespUsernameInvalid;
if(sqlInterface->userExists(userName)) if(sqlInterface->userExists(userName))