From 228ebbf4d1354c8d37cef21c2cfce28e12d0434b Mon Sep 17 00:00:00 2001
From: Changhua <lichanghua0821@gmail.com>
Date: Wed, 5 Feb 2025 09:17:50 +0800
Subject: [PATCH] Refactoring

---
 WeChatFerry/sdk/SDK.vcxproj                   |  1 -
 WeChatFerry/sdk/SDK.vcxproj.filters           |  3 --
 WeChatFerry/spy/Spy.vcxproj                   | 29 ++++++++---------
 WeChatFerry/spy/Spy.vcxproj.filters           | 31 ++++++++++---------
 ...chatroom_mgmt.cpp => chatroom_manager.cpp} |  2 +-
 .../{chatroom_mgmt.h => chatroom_manager.h}   |  0
 .../{contact_mgmt.cpp => contact_manager.cpp} |  2 +-
 .../spy/{contact_mgmt.h => contact_manager.h} |  0
 .../{exec_sql.cpp => database_executor.cpp}   |  2 +-
 .../spy/{exec_sql.h => database_executor.h}   |  0
 .../{receive_msg.cpp => message_handler.cpp}  |  4 +--
 .../spy/{receive_msg.h => message_handler.h}  |  0
 .../spy/{send_msg.cpp => message_sender.cpp}  |  6 ++--
 .../spy/{send_msg.h => message_sender.h}      |  0
 .../spy/{funcs.cpp => misc_manager.cpp}       |  6 ++--
 WeChatFerry/spy/{funcs.h => misc_manager.h}   |  0
 WeChatFerry/spy/rpc_server.cpp                | 14 ++++-----
 .../{user_info.cpp => userinfo_manager.cpp}   |  2 +-
 .../spy/{user_info.h => userinfo_manager.h}   |  0
 19 files changed, 51 insertions(+), 51 deletions(-)
 rename WeChatFerry/spy/{chatroom_mgmt.cpp => chatroom_manager.cpp} (99%)
 rename WeChatFerry/spy/{chatroom_mgmt.h => chatroom_manager.h} (100%)
 rename WeChatFerry/spy/{contact_mgmt.cpp => contact_manager.cpp} (99%)
 rename WeChatFerry/spy/{contact_mgmt.h => contact_manager.h} (100%)
 rename WeChatFerry/spy/{exec_sql.cpp => database_executor.cpp} (99%)
 rename WeChatFerry/spy/{exec_sql.h => database_executor.h} (100%)
 rename WeChatFerry/spy/{receive_msg.cpp => message_handler.cpp} (99%)
 rename WeChatFerry/spy/{receive_msg.h => message_handler.h} (100%)
 rename WeChatFerry/spy/{send_msg.cpp => message_sender.cpp} (99%)
 rename WeChatFerry/spy/{send_msg.h => message_sender.h} (100%)
 rename WeChatFerry/spy/{funcs.cpp => misc_manager.cpp} (99%)
 rename WeChatFerry/spy/{funcs.h => misc_manager.h} (100%)
 rename WeChatFerry/spy/{user_info.cpp => userinfo_manager.cpp} (98%)
 rename WeChatFerry/spy/{user_info.h => userinfo_manager.h} (100%)

diff --git a/WeChatFerry/sdk/SDK.vcxproj b/WeChatFerry/sdk/SDK.vcxproj
index 5f549ad..cb0fd9d 100644
--- a/WeChatFerry/sdk/SDK.vcxproj
+++ b/WeChatFerry/sdk/SDK.vcxproj
@@ -141,7 +141,6 @@ xcopy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\clients\python\wcferry</Com
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\com\log.hpp" />
     <ClInclude Include="..\com\util.h" />
     <ClInclude Include="framework.h" />
     <ClInclude Include="injector.h" />
diff --git a/WeChatFerry/sdk/SDK.vcxproj.filters b/WeChatFerry/sdk/SDK.vcxproj.filters
index 323d545..5adfeab 100644
--- a/WeChatFerry/sdk/SDK.vcxproj.filters
+++ b/WeChatFerry/sdk/SDK.vcxproj.filters
@@ -27,9 +27,6 @@
     <ClInclude Include="..\com\util.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="..\com\log.hpp">
