Add friend list support

Arrowgene.Ddon.Database/Files/Database/Script/schema_sqlite.sql

@@ -51,6 +51,7 @@ CREATE TABLE IF NOT EXISTS ddon_character
     "hide_equip_lantern_pawn"    BOOLEAN                           NOT NULL,
     "arisen_profile_share_range" SMALLINT                          NOT NULL,
     "fav_warp_slot_num"          INTEGER                           NOT NULL,
+    "online_status"              SMALLINT,
     CONSTRAINT fk_character_character_common_id FOREIGN KEY ("character_common_id") REFERENCES ddon_character_common ("character_common_id") ON DELETE CASCADE,
     CONSTRAINT fk_character_account_id FOREIGN KEY ("account_id") REFERENCES account ("id") ON DELETE CASCADE
 );
@@ -428,3 +429,17 @@ CREATE TABLE IF NOT EXISTS ddon_connection
     CONSTRAINT uq_connection_server_id_account_id UNIQUE (server_id, account_id),
     CONSTRAINT fk_connection_token_account_id FOREIGN KEY ("account_id") REFERENCES account ("id")
 );
+
+CREATE TABLE IF NOT EXISTS "ddon_contact_list" (
+    "id"                        INTEGER UNIQUE,
+    "requester_character_id"	INTEGER NOT NULL,
+    "requested_character_id"	INTEGER NOT NULL,
+    "status"                    SMALLINT NOT NULL,
+    "type"                      SMALLINT NOT NULL,
+    "requester_favorite"	    BOOLEAN NOT NULL,
+    "requested_favorite"	    BOOLEAN NOT NULL,
+    FOREIGN KEY("requester_character_id") REFERENCES "ddon_character"("character_id"),
+    FOREIGN KEY("requested_character_id") REFERENCES "ddon_character"("character_id"),
+    PRIMARY KEY("id" AUTOINCREMENT),
+    UNIQUE("requester_character_id","requested_character_id")
+);

Arrowgene.Ddon.Database/IDatabase.cs

@@ -37,6 +37,8 @@ public interface IDatabase
         bool UpdateCharacterBaseInfo(Character character);
         bool UpdateCharacterMatchingProfile(Character character);
         bool UpdateCharacterArisenProfile(Character character);
+        int UpdateCharacterOnlineStatus(Character character);
+        int UpdateAllCharactersOnlineStatus(OnlineStatus onlineStatus);
 
         // Pawn
         bool CreatePawn(Pawn pawn);
@@ -140,5 +142,16 @@ public interface IDatabase
         bool DeleteConnection(int serverId, int accountId);
         bool DeleteConnectionsByAccountId(int accountId);
         bool DeleteConnectionsByServerId(int serverId);
+
+        // ContactList
+        int InsertContact(uint requestingCharacterId, uint requestedCharacterId, ContactListStatus status,
+            ContactListType type, bool requesterFavorite, bool requestedFavorite);
+        int UpdateContact(uint requestingCharacterId, uint requestedCharacterId, ContactListStatus status,
+            ContactListType type, bool requesterFavorite, bool requestedFavorite);
+        int DeleteContact(uint requestingCharacterId, uint requestedCharacterId);
+        int DeleteContactById(uint id);
+        List<ContactListEntity> SelectContactsByCharacterId(uint characterId);
+        ContactListEntity SelectContactsByCharacterId(uint characterId1, uint characterId2);
+        ContactListEntity SelectContactListById(uint id);
     }
 }

Arrowgene.Ddon.Database/Sql/Core/DdonSqlDbCharacter.cs

