Reorganized some files.

Champions Reborn Server.vcxproj

@@ -221,10 +221,13 @@
     <ClInclude Include="Network\Event\NotifyClientDiscovered_RTA.h" />
     <ClInclude Include="Network\Event\NotifyClientRequestConnect.h" />
     <ClInclude Include="Network\Event\NotifyForcedLogout.h" />
+    <ClInclude Include="Network\Event\NotifyFriendStatus.h" />
     <ClInclude Include="Network\Event\NotifyGameDiscovered.h" />
-    <ClInclude Include="Network\Event\Notify_4C.h" />
     <ClInclude Include="Network\Event\NotifyClientRequestConnect_RTA.h" />
+    <ClInclude Include="Network\Event\NotifyInstantMessage.h" />
     <ClInclude Include="Network\Event\NotifyRoomMessage.h" />
+    <ClInclude Include="Network\Event\RequestAddFriend.h" />
+    <ClInclude Include="Network\Event\RequestAddIgnore.h" />
     <ClInclude Include="Network\Event\RequestCancelGame.h" />
     <ClInclude Include="Network\Event\RequestCancelGame_RTA.h" />
     <ClInclude Include="Network\Event\RequestCreateAccount.h" />
@@ -245,6 +248,8 @@
     <ClInclude Include="Network\Event\RequestGetRoom.h" />
     <ClInclude Include="Network\Event\RequestGetRules.h" />
     <ClInclude Include="Network\Event\RequestGetServerAddress.h" />
+    <ClInclude Include="Network\Event\RequestGetSocialListInitial.h" />
+    <ClInclude Include="Network\Event\RequestGetSocialListUpdate.h" />
     <ClInclude Include="Network\Event\RequestLeaveRoom.h" />
     <ClInclude Include="Network\Event\RequestLogin.h" />
     <ClInclude Include="Network\Event\RequestLogout.h" />
@@ -252,6 +257,7 @@
     <ClInclude Include="Network\Event\RequestMatchGame_RTA.h" />
     <ClInclude Include="Network\Event\RequestCreateNewCharacter_RTA.h" />
     <ClInclude Include="Network\Event\RequestSaveCharacter_RTA.h" />
+    <ClInclude Include="Network\Event\RequestSendInstantMessage.h" />
     <ClInclude Include="Network\Event\RequestSendRoomMessage.h" />
     <ClInclude Include="Network\Event\RequestStartGame.h" />
     <ClInclude Include="Network\Event\RequestTouchSession.h" />
@@ -259,7 +265,6 @@
     <ClInclude Include="Network\Event\RequestGetNetCharacterList_RTA.h" />
     <ClInclude Include="Network\Event\RequestAppendCharacterData.h" />
     <ClInclude Include="Network\Event\RequestUserJoinSuccess.h" />
-    <ClInclude Include="Network\Event\RequestGetFriendList.h" />
     <ClInclude Include="Network\GenericNetMessage.h" />
     <ClInclude Include="Network\GenericNetRequest.h" />
     <ClInclude Include="Network\GenericNetResponse.h" />
@@ -295,10 +300,13 @@
     <ClCompile Include="Network\Event\NotifyClientDiscovered_RTA.cpp" />
     <ClCompile Include="Network\Event\NotifyClientRequestConnect.cpp" />
     <ClCompile Include="Network\Event\NotifyForcedLogout.cpp" />
+    <ClCompile Include="Network\Event\NotifyFriendStatus.cpp" />
     <ClCompile Include="Network\Event\NotifyGameDiscovered.cpp" />
-    <ClCompile Include="Network\Event\Notify_4C.cpp" />
     <ClCompile Include="Network\Event\NotifyClientRequestConnect_RTA.cpp" />
+    <ClCompile Include="Network\Event\NotifyInstantMessage.cpp" />
     <ClCompile Include="Network\Event\NotifyRoomMessage.cpp" />
+    <ClCompile Include="Network\Event\RequestAddFriend.cpp" />
+    <ClCompile Include="Network\Event\RequestAddIgnore.cpp" />
     <ClCompile Include="Network\Event\RequestCancelGame.cpp" />
     <ClCompile Include="Network\Event\RequestCancelGame_RTA.cpp" />
     <ClCompile Include="Network\Event\RequestCreateAccount.cpp" />
