Moved type definitions to class/structure namespace in cases of priva…

…te usage, sending friend request is no longer possible to users from which there is a pending friend request
Arcidev · Aug 11, 2024 · 8355af1 · 8355af1
1 parent ca19694
commit 8355af1
Show file tree

Hide file tree

Showing 24 changed files with 64 additions and 30 deletions.
diff --git a/Client.Logic/Enums/UserRelationActionResult.cs b/Client.Logic/Enums/UserRelationActionResult.cs
@@ -6,6 +6,7 @@ public enum UserRelationActionResult
         Success = 0,
         UserNotFound,
         MissingFriendRequest,
+        PendingFriendRequest,
         UserBlocked,
         SenderBlocked
     }

diff --git a/Client.Logic/Network/PacketHandlerUser.cs b/Client.Logic/Network/PacketHandlerUser.cs
@@ -139,6 +139,9 @@ void Success()
                 case UserRelationActionResult.MissingFriendRequest:
                     game.OnInformationReceived(string.Format(Texts.FriendRequestMissing, name));
                     break;
+                case UserRelationActionResult.PendingFriendRequest:
+                    game.OnInformationReceived(string.Format(Texts.FriendRequestPending, name));
+                    break;
                 case UserRelationActionResult.UserBlocked:
                     game.OnInformationReceived(string.Format(Texts.UserBlocked, name));
                     break;

diff --git a/Client.Logic/Resources/Texts.Designer.cs b/Client.Logic/Resources/Texts.Designer.cs
diff --git a/Client.Logic/Resources/Texts.cs-CZ.resx b/Client.Logic/Resources/Texts.cs-CZ.resx
@@ -264,4 +264,7 @@
   <data name="FriendRequestReceived" xml:space="preserve">
     <value>Nová žádost o přátelství od {0}</value>
   </data>
+  <data name="FriendRequestPending" xml:space="preserve">
+    <value>Již máte nevyřízenou žádost o přátelství od uživatele {0}</value>
+  </data>
 </root>
diff --git a/Client.Logic/Resources/Texts.es-ES.resx b/Client.Logic/Resources/Texts.es-ES.resx
@@ -264,4 +264,7 @@
   <data name="FriendRequestReceived" xml:space="preserve">
     <value>Nueva solicitud de amistad de {0}</value>
   </data>
+  <data name="FriendRequestPending" xml:space="preserve">
+    <value>Ya tienes una solicitud de amistad pendiente de {0}</value>
+  </data>
 </root>
diff --git a/Client.Logic/Resources/Texts.resx b/Client.Logic/Resources/Texts.resx
@@ -244,4 +244,7 @@
   <data name="FriendRequestReceived" xml:space="preserve">
     <value>New friend request from {0}</value>
   </data>
+  <data name="FriendRequestPending" xml:space="preserve">
+    <value>You already have a pending friend request from {0}</value>
+  </data>
 </root>
diff --git a/Client.Logic/Resources/Texts.sk-SK.resx b/Client.Logic/Resources/Texts.sk-SK.resx
@@ -264,4 +264,7 @@
   <data name="FriendRequestReceived" xml:space="preserve">
     <value>Nová žiadosť o priateľstvo od {0}</value>
   </data>
+  <data name="FriendRequestPending" xml:space="preserve">
+    <value>Už máte čakajúcu žiadosť o priateľstvo od používateľa {0}</value>
+  </data>
 </root>
diff --git a/Server/Server/Achievements/AchievementMgr.cpp b/Server/Server/Achievements/AchievementMgr.cpp
@@ -36,7 +36,7 @@ void AchievementManager::updateUserAchievementProgress()
         }
 
         m_locker.lock();
-        auto mapCopy = std::map<std::tuple<uint32_t, uint32_t>, uint32_t>(m_userAchievementProgress);
+        auto mapCopy = UserAchievementProgress(m_userAchievementProgress);
         m_userAchievementProgress.clear();
         m_locker.unlock();
 