@@ -14,7 +14,7 @@ public abstract partial class DdonSqlDb<TCon, TCom, TReader> : SqlDb<TCon, TCom,
     {
         private static readonly string[] CharacterFields = new string[]
         {
-            "version", "character_common_id", "account_id", "first_name", "last_name", "created", "my_pawn_slot_num", "rental_pawn_slot_num", "hide_equip_head_pawn", "hide_equip_lantern_pawn", "arisen_profile_share_range", "fav_warp_slot_num"
+            "version", "character_common_id", "account_id", "first_name", "last_name", "created", "my_pawn_slot_num", "rental_pawn_slot_num", "hide_equip_head_pawn", "hide_equip_lantern_pawn", "arisen_profile_share_range", "fav_warp_slot_num", "online_status"
         };
 
         private static readonly string[] CDataMatchingProfileFields = new string[]
@@ -61,6 +61,9 @@ public abstract partial class DdonSqlDb<TCon, TCom, TReader> : SqlDb<TCon, TCom,
         private static readonly string SqlUpdateCharacterArisenProfile = $"UPDATE \"ddon_character_arisen_profile\" SET {BuildQueryUpdate(CDataArisenProfileFields)} WHERE \"character_id\" = @character_id;";
         private static readonly string SqlSelectCharacterArisenProfile = $"SELECT {BuildQueryField(CDataArisenProfileFields)} FROM \"ddon_character_arisen_profile\" WHERE \"character_id\" = @character_id;";
         private const string SqlDeleteCharacterArisenProfile = "DELETE FROM \"ddon_character_arisen_profile\" WHERE \"character_id\"=@character_id;";
+
+        private static readonly string SqlUpdateOnlineStatus = $"UPDATE \"ddon_character\" SET \"online_status\" = @online_status WHERE \"character_id\" = @character_id;";
+        private static readonly string SqlUpdateAllOnlineStatus = $"UPDATE \"ddon_character\" SET \"online_status\" = @online_status;";
 
 
         public bool CreateCharacter(Character character)
@@ -101,6 +104,25 @@ public bool UpdateCharacterBaseInfo(TCon conn, Character character)
 
             return characterUpdateRowsAffected > NoRowsAffected;
         }
+
+        public int UpdateCharacterOnlineStatus(Character character)
+        {
+            int rowsAffected = ExecuteNonQuery(SqlUpdateOnlineStatus, command =>
+            {
+                AddParameter(command, "@online_status", (byte) character.OnlineStatus);
+                AddParameter(command, "@character_id", character.CharacterId);
+            });
+            return rowsAffected;
+        }
+
+        public int UpdateAllCharactersOnlineStatus(OnlineStatus onlineStatus)
+        {
+            int rowsAffected = ExecuteNonQuery(SqlUpdateAllOnlineStatus, command =>
+            {
+                AddParameter(command, "@online_status", (byte) onlineStatus);
+            });
+            return rowsAffected;
+        }
 
         public bool UpdateCharacterMatchingProfile(Character character)
         {
@@ -366,6 +388,7 @@ private Character ReadAllCharacterData(TReader reader)
             character.ArisenProfile.MotionFrameNo = GetUInt32(reader, "motion_frame_no");
 
             character.FavWarpSlotNum = GetUInt32(reader, "fav_warp_slot_num");
+            character.OnlineStatus = (OnlineStatus) GetByte(reader, "online_status");
 
             return character;
         }
@@ -385,6 +408,7 @@ private void AddParameter(TCom command, Character character)
             AddParameter(command, "@hide_equip_head_pawn", character.HideEquipHeadPawn);
             AddParameter(command, "@hide_equip_lantern_pawn", character.HideEquipLanternPawn);
             AddParameter(command, "@arisen_profile_share_range", character.ArisenProfileShareRange);
+            AddParameter(command, "@online_status", (byte) character.OnlineStatus);
             // CDataMatchingProfile
             AddParameter(command, "@entry_job", (byte) character.MatchingProfile.EntryJob);
             AddParameter(command, "@entry_job_level", character.MatchingProfile.EntryJobLevel);

Arrowgene.Ddon.Database/Sql/Core/DdonSqlDbContactList.cs

