From 7481fe10bfec9709ab616f103db5b72ecbd8a5a0 Mon Sep 17 00:00:00 2001 From: johnnyjoy Date: Mon, 21 Jul 2025 21:45:10 +0800 Subject: [PATCH] chore: remove order by pinned --- server/router/api/v1/memo_service.go | 1 - store/db/mysql/memo.go | 3 --- store/db/postgres/memo.go | 3 --- store/db/sqlite/memo.go | 3 --- store/memo.go | 1 - web/src/components/MemoView.tsx | 3 +-- web/src/pages/Home.tsx | 1 - web/src/pages/UserProfile.tsx | 1 - 8 files changed, 1 insertion(+), 15 deletions(-) diff --git a/server/router/api/v1/memo_service.go b/server/router/api/v1/memo_service.go index 4d3d9fecd..36d36db51 100644 --- a/server/router/api/v1/memo_service.go +++ b/server/router/api/v1/memo_service.go @@ -112,7 +112,6 @@ func (s *APIV1Service) ListMemos(ctx context.Context, request *v1pb.ListMemosReq return nil, status.Errorf(codes.InvalidArgument, "invalid parent: %v", err) } memoFind.CreatorID = &userID - memoFind.OrderByPinned = true } if request.State == v1pb.State_ARCHIVED { state := store.Archived diff --git a/store/db/mysql/memo.go b/store/db/mysql/memo.go index 4dd87d35e..6518df3a2 100644 --- a/store/db/mysql/memo.go +++ b/store/db/mysql/memo.go @@ -139,9 +139,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo order = "ASC" } orderBy := []string{} - if find.OrderByPinned { - orderBy = append(orderBy, "`pinned` DESC") - } if find.OrderByUpdatedTs { orderBy = append(orderBy, "`updated_ts` "+order) } else { diff --git a/store/db/postgres/memo.go b/store/db/postgres/memo.go index 4ec66df7f..d9f57f7d7 100644 --- a/store/db/postgres/memo.go +++ b/store/db/postgres/memo.go @@ -131,9 +131,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo order = "ASC" } orderBy := []string{} - if find.OrderByPinned { - orderBy = append(orderBy, "pinned DESC") - } if find.OrderByUpdatedTs { orderBy = append(orderBy, "updated_ts "+order) } else { diff --git a/store/db/sqlite/memo.go b/store/db/sqlite/memo.go index d6580250a..db8a9831c 100644 --- a/store/db/sqlite/memo.go +++ b/store/db/sqlite/memo.go @@ -131,9 +131,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo order = "ASC" } orderBy := []string{} - if find.OrderByPinned { - orderBy = append(orderBy, "`pinned` DESC") - } if find.OrderByUpdatedTs { orderBy = append(orderBy, "`updated_ts` "+order) } else { diff --git a/store/memo.go b/store/memo.go index 0441e6824..e29bb0a4e 100644 --- a/store/memo.go +++ b/store/memo.go @@ -82,7 +82,6 @@ type FindMemo struct { // Ordering OrderByUpdatedTs bool - OrderByPinned bool OrderByTimeAsc bool } diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsx index d2bfc4931..e5a0fcb7d 100644 --- a/web/src/components/MemoView.tsx +++ b/web/src/components/MemoView.tsx @@ -136,8 +136,7 @@ const MemoView: React.FC = observer((props: Props) => { ) : (
diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsx index 7294a4e36..5c346d330 100644 --- a/web/src/pages/Home.tsx +++ b/web/src/pages/Home.tsx @@ -66,7 +66,6 @@ const Home = observer(() => { ? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix() : dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(), ) - .sort((a, b) => Number(b.pinned) - Number(a.pinned)) } owner={user.name} orderBy={viewStore.state.orderByTimeAsc ? "display_time asc" : "display_time desc"} diff --git a/web/src/pages/UserProfile.tsx b/web/src/pages/UserProfile.tsx index c208f35b0..f60671e97 100644 --- a/web/src/pages/UserProfile.tsx +++ b/web/src/pages/UserProfile.tsx @@ -107,7 +107,6 @@ const UserProfile = observer(() => { ? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix() : dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(), ) - .sort((a, b) => Number(b.pinned) - Number(a.pinned)) } owner={user.name} orderBy={viewStore.state.orderByTimeAsc ? "display_time asc" : "display_time desc"}