Update join.py

join.py

@@ -5,21 +5,15 @@ import os
 import time
 import requests
 from typing import List, Dict, Any
-import re
 
 # ===== 設定 =====
 X_ACCOUNT = os.getenv("dmsendertoken")
 if not X_ACCOUNT:
     raise RuntimeError("環境変数 dmsendertoken が設定されていません")
 
-BASE_MESSAGES = (
-    "https://desk-api.channel.io/desk/channels/200605/groups/463667/messages"
-)
-PARAMS = {
-    "sortOrder": "desc",
-    "limit": 34,
-    "logFolded": "false",
-}
+BASE = "https://desk-api.channel.io/desk/channels/200605"
+GROUP_ID = 463667
+CHECK_PERSON_ID = "599642"
 
 HEADERS = {
     "accept": "application/json",
@@ -27,6 +21,13 @@ HEADERS = {
     "content-type": "application/json",
     "x-account": X_ACCOUNT,
 }
+
+GET_PARAMS = {
+    "sortOrder": "desc",
+    "limit": 34,
+    "logFolded": "false",
+}
+
 TXT_WELCOME = """ようこそ
 こんにちは。ITRSAにようこそ。
 自動でいくつかの部屋に招待しています。
@@ -35,34 +36,10 @@ TXT_WELCOME = """ようこそ
 左側のメニューから、部屋(グループ)を開くことができます。
 ・Youtubeダウンローダーは、URLを送ると自動でYoutubeをダウンロードしてくれる部屋
 ・チャッピーは、ChatGPTと話せる部屋
-・幹部と裁判所からの報告はここを管理する幹部や裁判所から通知が来る部屋
-・{get_group_title(200605)}
+・幹部と裁判所からの報告はここを管理する幹部や裁判所から通知が来る部屋です。
+・
 """
 
-def get_group_title(group_id: int) -> str | None:
-    url = f"https://desk-api.channel.io/desk/channels/{group_id}/groups?limit=1000"
-    response = requests.get(url)
-    response.raise_for_status()
-    data = response.json()
-    groups = data.get("groups", [])
-    for group in groups:
-        if group.get("id") == group_id:
-            return group.get("title")
-    return None
-
-# 文字列内の {get_group_title(...)} を置換する関数
-def replace_titles_in_text(text: str) -> str:
-    pattern = r"\{get_group_title\((\d+)\)\}"
-
-    def replacer(match):
-        group_id = int(match.group(1))
-        title = get_group_title(group_id)
-        return title if title else "タイトルなし"
-
-    return re.sub(pattern, replacer, text)
-
-BOT_PERSON_ID = "599642"
-
 INVITE_GROUPS = [
     519217,
     536194,
@@ -71,50 +48,83 @@ INVITE_GROUPS = [
     530062
 ]
 
-# ===== 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 = f"{BASE}/groups/{GROUP_ID}/messages"
+    r = requests.get(url, headers=HEADERS, params=GET_PARAMS, timeout=20)
     r.raise_for_status()
     return r.json().get("messages", [])
 
 
 def post_welcome_message() -> None:
-    WELCOME_TEXT = replace_titles_in_text(TXT_WELCOME)
+    url = f"{BASE}/groups/{GROUP_ID}/messages"
     payload = {
-        "requestId": f"welcome-{int(time.time() * 1000)}",
-        "blocks": [{"type": "text", "value": WELCOME_TEXT}],
+        "requestId": f"desk-web-{int(time.time() * 1000)}",
+        "blocks": [
+            {"type": "text", "value": WELCOME_TEXT}
+        ]
     }
-    requests.post(BASE_MESSAGES, headers=HEADERS, json=payload, timeout=20)
+    requests.post(url, headers=HEADERS, json=payload, timeout=20).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/"
-        f"groups/{group_id}/invite?managerIds={manager_id}"
-    )
-    requests.post(url, headers=HEADERS, timeout=20)
+def invite_person(group_id: int, person_id: str) -> None:
+    url = f"{BASE}/groups/{group_id}/invite"
+    params = {"managerIds": person_id}
+    requests.post(url, headers=HEADERS, params=params, timeout=20).raise_for_status()
+    print(f"[INFO] personId={person_id} を group {group_id} に招待しました")
 
 
 # ===== ロジック =====
-def process_once() -> None:
-    messages = fetch_messages()
-
-    # 599642 の発言時刻一覧（新しい順）
-    bot_message_times = [
-        int(m.get("createdAt") or 0)
-        for m in messages
-        if str(m.get("personId")) == BOT_PERSON_ID
-    ]
-
-    target_join_persons: List[str] = []
+def process():
+    messages = get_messages()
+
+    # personId=599642 の最新発言時刻
+    latest_599642 = max(
+        (int(m.get("createdAt", 0))
+         for m in messages
+         if str(m.get("personId")) == CHECK_PERSON_ID),
+        default=0
+    )
 
-    for msg in messages:
-        log = msg.get("log") or {}
+    # 条件を満たす join メッセージを抽出
+    join_targets = []
+    for m in messages:
+        log = m.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", ""))
+        created_at = int(m.get("createdAt", 0))
+        person_id = str(m.get("personId", ""))
+
+        # join 以降に 599642 の発言が無い
+        if created_at > latest_599642:
+            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)
+
+
+def main():
+    print("[INFO] Bot 起動（10秒間隔）")
+    while True:
+        try:
+            process()
+        except Exception as e:
+            print(f"[ERROR] {e}")
+        time.sleep(10)
+
 
-        # この join より新しい bot 発言があるか
-        has_newer_
+if __name__ == "__main__":
+    main()