Update join.py

join.py

@@ -6,18 +6,16 @@ import time
 import requests
 from typing import List, Dict, Any
 
-# ===== 設定 =====
+# --- 設定 ---
 X_ACCOUNT = os.getenv("dmsendertoken")
 if not X_ACCOUNT:
-    raise RuntimeError("環境変数 dmsendertoken が設定されていません")
-
-GROUP_ID = 463667
-WATCH_PERSON_ID = "599642"
+    raise RuntimeError("環境変数 dmsendertoken が設定されていません。")
 
+BASE_MESSAGES = "https://desk-api.channel.io/desk/channels/200605/groups/463667/messages"
 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"
+BOT_PERSON_ID = "599642"
+WELCOME_TEXT = "こんにちは。ITRSAにようこそ。自動でいくつかの部屋に招待しています。"
 
 PARAMS = {
     "sortOrder": "desc",
@@ -32,80 +30,69 @@ HEADERS = {
     "x-account": X_ACCOUNT,
 }
 
-WELCOME_TEXT = "こんにちは。ITRSAにようこそ。自動でいくつかの部屋に招待しています。"
-
-
-# ===== 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", [])
-
-
+# --- API ---
 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}],
     }
-    requests.post(url, headers=HEADERS, json=payload, timeout=20)
-
-
-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)
+    r = requests.post(BASE_MESSAGES, headers=HEADERS, json=payload, timeout=30)
+    r.raise_for_status()
+    print("[INFO] 歓迎メッセージ送信")
 
+def invite_to_group(group_id: int, manager_id: str) -> None:
+    url = f"https://desk-api.channel.io/desk/channels/200605/groups/{group_id}/invite"
+    params = {"managerIds": manager_id}
+    r = requests.post(url, headers=HEADERS, params=params, timeout=30)
+    r.raise_for_status()
+    print(f"[INFO] group {group_id} に {manager_id} を招待")
 
-# ===== ロジック =====
+# --- メイン処理 ---
 def process():
-    messages = get_messages()
+    r = requests.get(BASE_MESSAGES, headers=HEADERS, params=PARAMS, timeout=30)
+    r.raise_for_status()
+    messages = r.json().get("messages", [])
+
+    # 最新の bot メッセージ時刻
+    bot_created_at = None
+    for m in messages:
+        if str(m.get("personId")) == BOT_PERSON_ID:
+            bot_created_at = int(m.get("createdAt") or 0)
+            break  # desc なので最初でOK
 
-    # 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_messages: List[Dict[str, Any]] = []
 
-    # 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 ""),
-            })
-
-    if not join_logs:
-        return
+        created_at = int(m.get("createdAt") or 0)
+        if bot_created_at and created_at <= bot_created_at:
+            continue
 
-    # 599642 以降の join
-    targets = [j for j in join_logs if j["createdAt"] > latest_watch_created]
+        for log in m.get("log", []) or []:
+            if log.get("action") == "join":
+                join_messages.append({
+                    "createdAt": created_at,
+                    "personId": str(m.get("personId")),
+                })
 
-    if not targets:
+    if not join_messages:
         return
 
-    # 先頭 join に対してのみ挨拶判定
-    should_send_welcome = latest_watch_created == 0 or (
-        targets and targets[0]["createdAt"] > latest_watch_created
-    )
-
-    if should_send_welcome:
+    # bot発言以降に join があり、botの発言がまだ無い場合のみ歓迎メッセージ
+    if bot_created_at is None:
         post_message(WELCOME_TEXT)
 
-    # invite は全 join 対象に実行
-    for j in targets:
-        pid = j["personId"]
-        if not pid:
+    # join 全員を invite（複数可）
+    invited = set()
+    for jm in join_messages:
+        pid = jm["personId"]
+        if not pid or pid in invited:
             continue
         for gid in INVITE_GROUPS:
-            invite(gid, pid)
-
+            invite_to_group(gid, pid)
+        invited.add(pid)
 
 def main():
-    print("[INFO] bot start (10秒間隔)")
+    print("[INFO] Bot 起動（10秒ごとにチェック）")
     while True:
         try:
             process()
@@ -113,6 +100,5 @@ def main():
             print(f"[ERROR] {e}")
         time.sleep(10)
 
-
 if __name__ == "__main__":
     main()