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
fix: find memo list order (#1149)
boojack904a6bd97fca
diff --git a/api/memo.go b/api/memo.goindex cc76418d6..80ce1b522 100644--- a/api/memo.go+++ b/api/memo.go@@ -42,7 +42,7 @@ type Memo struct {Pinned bool `json:"pinned"`// Related fields- Creator *User `json:"creator"`+ CreatorName string `json:"creatorName"`ResourceList []*Resource `json:"resourceList"`}diff --git a/store/memo.go b/store/memo.goindex 5121d1ced..f1eba20dc 100644--- a/store/memo.go+++ b/store/memo.go@@ -302,11 +302,11 @@ func findMemoRawList(ctx context.Context, tx *sql.Tx, find *api.MemoFind) ([]*mememo.row_status,memo.content,memo.visibility,- memo_organizer.pinned+ IFNULL(memo_organizer.pinned, 0) AS pinnedFROM memo- LEFT JOIN memo_organizer ON memo_organizer.memo_id = memo.id+ LEFT JOIN memo_organizer ON memo_organizer.memo_id = memo.id AND memo_organizer.user_id = memo.creator_idWHERE ` + strings.Join(where, " AND ") + `- ORDER BY memo_organizer.pinned DESC, memo.created_ts DESC+ ORDER BY pinned DESC, memo.created_ts DESC`if find.Limit != nil {query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)diff --git a/store/user.go b/store/user.goindex fdddbe506..6758aa0a7 100644--- a/store/user.go+++ b/store/user.go@@ -56,10 +56,11 @@ func (s *Store) ComposeMemoCreator(ctx context.Context, memo *api.Memo) error {return err}- user.Email = ""- user.OpenID = ""- user.UserSettingList = nil- memo.Creator = user+ if user.Nickname != "" {+ memo.CreatorName = user.Nickname+ } else {+ memo.CreatorName = user.Username+ }return nil}func (s *Store) CreateUser(ctx context.Context, create *api.UserCreate) (*api.User, error) {diff --git a/web/src/helpers/consts.ts b/web/src/helpers/consts.tsindex c1f103abb..7a240de40 100644--- a/web/src/helpers/consts.ts+++ b/web/src/helpers/consts.ts@@ -17,6 +17,6 @@ export const VISIBILITY_SELECTOR_ITEMS = [export const TAB_SPACE_WIDTH = 2;// default fetch memo amount-export const DEFAULT_MEMO_LIMIT = 30;+export const DEFAULT_MEMO_LIMIT = 20;export const MEMOS_LOGO_URL = "https://usememos.com/logo.png";diff --git a/web/src/pages/EmbedMemo.tsx b/web/src/pages/EmbedMemo.tsxindex 064bb52bf..fc789b4cd 100644--- a/web/src/pages/EmbedMemo.tsx+++ b/web/src/pages/EmbedMemo.tsx@@ -49,8 +49,8 @@ const EmbedMemo = () => {<div className="w-full flex flex-col justify-start items-start"><div className="w-full mb-2 flex flex-row justify-start items-center text-sm text-gray-400 dark:text-gray-300"><span>{dayjs(state.memo.createdTs).locale(i18n.language).format("YYYY/MM/DD HH:mm:ss")}</span>- <a className="ml-2 hover:underline hover:text-green-600" href={`/u/${state.memo.creator.id}`}>- @{state.memo.creator.nickname || state.memo.creator.username}+ <a className="ml-2 hover:underline hover:text-green-600" href={`/u/${state.memo.creatorId}`}>+ @{state.memo.creatorName}</a></div><MemoContent className="memo-content" content={state.memo.content} onMemoContentClick={() => undefined} />diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsxindex 7b537674b..bdb190973 100644--- a/web/src/pages/Explore.tsx+++ b/web/src/pages/Explore.tsx@@ -142,8 +142,8 @@ const Explore = () => {{memo.pinned && <div className="corner-container"></div>}<div className="memo-header"><span className="time-text">{createdAtStr}</span>- <a className="name-text" href={`/u/${memo.creator.id}`}>- @{memo.creator.nickname || memo.creator.username}+ <a className="name-text" href={`/u/${memo.creatorId}`}>+ @{memo.creatorName}</a></div><MemoContent className="memo-content" content={memo.content} onMemoContentClick={handleMemoContentClick} />diff --git a/web/src/pages/MemoDetail.tsx b/web/src/pages/MemoDetail.tsxindex e50f9b3c4..2b5e5d2ef 100644--- a/web/src/pages/MemoDetail.tsx+++ b/web/src/pages/MemoDetail.tsx@@ -79,8 +79,8 @@ const MemoDetail = () => {<div className="memo-header"><div className="status-container"><span className="time-text">{dayjs(state.memo.createdTs).locale(i18n.language).format("YYYY/MM/DD HH:mm:ss")}</span>- <a className="name-text" href={`/u/${state.memo.creator.id}`}>- @{state.memo.creator.nickname || state.memo.creator.username}+ <a className="name-text" href={`/u/${state.memo.creatorId}`}>+ @{state.memo.creatorName}</a></div></div>diff --git a/web/src/types/modules/memo.d.ts b/web/src/types/modules/memo.d.tsindex 4beb267d2..df93b7678 100644--- a/web/src/types/modules/memo.d.ts+++ b/web/src/types/modules/memo.d.ts@@ -14,7 +14,7 @@ interface Memo {visibility: Visibility;pinned: boolean;- creator: User;+ creatorName: string;resourceList: Resource[];}