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.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: use markdown image syntax (#83)
Stevenf80f0f2422d4
diff --git a/web/src/components/DailyMemo.tsx b/web/src/components/DailyMemo.tsxindex 9d90d06f3..9c572cbf7 100644--- a/web/src/components/DailyMemo.tsx+++ b/web/src/components/DailyMemo.tsx@@ -20,7 +20,7 @@ const DailyMemo: React.FC<Props> = (props: Props) => {createdAtStr: utils.getDateTimeString(propsMemo.createdTs),timeStr: utils.getTimeString(propsMemo.createdTs),};- const imageUrls = Array.from(memo.content.match(IMAGE_URL_REG) ?? []);+ const imageUrls = Array.from(memo.content.match(IMAGE_URL_REG) ?? []).map((s) => s.replace(IMAGE_URL_REG, "$1"));return (<div className="daily-memo-wrapper">diff --git a/web/src/components/DeletedMemo.tsx b/web/src/components/DeletedMemo.tsxindex b4f1c5109..954c93e97 100644--- a/web/src/components/DeletedMemo.tsx+++ b/web/src/components/DeletedMemo.tsx@@ -21,7 +21,7 @@ const DeletedMemo: React.FC<Props> = (props: Props) => {deletedAtStr: utils.getDateTimeString(propsMemo.updatedTs ?? Date.now()),};const [showConfirmDeleteBtn, toggleConfirmDeleteBtn] = useToggle(false);- const imageUrls = Array.from(memo.content.match(IMAGE_URL_REG) ?? []);+ const imageUrls = Array.from(memo.content.match(IMAGE_URL_REG) ?? []).map((s) => s.replace(IMAGE_URL_REG, "$1"));const handleDeleteMemoClick = async () => {if (showConfirmDeleteBtn) {diff --git a/web/src/components/Memo.tsx b/web/src/components/Memo.tsxindex b307505f7..2e8aeb722 100644--- a/web/src/components/Memo.tsx+++ b/web/src/components/Memo.tsx@@ -23,7 +23,7 @@ const Memo: React.FC<Props> = (props: Props) => {createdAtStr: utils.getDateTimeString(propsMemo.createdTs),};const [showConfirmDeleteBtn, toggleConfirmDeleteBtn] = useToggle(false);- const imageUrls = Array.from(memo.content.match(IMAGE_URL_REG) ?? []);+ const imageUrls = Array.from(memo.content.match(IMAGE_URL_REG) ?? []).map((s) => s.replace(IMAGE_URL_REG, "$1"));const handleShowMemoStoryDialog = () => {showMemoCardDialog(memo);diff --git a/web/src/components/MemoCardDialog.tsx b/web/src/components/MemoCardDialog.tsxindex 4d844408e..593f39dbc 100644--- a/web/src/components/MemoCardDialog.tsx+++ b/web/src/components/MemoCardDialog.tsx@@ -26,7 +26,7 @@ const MemoCardDialog: React.FC<Props> = (props: Props) => {});const [linkMemos, setLinkMemos] = useState<LinkedMemo[]>([]);const [linkedMemos, setLinkedMemos] = useState<LinkedMemo[]>([]);- const imageUrls = Array.from(memo.content.match(IMAGE_URL_REG) ?? []);+ const imageUrls = Array.from(memo.content.match(IMAGE_URL_REG) ?? []).map((s) => s.replace(IMAGE_URL_REG, "$1"));useEffect(() => {const fetchLinkedMemos = async () => {diff --git a/web/src/components/MemoEditor.tsx b/web/src/components/MemoEditor.tsxindex e6d111f06..c53443cff 100644--- a/web/src/components/MemoEditor.tsx+++ b/web/src/components/MemoEditor.tsx@@ -80,7 +80,7 @@ const MemoEditor: React.FC<Props> = () => {const file = event.clipboardData.files[0];const url = await handleUploadFile(file);if (url) {- editorRef.current?.insertText(url + " ");+ editorRef.current?.insertText(``);}}};@@ -91,7 +91,7 @@ const MemoEditor: React.FC<Props> = () => {const file = event.dataTransfer.files[0];const url = await handleUploadFile(file);if (url) {- editorRef.current?.insertText(url);+ editorRef.current?.insertText(``);}}};@@ -246,7 +246,7 @@ const MemoEditor: React.FC<Props> = () => {const file = inputEl.files[0];const url = await handleUploadFile(file);if (url) {- editorRef.current?.insertText(url);+ editorRef.current?.insertText(``);}};inputEl.click();diff --git a/web/src/components/ShareMemoImageDialog.tsx b/web/src/components/ShareMemoImageDialog.tsxindex 2418ed934..948d6fb4b 100644--- a/web/src/components/ShareMemoImageDialog.tsx+++ b/web/src/components/ShareMemoImageDialog.tsx@@ -20,10 +20,10 @@ const ShareMemoImageDialog: React.FC<Props> = (props: Props) => {...propsMemo,createdAtStr: utils.getDateTimeString(propsMemo.createdTs),};- const memoImgUrls = Array.from(memo.content.match(IMAGE_URL_REG) ?? []);+ const imageUrls = Array.from(memo.content.match(IMAGE_URL_REG) ?? []).map((s) => s.replace(IMAGE_URL_REG, "$1"));const [shortcutImgUrl, setShortcutImgUrl] = useState("");- const [imgAmount, setImgAmount] = useState(memoImgUrls.length);+ const [imgAmount, setImgAmount] = useState(imageUrls.length);const memoElRef = useRef<HTMLDivElement>(null);useEffect(() => {@@ -81,9 +81,9 @@ const ShareMemoImageDialog: React.FC<Props> = (props: Props) => {</Only><span className="time-text">{memo.createdAtStr}</span><div className="memo-content-text" dangerouslySetInnerHTML={{ __html: formatMemoContent(memo.content) }}></div>- <Only when={memoImgUrls.length > 0}>+ <Only when={imageUrls.length > 0}><div className="images-container">- {memoImgUrls.map((imgUrl, idx) => (+ {imageUrls.map((imgUrl, idx) => (<imgcrossOrigin="anonymous"decoding="async"diff --git a/web/src/helpers/consts.ts b/web/src/helpers/consts.tsindex 4d762fe3f..52e9d29da 100644--- a/web/src/helpers/consts.ts+++ b/web/src/helpers/consts.ts@@ -17,7 +17,7 @@ export const TAG_REG = /#(.+?) /g;export const LINK_REG = /(https?:\/\/[^\s<\\*>']+)/g;// image regex-export const IMAGE_URL_REG = /([^\s<\\*>']+\.(jpeg|jpg|gif|png|svg|webp))/g;+export const IMAGE_URL_REG = /!\[.*?\]\((.+?)\)/g;// linked memo regexexport const MEMO_LINK_REG = /\[@(.+?)\]\((.+?)\)/g;diff --git a/web/src/less/daily-memo-diary-dialog.less b/web/src/less/daily-memo-diary-dialog.lessindex c9ac7ac41..d3b0c1bb5 100644--- a/web/src/less/daily-memo-diary-dialog.less+++ b/web/src/less/daily-memo-diary-dialog.less@@ -20,7 +20,7 @@}&.share-btn {- @apply w-5 h-auto;+ @apply ~"p-0.5";}}}diff --git a/web/src/less/memo-content.less b/web/src/less/memo-content.lessindex 30fb4a3cd..eb17f837f 100644--- a/web/src/less/memo-content.less+++ b/web/src/less/memo-content.less@@ -5,7 +5,7 @@@apply w-full whitespace-pre-wrap break-words;> p {- @apply inline-block w-full h-auto mb-1 text-base leading-7 whitespace-pre-wrap break-words;+ @apply inline-block w-full h-auto mb-1 last:mb-0 text-base leading-7 whitespace-pre-wrap break-words;}.tag-span {diff --git a/web/src/less/memo.less b/web/src/less/memo.lessindex 4f56f2ef6..f776fe02c 100644--- a/web/src/less/memo.less+++ b/web/src/less/memo.less@@ -2,7 +2,7 @@@import "./memo-content.less";.memo-wrapper {- @apply flex flex-col justify-start items-start w-full max-w-full p-3 px-4 mt-2 bg-white rounded-lg border border-white hover:border-gray-200;+ @apply flex flex-col justify-start items-start w-full max-w-full p-4 pt-3 mt-2 bg-white rounded-lg border border-white hover:border-gray-200;&.deleted-memo {@apply border-gray-200;@@ -13,7 +13,7 @@}> .memo-top-wrapper {- @apply flex flex-row justify-between items-center w-full h-6 mb-2;+ @apply flex flex-row justify-between items-center w-full h-6 mb-1;> .time-text {@apply text-xs text-gray-400 cursor-pointer;