comfy-pr 0.2.20 → 0.2.25

package/src/updateFollowRuleSet.ts

@@ -1,42 +1,38 @@
 "use server";
-import { $elemMatch } from "@/packages/mongodb-pipeline-ts/$elemMatch";
-import { $pipeline } from "@/packages/mongodb-pipeline-ts/$pipeline";
 import { TaskDataOrNull } from "@/packages/mongodb-pipeline-ts/Task";
 import DIE from "@snomiao/die";
 import pMap from "p-map";
 import { peekYaml } from "peek-log";
-import { TaskError, TaskOK, type Task } from "../packages/mongodb-pipeline-ts/Task";
-import { CNRepos, type CRPull } from "./CNRepos";
+import { TaskError, TaskOK } from "../packages/mongodb-pipeline-ts/Task";
+import { CNRepos } from "./CNRepos";
 import { FollowRuleSets } from "./FollowRules";
-import type { GithubIssueComment } from "./GithubIssueComments";
+import { addCommentAction } from "./addCommentAction";
 import { analyzePullsStatus, analyzePullsStatusPipeline } from "./analyzePullsStatus";
-import { createIssueComment } from "./createIssueComment";
 import { $filaten } from "./db";
-import { zAddCommentAction, zFollowUpRules } from "./followRuleSchema";
+import { zAddCommentAction, zFollowUpRules, zSendEmailAction } from "./followRuleSchema";
 import { fetchIssueComments } from "./gh/fetchIssueComments";
-import { ghUser } from "./ghUser";
 import { initializeFollowRules } from "./initializeFollowRules";
 import { stringifyGithubRepoUrl } from "./parseOwnerRepo";
 import { parsePullUrl } from "./parsePullUrl";