-      <Filter>头文件</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">
diff --git a/WeChatFerry/spy/Spy.vcxproj b/WeChatFerry/spy/Spy.vcxproj
index 6a66d2d..3f601af 100644
--- a/WeChatFerry/spy/Spy.vcxproj
+++ b/WeChatFerry/spy/Spy.vcxproj
@@ -247,19 +247,20 @@ xcopy /y $(SolutionDir)DISCLAIMER.md $(SolutionDir)..\clients\python\wcferry</Co
     <ClInclude Include="..\rpc\pb_util.h" />
     <ClInclude Include="..\rpc\proto\wcf.pb.h" />
     <ClInclude Include="..\smc\codec.h" />
-    <ClInclude Include="chatroom_mgmt.h" />
-    <ClInclude Include="funcs.h" />
-    <ClInclude Include="exec_sql.h" />
+    <ClInclude Include="chatroom_manager.h" />
+    <ClInclude Include="misc_manager.h" />
+    <ClInclude Include="database_executor.h" />
     <ClInclude Include="framework.h" />
-    <ClInclude Include="contact_mgmt.h" />
-    <ClInclude Include="receive_msg.h" />
+    <ClInclude Include="contact_manager.h" />
+    <ClInclude Include="message_handler.h" />
     <ClInclude Include="resource.h" />
+    <ClInclude Include="rpc_helper.h" />
     <ClInclude Include="rpc_server.h" />
-    <ClInclude Include="send_msg.h" />
+    <ClInclude Include="message_sender.h" />
     <ClInclude Include="spy.h" />
     <ClInclude Include="spy_types.h" />
     <ClInclude Include="sqlite3.h" />
-    <ClInclude Include="user_info.h" />
+    <ClInclude Include="userinfo_manager.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\com\util.cpp" />
@@ -268,16 +269,16 @@ xcopy /y $(SolutionDir)DISCLAIMER.md $(SolutionDir)..\clients\python\wcferry</Co
     <ClCompile Include="..\rpc\nanopb\pb_encode.c" />
     <ClCompile Include="..\rpc\pb_util.cpp" />
     <ClCompile Include="..\rpc\proto\wcf.pb.c" />
-    <ClCompile Include="chatroom_mgmt.cpp" />
-    <ClCompile Include="funcs.cpp" />
+    <ClCompile Include="chatroom_manager.cpp" />
+    <ClCompile Include="misc_manager.cpp" />
     <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="exec_sql.cpp" />
-    <ClCompile Include="contact_mgmt.cpp" />
-    <ClCompile Include="receive_msg.cpp" />
+    <ClCompile Include="database_executor.cpp" />
+    <ClCompile Include="contact_manager.cpp" />
+    <ClCompile Include="message_handler.cpp" />
     <ClCompile Include="rpc_server.cpp" />
-    <ClCompile Include="send_msg.cpp" />
+    <ClCompile Include="message_sender.cpp" />
     <ClCompile Include="spy.cpp" />
-    <ClCompile Include="user_info.cpp" />
+    <ClCompile Include="userinfo_manager.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\rpc\proto\wcf.proto" />
diff --git a/WeChatFerry/spy/Spy.vcxproj.filters b/WeChatFerry/spy/Spy.vcxproj.filters
index 3bf11bb..dea6857 100644
--- a/WeChatFerry/spy/Spy.vcxproj.filters
+++ b/WeChatFerry/spy/Spy.vcxproj.filters
@@ -24,16 +24,16 @@
     <ClInclude Include="rpc_server.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="exec_sql.h">
+    <ClInclude Include="database_executor.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="contact_mgmt.h">
+    <ClInclude Include="contact_manager.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="receive_msg.h">
+    <ClInclude Include="message_handler.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="send_msg.h">
+    <ClInclude Include="message_sender.h">
       <Filter>头文件</Filter>
     </ClInclude>
     <ClInclude Include="spy.h">
@@ -63,16 +63,16 @@
     <ClInclude Include="..\rpc\pb_types.h">
       <Filter>nnrpc</Filter>
     </ClInclude>
-    <ClInclude Include="chatroom_mgmt.h">
+    <ClInclude Include="chatroom_manager.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="user_info.h">
+    <ClInclude Include="userinfo_manager.h">
       <Filter>头文件</Filter>
     </ClInclude>
     <ClInclude Include="resource.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="funcs.h">
+    <ClInclude Include="misc_manager.h">
       <Filter>头文件</Filter>
     </ClInclude>
     <ClInclude Include="sqlite3.h">
@@ -87,6 +87,9 @@
     <ClInclude Include="..\com\log.hpp">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="rpc_helper.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">
