fix

修复注册用户时密码低于6位时的提醒

Author: jkjoy

.DS_Store

@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20240117.0",
-    "wrangler": "^3.22.1"
+    "wrangler": "^4.84.0"
   },
   "keywords": [
     "cloudflare",

backend/package-lock.json

@@ -1141,6 +1141,18 @@ app.patch('/:id', async (c) => {
       return errorResponse('Failed to update memo', 500);
     }
 
+    if (body.content !== undefined) {
+      await db.prepare(`
+        DELETE FROM memo_tags
+        WHERE memo_id = ?
+      `).bind(id).run();
+
+      const tagNames = extractTagNamesFromMemoContent(body.content);
+      for (const tagName of tagNames) {
+        await attachTagToMemo(db, id, tagName, memo.creator_id);
+      }
+    }
+
     // 处理附件：删除指定的附件
     if (body.deleteResourceIds && Array.isArray(body.deleteResourceIds)) {
       for (const resourceId of body.deleteResourceIds) {
@@ -1312,6 +1324,16 @@ app.put('/:id', async (c) => {
       return errorResponse('Failed to update memo', 500);
     }
 
+    await db.prepare(`
+      DELETE FROM memo_tags
+      WHERE memo_id = ?
+    `).bind(id).run();
+
+    const tagNames = extractTagNamesFromMemoContent(body.content);
+    for (const tagName of tagNames) {
+      await attachTagToMemo(db, id, tagName, memo.creator_id);
+    }
+
     // 处理附件：删除指定的附件
     if (body.deleteResourceIds && Array.isArray(body.deleteResourceIds)) {
       for (const resourceId of body.deleteResourceIds) {

backend/package.json

@@ -3,7 +3,7 @@ const CODE_BLOCK_REG = /```[\s\S]*?```/g;
 const INLINE_CODE_REG = /`[^`\n]*`/g;
 const MARKDOWN_LINK_REG = /!?\[[^\]]*\]\([^)]+\)/g;
 const PLAIN_LINK_REG = /(?:https?|chrome|edge):\/\/\S+/g;
-const TAG_NAME_REG = /#([^\s#,]+)/g;
+const TAG_NAME_REG = /(^|[\s(\[{"'“‘（【《「『<,.;:!?，。！？；：、])#([^\s#,]+)/g;
 
 function buildTagSelectColumns(schema) {
   return [
@@ -59,7 +59,7 @@ export function extractTagNamesFromMemoContent(content) {
 
   const sanitizedContent = stripIgnoredTagSegments(content);
   const tagMatches = [...sanitizedContent.matchAll(TAG_NAME_REG)];
-  return [...new Set(tagMatches.map((match) => match[1]))];
+  return [...new Set(tagMatches.map((match) => match[2]))];
 }
 
 export async function findTagByName(db, tagName, creatorId = null) {

backend/src/handlers/memos.js

@@ -1,5 +1,5 @@
 import { matcher } from "./matcher";
-import { blockElementParserList, inlineElementParserList } from "./parser";
+import { blockElementParserList, inlineElementParserList, TAG_REG } from "./parser";
 
 type Parser = {
   name: string;
@@ -150,7 +150,10 @@ export const getMatchedTagNames = (markdownStr: string): string[] => {
 
   for (const node of getMatchedNodes(markdownStr)) {
     if (node.parserName === "tag") {
-      tagNameSet.add(node.matchedContent.slice(1));
+      const matchResult = matcher(node.matchedContent, TAG_REG);
+      if (matchResult) {
+        tagNameSet.add(matchResult[2]);
+      }
     }
   }
 

backend/src/utils/tags.js

@@ -1,14 +1,19 @@
 import { matcher } from "../matcher";
 
-export const TAG_REG = /#([^\s#,]+)/;
+export const TAG_REG = /(^|[\s(\[{"'“‘（【《「『<,.;:!?，。！？；：、])#([^\s#,]+)/;
 
 const renderer = (rawStr: string) => {
   const matchResult = matcher(rawStr, TAG_REG);
   if (!matchResult) {
     return rawStr;
   }
 
-  return <span className="tag-span">#{matchResult[1]}</span>;
+  return (
+    <>
+      {matchResult[1]}
+      <span className="tag-span">#{matchResult[2]}</span>
+    </>
+  );
 };
 
 export default {

frontend/src/labs/marked/index.tsx

@@ -64,7 +64,7 @@ const SignUp = () => {
       }
     } catch (error: any) {
       console.error(error);
-      toast.error(error.response.data.message || error.message || t("message.signup-failed"));
+      toast.error(error?.response?.data?.message || error?.response?.data?.error || error?.message || t("message.signup-failed"));
     }
     actionBtnLoadingState.setFinish();
   };
@@ -114,7 +114,6 @@ const SignUp = () => {
                 type="submit"
                 disabled={actionBtnLoadingState.isLoading}
                 loading={actionBtnLoadingState.isLoading}
-                onClick={handleSignUpButtonClick}
               >
                 {t("common.sign-up")}
               </Button>

frontend/src/labs/marked/parser/Tag.tsx

@@ -1,6 +1,7 @@
 import { lazy } from "react";
 import { createBrowserRouter } from "react-router-dom";
 import App from "@/App";
+import Loading from "@/pages/Loading";
 import { initialGlobalState } from "@/store/module";
 import AuthStatusProvider from "./AuthStatusProvider";
 
@@ -34,6 +35,7 @@ const router = createBrowserRouter([
     path: "/",
     element: <App />,
     loader: () => initialGlobalStateLoader(),
+    hydrateFallbackElement: <Loading />,
     children: [
       {
         path: "/auth",