oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-06 17:41:00 +00:00
Code Wiki Activity

Make entries sorting configurable

Browse source
This commit is contained in:
Frédéric Guillot 2017-12-02 17:04:01 -08:00
parent 453ff64f29
commit 2f1367a8d4
28 changed files with 253 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

6
model/entry.go
View file

@ -15,7 +15,7 @@ const (
EntryStatusRead = "read"
EntryStatusRemoved = "removed"
DefaultSortingOrder = "published_at"
DefaultSortingDirection = "desc"
DefaultSortingDirection = "asc"
)
// Entry represents a feed item in the system.
@ -81,8 +81,8 @@ func ValidateRange(offset, limit int) error {
return nil
}
// GetOppositeDirection returns the opposite sorting direction.
func GetOppositeDirection(direction string) string {
// OppositeDirection returns the opposite sorting direction.
func OppositeDirection(direction string) string {
if direction == "asc" {
return "desc"
}

6
model/entry_test.go
View file

@ -57,15 +57,15 @@ func TestValidateRange(t *testing.T) {
}
func TestGetOppositeDirection(t *testing.T) {
if GetOppositeDirection("asc") != "desc" {
if OppositeDirection("asc") != "desc" {
t.Errorf(`The opposite direction of "asc" should be "desc"`)
}
if GetOppositeDirection("desc") != "asc" {
if OppositeDirection("desc") != "asc" {
t.Errorf(`The opposite direction of "desc" should be "asc"`)
}
if GetOppositeDirection("invalid") != "asc" {
if OppositeDirection("invalid") != "asc" {
t.Errorf(`An invalid direction should return "asc"`)
}
}

6
model/token.go
View file

@ -4,8 +4,14 @@
package model
import "fmt"
// Token represents a CSRF token in the system.
type Token struct {
ID string
Value string
}
func (t Token) String() string {
return fmt.Sprintf(`ID="%s"`, t.ID)
}

19
model/user.go
View file

@ -11,15 +11,16 @@ import (
// User represents a user in the system.
type User struct {
ID int64 `json:"id"`
Username string `json:"username"`
Password string `json:"password,omitempty"`
IsAdmin bool `json:"is_admin,omitempty"`
Theme string `json:"theme,omitempty"`
Language string `json:"language,omitempty"`
Timezone string `json:"timezone,omitempty"`
LastLoginAt *time.Time `json:"last_login_at,omitempty"`
Extra map[string]string `json:"-"`
ID int64 `json:"id"`
Username string `json:"username"`
Password string `json:"password,omitempty"`
IsAdmin bool `json:"is_admin,omitempty"`
Theme string `json:"theme,omitempty"`
Language string `json:"language,omitempty"`
Timezone string `json:"timezone,omitempty"`
EntryDirection string `json:"entry_sorting_direction,omitempty"`
LastLoginAt *time.Time `json:"last_login_at,omitempty"`
Extra map[string]string `json:"-"`
}
// NewUser returns a new User.