jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-24 10:23:02 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Address second round of deck share review comments

Browse source
This commit is contained in:
Lukas Brübach 2026-09-20 19:08:17 +02:00 • committed by GitHub
parent 02b4e8d13d
commit 6fe6a75f8f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 33 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
servatrice/servatrice.ini.example
View file

@ -471,5 +471,5 @@ max_decks_per_share=50
; Maximum number of share links a single user may create per day. ; Maximum number of share links a single user may create per day.
; A value of 0 disables the limit. ; A value of 0 disables the limit.
; Default: 0 ; Default: 50
max_shares_per_day=0 max_shares_per_day=50

5
servatrice/src/servatrice.cpp
View file

@ -1082,7 +1082,7 @@ int Servatrice::getServerStatusUpdateTime() const
int Servatrice::getDeckShareExpiryDays() const int Servatrice::getDeckShareExpiryDays() const
{ {
return settingsCache->value("deck_share/expiry_days", 7).toInt(); return qMax(1, settingsCache->value("deck_share/expiry_days", 7).toInt());
} }
int Servatrice::getDeckShareCleanupInterval() const int Servatrice::getDeckShareCleanupInterval() const
@ -1098,8 +1098,7 @@ int Servatrice::getDeckShareMaxDecksPerShare() const
int Servatrice::getDeckShareMaxSharesPerDay() const int Servatrice::getDeckShareMaxSharesPerDay() const
{ {
// default: no limit return settingsCache->value("deck_share/max_shares_per_day", 50).toInt();
return settingsCache->value("deck_share/max_shares_per_day", 0).toInt();
} }
int Servatrice::getNumberOfTCPPools() const int Servatrice::getNumberOfTCPPools() const

3
servatrice/src/servatrice_database_interface.cpp
View file

