Merge branch 'main' into main

flechneo · web-flow · commit 789234c3fd6f · 2025-02-18T09:08:24.000+08:00
diff --git a/.github/workflows/daily-check-in.yml b/.github/workflows/daily-check-in.yml
@@ -2,28 +2,61 @@ name: Daily Check-in
 
 on:
   schedule:
-    - cron: '0 1 * * *'  # 每天1点 UTC 时间执行
+    #- cron: '0 1 * * *'  # 每天1点 UTC 时间执行
+    - cron: '0 */12 * * *'  # 每12小时执行一次
+
   workflow_dispatch:
 
 jobs:
   run_script:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
+      
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: '3.9.19'
 
-      - name: Install dependencies
+      - name: Install python dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.txt
-          playwright install firefox
+          playwright install --with-deps firefox
 
       - name: Execute script
         env:
           USERNAME: ${{ secrets.USERNAME }}
           PASSWORD: ${{ secrets.PASSWORD }}
         run: |
           python main.py
+
+      - name: Send Telegram Notification
+        env:
+          TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
+          TELEGRAM_USERID: ${{ secrets.TELEGRAM_USERID }}
+        if: ${{ success() && env.TELEGRAM_TOKEN != '' && env.TELEGRAM_USERID != '' }}
+        run: |
+          curl -s -X POST "https://api.telegram.org/bot${{ env.TELEGRAM_TOKEN }}/sendMessage" \
+          -d chat_id=${{ env.TELEGRAM_USERID }} \
+          -d parse_mode=HTML \
+          -d text="✅ <b>LINUX DO</b> 每日签到成功完成"
+
+      - name: Send Failure Notification
+        env:
+          TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
+          TELEGRAM_USERID: ${{ secrets.TELEGRAM_USERID }}
+        if: ${{ failure() && env.TELEGRAM_TOKEN != '' && env.TELEGRAM_USERID != '' }}
+        run: |
+          curl -s -X POST "https://api.telegram.org/bot${{ env.TELEGRAM_TOKEN }}/sendMessage" \
+          -d chat_id=${{ env.TELEGRAM_USERID }} \
+          -d parse_mode=HTML \
+          -d text="❌ <b>LINUX DO</b> 每日签到失败"
+
+      - name: Delete workflow runs
+        uses: Mattraks/delete-workflow-runs@v2
+        with:
+          token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          retain_days: 10
+          keep_minimum_runs: 6
diff --git a/README.md b/README.md
@@ -1,5 +1,3 @@
- [English](./README_en.md)
- 
 # LinuxDo 每日签到（每日打卡）
 
 ## 项目描述
@@ -25,7 +23,7 @@
    - 重复上述步骤，这次输入 `PASSWORD` 作为 `Name`，相应的密码作为 `Value`。
 
 ### GitHub Actions 自动运行
-此项目的 GitHub Actions 配置会自动每天零点 UTC 时间运行签到脚本。你无需进行任何操作即可启动此自动化任务。GitHub Actions 的工作流文件位于 `.github/workflows` 目录下，文件名为 `daily-check-in.yml`。
+此项目的 GitHub Actions 配置会自动每天 UTC 时间1点运行签到脚本。你无需进行任何操作即可启动此自动化任务。GitHub Actions 的工作流文件位于 `.github/workflows` 目录下，文件名为 `daily-check-in.yml`。
 
 如果你需要手动触发此工作流，可以通过以下步骤操作：
 
@@ -35,8 +33,27 @@
 
 ## 运行结果
 