@@ -318,12 +326,14 @@
     <ClCompile Include="Network\Event\RequestGetRoom.cpp" />
     <ClCompile Include="Network\Event\RequestGetRules.cpp" />
     <ClCompile Include="Network\Event\RequestGetServerAddress.cpp" />
+    <ClCompile Include="Network\Event\RequestGetSocialListUpdate.cpp" />
     <ClCompile Include="Network\Event\RequestLeaveRoom.cpp" />
     <ClCompile Include="Network\Event\RequestLogin.cpp" />
     <ClCompile Include="Network\Event\RequestLogout.cpp" />
     <ClCompile Include="Network\Event\RequestMatchGame.cpp" />
     <ClCompile Include="Network\Event\RequestCreateNewCharacter_RTA.cpp" />
     <ClCompile Include="Network\Event\RequestSaveCharacter_RTA.cpp" />
+    <ClCompile Include="Network\Event\RequestSendInstantMessage.cpp" />
     <ClCompile Include="Network\Event\RequestSendRoomMessage.cpp" />
     <ClCompile Include="Network\Event\RequestStartGame.cpp" />
     <ClCompile Include="Network\Event\RequestTouchSession.cpp" />
@@ -333,7 +343,7 @@
     <ClCompile Include="Network\Event\RequestGetNetCharacterList_RTA.cpp" />
     <ClCompile Include="Network\Event\RequestAppendCharacterData.cpp" />
     <ClCompile Include="Network\Event\RequestUserJoinSuccess.cpp" />
-    <ClCompile Include="Network\Event\RequestGetFriendList.cpp" />
+    <ClCompile Include="Network\Event\RequestGetSocialListInitial.cpp" />
     <ClCompile Include="Network\GenericNetRequest.cpp" />
     <ClCompile Include="network\RealmSocket.cpp" />
     <ClCompile Include="stdafx.cpp">

Champions Reborn Server.vcxproj.filters

@@ -131,9 +131,6 @@
     <ClInclude Include="Network\Event\RequestAppendCharacterData.h">
       <Filter>Header Files\Network\Event</Filter>
     </ClInclude>
-    <ClInclude Include="Network\Event\RequestGetFriendList.h">
-      <Filter>Header Files\Network\Event</Filter>
-    </ClInclude>
     <ClInclude Include="Network\Event\RequestCancelGame.h">
       <Filter>Header Files\Network\Event</Filter>
     </ClInclude>
@@ -218,9 +215,6 @@
     <ClInclude Include="Network\Event\RequestGetRoom.h">
       <Filter>Header Files\Network\Event</Filter>
     </ClInclude>
-    <ClInclude Include="Network\Event\Notify_4C.h">
-      <Filter>Header Files\Network\Event</Filter>
-    </ClInclude>
     <ClInclude Include="Network\Event\NotifyForcedLogout.h">
       <Filter>Header Files\Network\Event</Filter>
     </ClInclude>
@@ -293,6 +287,27 @@
     <ClInclude Include="Database\Transaction.h">
       <Filter>Header Files\Database</Filter>
     </ClInclude>
+    <ClInclude Include="Network\Event\RequestAddFriend.h">
+      <Filter>Header Files\Network\Event</Filter>
+    </ClInclude>
+    <ClInclude Include="Network\Event\RequestAddIgnore.h">
+      <Filter>Header Files\Network\Event</Filter>
+    </ClInclude>
+    <ClInclude Include="Network\Event\NotifyFriendStatus.h">
+      <Filter>Header Files\Network\Event</Filter>
+    </ClInclude>
+    <ClInclude Include="Network\Event\RequestGetSocialListUpdate.h">
+      <Filter>Header Files\Network\Event</Filter>
+    </ClInclude>
+    <ClInclude Include="Network\Event\RequestGetSocialListInitial.h">
+      <Filter>Header Files\Network\Event</Filter>
+    </ClInclude>
+    <ClInclude Include="Network\Event\RequestSendInstantMessage.h">
+      <Filter>Header Files\Network\Event</Filter>
+    </ClInclude>
+    <ClInclude Include="Network\Event\NotifyInstantMessage.h">
+      <Filter>Header Files\Network\Event</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -355,7 +370,7 @@
     <ClCompile Include="Network\Event\RequestMatchGame_RTA.cpp">
       <Filter>Source Files\Network\Event</Filter>
     </ClCompile>
