Update join.py

join.py

@@ -11,14 +11,14 @@ X_ACCOUNT = os.getenv("dmsendertoken")
 if not X_ACCOUNT:
     raise RuntimeError("環境変数 dmsendertoken が設定されていません")
 
-BASE = "https://desk-api.channel.io/desk/channels/200605"
-GROUP_ID = 463667
-WATCH_LIMIT = 34
-CHECK_INTERVAL = 10
-
-WELCOME_SENDER_ID = "599642"
-
-INVITE_GROUPS = [519217, 536194, 534868]
+BASE_MESSAGES = (
+    "https://desk-api.channel.io/desk/channels/200605/groups/463667/messages"
+)
+PARAMS = {
+    "sortOrder": "desc",
+    "limit": 34,
+    "logFolded": "false",
+}
 
 HEADERS = {
     "accept": "application/json",
@@ -29,100 +29,57 @@ HEADERS = {
 
 WELCOME_TEXT = "こんにちは。ITRSAにようこそ。自動でいくつかの部屋に招待しています。"
 
+BOT_PERSON_ID = "599642"
 
-# ===== API =====
+INVITE_GROUPS = [
+    519217,
+    536194,
+    534868,
+]
+
+# ===== API操作 =====
 def fetch_messages() -> List[Dict[str, Any]]:
-    url = f"{BASE}/groups/{GROUP_ID}/messages"
-    params = {
-        "sortOrder": "desc",
-        "limit": WATCH_LIMIT,
-        "logFolded": "false",
-    }
-    r = requests.get(url, headers=HEADERS, params=params, timeout=20)
+    r = requests.get(BASE_MESSAGES, headers=HEADERS, params=PARAMS, timeout=20)
     r.raise_for_status()
     return r.json().get("messages", [])
 
 
 def post_welcome_message() -> None:
-    url = f"{BASE}/groups/{GROUP_ID}/messages"
     payload = {
-        "requestId": f"desk-web-{int(time.time() * 1000)}",
-        "blocks": [
-            {"type": "text", "value": WELCOME_TEXT}
-        ]
+        "requestId": f"welcome-{int(time.time() * 1000)}",
+        "blocks": [{"type": "text", "value": WELCOME_TEXT}],
     }
-    r = requests.post(url, headers=HEADERS, json=payload, timeout=20)
-    r.raise_for_status()
-    print("[INFO] 歓迎メッセージを送信しました")
+    requests.post(BASE_MESSAGES, headers=HEADERS, json=payload, timeout=20)
 
 
-def invite_person(group_id: int, person_id: str) -> None:
-    url = f"{BASE}/groups/{group_id}/invite"
-    params = {"managerIds": person_id}
-    r = requests.post(url, headers=HEADERS, params=params, timeout=20)
-    r.raise_for_status()
-    print(f"[INFO] person {person_id} を group {group_id} に招待しました")
+def invite_to_group(group_id: int, manager_id: str) -> None:
+    url = (
+        f"https://desk-api.channel.io/desk/channels/200605/"
+        f"groups/{group_id}/invite?managerIds={manager_id}"
+    )
+    requests.post(url, headers=HEADERS, timeout=20)
 
 
 # ===== ロジック =====
-def process():
+def process_once() -> None:
     messages = fetch_messages()
 
-    # join ログを新しい順に抽出
-    join_logs = []
-    for msg in messages:
-        log = msg.get("log")
-        if log and log.get("action") == "join":
-            join_logs.append(msg)
-
-    if not join_logs:
-        return
-
-    # 599642 の最新メッセージ時刻
-    latest_welcome_sender_time = max(
-        (int(m.get("createdAt") or 0)
-         for m in messages
-         if str(m.get("personId")) == WELCOME_SENDER_ID),
-        default=0
-    )
-
-    # 599642 の発言「以降」にある join を対象にする
-    target_joins = [
-        m for m in join_logs
-        if int(m.get("createdAt") or 0) > latest_welcome_sender_time
+    # 599642 の発言時刻一覧（新しい順）
+    bot_message_times = [
+        int(m.get("createdAt") or 0)
+        for m in messages
+        if str(m.get("personId")) == BOT_PERSON_ID
     ]
 
-    if not target_joins:
-        return
-
-    # 招待対象 personId を重複排除
-    invite_person_ids = {
-        str(m.get("personId"))
-        for m in target_joins
-        if m.get("personId")
-    }
-
-    if not invite_person_ids:
-        return
+    target_join_persons: List[str] = []
 
-    # 歓迎メッセージは一度だけ
-    post_welcome_message()
-
-    # 各 join ユーザーを各グループに招待
-    for pid in invite_person_ids:
-        for gid in INVITE_GROUPS:
-            invite_person(gid, pid)
-
-
-def main():
-    print("[INFO] Bot 起動（10秒ごとにチェック）")
-    while True:
-        try:
-            process()
-        except Exception as e:
-            print(f"[ERROR] 処理中に例外: {e}")
-        time.sleep(CHECK_INTERVAL)
+    for msg in messages:
+        log = msg.get("log") or {}
+        if log.get("action") != "join":
+            continue
 
+        join_created_at = int(msg.get("createdAt") or 0)
+        join_person_id = str(msg.get("personId", ""))
 
-if __name__ == "__main__":
-    main()
+        # この join より新しい bot 発言があるか
+        has_newer_