diff --git a/Server/Server/Achievements/AchievementMgr.h b/Server/Server/Achievements/AchievementMgr.h
@@ -10,8 +10,10 @@ typedef std::map<uint32_t, Achievement> AchievementMap;
 class AchievementManager
 {
     private:
+        typedef std::map<std::tuple<uint32_t, uint32_t>, uint32_t> UserAchievementProgress;
+
         std::mutex m_locker;
-        std::map<std::tuple<uint32_t, uint32_t>, uint32_t> m_userAchievementProgress;
+        UserAchievementProgress m_userAchievementProgress;
         DbAchievementMap m_achievementMap;
         std::thread m_userAchievementProgressThread;
         bool m_stopUpdateThread;

diff --git a/Server/Server/Cards/PlayableCard.h b/Server/Server/Cards/PlayableCard.h
@@ -4,13 +4,14 @@
 #include "Card.h"
 #include "../Spells/SpellAuraEffect.h"
 
-typedef std::map<std::pair<uint32_t, uint32_t>, SpellAuraEffect> SpellAuraEffectsMap;
 
 class Player;
 
 class PlayableCard : public Card
 {
     private:
+        typedef std::map<std::pair<uint32_t, uint32_t>, SpellAuraEffect> SpellAuraEffectsMap;
+
         uint64_t m_guid;
         bool m_isDefending;
         Player* m_owner;

diff --git a/Server/Server/DataHolder.cpp b/Server/Server/DataHolder.cpp
@@ -4,7 +4,7 @@
 #include "Spells/SpellValidator.h"
 
 CardsDataMap DataHolder::m_cards;
-SpellsDataMap DataHolder::m_spells;
+DataHolder::SpellsDataMap DataHolder::m_spells;
 
 // Callback for selecting spells
 void DataHolder::loadSpellsCallback(PGresult const* result)

diff --git a/Server/Server/DataHolder.h b/Server/Server/DataHolder.h
@@ -6,11 +6,12 @@
 #include "../Database/DatabaseInstance.h"
 
 typedef std::map<uint32_t, Card> CardsDataMap;
-typedef std::map<uint32_t, Spell> SpellsDataMap;
 
 class DataHolder
 {
     private:
+        typedef std::map<uint32_t, Spell> SpellsDataMap;
+
         static SpellsDataMap m_spells;
         static CardsDataMap m_cards;
 

diff --git a/Server/Server/PacketHandlers/PacketHandler.h b/Server/Server/PacketHandlers/PacketHandler.h
@@ -4,15 +4,15 @@
 
 class ConnectedUser;
 
-typedef void(*PacketHandlerFunc)(ConnectedUser* user, Packet& packet);
-typedef bool(*HandlerValidatorFunc)(ConnectedUser const* user);
-
 struct PacketHandlerFuncWrapper
 {
+    typedef void(*PacketHandlerFunc)(ConnectedUser* user, Packet& packet);
+    typedef bool(*HandlerValidatorFunc)(ConnectedUser const* user);
+
     PacketHandlerFunc Handler;
     HandlerValidatorFunc HandlerValidator;
 
-    void Invoke(ConnectedUser* user, Packet& packet)
+    void Invoke(ConnectedUser* user, Packet& packet) const
     {
         if (Handler != nullptr && HandlerValidator != nullptr && HandlerValidator(user))
             Handler(user, packet);

diff --git a/Server/Server/PacketHandlers/UserHandler.cpp b/Server/Server/PacketHandlers/UserHandler.cpp
@@ -38,6 +38,7 @@ enum UserRelationActionResult
     USER_RELATION_ACTION_RESULT_SUCCESS = 0,
     USER_RELATION_ACTION_RESULT_USER_NOT_FOUND,
     USER_RELATION_ACTION_RESULT_MISSING_FRIEND_REQUEST,
+    USER_RELATION_ACTION_RESULT_PENDING_FRIEND_REQUEST,
     USER_RELATION_ACTION_RESULT_USER_BLOCKED,
     USER_RELATION_ACTION_RESULT_SENDER_BLOCKED
 };
@@ -196,6 +197,8 @@ void PacketHandler::handleUserRelationPacket(ConnectedUser* cUser, Packet& packe
                     result = USER_RELATION_ACTION_RESULT_SENDER_BLOCKED;
                 else if (dbHandler.IsUserBlocked(cUser->GetDatabaseId(), id))
                     result = USER_RELATION_ACTION_RESULT_USER_BLOCKED;
+                else if (dbHandler.HasFriendRequest(id, cUser->GetDatabaseId()))
+                    result = USER_RELATION_ACTION_RESULT_PENDING_FRIEND_REQUEST;
                 else
                 {
                     dbHandler.SetFriendRequest(cUser->GetDatabaseId(), id);

diff --git a/Server/Server/ServerNetwork.h b/Server/Server/ServerNetwork.h
@@ -33,7 +33,7 @@ class ServerNetwork
         ServerNetwork();
         ~ServerNetwork();
 
-        void Close() { shutdown(m_listenSocket, SD_BOTH); closesocket(m_listenSocket); }
+        void Close() const { shutdown(m_listenSocket, SD_BOTH); closesocket(m_listenSocket); }
         // accept new connections
         bool AcceptNewClient(uint32_t id, AchievementManager* achievementMgr);
         // receive incoming data

diff --git a/Server/Server/SignalHandler.cpp b/Server/Server/SignalHandler.cpp
@@ -2,7 +2,7 @@
 #include "SignalHandler.h"
 #include "../Shared/SharedDefines.h"
 
-SignalHandlersMap SignalHandler::m_handlers;
+SignalHandler::SignalHandlersMap SignalHandler::m_handlers;
 
 void SignalHandler::RegisterMethod(int signal, std::function<bool()> func)
 {

diff --git a/Server/Server/SignalHandler.h b/Server/Server/SignalHandler.h
@@ -2,11 +2,11 @@
 #include <functional>
 #include <map>
 
-typedef std::map<int, std::function<bool()>> SignalHandlersMap;
-
 class SignalHandler
 {
     private:
+        typedef std::map<int, std::function<bool()>> SignalHandlersMap;
+
         static SignalHandlersMap m_handlers;
         static void signalControlHandler(int signal);
 

diff --git a/Server/Server/Spells/SpellAuraEffectHandler.cpp b/Server/Server/Spells/SpellAuraEffectHandler.cpp
@@ -5,7 +5,7 @@
 #include "../Player.h"
 #include "../Cards/PlayableCard.h"
 
-SpellAuraEffectFuncWrapper const SpellAuraEffectHandler::m_spellAuraEffectHandlers[] =
+SpellAuraEffectHandler::SpellAuraEffectFuncWrapper const SpellAuraEffectHandler::m_spellAuraEffectHandlers[] =
 {
     { defaultApplyHandler,      nullptr,                    handleDamageOnTick  },  // SPELL_AURA_EFFECT_DAMAGE
     { statChangedApplyHandler,  statChangedRemoveHandler,   nullptr             },  // SPELL_AURA_EFFECT_MODIFY_STAT

diff --git a/Server/Server/Spells/SpellAuraEffectHandler.h b/Server/Server/Spells/SpellAuraEffectHandler.h
@@ -10,16 +10,16 @@ typedef void(*SpellAuraEffectApplyHandlerFunc)(SpellEffectValues const& aura, Pl
 typedef void(*SpellAuraEffectRemoveHandlerFunc)(SpellAuraEffect const& aura, PlayableCard* card);
 typedef void(*SpellAuraEffectTickHandlerFunc)(PlayableCard* card, uint8_t value, uint32_t spellAttributes, PlayableCard const* caster);
 
-struct SpellAuraEffectFuncWrapper
-{
-    SpellAuraEffectApplyHandlerFunc Apply;
-    SpellAuraEffectRemoveHandlerFunc Remove;
-    SpellAuraEffectTickHandlerFunc Tick;
-};
-
 class SpellAuraEffectHandler
 {
     private:
+        struct SpellAuraEffectFuncWrapper
+        {
+            SpellAuraEffectApplyHandlerFunc Apply;
+            SpellAuraEffectRemoveHandlerFunc Remove;
+            SpellAuraEffectTickHandlerFunc Tick;
+        };
+
         static SpellAuraEffectFuncWrapper const m_spellAuraEffectHandlers[];
 
         static void defaultApplyHandler(SpellEffectValues const& effectValues, Player* caster, PlayableCard* targetCard);

diff --git a/Server/Server/Spells/SpellTargetSelector.cpp b/Server/Server/Spells/SpellTargetSelector.cpp
@@ -3,7 +3,7 @@
 #include "../Cards/PlayableCard.h"
 #include "../Player.h"
 
-SpellTargetSelectorFunc const SpellTargetSelector::m_spellTargetSelectors[] =
+SpellTargetSelector::SpellTargetSelectorFunc const SpellTargetSelector::m_spellTargetSelectors[] =
 {
     handleTargetUnitTargetEnemy,    // TARGET_UNIT_TARGET_ENEMY
     handleTargetUnitTargetFriend,   // TARGET_UNIT_TARGET_FRIEND

diff --git a/Server/Server/Spells/SpellTargetSelector.h b/Server/Server/Spells/SpellTargetSelector.h
@@ -4,11 +4,12 @@
 
 class PlayableCard;
 class Player;
-typedef std::list<PlayableCard*>(*SpellTargetSelectorFunc)(Player const* attacker, Player const* victim, uint64_t targetGuid, uint32_t spellAttributes);
 
 class SpellTargetSelector
 {
     private:
+        typedef std::list<PlayableCard*>(*SpellTargetSelectorFunc)(Player const* attacker, Player const* victim, uint64_t targetGuid, uint32_t spellAttributes);
+
         static SpellTargetSelectorFunc const m_spellTargetSelectors[];
 
         // target handlers

diff --git a/Server/Server/Spells/SpellValidator.cpp b/Server/Server/Spells/SpellValidator.cpp
@@ -3,15 +3,15 @@
 #include "SpellDefines.h"
 #include "SpellEffect.h"
 
-SpellTargetValidatorFunc const SpellValidator::m_targetValidators[] =
+SpellValidator::SpellTargetValidatorFunc const SpellValidator::m_targetValidators[] =
 {
     validateTargetUnitTargetEnemy,  // TARGET_UNIT_TARGET_ENEMY
     validateTargetUnitTargetFriend, // TARGET_UNIT_TARGET_FRIEND
     validateTargetUnitCleaveEnemy,  // TARGET_UNIT_CLEAVE_ENEMY
     validateTargetUnitSelf          // TARGET_UNIT_SELF
 };
 
-SpellEffectValidatorFunc const SpellValidator::m_effectValidators[] =
+SpellValidator::SpellEffectValidatorFunc const SpellValidator::m_effectValidators[] =
 {
     defaultEffectValidator,         // SPELL_EFFECT_DIRECT_DAMAGE
     defaultEffectValidator,         // SPELL_EFFECT_APPLY_AURA
@@ -21,7 +21,7 @@ SpellEffectValidatorFunc const SpellValidator::m_effectValidators[] =
     defaultEffectValidator          // SPELL_EFFECT_SWAP
 };
 
-SpellAuraValidatorFunc const SpellValidator::m_auraValidators[] =
+SpellValidator::SpellAuraValidatorFunc const SpellValidator::m_auraValidators[] =
 {
     nullptr,                // SPELL_AURA_EFFECT_DAMAGE
     nullptr,                // SPELL_AURA_EFFECT_MODIFY_STAT

diff --git a/Server/Server/Spells/SpellValidator.h b/Server/Server/Spells/SpellValidator.h
@@ -4,13 +4,13 @@
 
 struct SpellEffectValues;
 
-typedef void(*SpellTargetValidatorFunc)(uint32_t spellEffectId, SpellEffectValues const& values);
-typedef void(*SpellEffectValidatorFunc)(uint32_t spellEffectId, SpellEffectValues const& values);
-typedef void(*SpellAuraValidatorFunc)(SpellEffectValues const& values);
-
 class SpellValidator
 {
     private:
+        typedef void(*SpellTargetValidatorFunc)(uint32_t spellEffectId, SpellEffectValues const& values);
+        typedef void(*SpellEffectValidatorFunc)(uint32_t spellEffectId, SpellEffectValues const& values);
+        typedef void(*SpellAuraValidatorFunc)(SpellEffectValues const& values);
+
         static SpellTargetValidatorFunc const m_targetValidators[];
         static SpellEffectValidatorFunc const m_effectValidators[];
         static SpellAuraValidatorFunc const m_auraValidators[];

diff --git a/Server/Settings/SettingsHandler.h b/Server/Settings/SettingsHandler.h
@@ -14,6 +14,7 @@ class SettingsHandler
 {
     private:
         typedef std::map<std::string, std::function<void(SettingsHandler*, std::string_view)>> ConfigMap;
+
         static ConfigMap m_configMap;
 
         DatabaseConfig m_dbConfig;