@@ -95,16 +98,16 @@
     <ClCompile Include="rpc_server.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="exec_sql.cpp">
+    <ClCompile Include="database_executor.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="contact_mgmt.cpp">
+    <ClCompile Include="contact_manager.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="receive_msg.cpp">
+    <ClCompile Include="message_handler.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="send_msg.cpp">
+    <ClCompile Include="message_sender.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
     <ClCompile Include="spy.cpp">
@@ -125,13 +128,13 @@
     <ClCompile Include="..\rpc\pb_util.cpp">
       <Filter>nnrpc</Filter>
     </ClCompile>
-    <ClCompile Include="chatroom_mgmt.cpp">
+    <ClCompile Include="chatroom_manager.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="user_info.cpp">
+    <ClCompile Include="userinfo_manager.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="funcs.cpp">
+    <ClCompile Include="misc_manager.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
     <ClCompile Include="..\com\util.cpp">
diff --git a/WeChatFerry/spy/chatroom_mgmt.cpp b/WeChatFerry/spy/chatroom_manager.cpp
similarity index 99%
rename from WeChatFerry/spy/chatroom_mgmt.cpp
rename to WeChatFerry/spy/chatroom_manager.cpp
index d7d156f..c8b2042 100644
--- a/WeChatFerry/spy/chatroom_mgmt.cpp
+++ b/WeChatFerry/spy/chatroom_manager.cpp
@@ -1,6 +1,6 @@
 #pragma execution_character_set("utf-8")
 
-#include "chatroom_mgmt.h"
+#include "chatroom_manager.h"
 #include "log.hpp"
 #include "pb_util.h"
 #include "rpc_helper.h"
diff --git a/WeChatFerry/spy/chatroom_mgmt.h b/WeChatFerry/spy/chatroom_manager.h
similarity index 100%
rename from WeChatFerry/spy/chatroom_mgmt.h
rename to WeChatFerry/spy/chatroom_manager.h
diff --git a/WeChatFerry/spy/contact_mgmt.cpp b/WeChatFerry/spy/contact_manager.cpp
similarity index 99%
rename from WeChatFerry/spy/contact_mgmt.cpp
rename to WeChatFerry/spy/contact_manager.cpp
index f100c3b..17cc7f8 100644
--- a/WeChatFerry/spy/contact_mgmt.cpp
+++ b/WeChatFerry/spy/contact_manager.cpp
@@ -1,6 +1,6 @@
 #pragma execution_character_set("utf-8")
 
-#include "contact_mgmt.h"
+#include "contact_manager.h"
 
 #include "log.hpp"
 #include "pb_util.h"
diff --git a/WeChatFerry/spy/contact_mgmt.h b/WeChatFerry/spy/contact_manager.h
similarity index 100%
rename from WeChatFerry/spy/contact_mgmt.h
rename to WeChatFerry/spy/contact_manager.h
diff --git a/WeChatFerry/spy/exec_sql.cpp b/WeChatFerry/spy/database_executor.cpp
similarity index 99%
rename from WeChatFerry/spy/exec_sql.cpp
rename to WeChatFerry/spy/database_executor.cpp
index 5581357..7ff8290 100644
--- a/WeChatFerry/spy/exec_sql.cpp
+++ b/WeChatFerry/spy/database_executor.cpp
@@ -1,4 +1,4 @@
-#include "exec_sql.h"
+#include "database_executor.h"
 
 #include <algorithm>
 #include <iterator>
diff --git a/WeChatFerry/spy/exec_sql.h b/WeChatFerry/spy/database_executor.h
similarity index 100%
rename from WeChatFerry/spy/exec_sql.h
rename to WeChatFerry/spy/database_executor.h
diff --git a/WeChatFerry/spy/receive_msg.cpp b/WeChatFerry/spy/message_handler.cpp
similarity index 99%
rename from WeChatFerry/spy/receive_msg.cpp
rename to WeChatFerry/spy/message_handler.cpp
index ceab7dc..cf8b884 100644
--- a/WeChatFerry/spy/receive_msg.cpp
+++ b/WeChatFerry/spy/message_handler.cpp
@@ -1,4 +1,4 @@
-#include "receive_msg.h"
+#include "message_handler.h"
 
 #include <condition_variable>
 #include <mutex>
@@ -7,7 +7,7 @@
 #include "framework.h"
 
 #include "log.hpp"
-#include "user_info.h"
+#include "userinfo_manager.h"
 #include "util.h"
 
 extern QWORD g_WeChatWinDllAddr;
