Move static IOBan methods to namespace (#4777)

* Move IOBan to namespace from class with static methods * Format
otland · Sep 18, 2024 · 4cd6cbe · 4cd6cbe
1 parent 416df19
commit 4cd6cbe
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/src/ban.cpp b/src/ban.cpp
@@ -9,7 +9,9 @@
 #include "database.h"
 #include "databasetasks.h"
 
-const std::optional<BanInfo> IOBan::getAccountBanInfo(uint32_t accountId)
+namespace IOBan {
+
+const std::optional<BanInfo> getAccountBanInfo(uint32_t accountId)
 {
 	Database& db = Database::getInstance();
 
@@ -43,7 +45,7 @@ const std::optional<BanInfo> IOBan::getAccountBanInfo(uint32_t accountId)
 	return banInfo;
 }
 
-const std::optional<BanInfo> IOBan::getIpBanInfo(const Connection::Address& clientIP)
+const std::optional<BanInfo> getIpBanInfo(const Connection::Address& clientIP)
 {
 	if (clientIP.is_unspecified()) {
 		return std::nullopt;
@@ -77,9 +79,11 @@ const std::optional<BanInfo> IOBan::getIpBanInfo(const Connection::Address& clie
 	return banInfo;
 }
 
-bool IOBan::isPlayerNamelocked(uint32_t playerId)
+bool isPlayerNamelocked(uint32_t playerId)
 {
 	return Database::getInstance()
 	    .storeQuery(fmt::format("SELECT 1 FROM `player_namelocks` WHERE `player_id` = {:d}", playerId))
 	    .get();
 }
+
+} // namespace IOBan
diff --git a/src/ban.h b/src/ban.h
@@ -6,19 +6,19 @@
 
 #include "connection.h"
 
+namespace IOBan {
+
 struct BanInfo
 {
 	std::string bannedBy;
 	std::string reason;
 	time_t expiresAt;
 };
 
-class IOBan
-{
-public:
-	static const std::optional<BanInfo> getAccountBanInfo(uint32_t accountId);
-	static const std::optional<BanInfo> getIpBanInfo(const Connection::Address& clientIP);
-	static bool isPlayerNamelocked(uint32_t playerId);
-};
+const std::optional<BanInfo> getAccountBanInfo(uint32_t accountId);
+const std::optional<BanInfo> getIpBanInfo(const Connection::Address& clientIP);
+bool isPlayerNamelocked(uint32_t playerId);
+
+}; // namespace IOBan
 
 #endif // FS_BAN_H