@@ -0,0 +1,155 @@
+using System.Collections.Generic;
+using System.Data.Common;
+using Arrowgene.Ddon.Shared.Model;
+
+namespace Arrowgene.Ddon.Database.Sql.Core
+{
+    public abstract partial class DdonSqlDb<TCon, TCom, TReader> : SqlDb<TCon, TCom, TReader>
+        where TCon : DbConnection
+        where TCom : DbCommand
+        where TReader : DbDataReader
+    {
+
+        private static readonly string TableName = "ddon_contact_list";
+
+        private static readonly string[] ContactListFields = new string[]
+        { 
+           /* id */ "requester_character_id", "requested_character_id", "status", "type", "requester_favorite", "requested_favorite"
+        };
+
+        private static readonly string SqlInsertContact = $"INSERT INTO \"{TableName}\" ({BuildQueryField(ContactListFields)}) VALUES ({BuildQueryInsert(ContactListFields)});";
+        private static readonly string SqlSelectContactById = $"SELECT \"id\", {BuildQueryField(ContactListFields)} FROM \"{TableName}\" WHERE \"id\"=@id;";
+        private static readonly string SqlSelectContactsByCharacterId = $"SELECT \"id\", {BuildQueryField(ContactListFields)} FROM \"{TableName}\" WHERE \"requester_character_id\"=@character_id or \"requested_character_id\"=@character_id;";
+
+        private static readonly string SqlSelectContactsByCharacterIds = $"SELECT \"id\", {BuildQueryField(ContactListFields)} FROM \"{TableName}\" " +
+                                                               $"WHERE (\"requester_character_id\"=@character_id_1 and \"requested_character_id\"=@character_id_2) or " +
+                                                               $"(\"requester_character_id\"=@character_id_2 and \"requested_character_id\"=@character_id_1);";
+
+        private static readonly string SqlDeleteContact = $"DELETE FROM \"{TableName}\" WHERE \"requester_character_id\"=@requester_character_id and \"requested_character_id\"=@requested_character_id;";
+        private static readonly string SqlDeleteContactById = $"DELETE FROM \"{TableName}\" WHERE \"id\"=@id;";
+
+
+        private static readonly string SqlUpdateContactByCharIds = $"UPDATE \"{TableName}\" SET \"status\"=@status, \"type\"=@type, \"requester_favorite\"=@requester_favorite, \"requested_favorite\"=@requested_favorite WHERE \"requester_character_id\"=@requester_character_id and \"requested_character_id\"=@requested_character_id;";
+
+
+        public int InsertContact(uint requestingCharacterId, uint requestedCharacterId, ContactListStatus status, ContactListType type, bool requesterFavorite, bool requestedFavorite)
+        {
+            int rowsAffected = ExecuteNonQuery(SqlInsertContact, command =>
+            {
+                AddParameter(command, "@requester_character_id", requestingCharacterId);
+                AddParameter(command, "@requested_character_id", requestedCharacterId);
+                AddParameter(command, "@status", (byte) status);
+                AddParameter(command, "@type", (byte) type);
+                AddParameter(command, "@requester_favorite", requesterFavorite);
+                AddParameter(command, "@requested_favorite", requestedFavorite);
+            }, out long autoIncrement);
+
+            if (rowsAffected > NoRowsAffected)
+            {
+                return (int)autoIncrement;
+            }
+
+            return 0;
+        }
+
+        public int UpdateContact(uint requestingCharacterId, uint requestedCharacterId, ContactListStatus status, ContactListType type, bool requesterFavorite, bool requestedFavorite)
+        {
+            int rowsAffected = ExecuteNonQuery(SqlUpdateContactByCharIds, command =>
+            {
+                AddParameter(command, "@requester_character_id", requestingCharacterId);
+                AddParameter(command, "@requested_character_id", requestedCharacterId);
+                AddParameter(command, "@status", (byte) status);
+                AddParameter(command, "@type", (byte) type);
+                AddParameter(command, "@requester_favorite", requesterFavorite);
+                AddParameter(command, "@requested_favorite", requestedFavorite);
+            });
+
+            return rowsAffected;
+        }
+
+        public int DeleteContact(uint requestingCharacterId, uint requestedCharacterId)
+        {
+            int rowsAffected = ExecuteNonQuery(SqlDeleteContact, command =>
+            {
+                AddParameter(command, "@requester_character_id", requestingCharacterId);
+                AddParameter(command, "@requested_character_id", requestedCharacterId);
+            });
+            return rowsAffected;
+        }
+
+        public int DeleteContactById(uint id)
+        {
+            int rowsAffected = ExecuteNonQuery(SqlDeleteContactById, command =>
+            {
+                AddParameter(command, "@id", id);
+            });
+            return rowsAffected;
+        }
+
+        public List<ContactListEntity> SelectContactsByCharacterId(uint characterId)
+        {
+            List<ContactListEntity> entities = new List<ContactListEntity>();
+            ExecuteReader(SqlSelectContactsByCharacterId,
+                command => { AddParameter(command, "@character_id", characterId); }, reader =>
+                {
+                    while (reader.Read())
+                    {
+                        ContactListEntity e = EntityReader(reader);
+                        entities.Add(e);
+                    }
+                });
+
+            return entities;
+        }
+
+        public ContactListEntity SelectContactsByCharacterId(uint characterId1, uint characterId2)
+        {
+            ContactListEntity entity = null;
+            ExecuteReader(SqlSelectContactsByCharacterIds,
+                command =>
+                {
+                    AddParameter(command, "@character_id_1", characterId1);
+                    AddParameter(command, "@character_id_2", characterId2);
+                }, reader =>
+                {
+                    if (reader.Read())
+                    {
+                        entity = EntityReader(reader);
+                    }
+                });
+
+            return entity;
+        }
+
+        public ContactListEntity SelectContactListById(uint id)
+        {
+            ContactListEntity entity = null;
+            ExecuteReader(SqlSelectContactById,
+                command =>
+                {
+                    AddParameter(command, "@id", id);
+                }, reader =>
+                {
+                    if (reader.Read())
+                    {
+                        entity = EntityReader(reader);
+                    }
+                });
+
+            return entity;
+        }
+
+        private ContactListEntity EntityReader(TReader reader)
+        {
+            ContactListEntity e = new ContactListEntity();
+            e.Id = GetUInt32(reader, "id");
+            e.RequesterCharacterId = GetUInt32(reader, "requester_character_id");
+            e.RequestedCharacterId = GetUInt32(reader, "requested_character_id");
+            e.Status = (ContactListStatus) GetByte(reader, "status");
+            e.Type = (ContactListType) GetByte(reader, "type");
+            e.RequesterFavorite = GetBoolean(reader, "requester_favorite");
+            e.RequestedFavorite = GetBoolean(reader, "requested_favorite");
+            return e;
+        }
+    }
+}

