Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-05-09 16:11:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: auto reject empty properties (#1794)

Browse Source 
Tested that having the config option set to 1 and having an empty property auto-rejected it.  Tested that having a model on the property or having the new config option set to 0 auto approved the property (as per live)
This commit is contained in:
David Markowitz 2025-05-07 21:15:10 -07:00 committed by GitHub
parent b6f7b4c092
commit e18c504ee4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dGame/dComponents/PropertyManagementComponent.cpp
View File

@ -26,6 +26,7 @@
#include <vector> #include <vector>
#include "CppScripts.h" #include "CppScripts.h"
#include <ranges> #include <ranges>
#include "dConfig.h"
PropertyManagementComponent* PropertyManagementComponent::instance = nullptr; PropertyManagementComponent* PropertyManagementComponent::instance = nullptr;
@ -151,7 +152,11 @@ void PropertyManagementComponent::SetPrivacyOption(PropertyPrivacyOption value)
info.rejectionReason = rejectionReason; info.rejectionReason = rejectionReason;
info.modApproved = 0; info.modApproved = 0;
Database::Get()->UpdatePropertyModerationInfo(info); if (models.empty() && Game::config->GetValue("auto_reject_empty_properties") == "1") {
UpdateApprovedStatus(false, "Your property is empty. Please place a model to have a public property.");
} else {
Database::Get()->UpdatePropertyModerationInfo(info);
}
} }
void PropertyManagementComponent::UpdatePropertyDetails(std::string name, std::string description) { void PropertyManagementComponent::UpdatePropertyDetails(std::string name, std::string description) {
@ -565,14 +570,14 @@ void PropertyManagementComponent::DeleteModel(const LWOOBJID id, const int delet
} }
} }
void PropertyManagementComponent::UpdateApprovedStatus(const bool value) { void PropertyManagementComponent::UpdateApprovedStatus(const bool value, const std::string& rejectionReason) {
if (owner == LWOOBJID_EMPTY) return; if (owner == LWOOBJID_EMPTY) return;
IProperty::Info info; IProperty::Info info;
info.id = propertyId; info.id = propertyId;
info.modApproved = value; info.modApproved = value;
info.privacyOption = static_cast<uint32_t>(privacyOption); info.privacyOption = static_cast<uint32_t>(privacyOption);
info.rejectionReason = ""; info.rejectionReason = rejectionReason;
Database::Get()->UpdatePropertyModerationInfo(info); Database::Get()->UpdatePropertyModerationInfo(info);
} }

2
dGame/dComponents/PropertyManagementComponent.h
View File

@ -135,7 +135,7 @@ public:
* Updates whether or not this property is approved by a moderator * Updates whether or not this property is approved by a moderator
* @param value true if the property should be approved, false otherwise * @param value true if the property should be approved, false otherwise
*/ */
void UpdateApprovedStatus(bool value); void UpdateApprovedStatus(bool value, const std::string& rejectionReason = "");
/** /**
* Loads all the models on this property from the database * Loads all the models on this property from the database

3
resources/worldconfig.ini
View File

@ -77,3 +77,6 @@ allow_players_to_skip_cinematics=0
# Customizable message for what to say when there is a cdclient fdb mismatch # Customizable message for what to say when there is a cdclient fdb mismatch
cdclient_mismatch_title=Version out of date cdclient_mismatch_title=Version out of date
cdclient_mismatch_message=We detected that your client is out of date. Please update your client to the latest version. cdclient_mismatch_message=We detected that your client is out of date. Please update your client to the latest version.
# Auto reject properties which contain no models | must be 1 in order to auto reject.
auto_reject_empty_properties=0