jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 00:24:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Smarter rooms (#2484)

Browse source 
* Added VIP only room

* Added DONATOR room.

* Extended Room to include privilege level.

* Updated room join logic

* Updated server tab permissions column display based on perm+privlevel definitions

* Fixed new client -> old server blank permissions column on server tab

Added the ability for registered user - VIP/DONATOR/PRIVILEGED room.
This commit is contained in:
woogerboy21 2017-03-22 21:45:16 -04:00 • committed by Zach H
parent 317ac05919
commit 2f23a9cb2f
12 changed files with 79 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

1
common/pb/serverinfo_room.proto
View file

@ -14,4 +14,5 @@ message ServerInfo_Room {
repeated ServerInfo_User user_list = 8;
repeated ServerInfo_GameType gametype_list = 9;
optional string permissionlevel = 10;
optional string privilegelevel = 11;
}

20
common/server_protocolhandler.cpp
View file

@ -620,23 +620,9 @@ Response::ResponseCode Server_ProtocolHandler::cmdJoinRoom(const Command_JoinRoo
if (!r)
return Response::RespNameNotFound;
QString roomPermission = r->getRoomPermission().toLower();
if (roomPermission != "none"){
if (roomPermission == "registered") {
if (!(userInfo->user_level() & ServerInfo_User::IsRegistered))
return Response::RespUserLevelTooLow;
}
if (roomPermission == "moderator"){
if (!(userInfo->user_level() & ServerInfo_User::IsModerator))
return Response::RespUserLevelTooLow;
}
if (roomPermission == "administrator"){
if (!(userInfo->user_level() & ServerInfo_User::IsAdmin))
return Response::RespUserLevelTooLow;
}
}
if (!(userInfo->user_level() & ServerInfo_User::IsModerator))
if (!(r->userMayJoin(*userInfo)))
return Response::RespUserLevelTooLow;
r->addClient(this);
rooms.insert(r->getId(), r);

31
common/server_room.cpp
View file

@ -14,8 +14,8 @@
#include "pb/serverinfo_chat_message.pb.h"
#include <google/protobuf/descriptor.h>
Server_Room::Server_Room(int _id, int _chatHistorySize, const QString &_name, const QString &_description, const QString &_permissionLevel, bool _autoJoin, const QString &_joinMessage, const QStringList &_gameTypes, Server *parent)
: QObject(parent), id(_id), chatHistorySize(_chatHistorySize), name(_name), description(_description), permissionLevel(_permissionLevel), autoJoin(_autoJoin), joinMessage(_joinMessage), gameTypes(_gameTypes), gamesLock(QReadWriteLock::Recursive)
Server_Room::Server_Room(int _id, int _chatHistorySize, const QString &_name, const QString &_description, const QString &_permissionLevel, const QString &_privilegeLevel, bool _autoJoin, const QString &_joinMessage, const QStringList &_gameTypes, Server *parent)
: QObject(parent), id(_id), chatHistorySize(_chatHistorySize), name(_name), description(_description), permissionLevel(_permissionLevel), privilegeLevel(_privilegeLevel), autoJoin(_autoJoin), joinMessage(_joinMessage), gameTypes(_gameTypes), gamesLock(QReadWriteLock::Recursive)
{
connect(this, SIGNAL(gameListChanged(ServerInfo_Game)), this, SLOT(broadcastGameListUpdate(ServerInfo_Game)), Qt::QueuedConnection);
}
@ -36,6 +36,31 @@ Server_Room::~Server_Room()
usersLock.unlock();
}
bool Server_Room::userMayJoin(const ServerInfo_User & userInfo)
{
if (permissionLevel.toLower() == "administrator" || permissionLevel.toLower() == "moderator")
return false;
if (permissionLevel.toLower() == "registered" && !(userInfo.user_level() & ServerInfo_User::IsRegistered))
return false;
if (privilegeLevel.toLower() != "none")
{
if (privilegeLevel.toLower() == "privileged")
{
if (privilegeLevel.toLower() == "none")
return false;
}
else
{
if (privilegeLevel.toLower() != QString::fromStdString(userInfo.privlevel()).toLower())
return false;
}
}
return true;
}
Server *Server_Room::getServer() const
{
return static_cast<Server *>(parent());
@ -44,11 +69,11 @@ Server *Server_Room::getServer() const
const ServerInfo_Room &Server_Room::getInfo(ServerInfo_Room &result, bool complete, bool showGameTypes, bool includeExternalData) const
{
result.set_room_id(id);
result.set_name(name.toStdString());
result.set_description(description.toStdString());
result.set_auto_join(autoJoin);
result.set_permissionlevel(permissionLevel.toStdString());
result.set_privilegelevel(privilegeLevel.toStdString());
gamesLock.lockForRead();
result.set_game_count(games.size() + externalGames.size());

5
common/server_room.h
View file

@ -35,6 +35,7 @@ private:
QString name;
QString description;
QString permissionLevel;
QString privilegeLevel;
bool autoJoin;
QString joinMessage;
QStringList gameTypes;
@ -49,13 +50,15 @@ public:
mutable QReadWriteLock usersLock;
mutable QReadWriteLock gamesLock;
mutable QReadWriteLock historyLock;
Server_Room(int _id, int _chatHistorySize, const QString &_name, const QString &_description, const QString &_permissionLevel, bool _autoJoin, const QString &_joinMessage, const QStringList &_gameTypes, Server *parent );
Server_Room(int _id, int _chatHistorySize, const QString &_name, const QString &_description, const QString &_permissionLevel, const QString &_privilegeLevel, bool _autoJoin, const QString &_joinMessage, const QStringList &_gameTypes, Server *parent );
~Server_Room();
int getId() const { return id; }
QString getName() const { return name; }
QString getDescription() const { return description; }
QString getRoomPermission() const { return permissionLevel; }
QString getRoomPrivilege() const { return privilegeLevel; }
bool getAutoJoin() const { return autoJoin; }
bool userMayJoin(const ServerInfo_User &userInfo);
QString getJoinMessage() const { return joinMessage; }
const QStringList &getGameTypes() const { return gameTypes; }
const QMap<int, Server_Game *> &getGames() const { return games; }