fix: restore features lost in rebase

Author: Cryolitia

src/config.ts

@@ -16,12 +16,14 @@ export async function getRepoConfig(
 ): Promise<RepoConfig | null> {
   const [owner] = fullName.split("/");
 
-  const exact = await kv.get(configKey(fullName));
+  const exactKey = configKey(fullName);
+  const exact = await kv.get(exactKey);
   if (exact) {
     return JSON.parse(exact) as RepoConfig;
   }
 
-  const wildcard = await kv.get(wildcardKey(owner));
+  const wildKey = wildcardKey(owner);
+  const wildcard = await kv.get(wildKey);
   if (wildcard) {
     return JSON.parse(wildcard) as RepoConfig;
   }
@@ -33,7 +35,8 @@ export async function getOrgWildcardConfig(
   kv: KVNamespace,
   orgName: string,
 ): Promise<RepoConfig | null> {
-  const raw = await kv.get(wildcardKey(orgName));
+  const key = wildcardKey(orgName);
+  const raw = await kv.get(key);
   if (!raw) return null;
   return JSON.parse(raw) as RepoConfig;
 }

src/formatters/issues.ts

@@ -27,13 +27,13 @@ export function formatIssues(event: GitHubEvent): string {
   const lines: string[] = [];
   lines.push(headerLine("Event:    ", `${emoji} issue`));
   lines.push(headerLine("Repo:     ", `<a href="${repoUrl}">${escapeHtml(repo)}</a>`));
+  lines.push(headerLine("Number:   ", `#${number}`));
+  lines.push(headerLine("Title:    ", `<a href="${url}">${escapeHtml(title)}</a>`));
   lines.push(headerLine("Action:   ", actionText));
   lines.push(headerLine("By:       ", `<a href="${senderUrl}">${escapeHtml(sender)}</a>`));
   if (labels.length > 0) {
     lines.push(headerLine("Labels:   ", labels.map((l) => escapeHtml(l.name)).join(", ")));
   }
-  lines.push("");
-  lines.push(`<a href="${url}">#${number} ${escapeHtml(title)}</a>`);
 
   return lines.join("\n");
 }

src/formatters/pull_request.ts

@@ -33,12 +33,19 @@ export function formatPullRequest(event: GitHubEvent): string {
   else if (action === "reopened") actionText = "reopened";
   else if (action === "ready_for_review") actionText = "ready for review";
   else if (action === "converted_to_draft") actionText = "converted to draft";
+  else if (action === "review_requested") actionText = "review requested";
   else if (action === "synchronize") actionText = "synchronized";
   else actionText = action;
 
+  const requestedReviewers = action === "review_requested"
+    ? (event.requested_reviewer as { login: string } | undefined) ?? (pr?.requested_reviewers as Array<{ login: string }> | undefined)
+    : undefined;
+
   const lines: string[] = [];
   lines.push(headerLine("Event:    ", `${emoji} pull_request`));
   lines.push(headerLine("Repo:     ", `<a href="${repoUrl}">${escapeHtml(repo)}</a>`));
+  lines.push(headerLine("Number:   ", `#${number}`));
+  lines.push(headerLine("Title:    ", `<a href="${url}">${escapeHtml(title)}</a>`));
   lines.push(headerLine("Action:   ", actionText));
   lines.push(headerLine("By:       ", `<a href="${senderUrl}">${escapeHtml(sender)}</a>`));
   if (headLabel && baseLabel) {
@@ -53,13 +60,24 @@ export function formatPullRequest(event: GitHubEvent): string {
   if (labels.length > 0) {
     lines.push(headerLine("Labels:   ", labels.map((l) => escapeHtml(l.name)).join(", ")));
   }
-  lines.push("");
-  lines.push(`<a href="${url}">#${number} ${escapeHtml(title)}</a>`);
+  if (action === "review_requested" && requestedReviewers) {
+    const reviewers = Array.isArray(requestedReviewers)
+      ? requestedReviewers.map((r) => escapeHtml(r.login)).join(", ")
+      : escapeHtml(requestedReviewers.login);
+    lines.push(headerLine("Reviewer: ", reviewers));
+  }
+  const body = (pr?.body as string) ?? "";
+  if (body) {
+    lines.push("");
+    const truncated = body.length > 300 ? body.substring(0, 300) + "..." : body;
+    lines.push(escapeHtml(truncated));
+  }
   if (action === "synchronize") {
     const before = (event.before as string) ?? "";
     const after = (event.after as string) ?? "";
     if (before && after) {
       const compareUrl = `${repoUrl}/compare/${before.substring(0, 7)}...${after.substring(0, 7)}`;
+      lines.push("");
       lines.push(`<a href="${compareUrl}">Compare changes</a>`);
     }
   }

src/index.ts

@@ -6,15 +6,22 @@ import { sendMessage, sendAlert } from "./telegram";
 
 export interface Env {
   TG_GH_KV: KVNamespace;
+  DEBUG?: string;
+}
+
+function isDebug(env: Env): boolean {
+  return env.DEBUG === "1" || env.DEBUG === "true";
 }
 
 export default {
   async fetch(request: Request, env: Env): Promise<Response> {
     if (request.method !== "POST") {
+      console.log("rejected: non-POST method");
       return new Response("Method not allowed", { status: 405 });
     }
 
     const eventType = request.headers.get("X-GitHub-Event") ?? "";
+    console.log(`[event:${eventType}] received`);
 
     if (eventType === "ping") {
       return new Response("OK", { status: 200 });
@@ -27,37 +34,66 @@ export default {
     try {
       payload = JSON.parse(body);
     } catch {
+      console.log(`[event:${eventType}] invalid JSON`);
       return new Response("Invalid JSON", { status: 400 });
     }
 
     const fullName = (payload.repository as { full_name?: string } | undefined)?.full_name;
     const orgName = (payload.organization as { login?: string } | undefined)?.login;
 
+    if (isDebug(env)) {
+      console.log(`[event:${eventType}] fullName=${fullName} orgName=${orgName}`);
+      console.log(`[event:${eventType}] env.TG_GH_KV type: ${typeof env.TG_GH_KV}, get: ${typeof env.TG_GH_KV?.get}`);
+
+      try {
+        const listResult = await env.TG_GH_KV.list({ prefix: "config:" });
+        console.log(`[event:${eventType}] KV list config:* returned ${listResult.keys.length} keys`);
+        for (const k of listResult.keys.slice(0, 5)) {
+          console.log(`[event:${eventType}] KV key: ${k.name}`);
+        }
+        if (listResult.keys.length === 0) {
+          await env.TG_GH_KV.put("config:__debug__", "hello");
+          const debugGet = await env.TG_GH_KV.get("config:__debug__");
+          console.log(`[event:${eventType}] KV put/get debug: ${debugGet}`);
+        }
+      } catch (e) {
+        console.error(`[event:${eventType}] KV list failed:`, e);
+      }
+    }
+
     if (!fullName && !orgName) {
+      console.log(`[event:${eventType}] no fullName or orgName, returning 200`);
       return new Response("OK", { status: 200 });
     }
 
     let adminConfig;
     try {
       adminConfig = await getAdminConfig(env.TG_GH_KV);
+      console.log(`[event:${eventType}] adminConfig loaded: ${adminConfig ? "yes" : "no"}`);
     } catch (e) {
-      console.error("Failed to read admin config:", e);
+      console.error(`[event:${eventType}] failed to read admin config:`, e);
       return new Response("Internal error", { status: 500 });
     }
 
     let config = null;
     if (fullName) {
       config = await getRepoConfig(env.TG_GH_KV, fullName);
+      console.log(`[event:${eventType}] getRepoConfig(${fullName}): ${config ? "found" : "null"}`);
     }
     if (!config && orgName) {
       config = await getOrgWildcardConfig(env.TG_GH_KV, orgName);
+      console.log(`[event:${eventType}] getOrgWildcardConfig(${orgName}): ${config ? "found" : "null"}`);
     }
     if (!config) {
+      console.log(`[event:${eventType}] no config matched, returning 204`);
       return new Response(null, { status: 204 });
     }
 
+    console.log(`[event:${eventType}] config found, verifying signature`);
+
     const valid = await verifySignature(body, signature, config.secret);
     if (!valid) {
+      console.log(`[event:${eventType}] signature verification FAILED`);
       if (adminConfig) {
         const context = fullName ?? orgName ?? "unknown";
         try {
@@ -69,8 +105,11 @@ export default {
       return new Response("Unauthorized", { status: 401 });
     }
 
+    console.log(`[event:${eventType}] signature OK`);
+
     const isPrivate = (payload.repository as { private?: boolean } | undefined)?.private ?? false;
     const targets = matchTargets(config, eventType, isPrivate);
+    console.log(`[event:${eventType}] matched ${targets.length} target(s)`);
 
     const formatter = getFormatter(eventType);
     const message = formatter(payload as import("./types").GitHubEvent);
@@ -91,8 +130,10 @@ export default {
           chat_id: target.chat_id,
           text: message,
         });
+        console.log(`[event:${eventType}] sent to target (${target.public ? "public" : "private"})`);
       } catch (e) {
         const errMsg = e instanceof Error ? e.message : String(e);
+        console.error(`[event:${eventType}] failed to send to target:`, errMsg);
         errors.push(`Failed to send to ${target.chat_id}: ${errMsg}`);
       }
     }

wrangler.toml

@@ -2,6 +2,9 @@ name = "telegram-github-worker"
 main = "src/index.ts"
 compatibility_date = "2025-04-21"
 
+[vars]
+DEBUG = ""
+
 [[kv_namespaces]]
 binding = "TG_GH_KV"
 id = "KV_ID_PLACEHOLDER"