Update join.py

join.py

@@ -4,7 +4,7 @@
 import os
 import time
 import requests
-from typing import List, Dict, Any
+from typing import List, Dict, Any, Optional
 
 # ===== 設定 =====
 X_ACCOUNT = os.getenv("dmsendertoken")
@@ -13,8 +13,11 @@ if not X_ACCOUNT:
 
 BASE = "https://desk-api.channel.io/desk/channels/200605"
 GROUP_ID = 463667
-CHECK_PERSON_ID = "479401"
-BLACKLIST_CHAT_IDS = ["463667", "481108"]
+CHECK_PERSON_ID = "614601"
+
+# accountIdベースのブラックリスト
+BLACKLIST_ACCOUNT_IDS = ["463667", "481108"]
+
 HEADERS = {
     "accept": "application/json",
     "accept-language": "ja",
@@ -51,18 +54,6 @@ INVITE_GROUPS = [
 ]
 
 # ===== API =====
-def blacklist_manager(person_id: str) -> None:
-    url = f"https://desk-api.channel.io/desk/channels/200605/managers/{person_id}"
-
-    # OPTIONS
-    opt = requests.options(url, headers=HEADERS, timeout=20)
-    opt.raise_for_status()
-
-    # DELETE
-    delete = requests.delete(url, headers=HEADERS, timeout=20)
-    delete.raise_for_status()
-
-    print(f"[INFO] personId={person_id} をブラックリスト処理しました")
 
 def get_messages() -> List[Dict[str, Any]]:
     url = f"{BASE}/groups/{GROUP_ID}/messages"
@@ -70,22 +61,54 @@ def get_messages() -> List[Dict[str, Any]]:
     r.raise_for_status()
     return r.json().get("messages", [])
 
-def get_group_titles() -> dict[int, str]:
-    url = "https://desk-api.channel.io/desk/channels/200605/groups?limit=1000"
-    response = requests.get(url, headers=HEADERS)
-    response.raise_for_status()
 
-    data = response.json()
-    groups = data.get("groups", [])
+def get_group_titles() -> Dict[int, str]:
+    url = f"{BASE}/groups?limit=1000"
+    response = requests.get(url, headers=HEADERS, timeout=20)
+    response.raise_for_status()
 
+    groups = response.json().get("groups", [])
     return {
         group.get("id"): group.get("title")
         for group in groups
         if "id" in group and "title" in group
     }
 
+
+def get_manager_account_id(person_id: str) -> Optional[str]:
+    """
+    personId を使って managers API を取得し、
+    managers[0].accountId を返す
+    """
+    url = f"{BASE}/managers"
+    params = {
+        "limit": 1,
+        "since": person_id
+    }
+
+    r = requests.get(url, headers=HEADERS, params=params, timeout=20)
+    r.raise_for_status()
+
+    data = r.json()
+    managers = data.get("managers", [])
+
+    if not managers:
+        return None
+
+    return str(managers[0].get("accountId"))
+
+
+def blacklist_manager(person_id: str) -> None:
+    """
+    personId を使って manager を削除
+    """
+    url = f"{BASE}/managers/{person_id}"
+    requests.delete(url, headers=HEADERS, timeout=20).raise_for_status()
+    print(f"[INFO] personId={person_id} を削除しました")
+
+
 def post_welcome_message() -> None:
-    TITLES = get_group_titles()  # {group_id: title}
+    TITLES = get_group_titles()
 
     welcome_text = WELCOME_TEMPLATE.format(
         hq=TITLES.get(532214, "本部")
@@ -98,11 +121,11 @@ def post_welcome_message() -> None:
             {"type": "text", "value": welcome_text}
         ]
     }
+
     requests.post(url, headers=HEADERS, json=payload, timeout=20).raise_for_status()
     print("[INFO] 歓迎メッセージを送信しました")
 
 
-
 def invite_person(group_id: int, person_id: str) -> None:
     url = f"{BASE}/groups/{group_id}/invite"
     params = {"managerIds": person_id}
@@ -111,50 +134,61 @@ def invite_person(group_id: int, person_id: str) -> None:
 
 
 # ===== ロジック =====
+
 def process():
     messages = get_messages()
 
-    # personId=599642 の最新発言時刻
-    latest_599642 = max(
+    # CHECK_PERSON_ID の最新発言時刻
+    latest_check_person = max(
         (int(m.get("createdAt", 0))
          for m in messages
-         if str(m.get("chatId")) == CHECK_PERSON_ID),
+         if str(m.get("personId")) == CHECK_PERSON_ID),
         default=0
     )
 
-    # 条件を満たす join メッセージを抽出
     join_targets = []
+
     for m in messages:
         log = m.get("log") or {}
         if log.get("action") != "join":
             continue
-    
+
         created_at = int(m.get("createdAt", 0))
         person_id = str(m.get("personId", ""))
-        chat_id = str(m.get("chatId", ""))
-    
-        # ===== ブラックリスト判定 =====
-        if chat_id in BLACKLIST_CHAT_IDS:
-            blacklist_manager(person_id)
+
+        # ===== ブラックリスト判定（accountIdベース）=====
+        try:
+            account_id = get_manager_account_id(person_id)
+        except Exception as e:
+            print(f"[ERROR] manager取得失敗 personId={person_id} : {e}")
             continue
-    
+
+        if account_id and account_id in BLACKLIST_ACCOUNT_IDS:
+            try:
+                blacklist_manager(person_id)
+            except Exception as e:
+                print(f"[ERROR] 削除失敗 personId={person_id} : {e}")
+            continue
+
         # ===== 通常処理 =====
-        if created_at > latest_599642:
+        if created_at > latest_check_person:
             join_targets.append(person_id)
 
     if not join_targets:
         return
 
-    # 重複排除
     join_targets = list(set(join_targets))
 
     # 歓迎メッセージは1回だけ
     post_welcome_message()
 
-    # 全員を各グループへ招待
+    # 招待処理
     for pid in join_targets:
         for gid in INVITE_GROUPS:
-            invite_person(gid, pid)
+            try:
+                invite_person(gid, pid)
+            except Exception as e:
+                print(f"[ERROR] 招待失敗 personId={pid} group={gid} : {e}")
 
 
 def main():