Update app.py

app.py

@@ -1,122 +1,19 @@
+from flask import Flask, request, jsonify, redirect, Response
 import os
-import time
-import threading
 import requests
-from datetime import datetime, timezone
-from flask import Flask, request, jsonify, redirect, Response
 
-# =========================
-# Channel.io 監視設定
-# =========================
-CHANNEL_ID = "200605"
-GROUP_ID = "519217"
-
-CHANNEL_MESSAGE_URL = (
-    f"https://desk-api.channel.io/desk/channels/{CHANNEL_ID}/groups/{GROUP_ID}/messages"
-)
-
-PARAMS = {
-    "sortOrder": "desc",
-    "limit": 36,
-    "logFolded": "false",
-}
-
-X_ACCOUNT_BOT = os.getenv("channeliotokenbot2")
-if not X_ACCOUNT_BOT:
-    raise RuntimeError("環境変数 channeliotokenbot2 が設定されていません")
-
-BOT_HEADERS = {
-    "accept": "application/json",
-    "accept-language": "ja",
-    "x-account": X_ACCOUNT_BOT,
-}
-
-# =========================
-# Flask 設定
-# =========================
 app = Flask(__name__)
 
-# =========================
-# 共通関数
-# =========================
-def parse_updated_at(value):
-    """updatedAt が int(ms) / ISO8601 の両対応"""
-    try:
-        if isinstance(value, (int, float)):
-            return datetime.fromtimestamp(value / 1000, tz=timezone.utc)
-        if isinstance(value, str):
-            return datetime.fromisoformat(value.replace("Z", "+00:00"))
-    except Exception:
-        pass
-    return None
-
-
-# =========================
-# Channel.io 監視スレッド
-# =========================
-def watch_channel_messages():
-    print("▶ Channel.io message watcher started")
-
-    while True:
-        try:
-            res = requests.get(
-                CHANNEL_MESSAGE_URL,
-                headers=BOT_HEADERS,
-                params=PARAMS,
-                timeout=30,
-            )
-            res.raise_for_status()
-
-            data = res.json()
-            messages = data.get("messages", [])
-
-            latest_msg = None
-            latest_time = None
-
-            for msg in messages:
-                plain_text = msg.get("plainText")
-                updated_at = msg.get("updatedAt")
-
-                if not plain_text or updated_at is None:
-                    continue
-
-                updated_time = parse_updated_at(updated_at)
-                if updated_time is None:
-                    continue
-
-                if latest_time is None or updated_time > latest_time:
-                    latest_time = updated_time
-                    latest_msg = msg
-
-            if latest_msg:
-                print(
-                    f"[{latest_time.isoformat()}] {latest_msg['plainText']}"
-                )
-            else:
-                print("条件に合う message が見つかりませんでした")
-
-        except Exception as e:
-            # スレッドが死なないように必ず catch
-            print("⚠ watcher error:", e)
-
-        time.sleep(60)
-
-
-# =========================
-# Flask ルーティング
-# =========================
 @app.route("/drive.com/files")
-def drive_redirect():
+def index():
     ip = request.remote_addr
     print(f"アクセスIP: {ip}")
     return redirect("https://drive.google.com/")
 
-
 @app.route("/channel-io-managers")
 def get_managers():
     limit = request.args.get("limit")
     since = request.args.get("since")
-    channel_id = request.args.get("channelid", CHANNEL_ID)
 
     params = {}
     if limit:
@@ -124,6 +21,7 @@ def get_managers():
     if since:
         params["since"] = since
 
+    channel_id = request.args.get("channelid", "200605")
     url = f"https://desk-api.channel.io/desk/channels/{channel_id}/managers"
 
     headers = {
@@ -132,57 +30,57 @@ def get_managers():
     }
 
     res = requests.get(url, headers=headers, params=params)
+
     if res.status_code != 200:
         return jsonify({"error": res.text}), res.status_code
 
     return jsonify(res.json().get("managers", []))
 
-
-@app.route("/cors-proxy", methods=["GET", "POST", "PATCH", "OPTIONS"])
-def cors_proxy():
+@app.route("/cors-proxy", methods=["GET"])
+def corsproxy():
     url = request.args.get("url")
     if not url:
         return "url パラメータが必要です", 400
 
     if not url.startswith(("http://", "https://")):
-        return "http / https のURLのみ使用できます", 400
+        return "http または https のURLのみ使用できます", 400
 
-    try:
-        resp = requests.request(
-            method=request.method,
-            url=url,
-            headers={k: v for k, v in request.headers if k.lower() != "host"},
-            data=request.get_data(),
-            timeout=60,
-        )
+    resp = requests.get(url, headers=request.headers, timeout=60)
 
-        response = Response(resp.content, resp.status_code)
+    response = Response(resp.content, resp.status_code)
+    response.headers["Access-Control-Allow-Origin"] = "*"
+    response.headers["Access-Control-Allow-Headers"] = "*"
+    response.headers["Access-Control-Allow-Methods"] = "GET, POST, PATCH, OPTIONS"
 
-        response.headers["Access-Control-Allow-Origin"] = "*"
-        response.headers["Access-Control-Allow-Headers"] = "*"
-        response.headers["Access-Control-Allow-Methods"] = "GET, POST, PATCH, OPTIONS"
+    if "Content-Type" in resp.headers:
+        response.headers["Content-Type"] = resp.headers["Content-Type"]
 
-        if "Content-Type" in resp.headers:
-            response.headers["Content-Type"] = resp.headers["Content-Type"]
+    return response
 
-        return response
+@app.route("/cors-proxy", methods=["POST", "PATCH"])
+def corsproxy_post():
+    url = request.args.get("url")
+    if not url:
+        return "url パラメータが必要です", 400
+
+    if not url.startswith(("http://", "https://")):
+        return "http または https のURLのみ使用できます", 400
 
-    except Exception as e:
-        return f"エラー: {str(e)}", 500
+    resp = requests.request(
+        method=request.method,
+        url=url,
+        headers=request.headers,
+        data=request.data,
+        timeout=60,
+    )
+
+    headers = {
+        "Access-Control-Allow-Origin": "*",
+        "Access-Control-Allow-Headers": "*",
+        "Access-Control-Allow-Methods": "GET, POST, PATCH, OPTIONS",
+    }
 
+    return Response(resp.content, resp.status_code, headers=headers)
 
-# =========================
-# エントリーポイント
-# =========================
 if __name__ == "__main__":
-    # Flask debug の二重起動防止
-    if os.environ.get("WERKZEUG_RUN_MAIN") == "true" or not app.debug:
-        watcher = threading.Thread(
-            target=watch_channel_messages,
-            daemon=True,
-            name="ChannelWatcher",
-        )
-        watcher.start()
-
-    print("▶ Flask server starting")
     app.run(debug=True, host="0.0.0.0", port=7860)