Arrowgene.Ddon.GameServer/DdonGameServer.cs

@@ -40,6 +40,7 @@
 using Arrowgene.Networking.Tcp;
 using Arrowgene.Ddon.GameServer.Shop;
 using Arrowgene.Ddon.GameServer.Characters;
+using Arrowgene.Ddon.Shared.Model;
 
 namespace Arrowgene.Ddon.GameServer
 {
@@ -133,6 +134,9 @@ ClientConnectionChangeArgs connectionChangeEventArgs
                     = new ClientConnectionChangeArgs(ClientConnectionChangeArgs.EventType.DISCONNECT, client);
                 connectionChangeEvent(this, connectionChangeEventArgs);
             }
+
+            client.Character.OnlineStatus = OnlineStatus.Offline;
+            Database.UpdateCharacterOnlineStatus(client.Character);
         }
 
         public override GameClient NewClient(ITcpSocket socket)
@@ -234,6 +238,11 @@ private void LoadPacketHandler()
             AddHandler(new EquipUpdateHidePawnLanternHandler(this));
 
             AddHandler(new FriendGetFriendListHandler(this));
+            AddHandler(new FriendApplyFriendListHandler(this));
+            AddHandler(new FriendApproveFriendListHandler(this));
+            AddHandler(new FriendRemoveFriendHandler(this));
+            AddHandler(new FriendRegisterFavoriteFriendHandler(this));
+            AddHandler(new FriendCancelFriendApplicationHandler(this));
             AddHandler(new FriendGetRecentCharacterListHandler(this));
 
             AddHandler(new Gp_28_2_1_Handler(this));

Arrowgene.Ddon.GameServer/Handler/CharacterCommunityCharacterStatusGetHandler.cs

@@ -1,12 +1,16 @@
-using Arrowgene.Ddon.GameServer.Dump;
+using System.Collections.Generic;
+using Arrowgene.Ddon.GameServer.Dump;
 using Arrowgene.Ddon.Server;
 using Arrowgene.Ddon.Server.Network;