-    <ClCompile Include="Network\Event\RequestGetFriendList.cpp">
+    <ClCompile Include="Network\Event\RequestGetSocialListInitial.cpp">
       <Filter>Source Files\Network\Event</Filter>
     </ClCompile>
     <ClCompile Include="Network\Event\RequestCancelGame.cpp">
@@ -433,9 +448,6 @@
     <ClCompile Include="Network\Event\RequestGetRoom.cpp">
       <Filter>Source Files\Network\Event</Filter>
     </ClCompile>
-    <ClCompile Include="Network\Event\Notify_4C.cpp">
-      <Filter>Source Files\Network\Event</Filter>
-    </ClCompile>
     <ClCompile Include="Network\Event\NotifyForcedLogout.cpp">
       <Filter>Source Files\Network\Event</Filter>
     </ClCompile>
@@ -499,6 +511,24 @@
     <ClCompile Include="Network\GenericNetRequest.cpp">
       <Filter>Source Files\Network</Filter>
     </ClCompile>
+    <ClCompile Include="Network\Event\RequestAddFriend.cpp">
+      <Filter>Source Files\Network\Event</Filter>
+    </ClCompile>
+    <ClCompile Include="Network\Event\RequestAddIgnore.cpp">
+      <Filter>Source Files\Network\Event</Filter>
+    </ClCompile>
+    <ClCompile Include="Network\Event\NotifyFriendStatus.cpp">
+      <Filter>Source Files\Network\Event</Filter>
+    </ClCompile>
+    <ClCompile Include="Network\Event\RequestGetSocialListUpdate.cpp">
+      <Filter>Source Files\Network\Event</Filter>
+    </ClCompile>
+    <ClCompile Include="Network\Event\RequestSendInstantMessage.cpp">
+      <Filter>Source Files\Network\Event</Filter>
+    </ClCompile>
+    <ClCompile Include="Network\Event\NotifyInstantMessage.cpp">
+      <Filter>Source Files\Network\Event</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Champions Server.rc" />

Network/Event/RequestGetFriendList.cpp

@@ -1,38 +0,0 @@
-#include "RequestGetFriendList.h"
-
-void RequestGetFriendList::Deserialize( sptr_byte_stream stream )
-{
-	DeserializeHeader( stream );
-}
-
-sptr_generic_response RequestGetFriendList::ProcessRequest( sptr_socket socket, sptr_byte_stream stream )
-{
-	Deserialize( stream );
-
-	auto publicKey = stream->read_utf8();
-	auto unknown = stream->read_u32();
-
-	return std::make_shared< ResultGetFriendList >( this );
-}
-
-ResultGetFriendList::ResultGetFriendList( GenericRequest *request ) : GenericResponse( *request )
-{
-}
-
-void ResultGetFriendList::Serialize( ByteBuffer &out ) const
-{
-	out.write_u16( m_packetId );
-	out.write_u32( m_trackId );
-	out.write_u32( 0 );
-
-	// Friends
-	out.write_u32(1);
-	out.write_utf16(L"String_1");
-
-	out.write_u32(1);
-	out.write_utf16(L"String_2");
-
-	// Ignore
-	out.write_u32(1);
-	out.write_utf16(L"String_3");
-}

Network/Event/RequestGetFriendList.h

@@ -1,25 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include "../GenericNetRequest.h"
-#include "../GenericNetResponse.h"
-
-class RequestGetFriendList : public GenericRequest
-{
-public:
-	static std::unique_ptr< RequestGetFriendList > Create()
-	{
-		return std::make_unique< RequestGetFriendList >();
-	}
-
-	sptr_generic_response ProcessRequest( sptr_socket socket, sptr_byte_stream stream ) override;
-	void Deserialize( sptr_byte_stream stream ) override;
-};
-
-class ResultGetFriendList : public GenericResponse {
-public:
-	ResultGetFriendList( GenericRequest *request );
-	void Serialize( ByteBuffer &out ) const;
-};