diff --git a/WeChatFerry/spy/receive_msg.h b/WeChatFerry/spy/message_handler.h
similarity index 100%
rename from WeChatFerry/spy/receive_msg.h
rename to WeChatFerry/spy/message_handler.h
diff --git a/WeChatFerry/spy/send_msg.cpp b/WeChatFerry/spy/message_sender.cpp
similarity index 99%
rename from WeChatFerry/spy/send_msg.cpp
rename to WeChatFerry/spy/message_sender.cpp
index ff1609d..36b4d5f 100644
--- a/WeChatFerry/spy/send_msg.cpp
+++ b/WeChatFerry/spy/message_sender.cpp
@@ -1,13 +1,13 @@
-#include "send_msg.h"
+#include "message_sender.h"
 
 #include <sstream>
 #include <vector>
 
-#include "exec_sql.h"
+#include "database_executor.h"
 #include "log.hpp"
 #include "rpc_helper.h"
 #include "spy_types.h"
-#include "user_info.h"
+#include "userinfo_manager.h"
 #include "util.h"
 
 extern QWORD g_WeChatWinDllAddr;
diff --git a/WeChatFerry/spy/send_msg.h b/WeChatFerry/spy/message_sender.h
similarity index 100%
rename from WeChatFerry/spy/send_msg.h
rename to WeChatFerry/spy/message_sender.h
diff --git a/WeChatFerry/spy/funcs.cpp b/WeChatFerry/spy/misc_manager.cpp
similarity index 99%
rename from WeChatFerry/spy/funcs.cpp
rename to WeChatFerry/spy/misc_manager.cpp
index b27642d..f6f252f 100644
--- a/WeChatFerry/spy/funcs.cpp
+++ b/WeChatFerry/spy/misc_manager.cpp
@@ -1,5 +1,5 @@
 #pragma warning(disable : 4244)
-#include "funcs.h"
+#include "misc_manager.h"
 
 #include <filesystem>
 #include <fstream>
@@ -7,9 +7,9 @@
 #include "framework.h"
 
 #include "codec.h"
-#include "exec_sql.h"
+#include "database_executor.h"
 #include "log.hpp"
-#include "receive_msg.h"
+#include "message_handler.h"
 #include "spy_types.h"
 #include "util.h"
 
diff --git a/WeChatFerry/spy/funcs.h b/WeChatFerry/spy/misc_manager.h
similarity index 100%
rename from WeChatFerry/spy/funcs.h
rename to WeChatFerry/spy/misc_manager.h
diff --git a/WeChatFerry/spy/rpc_server.cpp b/WeChatFerry/spy/rpc_server.cpp
index 111a0a1..96e71f7 100644
--- a/WeChatFerry/spy/rpc_server.cpp
+++ b/WeChatFerry/spy/rpc_server.cpp
@@ -20,18 +20,18 @@
 
 #include "wcf.pb.h"
 
-#include "chatroom_mgmt.h"
-#include "contact_mgmt.h"
-#include "exec_sql.h"
-#include "funcs.h"
+#include "chatroom_manager.h"
+#include "contact_manager.h"
+#include "database_executor.h"
+#include "misc_manager.h"
 #include "log.hpp"
 #include "pb_types.h"
 #include "pb_util.h"
-#include "receive_msg.h"
-#include "send_msg.h"
+#include "message_handler.h"
+#include "message_sender.h"
 #include "spy.h"
 #include "spy_types.h"
-#include "user_info.h"
+#include "userinfo_manager.h"
 #include "util.h"
 
 namespace fs = std::filesystem;
diff --git a/WeChatFerry/spy/user_info.cpp b/WeChatFerry/spy/userinfo_manager.cpp
similarity index 98%
rename from WeChatFerry/spy/user_info.cpp
rename to WeChatFerry/spy/userinfo_manager.cpp
index c58e471..b8720ef 100644
--- a/WeChatFerry/spy/user_info.cpp
+++ b/WeChatFerry/spy/userinfo_manager.cpp
@@ -1,4 +1,4 @@
-#include "user_info.h"
+#include "userinfo_manager.h"
 
 #include <filesystem>
 #include <mutex>
diff --git a/WeChatFerry/spy/user_info.h b/WeChatFerry/spy/userinfo_manager.h
similarity index 100%
rename from WeChatFerry/spy/user_info.h
rename to WeChatFerry/spy/userinfo_manager.h