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: update inbox detect
Steven2b7d7c95a531
diff --git a/api/v1/memo.go b/api/v1/memo.goindex df5ba6c72..db3ecc2fd 100644--- a/api/v1/memo.go+++ b/api/v1/memo.go@@ -338,7 +338,7 @@ func (s *APIV1Service) CreateMemo(c echo.Context) error {}); err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to upsert memo relation").SetInternal(err)}- if memoRelationUpsert.Type == MemoRelationComment {+ if memo.Visibility != store.Private && memoRelationUpsert.Type == MemoRelationComment {relatedMemo, err := s.Store.GetMemo(ctx, &store.FindMemo{ID: &memoRelationUpsert.RelatedMemoID,})diff --git a/web/src/components/Header.tsx b/web/src/components/Header.tsxindex f1273bb78..8032d87ef 100644--- a/web/src/components/Header.tsx+++ b/web/src/components/Header.tsx@@ -3,6 +3,8 @@ import { useEffect } from "react";import { NavLink, useLocation } from "react-router-dom";import useCurrentUser from "@/hooks/useCurrentUser";import { useLayoutStore } from "@/store/module";+import useInboxStore from "@/store/v1/inbox";+import { Inbox_Status } from "@/types/proto/api/v2/inbox_service";import { useTranslate } from "@/utils/i18n";import { resolution } from "@/utils/layout";import Icon from "./Icon";@@ -19,8 +21,26 @@ const Header = () => {const t = useTranslate();const location = useLocation();const layoutStore = useLayoutStore();- const showHeader = layoutStore.state.showHeader;const user = useCurrentUser();+ const inboxStore = useInboxStore();+ const showHeader = layoutStore.state.showHeader;+ const hasUnreadInbox = inboxStore.inboxes.some((inbox) => inbox.status === Inbox_Status.UNREAD);++ useEffect(() => {+ if (!user) {+ return;+ }++ inboxStore.fetchInboxes();+ // Fetch inboxes every 5 minutes.+ const timer = setInterval(async () => {+ await inboxStore.fetchInboxes();+ }, 1000 * 60 * 5);++ return () => {+ clearInterval(timer);+ };+ }, []);useEffect(() => {const handleWindowResize = () => {@@ -56,7 +76,14 @@ const Header = () => {id: "header-inbox",path: "/inbox",title: t("common.inbox"),- icon: <Icon.Bell className="mr-3 w-6 h-auto opacity-70" />,+ icon: (+ <>+ <div className="relative">+ <Icon.Bell className="mr-3 w-6 h-auto opacity-70" />+ {hasUnreadInbox && <div className="absolute top-0 left-5 w-2 h-2 rounded-full bg-blue-500"></div>}+ </div>+ </>+ ),};const exploreNavLink: NavLinkItem = {id: "header-explore",diff --git a/web/src/components/Inbox/MemoCommentMessage.tsx b/web/src/components/Inbox/MemoCommentMessage.tsxindex cce224ee1..88f8ec36d 100644--- a/web/src/components/Inbox/MemoCommentMessage.tsx+++ b/web/src/components/Inbox/MemoCommentMessage.tsx@@ -37,9 +37,12 @@ const MemoCommentMessage = ({ inbox }: Props) => {return;}navigateTo(`/m/${activity?.payload?.memoComment?.relatedMemoId}`);+ if (inbox.status === Inbox_Status.UNREAD) {+ handleArchiveMessage(true);+ }};- const handleArchiveMessage = async () => {+ const handleArchiveMessage = async (silence = false) => {await inboxStore.updateInbox({name: inbox.name,@@ -47,7 +50,9 @@ const MemoCommentMessage = ({ inbox }: Props) => {},["status"]);- toast.success("Archived");+ if (!silence) {+ toast.success("Archived");+ }};return (@@ -73,7 +78,10 @@ const MemoCommentMessage = ({ inbox }: Props) => {<div>{inbox.status === Inbox_Status.UNREAD && (<Tooltip title="Archive" placement="top">- <Icon.Inbox className="w-4 h-auto cursor-pointer text-gray-400 hover:text-blue-600" onClick={handleArchiveMessage} />+ <Icon.Inbox+ className="w-4 h-auto cursor-pointer text-gray-400 hover:text-blue-600"+ onClick={() => handleArchiveMessage()}+ /></Tooltip>)}</div>