torsten/yourchat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ergänze Unterstützung für Datenbankintegration in ChatRoom und ChatUser

Browse Source 
- Implementiere einen neuen Konstruktor in der Klasse `ChatUser`, der eine Datenbankverbindung akzeptiert, um Benutzerinformationen zu laden.
- Füge eine Methode `setDatabase` in der Klasse `ChatRoom` hinzu, um die Datenbankverbindung zu setzen.
- Aktualisiere die Logik in `ChatRoom`, um den neuen Konstruktor zu verwenden, wenn eine Datenbankverbindung vorhanden ist, andernfalls wird der alte Konstruktor verwendet.
- Stelle sicher, dass die Datenbankverbindung in den Server- und SSLServer-Klassen beim Erstellen neuer Räume gesetzt wird.
This commit is contained in:
Torsten Schulz (local)
2025-09-05 09:56:14 +02:00
parent e38cd6ef9d
commit dce5a56316
6 changed files with 110 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/chat_room.cpp
View File

@@ -113,7 +113,14 @@ namespace Yc
{
return false;
}
auto newUser = std::make_shared<ChatUser>(shared_from_this(), _userName, color, socket);
std::shared_ptr<ChatUser> newUser;
if (_database) {
// Verwende den neuen Konstruktor mit Datenbank
newUser = std::make_shared<ChatUser>(shared_from_this(), _userName, color, socket, _database);
} else {
// Fallback auf den alten Konstruktor
newUser = std::make_shared<ChatUser>(shared_from_this(), _userName, color, socket);
}
_users.push_back(newUser);
newUser->start();
if (_parent) {
@@ -631,5 +638,10 @@ namespace Yc
addMessage(ChatUser::system, msg, "", "");
}
void ChatRoom::setDatabase(std::shared_ptr<Yc::Lib::Database> database)
{
_database = database;
}
} // namespace Lib
} // namespace Yc

3
src/core/chat_room.h
View File

@@ -15,6 +15,7 @@
#include "lib/base.h"
#include "chat_user.h"
#include "object/room.h"
#include "lib/database.h"
namespace Yc
{
@@ -50,6 +51,7 @@ namespace Yc
void addMessage(ChatUser::MsgType type, const char *messageText, std::string userName = "", std::string color = "");
void addMessage(ChatUser::MsgType type, std::string messageText, std::string userName = "", std::string color = "");
void addMessage(ChatUser::MsgType type, Json::Value messageText, std::string userName = "", std::string color = "");
void setDatabase(std::shared_ptr<Yc::Lib::Database> database);
RoomType type();
bool isType(RoomType type);
bool canDice();
@@ -91,6 +93,7 @@ namespace Yc
};
std::shared_ptr<Server> _parent;
std::shared_ptr<Yc::Lib::Database> _database;
std::string _name;
std::string _password;
std::vector<std::string> _allowedUsers;

84
src/core/chat_user.cpp
View File

