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.

chore: remove order by pinned

johnnyjoy7481fe10bfec
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<Props> = observer((props: Props) => {
) : (
<div
className={cn(
- "group relative flex flex-col justify-start items-start w-full px-4 py-3 mb-2 gap-2 text-card-foreground rounded-lg border border-border transition-colors",
- props.showPinned && memo.pinned ? "bg-accent" : "bg-card",
+ "group relative flex flex-col justify-start items-start bg-card w-full px-4 py-3 mb-2 gap-2 text-card-foreground rounded-lg border border-border transition-colors",
className,
)}
>
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"}