From 85803bc96c7a2d819a74a355c282f8d8f442d284 Mon Sep 17 00:00:00 2001
From: Maru <matheus@itsmaru.com>
Date: Sat, 17 Mar 2018 21:47:23 -0300
Subject: [PATCH] Get rid of old stuff;

---
 src/servers/sapphire_zone/Social/Group.cpp | 24 ++++------------------
 src/servers/sapphire_zone/Social/Group.h   | 17 +++------------
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/src/servers/sapphire_zone/Social/Group.cpp b/src/servers/sapphire_zone/Social/Group.cpp
index 8aadec01..fc35192d 100644
--- a/src/servers/sapphire_zone/Social/Group.cpp
+++ b/src/servers/sapphire_zone/Social/Group.cpp
@@ -28,30 +28,14 @@ uint32_t Group::addMember( uint64_t characterId )
 
    uint32_t logMessage = 0;
 
-   m_groupMembers.insert( characterId );
-
-   return logMessage;
-}
-
-uint32_t Group::addInvite( uint64_t characterId )
-{
-   assert( characterId != 0 );
-
-   uint32_t logMessage = 0;
-
-   m_groupInvites.insert( characterId );
+   m_members.insert( characterId );
 
    return logMessage;
 }
 
 bool Group::hasMember( uint64_t memberId ) const
 {
-   return m_groupMembers.find( memberId ) != m_groupMembers.end();
-}
-
-bool Group::hasInvite( uint64_t inviteId ) const
-{
-   return m_groupInvites.find( inviteId ) != m_groupInvites.end();
+   return m_members.find( memberId ) != m_members.end();
 }
 
 Core::Network::Packets::GamePacketPtr Group::processInvite( uint64_t recipientId, uint64_t senderId )
@@ -76,9 +60,9 @@ Core::Network::Packets::GamePacketPtr Group::processInvite( uint64_t recipientId
    {
       // todo: broadcast join message
 
-      m_groupInvites.erase( recipientId );
+      //m_groupInvites.erase( recipientId );
 
-      m_groupMembers.emplace( recipientId );
+      m_members.emplace( recipientId );
    }
    else
    {
diff --git a/src/servers/sapphire_zone/Social/Group.h b/src/servers/sapphire_zone/Social/Group.h
index 93432695..256d230a 100644
--- a/src/servers/sapphire_zone/Social/Group.h
+++ b/src/servers/sapphire_zone/Social/Group.h
@@ -49,10 +49,9 @@ public:
    bool isContentGroup() const;
 
    // New group system: return error code for logmessage
-   //TODO: change the member models!!!!!!!
 
    virtual uint32_t addMember( uint64_t characterId );
-   virtual uint32_t addInvite( uint64_t characterId );
+   //virtual uint32_t addInvite( uint64_t characterId );
    
    virtual Core::Network::Packets::GamePacketPtr processInvite( uint64_t recipientId, uint64_t senderId );
 
@@ -65,24 +64,18 @@ public:
 
    //virtual void populateGroupMembers();
 
-   /*! generates a player entry used for lists (social, etc) */
-   //
-
    /*! access member vector */
    std::set< uint64_t >& getMembers();
 
-   /*! access invite vector */
-   std::set< uint64_t >& getInvites();
-
    /*! get container limit */
    uint32_t getCapacity() const;
 
    /*! get total size of group (members + invites) */
    uint32_t Group::getTotalSize() const;
 
+   /*! check if group has member */
    bool hasMember( uint64_t memberId ) const;
 
-   bool hasInvite( uint64_t inviteId ) const;
 
 protected:
    GroupType m_type{ GroupType::None };
@@ -92,11 +85,7 @@ protected:
    uint32_t m_maxRoles{ 50 };
    std::chrono::steady_clock::time_point m_createTime{ std::chrono::steady_clock::now() };
 
-   std::set< uint64_t > m_groupMembers;
-   std::set< uint64_t > m_groupInvites;
-
-   std::map< uint64_t, GroupMember > m_members;
-   std::map< uint64_t, GroupMember > m_invites; // <recipient, groupmember (which contains senderId)>
+   std::set< uint64_t > m_members;
 
 private: