fix scan join-issues bug for vteam (#2)

- mcpp-community/OpenOrg#1

Signed-off-by: SPeak Shen <speakshen@163.com>

Author: Sunrisepeak

src/components/README.md

@@ -16,6 +16,25 @@ python src/components/scan_join_issues.py
 
 **Configuration:** `config/join-config.yml`
 
+**Approval Mode:**
+- When a team is configured with `mode: approval`, the user will only be added after approvals are found.
+- Approvals are detected from issue comments that contain approval keywords, or an optional approval label.
+- `reviewers.users`: All specified users must approve.
+- `reviewers.teams`: Each team requires approval from at least one member.
+
+Example:
+```yaml
+teams:
+  vteam:
+    mode: approval
+    team_slug: vteam
+    reviewers:
+      users: ["sunrisepeak"]
+      teams: ["coreteam"]
+    approval_keywords: ["/approve", "approve", "lgtm"]
+    approval_label: "approved"
+```
+
 ### 2. task_checker.py
 
 Scans for task issues with priority labels (P0/P1/P2) and sends reminders if they haven't been updated within configured timeouts.

src/components/scan_join_issues.py

@@ -14,11 +14,87 @@
     is_org_member,
     add_user_to_team,
     is_user_in_team,
+    list_issue_comments,
     list_open_join_issues,
     update_issue_title,
 )
 from libs.utils import load_simple_yaml
 
+def _normalize_list(value):
+    if not value:
+        return []
+    if isinstance(value, list):
+        return [str(v).strip() for v in value if str(v).strip()]
+    return [str(value).strip()]
+
+def _is_approval_comment(body, keywords):
+    if not body:
+        return False
+    text = body.lower()
+    for kw in keywords:
+        if kw and kw.lower() in text:
+            return True
+    return False
+
+def _is_issue_approved(token, repo, org, issue, team_cfg, team_slug, verbose=False):
+    reviewers = team_cfg.get("reviewers") or {}
+    required_users = _normalize_list(reviewers.get("users"))
+    required_teams = _normalize_list(reviewers.get("teams"))
+
+    approval_label = team_cfg.get("approval_label") or team_cfg.get("approved_label")
+    if approval_label and has_label(issue, approval_label):
+        return True
+
+    approval_keywords = _normalize_list(team_cfg.get("approval_keywords"))
+    if not approval_keywords:
+        approval_keywords = ["/approve", "approve", "approved", "lgtm", "同意", "批准", "通过", "已批准"]
+
+    if not required_users and not required_teams:
+        if verbose:
+            print("  ⊘ 跳过: 未配置审核人/团队")
+        return False
+
+    try:
+        comments = list_issue_comments(token, repo, issue["number"])
+    except RuntimeError as e:
+        if verbose:
+            print(f"  ✗ 获取评论失败: {e}")
+        return False
+
+    approvals = set()
+    for c in comments:
+        body = c.get("body", "")
+        if not _is_approval_comment(body, approval_keywords):
+            continue
+        author = c.get("user", {}).get("login", "")
+        if author:
+            approvals.add(author)
+
+    # Check required teams approvals (need at least one member approval per team)
+    team_member_cache = {}
+    for team in required_teams:
+        approved_by_team = False
+        for approver in approvals:
+            cache_key = (team, approver)
+            if cache_key not in team_member_cache:
+                team_member_cache[cache_key] = is_user_in_team(token, org, team, approver)
+            if team_member_cache[cache_key]:
+                approved_by_team = True
+                break
+        if not approved_by_team:
+            if verbose:
+                print(f"  ⊘ 跳过: 缺少团队 @{org}/{team} 成员的批准")
+            return False
+
+    # Check required users approvals
+    for user in required_users:
+        if user not in approvals:
+            if verbose:
+                print(f"  ⊘ 跳过: 缺少审核人 @{user} 的批准")
+            return False
+
+    return True
+
 def scan(verbose=False):
     # Load configuration first
     config_path = Path(__file__).parent.parent / "config" / "join-config.yml"