+### 网页中查看
 `Actions`栏 -> 点击最新的`Daily Check-in` workflow run -> `run_script` -> `Execute script`
 
 可看到`Connect Info`：
 （新号可能这里为空，多挂几天就有了）
 ![image](https://github.com/user-attachments/assets/853549a5-b11d-4d5a-9284-7ad2f8ea698b)
+
+### Telegram 通知
+
+可选功能：配置 Telegram 通知，实时获取签到结果。
+
+需要在 GitHub Secrets 中配置：
+- `TELEGRAM_TOKEN`：Telegram Bot Token
+- `TELEGRAM_USERID`：Telegram 用户 ID
+
+获取方法：
+1. Bot Token：与 [@BotFather](https://t.me/BotFather) 对话创建机器人获取
+2. 用户 ID：与 [@userinfobot](https://t.me/userinfobot) 对话获取
+
+未配置时将自动跳过通知功能，不影响签到。
+
+## 自动更新
+
+默认状态下自动更新是关闭的，[点击此处](https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web/blob/main/README_CN.md#%E6%89%93%E5%BC%80%E8%87%AA%E5%8A%A8%E6%9B%B4%E6%96%B0)查看打开自动更新步骤。
diff --git a/README_en.md b/README_en.md
diff --git a/main.py b/main.py
@@ -1,11 +1,36 @@
 import os
 import random
 import time
+import functools
+import sys
 
 from loguru import logger
 from playwright.sync_api import sync_playwright
 from tabulate import tabulate
 
+
+def retry_decorator(retries=3):
+    def decorator(func):
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs):
+            for attempt in range(retries):
+                try:
+                    return func(*args, **kwargs)
+                except Exception as e:
+                    if attempt == retries - 1:  # 最后一次尝试
+                        logger.error(f"函数 {func.__name__} 最终执行失败: {str(e)}")
+                    logger.warning(f"函数 {func.__name__} 第 {attempt + 1}/{retries} 次尝试失败: {str(e)}")
+                    time.sleep(1)
+            return None
+
+        return wrapper
+
+    return decorator
+
+
+os.environ.pop("DISPLAY", None)
+os.environ.pop("DYLD_LIBRARY_PATH", None)
+
 USERNAME = os.environ.get("USERNAME")
 PASSWORD = os.environ.get("PASSWORD")
 
@@ -21,7 +46,7 @@ def __init__(self) -> None:
         self.page.goto(HOME_URL)
 
     def login(self):
-        logger.info("Login")
+        logger.info("开始登录")
         self.page.click(".login-button .d-button-label")
         time.sleep(2)
         self.page.fill("#login-account-name", USERNAME)
@@ -32,36 +57,78 @@ def login(self):
         time.sleep(10)
         user_ele = self.page.query_selector("#current-user")
         if not user_ele:
-            logger.error("Login failed")
+            logger.error("登录失败")
             return False
         else:
-            logger.info("Login success")
+            logger.info("登录成功")
             return True
 
     def click_topic(self):
-        for topic in self.page.query_selector_all("#list-area .title"):
-            logger.info("Click topic: " + topic.get_attribute("href"))
-            page = self.context.new_page()
-            page.goto(HOME_URL + topic.get_attribute("href"))
-            time.sleep(3)
-            if random.random() < 0.02:  # 100 * 0.02 * 30 = 60
-                self.click_like(page)
-            time.sleep(3)
-            page.close()
+        topic_list = self.page.query_selector_all("#list-area .title")
+        logger.info(f"发现 {len(topic_list)} 个主题帖")
+        for topic in topic_list:
+            self.click_one_topic(topic.get_attribute("href"))
+
+    @retry_decorator()
+    def click_one_topic(self, topic_url):
+        page = self.context.new_page()
+        page.goto(HOME_URL + topic_url)
+        if random.random() < 0.3:  # 0.3 * 30 = 9
+            self.click_like(page)
+        self.browse_post(page)
+        page.close()
+
+    def browse_post(self, page):
+        prev_url = None
+        # 开始自动滚动，最多滚动10次
+        for _ in range(10):
+            # 随机滚动一段距离
+            scroll_distance = random.randint(550, 650)  # 随机滚动 550-650 像素
+            logger.info(f"向下滚动 {scroll_distance} 像素...")
+            page.evaluate(f"window.scrollBy(0, {scroll_distance})")
+            logger.info(f"已加载页面: {page.url}")
+
+            if random.random() < 0.03:  # 33 * 4 = 132
+                logger.success("随机退出浏览")
+                break
+
+            # 检查是否到达页面底部
+            at_bottom = page.evaluate("window.scrollY + window.innerHeight >= document.body.scrollHeight")
+            current_url = page.url
+            if current_url != prev_url:
+                prev_url = current_url
+            elif at_bottom and prev_url == current_url:
+                logger.success("已到达页面底部，退出浏览")
+                break
+
+            # 动态随机等待
+            wait_time = random.uniform(2, 4)  # 随机等待 2-4 秒
+            logger.info(f"等待 {wait_time:.2f} 秒...")
+            time.sleep(wait_time)
 
     def run(self):
         if not self.login():
-            return
+            logger.error("登录失败，程序终止")
+            sys.exit(1)  # 使用非零退出码终止整个程序
         self.click_topic()
         self.print_connect_info()
 
     def click_like(self, page):
-        logger.info("Click like")
-        page.locator(".discourse-reactions-reaction-button").first.click()
-        logger.info("Like success")
+        try:
+            # 专门查找未点赞的按钮
+            like_button = page.locator('.discourse-reactions-reaction-button[title="点赞此帖子"]').first
+            if like_button:
+                logger.info("找到未点赞的帖子，准备点赞")
+                like_button.click()
+                logger.info("点赞成功")
+                time.sleep(random.uniform(1, 2))
+            else:
+                logger.info("帖子可能已经点过赞了")
+        except Exception as e:
+            logger.error(f"点赞失败: {str(e)}")
 
     def print_connect_info(self):
-        logger.info("Print connect info")
+        logger.info("获取连接信息")
         page = self.context.new_page()
         page.goto("https://connect.linux.do/")
         rows = page.query_selector_all("table tr")
