koishi-plugin-minecraft-notifier 1.10.0 → 1.10.2

package/lib/helper/xaml-helper.d.ts

@@ -0,0 +1 @@
+export declare function escapeForXaml(text: string): string;

package/lib/index.cjs

@@ -540,6 +540,11 @@ async function upsertFileToGitCode(ctx, owner, repo, path3, content, message, to
   });
 }
 
+// src/helper/xaml-helper.ts
+function escapeForXaml(text) {
+  return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;").replace(/\\/g, "\\\\");
+}
+
 // src/xaml-generator.ts
 function generateXaml(summary, version) {
   const orderedCategories = [
@@ -564,7 +569,7 @@ function generateXaml(summary, version) {
                     <TextBlock
                         Margin="${margin}"
                         Foreground="{DynamicResource ColorBrush1}"
-                        Text="- ${(0, import_autocorrect_node.format)(msg)}" />`;
+                        Text="- ${escapeForXaml((0, import_autocorrect_node.format)(msg))}" />`;
     }
     for (let j = 0; j < subcategories.length; j++) {
       const sub = subcategories[j];
@@ -573,7 +578,7 @@ function generateXaml(summary, version) {
                         Margin="0,0,0,4"
                         FontSize="14"
                         Foreground="{DynamicResource ColorBrush3}"
-                        Text="${sub.emoji} ${sub.subcategory}" />`;
+                        Text="${sub.emoji} ${escapeForXaml((0, import_autocorrect_node.format)(sub.subcategory))}" />`;
       for (let k = 0; k < sub.items.length; k++) {
         const msg = sub.items[k];
         const margin = k === sub.items.length - 1 && j === subcategories.length - 1 ? "" : 'Margin="0,0,0,2"';
@@ -581,7 +586,7 @@ function generateXaml(summary, version) {
                     <TextBlock
                         ${margin}
                         Foreground="{DynamicResource ColorBrush1}"
-                        Text="  - ${(0, import_autocorrect_node.format)(msg)}" />`;
+                        Text="  - ${escapeForXaml((0, import_autocorrect_node.format)(msg))}" />`;
       }
       if (j < subcategories.length - 1) {
         contentXaml += `
@@ -592,7 +597,7 @@ function generateXaml(summary, version) {
     categoriesXaml += `
             <!--  ${categoryTitle}\u5361\u7247  -->
             <local:MyCard
-                Title="${categoryTitle}"
+                Title="${escapeForXaml((0, import_autocorrect_node.format)(categoryTitle))}"
                 Margin="0,5,0,10"
                 CanSwap="True"
                 IsSwapped="${["new_features", "improvements", "balancing"].includes(category) ? "False" : "True"}"
@@ -785,6 +790,10 @@ async function checkVersionUpdate(ctx, cfg, articleRecord, notifierRecord, versi
   }
   const currentTryTime = articleRecord[tryTimeKey];
   const newVersion = notifierRecord[versionKey];
+  await updateArticleRecord(ctx, {
+    [versionKey]: newVersion,
+    latestVersion: newVersion
+  });
   const success = await processNewVersionArticle(
     ctx,
     cfg,
@@ -793,21 +802,19 @@ async function checkVersionUpdate(ctx, cfg, articleRecord, notifierRecord, versi
   );
   if (success) {
     await updateArticleRecord(ctx, {
-      [versionKey]: newVersion,
-      [tryTimeKey]: 0,
-      latestVersion: newVersion
+      [tryTimeKey]: 0
     });
     return true;
   }
   const newTryTime = currentTryTime + 1;
   if (newTryTime >= 5) {
     await updateArticleRecord(ctx, {
-      [versionKey]: newVersion,
-      [tryTimeKey]: 0,
-      latestVersion: newVersion
+      [tryTimeKey]: 0
     });
   } else {
     await updateArticleRecord(ctx, {
+      [versionKey]: articleRecord[versionKey],
+      latestVersion: articleRecord[versionKey],
       [tryTimeKey]: newTryTime
     });
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-minecraft-notifier",
   "description": "A Minecraft new version notification plugin, also featuring a PCL homepage.",
-  "version": "1.10.0",
+  "version": "1.10.2",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",