Update ngwords.py

ngwords.py

@@ -1,98 +1,101 @@
 import os
 import time
-import json
 import requests
+from datetime import datetime
 
-# ===== 設定 =====
 BASE_URL = "https://desk-api.channel.io/desk/channels/200605"
 SOURCE_GROUP_ID = "536194"
 DEST_GROUP_ID = "536281"
 
-GET_MESSAGES_URL = f"{BASE_URL}/groups/{SOURCE_GROUP_ID}/messages"
-POST_MESSAGE_URL = f"{BASE_URL}/groups/{DEST_GROUP_ID}/messages"
-DELETE_MESSAGE_URL = f"{BASE_URL}/groups/{SOURCE_GROUP_ID}/messages"
+TOKEN = os.getenv("channeliotokenbot2")
 
 HEADERS = {
-    "x-account": os.getenv("channeliotokenbot2"),
+    "x-account": TOKEN,
     "Content-Type": "application/json"
 }
 
-PARAMS = {
-    "sortOrder": "desc",
-    "limit": 34,
-    "logFolded": "false"
-}
-
-NG_WORDS_FILE = "ngwords.txt"
+GET_URL = f"{BASE_URL}/groups/{SOURCE_GROUP_ID}/messages"
+POST_URL = f"{BASE_URL}/groups/{DEST_GROUP_ID}/messages"
 
 
-# ===== NGワード読み込み =====
-def load_ng_words():
-    with open(NG_WORDS_FILE, encoding="utf-8") as f:
+def load_ng_words(path="ngwords.txt"):
+    with open(path, encoding="utf-8") as f:
         return [line.strip() for line in f if line.strip()]
 
 
-# ===== メッセージ取得 =====
-def fetch_messages():
-    r = requests.get(GET_MESSAGES_URL, headers=HEADERS, params=PARAMS)
-    r.raise_for_status()
-    return r.json().get("messages", [])
-
-
-# ===== メッセージ転送 =====
-def forward_message(msg, index):
-    blocks = msg.get("blocks")
-    files = msg.get("blocks") if blocks else None
-
-    info_block = {
-        "type": "text",
-        "value": f"送信者：{msg.get('personId')}、送信エポックミリ秒：{msg.get('createdAt')}"
-    }
-
-    if blocks:
-        new_blocks = [info_block] + blocks
-    else:
-        new_blocks = [info_block]
+def contains_ng_word(text, ng_words):
+    return any(word in text for word in ng_words)
 
-    body = {
-        "requestId": f"desk-web-{int(time.time() * 1000)}",
-        "blocks": new_blocks,
-        "buttons": None,
-        "form": None,
-        "webPage": None,
-        "files": files,
-        "customPayload": None
-    }
 
-    r = requests.post(POST_MESSAGE_URL, headers=HEADERS, json=body)
-    r.raise_for_status()
-
-
-# ===== メッセージ削除 =====
-def delete_message(message_id):
-    url = f"{DELETE_MESSAGE_URL}/{message_id}"
-    r = requests.delete(url, headers=HEADERS)
-    r.raise_for_status()
-
-
-# ===== メインループ =====
 def main():
     ng_words = load_ng_words()
-    print("監視開始…")
 
     while True:
         try:
-            messages = fetch_messages()
+            resp = requests.get(
+                GET_URL,
+                headers=HEADERS,
+                params={
+                    "sortOrder": "desc",
+                    "limit": 34,
+                    "logFolded": "false"
+                }
+            )
+            resp.raise_for_status()
+            data = resp.json()
+
+            messages = data.get("messages", [])
 
             for i, msg in enumerate(messages):
                 plain_text = msg.get("plainText", "")
-                message_id = msg.get("id")
-
-                if any(ng in plain_text for ng in ng_words):
-                    print(f"NG検出（index={i}, id={message_id}）")
-
-                    forward_message(msg, i)
-                    delete_message(message_id)
+                if not plain_text:
+                    continue
+
+                if not contains_ng_word(plain_text, ng_words):
+                    continue
+
+                person_id = msg.get("personId")
+                created_at = msg.get("createdAt")
+                blocks = msg.get("blocks") or []
+                files = msg.get("files")
+
+                # 先頭に送信者情報ブロックを追加
+                info_block = {
+                    "type": "text",
+                    "value": f"送信者：{person_id}、送信エポックミリ秒：{created_at}"
+                }
+
+                new_blocks = [info_block] + blocks
+
+                post_body = {
+                    "requestId": f"desk-web-{int(time.time() * 1000)}",
+                    "blocks": new_blocks,
+                    "buttons": None,
+                    "form": None,
+                    "webPage": None,
+                    "files": files if files else None,
+                    "customPayload": None
+                }
+
+                # POST
+                post_resp = requests.post(
+                    POST_URL,
+                    headers=HEADERS,
+                    json=post_body
+                )
+                post_resp.raise_for_status()
+
+                # DELETE 元メッセージ
+                msg_id = msg.get("id")
+                delete_url = f"{BASE_URL}/groups/{SOURCE_GROUP_ID}/messages/{msg_id}"
+
+                del_resp = requests.delete(
+                    delete_url,
+                    headers=HEADERS
+                )
+                del_resp.raise_for_status()
+
+                print(f"処理完了: message_id={msg_id}")
 
         except Exception as e:
             print("エラー:", e)