notion-github 1.0.4 → 1.0.6

package/dist/cli.js

@@ -4558,7 +4558,7 @@ var {
 } = import_index.default;
 
 // package.json
-var version = "1.0.4";
+var version = "1.0.6";
 
 // src/commands/create/action.ts
 var import_rest = require("@octokit/rest");
@@ -5949,32 +5949,31 @@ fetch.Promise = global.Promise;
 var lib_default = fetch;
 
 // src/utils/discord.ts
-async function sendDiscordNotification(webhookUrl, prTitle, prUrl, reviewers, lang = "en") {
-  const message = [
-    `\u{1F389} ${lang === "ko" ? "\uC0C8\uB85C\uC6B4 PR\uC774 \uC0DD\uC131\uB418\uC5C8\uC2B5\uB2C8\uB2E4!" : "New PR Created!"}`,
-    ``,
-    `\u{1F4CC} ${prTitle}`,
-    `\u{1F517} ${prUrl}`
-  ];
-  if (reviewers && reviewers.length > 0) {
-    message.push(``, `\u{1F465} ${lang === "ko" ? "\uB9AC\uBDF0\uC5B4" : "Reviewers"}: ${reviewers.map((r) => `@${r}`).join(", ")}`);
-  }
-  const payload = { content: message.join("\n") };
-  console.log("Sending Discord notification:", payload);
+async function sendDiscordNotification(webhookUrl, prTitle, prUrl, reviewers, lang = "en", template, discordReviewerMapping) {
+  const defaultTemplate = {
+    ko: ["# \u{1F389} \uC0C8\uB85C\uC6B4 PR\uC774 \uC0DD\uC131\uB418\uC5C8\uC2B5\uB2C8\uB2E4!", "## \uC81C\uBAA9", "> ${title}", "## \uB9C1\uD06C", "> ${url}", "${reviewers}"].join("\n"),
+    en: ["# \u{1F389} New PR Created!", "## Title", "> ${title}", "## Link", "> ${url}", "${reviewers}"].join("\n")
+  };
+  const selectedTemplate = template && template[lang] || defaultTemplate[lang];
+  const mappedReviewers = reviewers?.map((reviewer) => {
+    const discordId = discordReviewerMapping?.[reviewer];
+    return discordId ? `<@${discordId}>` : `@${reviewer}`;
+  });
+  let message = selectedTemplate.replace("${title}", prTitle).replace("${url}", prUrl).replace(
+    "${reviewers}",
+    mappedReviewers && mappedReviewers.length > 0 ? `## ${lang === "ko" ? "\uB9AC\uBDF0\uC5B4" : "Reviewers"}
+> ${mappedReviewers.join(", ")}` : ""
+  );
   try {
     const response = await lib_default(webhookUrl, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(payload)
+      body: JSON.stringify({ content: message })
     });
     if (!response.ok) {
-      const errorText = await response.text();
-      console.error("Discord API Error:", errorText);
       throw new Error(`Discord API returned ${response.status}`);
     }
-    console.log("Discord notification sent successfully");
   } catch (error) {
-    console.error("Discord notification error:", error);
     throw new Error(lang === "ko" ? "\uB514\uC2A4\uCF54\uB4DC \uC54C\uB9BC \uC804\uC1A1 \uC2E4\uD328" : "Failed to send Discord notification");
   }
 }
@@ -5992,7 +5991,7 @@ async function action(options) {
       }
       options.repo = config.defaultRepository;
     }
-    const [owner, repo] = options.repo.split("/");
+    const [owner, repo] = (options.repo || config.defaultRepository || "").split("/");
     const octokit = new import_rest.Octokit({ auth: config.githubToken });
     if (!owner || !repo) {
       console.error(getMessage("repoFormatError", lang));
@@ -6017,6 +6016,8 @@ ${error.message}`);
     }
     console.log(getMessage("creatingPR", lang));
     try {
+      console.log("Config:", config);
+      console.log("Creating PR with options:", options);
       const response = await octokit.pulls.create({
         owner,
         repo,
@@ -6043,33 +6044,32 @@ ${error.message}`);
           }
         }
       }
-      console.log(getMessage("prCreateSuccess", lang, response.data.html_url));
       if (config.discordWebhook) {
-        console.log("Discord webhook URL:", config.discordWebhook);
         try {
           await sendDiscordNotification(
             config.discordWebhook,
             options.title,
             response.data.html_url,
             config.defaultReviewers,
-            lang
+            lang,
+            config.discordTemplate,
+            config.discordReviewerMapping
           );
           console.log(getMessage("discordNotificationSent", lang));
         } catch (error) {
-          console.error("Discord error:", error);
           console.error(getMessage("discordNotificationFailed", lang, error.message));
         }
       }
+      console.log(getMessage("prCreateSuccess", lang, response.data.html_url));
     } catch (e) {
-      console.error("Error details:", e);
       if (e.message.includes("Bad credentials")) {
         console.error(getMessage("invalidToken", lang));
       } else if (e.message.includes("Not Found")) {
         console.error(getMessage("accessError", lang));
         console.error(getMessage("checkToken", lang));
-        console.error(getMessage("checkRepo", lang, options.repo || ""));
+        console.error(getMessage("checkRepo", lang));
       } else {
-        console.error("Original error:", e.message);
+        console.error(e.message);
       }
       process.exit(1);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notion-github",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "GitHub and Notion integration for PR automation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",