@@ -57,6 +133,7 @@ def scan(verbose=False):
         "title_updated": 0,
         "not_member_yet": 0,
         "reminder_sent": 0,
+        "waiting_approval": 0,
         "team_added": 0,
         "team_add_failed": 0,
         "completed": 0,
@@ -92,6 +169,7 @@ def scan(verbose=False):
 
         team_cfg = teams_cfg[target]
         team_slug = team_cfg.get("team_slug", "") or ""
+        team_mode = team_cfg.get("mode", "auto")
 
         if verbose:
             print(f"  目标团队: {target} (team_slug={team_slug})")
@@ -114,6 +192,14 @@ def scan(verbose=False):
         if verbose:
             print(f"  ✓ @{author} 已是组织成员")
 
+        # If approval required, ensure it is approved before adding to team
+        if team_mode == "approval" and team_slug:
+            if not _is_issue_approved(token, repo, org, it, team_cfg, team_slug, verbose=verbose):
+                summary["waiting_approval"] += 1
+                if verbose:
+                    print(f"  ⊘ 跳过: @{author} 等待审核\n")
+                continue
+
         # If needs team, ensure team membership
         if team_slug:
             if not is_user_in_team(token, org, team_slug, author):

src/libs/github_client.py

@@ -155,6 +155,27 @@ def is_user_in_team(token, org, team_slug, username):
     code, payload = gh("GET", f"orgs/{org}/teams/{team_slug}/memberships/{username}", token)
     return code == 200 and payload and payload.get("state") in ("active", "pending")
 
+def list_issue_comments(token, repo, issue_number, per_page=100):
+    """
+    List comments for a GitHub issue.
+
+    Args:
+        token: GitHub API token
+        repo: Repository in "owner/name" format
+        issue_number: Issue number
+        per_page: Number of results per page (max 100)
+
+    Returns:
+        List of comment objects
+
+    Raises:
+        RuntimeError: If the request fails
+    """
+    code, payload = gh("GET", f"repos/{repo}/issues/{issue_number}/comments?per_page={per_page}", token)
+    if code != 200:
+        raise RuntimeError(f"Failed to list issue comments: {code} {payload}")
+    return payload or []
+
 def search_issues(token, query, per_page=100):
     """
     Search issues using GitHub search API.

src/libs/summary_reporter.py

@@ -136,6 +136,7 @@ def _format_join_issues_summary(self, summary: Dict[str, Any], include_details:
         completed = summary.get("completed", 0)
         skipped = summary.get("skipped", 0)
         not_member = summary.get("not_member_yet", 0)
+        waiting_approval = summary.get("waiting_approval", 0)
 
         # 简要统计
         lines.append(f"- **待处理请求:** {total}")
@@ -145,6 +146,8 @@ def _format_join_issues_summary(self, summary: Dict[str, Any], include_details:
             lines.append(f"- **标题已更新:** {summary.get('title_updated', 0)}")
             lines.append(f"- **等待加入组织:** {not_member}")
             lines.append(f"  - 发送提醒: {summary.get('reminder_sent', 0)}")
+            if waiting_approval > 0:
+                lines.append(f"- **等待审核:** {waiting_approval}")
             lines.append(f"- **已添加到团队:** {summary.get('team_added', 0)}")
 
             team_failed = summary.get("team_add_failed", 0)
@@ -156,6 +159,8 @@ def _format_join_issues_summary(self, summary: Dict[str, Any], include_details:
             # 简化模式：只显示关键指标
             if not_member > 0:
                 lines.append(f"- **等待加入组织:** {not_member} (已发送 {summary.get('reminder_sent', 0)} 条提醒)")
+            if waiting_approval > 0:
+                lines.append(f"- **等待审核:** {waiting_approval}")
             if skipped > 0:
                 lines.append(f"- **跳过:** {skipped}")