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.

feat: support order by time asc

Steven07667257d5b0
diff --git a/server/router/api/v1/memo_service.go b/server/router/api/v1/memo_service.go
index 2a638447b..d51eabe31 100644
--- a/server/router/api/v1/memo_service.go
+++ b/server/router/api/v1/memo_service.go
@@ -891,6 +891,9 @@ func (s *APIV1Service) buildMemoFindWithFilter(ctx context.Context, find *store.
if filter.OrderByPinned {
find.OrderByPinned = filter.OrderByPinned
}
+ if filter.OrderByTimeAsc {
+ find.OrderByTimeAsc = filter.OrderByTimeAsc
+ }
if filter.DisplayTimeAfter != nil {
workspaceMemoRelatedSetting, err := s.Store.GetWorkspaceMemoRelatedSetting(ctx)
if err != nil {
@@ -995,6 +998,7 @@ var MemoFilterCELAttributes = []cel.EnvOption{
cel.Variable("visibilities", cel.ListType(cel.StringType)),
cel.Variable("tag_search", cel.ListType(cel.StringType)),
cel.Variable("order_by_pinned", cel.BoolType),
+ cel.Variable("order_by_time_asc", cel.BoolType),
cel.Variable("display_time_before", cel.IntType),
cel.Variable("display_time_after", cel.IntType),
cel.Variable("creator", cel.StringType),
@@ -1014,6 +1018,7 @@ type MemoFilter struct {
Visibilities []store.Visibility
TagSearch []string
OrderByPinned bool
+ OrderByTimeAsc bool
DisplayTimeBefore *int64
DisplayTimeAfter *int64
Creator *string
@@ -1074,6 +1079,9 @@ func findMemoField(callExpr *expr.Expr_Call, filter *MemoFilter) {
} else if idExpr.Name == "order_by_pinned" {
value := callExpr.Args[1].GetConstExpr().GetBoolValue()
filter.OrderByPinned = value
+ } else if idExpr.Name == "order_by_time_asc" {
+ value := callExpr.Args[1].GetConstExpr().GetBoolValue()
+ filter.OrderByTimeAsc = value
} else if idExpr.Name == "display_time_before" {
displayTimeBefore := callExpr.Args[1].GetConstExpr().GetInt64Value()
filter.DisplayTimeBefore = &displayTimeBefore
diff --git a/store/db/mysql/memo.go b/store/db/mysql/memo.go
index e45f551c2..112aeb7df 100644
--- a/store/db/mysql/memo.go
+++ b/store/db/mysql/memo.go
@@ -116,12 +116,16 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
if find.OrderByPinned {
orders = append(orders, "`pinned` DESC")
}
+ order := "DESC"
+ if find.OrderByTimeAsc {
+ order = "ASC"
+ }
if find.OrderByUpdatedTs {
- orders = append(orders, "`updated_ts` DESC")
+ orders = append(orders, "`updated_ts` "+order)
} else {
- orders = append(orders, "`created_ts` DESC")
+ orders = append(orders, "`created_ts` "+order)
}
- orders = append(orders, "`id` DESC")
+ orders = append(orders, "`id` "+order)
if find.Random {
orders = append(orders, "RAND()")
}
diff --git a/store/db/postgres/memo.go b/store/db/postgres/memo.go
index 49e9e6213..57cbd61cf 100644
--- a/store/db/postgres/memo.go
+++ b/store/db/postgres/memo.go
@@ -107,12 +107,16 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
if find.OrderByPinned {
orders = append(orders, "pinned DESC")
}
+ order := "DESC"
+ if find.OrderByTimeAsc {
+ order = "ASC"
+ }
if find.OrderByUpdatedTs {
- orders = append(orders, "updated_ts DESC")
+ orders = append(orders, "updated_ts "+order)
} else {
- orders = append(orders, "created_ts DESC")
+ orders = append(orders, "created_ts "+order)
}
- orders = append(orders, "id DESC")
+ orders = append(orders, "id "+order)
if find.Random {
orders = append(orders, "RAND()")
}
diff --git a/store/db/sqlite/memo.go b/store/db/sqlite/memo.go
index 6f6bd7132..6ebd856b1 100644
--- a/store/db/sqlite/memo.go
+++ b/store/db/sqlite/memo.go
@@ -108,12 +108,16 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
if find.OrderByPinned {
orderBy = append(orderBy, "`pinned` DESC")
}
+ order := "DESC"
+ if find.OrderByTimeAsc {
+ order = "ASC"
+ }
if find.OrderByUpdatedTs {
- orderBy = append(orderBy, "`updated_ts` DESC")
+ orderBy = append(orderBy, "`updated_ts` "+order)
} else {
- orderBy = append(orderBy, "`created_ts` DESC")
+ orderBy = append(orderBy, "`created_ts` "+order)
}
- orderBy = append(orderBy, "`id` DESC")
+ orderBy = append(orderBy, "`id` "+order)
if find.Random {
orderBy = []string{"RANDOM()"}
}
diff --git a/store/memo.go b/store/memo.go
index d4aa6d626..ce95412da 100644
--- a/store/memo.go
+++ b/store/memo.go
@@ -80,6 +80,8 @@ type FindMemo struct {
Offset *int
OrderByUpdatedTs bool
OrderByPinned bool
+
+ OrderByTimeAsc bool
}
type FindMemoPayload struct {