Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

feat: upsert tag based content (#816)

boojackb6f19ca093ca
diff --git a/README.md b/README.md
index 513c93bc1..54d855c6c 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
<p align="center">
<a href="https://github.com/usememos/memos/stargazers"><img alt="GitHub stars" src="https://img.shields.io/github/stars/usememos/memos" /></a>
<a href="https://hub.docker.com/r/neosmemo/memos"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/neosmemo/memos.svg" /></a>
- <img alt="Go report" src="https://goreportcard.com/badge/github.com/usememos/memos" />
+ <a href="https://discord.gg/tfPJa4UmAv"><img alt="Discord" src="https://img.shields.io/badge/discord-chat-5865f2?logo=discord&logoColor=f5f5f5" /></a>
</p>
<p align="center">
diff --git a/web/src/components/MemoEditor.tsx b/web/src/components/MemoEditor.tsx
index 968b9b0e2..4281ab829 100644
--- a/web/src/components/MemoEditor.tsx
+++ b/web/src/components/MemoEditor.tsx
@@ -1,6 +1,7 @@
-import { isNumber, last, toLower } from "lodash";
+import { isNumber, last, toLower, uniq } from "lodash";
import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
+import { getMatchedNodes } from "../labs/marked";
import { deleteMemoResource, upsertMemoResource } from "../helpers/api";
import { TAB_SPACE_WIDTH, UNKNOWN_ID, VISIBILITY_SELECTOR_ITEMS } from "../helpers/consts";
import { useEditorStore, useLocationStore, useMemoStore, useResourceStore, useTagStore, useUserStore } from "../store/module";
@@ -326,6 +327,13 @@ const MemoEditor = () => {
toastHelper.error(error.response.data.message);
}
+ // Upsert tag based with content.
+ const matchedNodes = getMatchedNodes(content);
+ const tagNameList = uniq(matchedNodes.filter((node) => node.parserName === "tag").map((node) => node.matchedContent.slice(1)));
+ for (const tagName of tagNameList) {
+ await tagStore.upsertTag(tagName);
+ }
+
setState((state) => {
return {
...state,
diff --git a/web/src/labs/marked/index.ts b/web/src/labs/marked/index.ts
index f06dc262f..436b99361 100644
--- a/web/src/labs/marked/index.ts
+++ b/web/src/labs/marked/index.ts
@@ -53,3 +53,75 @@ export const marked = (markdownStr: string, blockParsers = blockElementParserLis
return markdownStr;
};
+
+interface MatchedNode {
+ parserName: string;
+ matchedContent: string;
+}
+
+export const getMatchedNodes = (markdownStr: string): MatchedNode[] => {
+ const matchedNodeList: MatchedNode[] = [];
+
+ const walkthough = (markdownStr: string, blockParsers = blockElementParserList, inlineParsers = inlineElementParserList): string => {
+ for (const parser of blockParsers) {
+ const matchResult = parser.matcher(markdownStr);
+ if (!matchResult) {
+ continue;
+ }
+ const matchedStr = matchResult[0];
+ const retainContent = markdownStr.slice(matchedStr.length);
+ matchedNodeList.push({
+ parserName: parser.name,
+ matchedContent: matchedStr,
+ });
+
+ if (parser.name === "br") {
+ return walkthough(retainContent, blockParsers, inlineParsers);
+ } else {
+ if (retainContent.startsWith("\n")) {
+ return walkthough(retainContent.slice(1), blockParsers, inlineParsers);
+ }
+ }
+ }
+
+ let matchedInlineParser = undefined;
+ let matchedIndex = -1;
+
+ for (const parser of inlineParsers) {
+ const matchResult = parser.matcher(markdownStr);
+ if (!matchResult) {
+ continue;
+ }
+
+ if (parser.name === "plain text" && matchedInlineParser !== undefined) {
+ continue;
+ }
+
+ const startIndex = matchResult.index as number;
+ if (matchedInlineParser === undefined || matchedIndex > startIndex) {
+ matchedInlineParser = parser;
+ matchedIndex = startIndex;
+ }
+ }
+
+ if (matchedInlineParser) {
+ const matchResult = matchedInlineParser.matcher(markdownStr);
+ if (matchResult) {
+ const matchedStr = matchResult[0];
+ const matchedLength = matchedStr.length;
+ const suffixStr = markdownStr.slice(matchedIndex + matchedLength);
+ matchedNodeList.push({
+ parserName: matchedInlineParser.name,
+ matchedContent: matchedStr,
+ });
+ return walkthough(suffixStr, [], inlineParsers);
+ }
+ }
+
+ return markdownStr;
+ };
+
+ walkthough(markdownStr);
+
+ return matchedNodeList;
+};