+using Arrowgene.Ddon.Shared.Entity.PacketStructure;
+using Arrowgene.Ddon.Shared.Entity.Structure;
+using Arrowgene.Ddon.Shared.Model;
 using Arrowgene.Ddon.Shared.Network;
 using Arrowgene.Logging;
 
 namespace Arrowgene.Ddon.GameServer.Handler
 {
-    public class CharacterCommunityCharacterStatusGetHandler : PacketHandler<GameClient>
+    public class CharacterCommunityCharacterStatusGetHandler : GameStructurePacketHandler<C2SCharacterCommunityCharacterStatusGetReq>
     {
         private static readonly ServerLogger Logger = LogProvider.Logger<ServerLogger>(typeof(CharacterCommunityCharacterStatusGetHandler));
 
@@ -15,11 +19,44 @@ public CharacterCommunityCharacterStatusGetHandler(DdonGameServer server) : base
         {
         }
 
-        public override PacketId Id => PacketId.C2S_CHARACTER_COMMUNITY_CHARACTER_STATUS_GET_REQ;
+        // public override PacketId Id => PacketId.C2S_CHARACTER_COMMUNITY_CHARACTER_STATUS_GET_REQ;
 
-        public override void Handle(GameClient client, IPacket packet)
+        public override void Handle(GameClient client, StructurePacket<C2SCharacterCommunityCharacterStatusGetReq> packet)
         {
-            client.Send(InGameDump.Dump_65);
+            // client.Send(InGameDump.Dump_65);
+
+            List<CDataCharacterListElement> updateCharacterList = new List<CDataCharacterListElement>();
+            List<CDataUpdateMatchingProfileInfo> updateMatchingProfileList = new List<CDataUpdateMatchingProfileInfo>();
+
+            List<ContactListEntity> friends = Database.SelectContactsByCharacterId(client.Character.CharacterId);
+
+            foreach (var f in friends)
+            {
+                if (f.Type != ContactListType.FriendList || f.Status != ContactListStatus.Accepted) continue;
+                Character otherCharacter =
+                    Database.SelectCharacter(f.GetOtherCharacterId(client.Character.CharacterId));
+
+                if (f.Status == ContactListStatus.Accepted)
+                {
+                    updateCharacterList.Add(ContactListEntity.CharacterToListEml(otherCharacter));
+                    updateMatchingProfileList.Add(new CDataUpdateMatchingProfileInfo()
+                    {
+                        CharacterId = otherCharacter.CharacterId,
+                        Comment = ""
+                    });
+                }
+            }
+
+            client.Send(new S2CCharacterCommunityCharacterStatusUpdateNtc()
+            {
+                UpdateCharacterList = updateCharacterList,
+                UpdateMatchingProfileList = updateMatchingProfileList
+            });
+
+            client.Send(new S2CCharacterCommunityCharacterStatusGetRes()
+            {
+                Result = updateCharacterList.Count + 1
+            });
         }
     }
 }

Arrowgene.Ddon.GameServer/Handler/CharacterSetOnlineStatusHandler.cs

@@ -24,6 +24,8 @@ public override void Handle(GameClient client, StructurePacket<C2SCharacterSetOn
             client.Send(new S2CCharacterSetOnlineStatusRes() {
                 OnlineStatus = packet.Structure.OnlineStatus
             });
+
+            Database.UpdateCharacterOnlineStatus(client.Character);
         }
     }
 }

Arrowgene.Ddon.GameServer/Handler/ConnectionLogoutHandler.cs

@@ -1,6 +1,7 @@
 using Arrowgene.Ddon.Server;
 using Arrowgene.Ddon.Server.Network;
 using Arrowgene.Ddon.Shared.Entity.PacketStructure;
+using Arrowgene.Ddon.Shared.Model;
 using Arrowgene.Ddon.Shared.Network;
 using Arrowgene.Logging;
 
@@ -21,6 +22,8 @@ public override void Handle(GameClient client, IPacket packet)
         {
             S2CConnectionLogoutRes res = new S2CConnectionLogoutRes();
             client.Send(res);
+            client.Character.OnlineStatus = OnlineStatus.Offline;
+            Database.UpdateCharacterOnlineStatus(client.Character);
         }
     }
 }