-import { notifySlackLinks } from "./slack/notifySlackLinks";
+import { sendEmailAction } from "./sendEmailAction";
 import { yaml } from "./utils/yaml";
 
 if (import.meta.main) {
-  // updateFollowRuleSet({yaml: 'default'})
-  await FollowRuleSets.drop();
-  const defaultRuleSet = await initializeFollowRules();
-
-  await updateFollowRuleSet({ name: "default", enable: true, yaml: defaultRuleSet.yaml });
-  await runFollowRuleSet();
+  // const defaultRuleSet = await initializeFollowRules();
+  // await updateFollowRuleSet({ name: "default", enable: true, yaml: defaultRuleSet.yaml });
+  // await runFollowRuleSet();
 }
 
 export async function runFollowRuleSet({ name = "default" } = {}) {
   const ruleset = (await FollowRuleSets.findOne({ name })) ?? DIE("default ruleset not found");
+
+  console.log("RUNNING ruleset:");
+  console.log(ruleset.yamlWhenEnabled);
   return peekYaml(
     await updateFollowRuleSet({
       name: ruleset.name,
-      enable: ruleset.enabled ?? DIE("Ruleset is not enabled"),
-      yaml: ruleset.yamlWhenEnabled ?? DIE("Enabled yaml is not found"),
+      enable: ruleset.enabled || DIE(new Error("Ruleset is not enabled")),
+      yaml: ruleset.yamlWhenEnabled || DIE("Enabled yaml is not found"),
       runAction: true,
     }),
   );
@@ -48,23 +44,24 @@ export async function updateFollowRuleSet({
   enable,
   runAction = false,
 }: {
+  /** 'default' */
   name: string;
-  /** update yaml if provided */
+  /** update yaml if provided, unchange if undefined */
   yaml?: string;
-  /** update enable if provided */
+  /** update enable if provided, unchange if undefined */
   enable?: boolean | undefined;
-  /** run action if set to true */
+  /** run action if true */
   runAction?: boolean;
 }) {
   "use server";
   return await (async function () {
     if (enable === false) {
       await FollowRuleSets.updateOne({ name }, { $set: { enabled: false, yamlWhenEnabled: "" } });
-      DIE("ruleset is disabled, no need to run");
+      DIE`ruleset is disabled, no need to run`;
     }
 
     // must parse while run, because the date in code is dynamic generated
-    const rules = zFollowUpRules.parse(yaml.parse(code || DIE("yaml is empty")));
+    const rules = zFollowUpRules.parse(yaml.parse(code || DIE`yaml is empty`));
     // save if parse succ
     // await FollowRuleSets.updateOne({ name }, { $set: { yaml: code, rules } });
     const parseResult = await pMap(
@@ -104,60 +101,11 @@ export async function updateFollowRuleSet({
             async ([name, _action]) => {
               if (name === "add-comment") {
                 const action = zAddCommentAction.parse(_action);
-                const matchedData = TaskDataOrNull(matched) ?? DIE("NO-PAYLOAD-AVAILABLE");
-                return await pMap(
-                  matchedData,
-                  async (payload) => {
-                    const loadedAction = {
-                      action: "add-comment",
-                      url: payload.url,
-                      by: action.by,
-                      body: action.body.replace(
-                        /{{\$(\w+)}}/,
-                        (_, key: string) =>
-                          (payload as any)[key] ||
-                          DIE("Missing key: " + key + " in payload: " + JSON.stringify(payload)),
-                      ),
-                    };
-
-                    if (runAction && loadedAction.by === ghUser.login) {
-                      const existedCommentsTask =
-                        (await $pipeline(CNRepos)
-                          .unwind("$crPulls.data")
-                          .match({ "crPulls.data.pull.html_url": loadedAction.url })
-                          .with<{ "crPulls.data": CRPull }>()
-                          .replaceRoot({ newRoot: "$crPulls.data.comments" })
-                          .as<Task<GithubIssueComment[]>>()
-                          .aggregate()
-                          .next()) ??
-                        DIE("comments is not fetched before, plz check " + loadedAction.url + " in CNRepos");
-
-                      const existedComments =
-                        TaskDataOrNull(existedCommentsTask) ??
-                        DIE("NO-COMMENTS-FOUND should never happen here, bcz pipeline filtered at first");
-                      const existedComment = existedComments.find((e) => e.body === loadedAction.body);
-
-                      if (!existedComment) {
-                        const { comments, comment } = await createIssueComment(
-                          loadedAction.url,
-                          loadedAction.body,
-                          loadedAction.by,
-                        );
-                        const updateResult = await CNRepos.updateOne(
-                          $filaten({ crPulls: { data: $elemMatch({ pull: { html_url: loadedAction.url } }) } }),
-                          { $set: { "crPulls.data.$.comments": comments } },
-                        );
-                        if (!updateResult.matchedCount) DIE("created issue not matched");
-                        await notifySlackLinks("A New issue comment are created from rule " + rule.name, [
-                          comment.html_url,
-                        ]);
-                      }
-                    }
-
-                    return loadedAction;
-                  },
-                  { concurrency: 1 },
-                );
+                return await addCommentAction({ matched, action, runAction, rule });
+              }
+              if (name === "send-email") {
+                const action = zSendEmailAction.parse(_action);
+                return await sendEmailAction({ matched, action, runAction, rule });
               }
             },
             { concurrency: 1 },
@@ -170,8 +118,15 @@ export async function updateFollowRuleSet({
       },
       { concurrency: 1 },
     );
-    if (enable) {
-      await FollowRuleSets.updateOne({ name }, { $set: { enabled: true, yamlWhenEnabled: code, yaml: code } });
+
+    if (enable === true) {
+      await FollowRuleSets.updateOne(
+        { name },
+        {
+          $set: { enabled: true, yamlWhenEnabled: code, yaml: code },
+          $push: { enableHistory: { mtime: new Date(), yaml: code } },
+        },
+      );
     } else {
       await FollowRuleSets.updateOne({ name }, { $set: { yaml: code } });
     }

package/src/updateOutdatedPullsTemplates.ts

@@ -25,6 +25,7 @@ export async function updateOutdatedPullsTemplates() {
   const outdated_publishcr_v2 = await readTemplate("outdated/add-action-v2.md");
   const outdated_pyproject_v3 = await readTemplate("outdated/add-toml-v3.md");
   const outdated_publishcr_v3 = await readTemplate("outdated/add-action-v3.md");
+  const outdated_pyproject_v4 = await readTemplate("outdated/add-toml-v4.md");
   const outdateTitles = [
     outdated_pyproject.title,
     outdated_publishcr.title,
@@ -32,6 +33,7 @@ export async function updateOutdatedPullsTemplates() {
     outdated_publishcr_v2.title,
     outdated_pyproject_v3.title,
     outdated_publishcr_v3.title,
+    outdated_pyproject_v4.title,
   ];
   const outdateBodies = [
     outdated_pyproject.body,
@@ -40,6 +42,7 @@ export async function updateOutdatedPullsTemplates() {
     outdated_publishcr_v2.body,
     outdated_pyproject_v3.body,
     outdated_publishcr_v3.body,
+    outdated_pyproject_v4.body,
   ];
 
   // const templateOutdate = new Date("2024-06-13T09:02:56.630Z");
@@ -109,6 +112,7 @@ export async function updateOutdatedPullsTemplates() {
             .with(outdated_pyproject, () => pyproject)
             .with(outdated_pyproject_v2, () => pyproject)
             .with(outdated_pyproject_v3, () => pyproject)
+            .with(outdated_pyproject_v4, () => pyproject)
             .with(outdated_publishcr, () => publishcr)
             .with(outdated_publishcr_v2, () => publishcr)
             .with(outdated_publishcr_v3, () => publishcr)