@@ -45,6 +45,13 @@ namespace Yc
return;
}
auto server = _parent->getServer();
if (!server) {
// Fallback wenn Server nicht verfügbar
_user = Yc::Object::User(Json::Value());
_token = Yc::Lib::Tools::generateRandomString(32);
sendMsg(token, _token, _name, _color);
return;
}
auto db = server->_database;
// Suche Community-User
std::string query = "SELECT * FROM community.\"user\" WHERE username = '" + name + "' LIMIT 1;";
@@ -107,6 +114,83 @@ namespace Yc
// Thread-Start erfolgt jetzt explizit per start(), nicht im Konstruktor
}
ChatUser::ChatUser(std::shared_ptr<ChatRoom> parent, std::string name, std::string color, int socket, std::shared_ptr<Database> database)
: _parent(std::move(parent)),
_name(name),
_color(color),
_socket(socket),
_stop(false)
{
// Verwende die direkt übergebene Datenbank
if (!database) {
// Fallback wenn keine Datenbank verfügbar
_user = Yc::Object::User(Json::Value());
_token = Yc::Lib::Tools::generateRandomString(32);
sendMsg(token, _token, _name, _color);
return;
}
auto db = database;
// Suche Community-User
std::string query = "SELECT * FROM community.\"user\" WHERE username = '" + name + "' LIMIT 1;";
auto result = db->exec(query);
Json::Value userJson;
if (result.empty()) {
// Kein Community-User, lege Dummy an
userJson["display_name"] = name;
userJson["color"] = "#000000";
} else {
const auto& row = result[0];
int falukant_user_id = row["id"].as<int>();
// Suche Chat-User
std::string chatUserQuery = "SELECT * FROM chat.\"user\" WHERE falukant_user_id = " + std::to_string(falukant_user_id) + " LIMIT 1;";
auto chatUserResult = db->exec(chatUserQuery);
if (chatUserResult.empty()) {
// Chat-User anlegen
std::string insert = "INSERT INTO chat.\"user\" (falukant_user_id, display_name, color, show_gender, show_age, created_at, updated_at) VALUES (" +
std::to_string(falukant_user_id) + ", '" + name + "', '#000000', true, true, NOW(), NOW()) RETURNING *;";
auto newUser = db->exec(insert);
if (!newUser.empty()) {
const auto& u = newUser[0];
userJson["id"] = u["id"].as<int>();
userJson["falukant_user_id"] = u["falukant_user_id"].as<int>();
userJson["display_name"] = u["display_name"].c_str();
userJson["color"] = u["color"].c_str();
userJson["show_gender"] = u["show_gender"].as<bool>();
userJson["show_age"] = u["show_age"].as<bool>();
userJson["created_at"] = u["created_at"].c_str();
userJson["updated_at"] = u["updated_at"].c_str();
}
} else {
const auto& u = chatUserResult[0];
userJson["id"] = u["id"].as<int>();
userJson["falukant_user_id"] = u["falukant_user_id"].as<int>();
userJson["display_name"] = u["display_name"].c_str();
userJson["color"] = u["color"].c_str();
userJson["show_gender"] = u["show_gender"].as<bool>();
userJson["show_age"] = u["show_age"].as<bool>();
userJson["created_at"] = u["created_at"].c_str();
userJson["updated_at"] = u["updated_at"].c_str();
}
// Rechte laden
std::string rightsQuery = "SELECT r.tr FROM chat.user_rights ur JOIN chat.rights r ON ur.chat_right_id = r.id WHERE ur.chat_user_id = " + std::to_string(userJson["id"].asInt()) + ";";
auto rightsResult = db->exec(rightsQuery);
Json::Value rights(Json::arrayValue);
for (const auto& r : rightsResult) {
rights.append(r["tr"].c_str());
}
userJson["rights"] = rights;
}
_user = Yc::Object::User(userJson);
// Prefer DB color if available
if (_user.id() != 0 && !_user.color().empty()) {
_color = _user.color();
}
_token = Yc::Lib::Tools::generateRandomString(32);
// Beim Initial-Token direkt Name und aktuelle Farbe mitsenden, damit der Client "ich" korrekt färben kann
sendMsg(token, _token, _name, _color);
// Thread-Start erfolgt jetzt explizit per start(), nicht im Konstruktor
}
ChatUser::~ChatUser()
{
// Hinweis: Thread wird nicht im Destruktor gejoint, um Deadlocks zu vermeiden!

4
src/core/chat_user.h
View File

@@ -8,6 +8,7 @@
#include <thread>
#include "lib/base.h"
#include "object/user.h"
#include "lib/database.h"
namespace Yc
{
@@ -33,7 +34,8 @@ namespace Yc
result = 9
};
ChatUser(std::shared_ptr<ChatRoom> parent, std::string name, std::string color, int socket);
ChatUser(std::shared_ptr<ChatRoom> parent, std::string name, std::string color, int socket);
ChatUser(std::shared_ptr<ChatRoom> parent, std::string name, std::string color, int socket, std::shared_ptr<Database> database);
~ChatUser();
std::string name() const;
std::string getToken() const;

3
src/core/server.cpp
View File

@@ -359,6 +359,7 @@ namespace Yc {
room["allowed"] = Json::arrayValue; // ggf. später befüllen
room["roundlength"] = 60; // Default-Wert
auto newRoom = std::make_shared<ChatRoom>(self, room);
newRoom->setDatabase(_database);
_rooms.push_back(newRoom);
created = true;
#ifdef YC_DEBUG
@@ -389,6 +390,7 @@ namespace Yc {
std::cout << "[Debug] Creating fallback room: " << room["name"].asString() << std::endl;
#endif
auto newRoom = std::make_shared<ChatRoom>(self, room);
newRoom->setDatabase(_database);
_rooms.push_back(newRoom);
created = true;
}
@@ -404,6 +406,7 @@ namespace Yc {
room["type"] = 0;
room["roundlength"] = 0;
auto newRoom = std::make_shared<ChatRoom>(self, room);
newRoom->setDatabase(_database);
_rooms.push_back(newRoom);
created = true;
}

4
src/core/ssl_server.cpp
View File

@@ -437,6 +437,7 @@ void SSLServer::createRooms() {
for (const auto& room : dbRooms) {
std::cout << "[YourChat] Database room: " << room << std::endl;
auto newRoom = std::make_shared<ChatRoom>(nullptr, room);
newRoom->setDatabase(_database);
_rooms.push_back(newRoom);
}
std::cout << "[YourChat] Loaded " << _rooms.size() << " rooms from database" << std::endl;
@@ -462,6 +463,7 @@ void SSLServer::createRooms() {
std::cout << "[YourChat] Config room: " << room << std::endl;
// Create room objects using the same logic as the main server
auto newRoom = std::make_shared<ChatRoom>(nullptr, room);
newRoom->setDatabase(_database);
_rooms.push_back(newRoom);
}
} else {
@@ -474,6 +476,7 @@ void SSLServer::createRooms() {
defaultRoom["type"] = 0;
defaultRoom["roundlength"] = 0;
auto newRoom = std::make_shared<ChatRoom>(nullptr, defaultRoom);
newRoom->setDatabase(_database);
_rooms.push_back(newRoom);
std::cout << "[YourChat] Created default room 'Halle'" << std::endl;
}
@@ -499,6 +502,7 @@ void SSLServer::reloadRooms() {
for (const auto& room : dbRooms) {
std::cout << "[YourChat] Database room: " << room << std::endl;
auto newRoom = std::make_shared<ChatRoom>(nullptr, room);
newRoom->setDatabase(_database);
_rooms.push_back(newRoom);
}
std::cout << "[YourChat] Loaded " << _rooms.size() << " rooms from database" << std::endl;