Merge remote-tracking branch 'github/main'

# Conflicts:
#	facebook/FBmain.py

Author: LiggMax

FBver/FB_middle.py

@@ -33,6 +33,8 @@ def parse_bool(type_data):
 
 
 async def main(content0, content1):
+    is_multiple_accounts = True
+    multiple_accounts = 5
     app = QApplication.instance()
     if not app:
         app = QApplication(sys.argv)

facebook/.gitignore

@@ -1 +1,2 @@
-regeditfile.reg
+regeditfile.reg
+/FB.json

facebook/FBmain.py

@@ -626,6 +626,7 @@ async def getusers(self):
                     csv_writer.writerow(['userid', 'username', 'societiesid'])  # 写入表头
                     csv_writer.writerows(in_csv_data)  # 写入数据
                 print(f"爬取完成，共获取 {user_counter} 个用户信息")
+                await self.robust_update_status("開始提交數據...")
                 # 使用线程池执行数据库提交（避免阻塞主线程）
                 loop = asyncio.get_event_loop()
                 with ThreadPoolExecutor() as executor:
@@ -641,7 +642,7 @@ async def getusers(self):
                         user_counter  # 实际获取数量
                     )
 
-                await self.robust_update_status(f"{csv_filename}数据提交完成")
+                await self.robust_update_status(f"{csv_filename}數據提交完成")
                 upend_time = datetime.datetime.now()
                 db_manager.update_updata_table(self.device, len(users), upend_time)
             else:
@@ -761,6 +762,7 @@ async def getusers_fans(self):
                     csv_writer.writerow(['userid', 'username', 'societiesid'])  # 写入表头
                     csv_writer.writerows(in_csv_data)  # 写入数据
                 print(f"爬取完成，共获取 {user_counter} 个用户信息")
+                await self.robust_update_status("開始提交數據...")
                 # 使用线程池执行数据库提交（避免阻塞主线程）
                 loop = asyncio.get_event_loop()
                 with ThreadPoolExecutor() as executor:
@@ -775,13 +777,14 @@ async def getusers_fans(self):
                         self.groups_num,  # 总粉丝数
                         user_counter  # 实际获取数量
                     )
-                await self.robust_update_status(f"{csv_filename}数据提交完成")
+                await self.robust_update_status(f"{csv_filename}數據提交完成")
                 upend_time = datetime.datetime.now()
                 db_manager.update_updata_table(self.device, len(users), upend_time)
             else:
                 print("無用戶")
 
     async def getusers_like(self):
+        await self.robust_update_status("開始獲取贊助帖子用戶...")
         await self.page.goto(url="https://www.facebook.com/", wait_until='load', timeout=50000)
         title = await self.page.title()
         if "Facebook" in title:
@@ -835,7 +838,7 @@ async def cycle_post(self, num_posts, like_count, seek_count):
                 if element:
                     await element.scroll_into_view_if_needed()
                     print(f"第 {i} 个帖子")
-                    await self.robust_update_status(f"第 {i} 个帖子")
+                    await self.robust_update_status(f"第 {i} 個帖子")
                     like_count, seek_count = await self.sponsor_like(selector, like_count, seek_count)
                     # if like_count >= num_posts:
                     #     break
@@ -850,6 +853,7 @@ async def cycle_post(self, num_posts, like_count, seek_count):
         return like_count, seek_count
 
     async def getusers_like_url(self, url):
+        await self.robust_update_status("開始獲取指定貼文點贊用戶...")
         for i in range(len(url)):
             await self.page.goto(url=url[i], wait_until='load', timeout=50000)
 
@@ -912,9 +916,6 @@ async def sponsor_like_click(self, selector):
 
     async def get_sponsor_user(self):
         """修正版：获取赞助帖子的点赞用户"""
-        print("開始獲取贊助帖子用戶......")
-        await self.robust_update_status("開始獲取贊助帖子用戶...")
-
         # 初始化变量（移到循环外）
         previous_count = 0
         current_count = 0
@@ -1099,12 +1100,12 @@ async def dialog_(self):
 
             if not page_size:
                 print("未找到页面窗口")
-                await self.robust_update_status(f"未找到弹窗")
+                await self.robust_update_status(f"未找到彈窗")
                 return
 
         except Exception as e:
             print(f"等待窗口出现时出错: {str(e)}")
-            await self.robust_update_status(f"等待弹窗出现时出错")
+            await self.robust_update_status(f"等待彈窗出現時出錯")
             return
         try:
             # 获取弹窗的位置和大小
@@ -1117,7 +1118,7 @@ async def dialog_(self):
                 print(f"鼠标滚动，位置: ({center_x}, {center_y})")
         except Exception as e:
             print(f"鼠标滚动出错: {str(e)}")
-            await self.robust_update_status(f"鼠标滚动出错")
+            await self.robust_update_status(f"鼠標滾動出錯")
 
     async def home_post(self):
         await self.page.goto(url="https://www.facebook.com/", wait_until='load')

facebook/database_manager.py

@@ -166,12 +166,12 @@ def insert_supportUser(self, userData: any) -> bool:
                     userid, username, supportid = item
 
                     # 检查是否已存在相同的记录
-                    cursor.execute("SELECT COUNT(*) FROM SupportUser_copy1 WHERE userid = ? AND Supportid = ?", 
+                    cursor.execute("SELECT COUNT(*) FROM SupportUser WHERE userid = ? AND Supportid = ?",
                                    userid, supportid)
                     if cursor.fetchone()[0] == 0:
                         # 不存在相同记录，执行插入
                         query = """
-                        INSERT INTO SupportUser_copy1 (userid, username, Supportid)
+                        INSERT INTO SupportUser (userid, username, Supportid)
                         VALUES (?, ?, ?)
                         """
                         cursor.execute(query, userid, username, supportid)
@@ -202,12 +202,12 @@ def insert_post_info(self, post_info: any) -> bool:
             # 使用 UPSERT 操作（如果记录存在则更新，否则插入）
             cursor.execute(
                 """
-                IF EXISTS (SELECT 1 FROM SupportInf_copy1 WHERE Supportid = ?)
-                    UPDATE SupportInf_copy1 
+                IF EXISTS (SELECT 1 FROM SupportInf WHERE Supportid = ?)
+                    UPDATE SupportInf 
                     SET number = number + ?, SupportName = ?
                     WHERE Supportid = ?
                 ELSE
-                    INSERT INTO SupportInf_copy1 (Supportid, SupportName, number)
+                    INSERT INTO SupportInf (Supportid, SupportName, number)
                     VALUES (?, ?, ?)
                 """,
                 post_info['Supportid'],