@ -1224,7 +1224,8 @@ bool Servatrice_DatabaseInterface::getDeckSharesForUser(int userId, QList<DeckSh
QSqlQuery *query = prepareQuery("select s.id, s.name, UNIX_TIMESTAMP(s.created_at), " QSqlQuery *query = prepareQuery("select s.id, s.name, UNIX_TIMESTAMP(s.created_at), "
"UNIX_TIMESTAMP(s.expires_at), count(i.id) from {prefix}_deck_share s left join " "UNIX_TIMESTAMP(s.expires_at), count(i.id) from {prefix}_deck_share s left join "
"{prefix}_deck_share_item i on i.share_id = s.id where s.created_by = :created_by " "{prefix}_deck_share_item i on i.share_id = s.id "
"where s.created_by = :created_by and s.expires_at > now() "
"group by s.id, s.name, s.created_at, s.expires_at order by s.created_at desc"); "group by s.id, s.name, s.created_at, s.expires_at order by s.created_at desc");
query->bindValue(":created_by", userId); query->bindValue(":created_by", userId);
if (!execSqlQuery(query)) { if (!execSqlQuery(query)) {

43
servatrice/src/serversocketinterface.cpp
View file

@ -621,9 +621,6 @@ bool AbstractServerSocketInterface::deckListHelper(int folderId,
const QString name = folderInfo.first; const QString name = folderInfo.first;
const bool ownPublic = folderInfo.second; const bool ownPublic = folderInfo.second;
const bool effectivePublic = inheritedPublic || ownPublic; const bool effectivePublic = inheritedPublic || ownPublic;
if (publicOnly && !effectivePublic) {
continue;
}
ServerInfo_DeckStorage_TreeItem *newItem = folder->add_items(); ServerInfo_DeckStorage_TreeItem *newItem = folder->add_items();
newItem->set_id(folderIdValue); newItem->set_id(folderIdValue);
@ -633,6 +630,10 @@ bool AbstractServerSocketInterface::deckListHelper(int folderId,
if (!deckListHelper(newItem->id(), newItem->mutable_folder(), userId, effectivePublic, publicOnly)) { if (!deckListHelper(newItem->id(), newItem->mutable_folder(), userId, effectivePublic, publicOnly)) {
return false; return false;
} }
if (publicOnly && !effectivePublic && newItem->mutable_folder()->items_size() == 0) {
folder->mutable_items()->RemoveLast();
}
} }
query = sqlInterface->prepareQuery("select id, name, upload_time, is_public, banner_card_name, " query = sqlInterface->prepareQuery("select id, name, upload_time, is_public, banner_card_name, "
@ -1033,11 +1034,15 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckUpload(const Comman
fileInfo->mutable_file()->set_is_public(cmd.has_is_public() && cmd.is_public()); fileInfo->mutable_file()->set_is_public(cmd.has_is_public() && cmd.is_public());
rc.setResponseExtension(re); rc.setResponseExtension(re);
} else if (cmd.has_deck_id()) { } else if (cmd.has_deck_id()) {
QSqlQuery *query = QString updateQuery = "update {prefix}_decklist_files set name=:name, upload_time=NOW(), content=:content, "
sqlInterface->prepareQuery("update {prefix}_decklist_files set name=:name, upload_time=NOW(), " "banner_card_name=:banner_card_name, banner_card_provider=:banner_card_provider, "
"content=:content, banner_card_name=:banner_card_name, " "color_identity=:color_identity, tags=:tags";
"banner_card_provider=:banner_card_provider, color_identity=:color_identity, " if (cmd.has_is_public()) {
"tags=:tags where id = :id_deck and id_user = :id_user"); updateQuery += ", is_public=:is_public";
}
updateQuery += " where id = :id_deck and id_user = :id_user";
QSqlQuery *query = sqlInterface->prepareQuery(updateQuery);
query->bindValue(":id_deck", cmd.deck_id()); query->bindValue(":id_deck", cmd.deck_id());
query->bindValue(":id_user", userInfo->id()); query->bindValue(":id_user", userInfo->id());
query->bindValue(":name", deckName); query->bindValue(":name", deckName);
@ -1046,6 +1051,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckUpload(const Comman
query->bindValue(":banner_card_provider", bannerCardProvider); query->bindValue(":banner_card_provider", bannerCardProvider);
query->bindValue(":color_identity", colorIdentity); query->bindValue(":color_identity", colorIdentity);
query->bindValue(":tags", tagsJson); query->bindValue(":tags", tagsJson);
if (cmd.has_is_public()) {
query->bindValue(":is_public", cmd.is_public() ? 1 : 0);
}
if (!sqlInterface->execSqlQuery(query)) { if (!sqlInterface->execSqlQuery(query)) {
return Response::RespContextError; return Response::RespContextError;
} }
@ -1149,8 +1157,10 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckShareCreate(const C
"created_by = :created_by and created_at >= " "created_by = :created_by and created_at >= "
"DATE_SUB(NOW(), INTERVAL 1 DAY)"); "DATE_SUB(NOW(), INTERVAL 1 DAY)");
countQuery->bindValue(":created_by", userInfo->id()); countQuery->bindValue(":created_by", userInfo->id());
if (sqlInterface->execSqlQuery(countQuery) && countQuery->next() && if (!sqlInterface->execSqlQuery(countQuery) || !countQuery->next()) {
countQuery->value(0).toInt() >= maxSharesPerDay) { return Response::RespContextError;
}
if (countQuery->value(0).toInt() >= maxSharesPerDay) {
return Response::RespTooManyRequests; return Response::RespTooManyRequests;
} }
} }
@ -1185,25 +1195,26 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckShareCreate(const C
// Drain the deck list before resolving each deck: getDeckFromDatabase // Drain the deck list before resolving each deck: getDeckFromDatabase
// issues its own query on the same cached statement set. // issues its own query on the same cached statement set.
QSqlQuery *query = sqlInterface->prepareQuery("select id from {prefix}_decklist_files where id_folder = " QSqlQuery *query =
":id_folder and id_user = :id_user"); sqlInterface->prepareQuery("select id, color_identity from {prefix}_decklist_files where id_folder = "
":id_folder and id_user = :id_user");
query->bindValue(":id_folder", folderId); query->bindValue(":id_folder", folderId);
query->bindValue(":id_user", userInfo->id()); query->bindValue(":id_user", userInfo->id());
if (!sqlInterface->execSqlQuery(query)) { if (!sqlInterface->execSqlQuery(query)) {
return Response::RespContextError; return Response::RespContextError;
} }
QList<int> deckIds; QList<std::pair<int, QString>> deckRows;
while (query->next()) { while (query->next()) {
deckIds.append(query->value(0).toInt()); deckRows.append({query->value(0).toInt(), query->value(1).toString()});
} }
for (const int deckId : deckIds) { for (const auto &[deckId, colorIdentity] : deckRows) {
DeckList *deck; DeckList *deck;
try { try {
deck = sqlInterface->getDeckFromDatabase(deckId, userInfo->id()); deck = sqlInterface->getDeckFromDatabase(deckId, userInfo->id());
} catch (Response::ResponseCode &r) { } catch (Response::ResponseCode &r) {
return r; return r;
} }
items.append(makeShareItemFromDeck(*deck, QString())); items.append(makeShareItemFromDeck(*deck, colorIdentity));
delete deck; delete deck;
} }
} else { } else {