Update join.py

join.py

@@ -4,19 +4,21 @@
 import os
 import time
 import requests
-from typing import Dict, Any, List
+from typing import List, Dict, Any
 
-# --- 設定 ---
+# ===== 設定 =====
 X_ACCOUNT = os.getenv("dmsendertoken")
 if not X_ACCOUNT:
-    raise RuntimeError("環境変数 dmsendertoken が設定されていません。")
+    raise RuntimeError("環境変数 dmsendertoken が設定されていません")
 
 GROUP_ID = 463667
-WATCH_PERSON_ID = "599642"  # この personId の発言有無をチェック
-BASE_MESSAGES = f"https://desk-api.channel.io/desk/channels/200605/groups/{GROUP_ID}/messages"
+WATCH_PERSON_ID = "599642"
 
 INVITE_GROUPS = [519217, 536194, 534868]
 
+BASE_MESSAGES = "https://desk-api.channel.io/desk/channels/200605/groups/{group_id}/messages"
+BASE_INVITE = "https://desk-api.channel.io/desk/channels/200605/groups/{group_id}/invite"
+
 PARAMS = {
     "sortOrder": "desc",
     "limit": 34,
@@ -30,96 +32,80 @@ HEADERS = {
     "x-account": X_ACCOUNT,
 }
 
-WELCOME_MESSAGE = "こんにちは。ITRSAにようこそ。自動でいくつかの部屋に招待しています。"
+WELCOME_TEXT = "こんにちは。ITRSAにようこそ。自動でいくつかの部屋に招待しています。"
 
 
-# --- API ---
-def fetch_messages() -> List[Dict[str, Any]]:
-    r = requests.get(BASE_MESSAGES, headers=HEADERS, params=PARAMS, timeout=20)
+# ===== API =====
+def get_messages() -> List[Dict[str, Any]]:
+    url = BASE_MESSAGES.format(group_id=GROUP_ID)
+    r = requests.get(url, headers=HEADERS, params=PARAMS, timeout=20)
     r.raise_for_status()
     return r.json().get("messages", [])
 
 
 def post_message(text: str) -> None:
+    url = BASE_MESSAGES.format(group_id=GROUP_ID)
     payload = {
         "requestId": f"desk-web-{int(time.time() * 1000)}",
         "blocks": [{"type": "text", "value": text}],
     }
-    r = requests.post(BASE_MESSAGES, headers=HEADERS, json=payload, timeout=20)
-    r.raise_for_status()
-    print("[INFO] ウェルカムメッセージ送信")
+    requests.post(url, headers=HEADERS, json=payload, timeout=20)
 
 
-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"
-        f"?managerIds={manager_id}"
-    )
-    r = requests.post(url, headers=HEADERS, timeout=20)
-    r.raise_for_status()
-    print(f"[INFO] group {group_id} に personId={manager_id} を招待")
+def invite(group_id: int, person_id: str) -> None:
+    url = BASE_INVITE.format(group_id=group_id)
+    params = {"managerIds": person_id}
+    requests.post(url, headers=HEADERS, params=params, timeout=20)
 
 
-# --- ロジック ---
+# ===== ロジック =====
 def process():
-    messages = fetch_messages()
-
-    # personId=599642 の最新メッセージ時刻
-    latest_watch_created_at = max(
-        (int(m.get("createdAt") or 0)
-         for m in messages
-         if str(m.get("personId", "")) == WATCH_PERSON_ID),
-        default=0
-    )
-
-    join_events = []
-
-    for msg in messages:
-        created_at = int(msg.get("createdAt") or 0)
-        logs = msg.get("logs") or []
+    messages = get_messages()
 
-        for log in logs:
-            if log.get("action") != "join":
-                continue
+    # personId == 599642 の最新メッセージ時刻
+    latest_watch_created = max(
+        (int(m.get("createdAt") or 0) for m in messages if str(m.get("personId")) == WATCH_PERSON_ID),
+        default=0,
+    )
 
-            join_person_id = str(log.get("personId", ""))
+    # join ログ抽出
+    join_logs = []
+    for m in messages:
+        log = m.get("log") or {}
+        if log.get("action") == "join":
+            join_logs.append({
+                "createdAt": int(m.get("createdAt") or 0),
+                "personId": str(m.get("personId") or ""),
+            })
 
-            # join メッセージ以降に 599642 の発言があるか
-            has_watch_after = any(
-                str(m.get("personId", "")) == WATCH_PERSON_ID
-                and int(m.get("createdAt") or 0) > created_at
-                for m in messages
-            )
+    if not join_logs:
+        return
 
-            join_events.append({
-                "created_at": created_at,
-                "person_id": join_person_id,
-                "has_watch_after": has_watch_after,
-            })
+    # 599642 以降の join
+    targets = [j for j in join_logs if j["createdAt"] > latest_watch_created]
 
-    if not join_events:
+    if not targets:
         return
 
-    # createdAt が新しい順に処理
-    join_events.sort(key=lambda x: x["created_at"], reverse=True)
+    # 先頭 join に対してのみ挨拶判定
+    should_send_welcome = latest_watch_created == 0 or (
+        targets and targets[0]["createdAt"] > latest_watch_created
+    )
 
-    # 599642 の発言がない join が1つでもあれば最初だけ挨拶
-    need_welcome = any(not e["has_watch_after"] for e in join_events)
-    if need_welcome:
-        post_message(WELCOME_MESSAGE)
+    if should_send_welcome:
+        post_message(WELCOME_TEXT)
 
-    # 招待処理（条件どおり：複数あっても全部）
-    for e in join_events:
-        if e["created_at"] <= latest_watch_created_at:
+    # invite は全 join 対象に実行
+    for j in targets:
+        pid = j["personId"]
+        if not pid:
             continue
-
         for gid in INVITE_GROUPS:
-            invite_to_group(gid, e["person_id"])
+            invite(gid, pid)
 
 
-def main_loop():
-    print("[INFO] Bot 起動（10秒ごと）")
+def main():
+    print("[INFO] bot start (10秒間隔)")
     while True:
         try:
             process()
@@ -129,4 +115,4 @@ def main_loop():
 
 
 if __name__ == "__main__":
-    main_loop()
+    main()