8000 [pull] main from miniflux:main by pull[bot] · Pull Request #311 · suhaoGe/miniflux · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions client/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ type UserModificationRequest struct {
EntryOrder *string `json:"entry_sorting_order"`
Stylesheet *string `json:"stylesheet"`
CustomJS *string `json:"custom_js"`
GoogleID *string `json:"google_id"`
OpenIDConnectID *string `json:"openid_connect_id"`
EntriesPerPage *int `json:"entries_per_page"`
KeyboardShortcuts *bool `json:"keyboard_shortcuts"`
ShowReadingTime *bool `json:"show_reading_time"`
Expand Down
16 changes: 8 additions & 8 deletions internal/api/entry_handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (h *handler) getFeedEntryHandler(w http.ResponseWriter, r *http.Request) {

builder := h.store.NewEntryQueryBuilder(request.UserID(r)).
WithFeedID(feedID).
WithEntryID(entryID)
WithEntryIDs(entryID)

h.getEntryFromBuilder(w, r, builder)
}
Expand All @@ -77,7 +77,7 @@ func (h *handler) getCategoryEntryHandler(w http.ResponseWriter, r *http.Request

builder := h.store.NewEntryQueryBuilder(request.UserID(r)).
WithCategoryID(categoryID).
WithEntryID(entryID)
WithEntryIDs(entryID)

h.getEntryFromBuilder(w, r, builder)
}
Expand All @@ -90,7 +90,7 @@ func (h *handler) getEntryHandler(w http.ResponseWriter, r *http.Request) {
}

builder := h.store.NewEntryQueryBuilder(request.UserID(r)).
WithEntryID(entryID)
WithEntryIDs(entryID)

h.getEntryFromBuilder(w, r, builder)
}
Expand Down Expand Up @@ -164,11 +164,11 @@ func (h *handler) findEntries(w http.ResponseWriter, r *http.Request, feedID int
builder := h.store.NewEntryQueryBuilder(userID).
WithFeedID(feedID).
WithCategoryID(categoryID).
WithStatuses(statuses).
WithStatuses(statuses...).
WithSorting(order, direction).
WithOffset(offset).
WithLimit(limit).
WithTags(tags).
WithTags(tags...).
WithEnclosures()

if request.HasQueryParam(r, "globally_visible") {
Expand Down Expand Up @@ -242,7 +242,7 @@ func (h *handler) saveEntryHandler(w http.ResponseWriter, r *http.Request) {
}

entry, err := h.store.NewEntryQueryBuilder(request.UserID(r)).
WithEntryID(entryID).
WithEntryIDs(entryID).
GetEntry()
if err != nil {
response.JSONServerError(w, r, err)
Expand Down Expand Up @@ -286,7 +286,7 @@ func (h *handler) updateEntryHandler(w http.ResponseWriter, r *http.Request) {
loggedUserID := request.UserID(r)

entry, err := h.store.NewEntryQueryBuilder(loggedUserID).
WithEntryID(entryID).
WithEntryIDs(entryID).
GetEntry()
if err != nil {
response.JSONServerError(w, r, err)
Expand Down Expand Up @@ -445,7 +445,7 @@ func (h *handler) fetchContentHandler(w http.ResponseWriter, r *http.Request) {
}

entry, err := h.store.NewEntryQueryBuilder(loggedUserID).
WithEntryID(entryID).
WithEntryIDs(entryID).
GetEntry()
if err != nil {
response.JSONServerError(w, r, err)
Expand Down
6 changes: 3 additions & 3 deletions internal/fever/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ func (h *feverHandler) handleItems(w http.ResponseWriter, r *http.Request) {
itemIDs = append(itemIDs, itemID)
}

builder.WithEntryIDs(itemIDs)
builder.WithEntryIDs(itemIDs...)
}
default:
slog.Debug("[Fever] Fetching oldest items",
Expand Down Expand Up @@ -343,7 +343,7 @@ func (h *feverHandler) handleUnreadItems(w http.ResponseWriter, r *http.Request)
)

rawEntryIDs, err := h.store.NewEntryQueryBuilder(userID).
WithStatus(model.EntryStatusUnread).
WithStatuses(model.EntryStatusUnread).
GetEntryIDs()
if err != nil {
response.JSONServerError(w, r, err)
Expand Down Expand Up @@ -410,7 +410,7 @@ func (h *feverHandler) handleWriteItems(w http.ResponseWriter, r *http.Request)
}

entry, err := h.store.NewEntryQueryBuilder(userID).
WithEntryID(entryID).
WithEntryIDs(entryID).
GetEntry()
if err != nil {
response.JSONServerError(w, r, err)
Expand Down
8 changes: 4 additions & 4 deletions internal/googlereader/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ func (h *greaderHandler) editTagHandler(w http.ResponseWriter, r *http.Request)
)

entries, err := h.store.NewEntryQueryBuilder(userID).
WithEntryIDs(itemIDs).
WithEntryIDs(itemIDs...).
GetEntries()
if err != nil {
response.JSONServerError(w, r, err)
Expand Down Expand Up @@ -650,7 +650,7 @@ func (h *greaderHandler) streamItemContentsHandler(w http.ResponseWriter, r *htt

entries, err := h.store.NewEntryQueryBuilder(userID).
WithEnclosures().
WithEntryIDs(itemIDs).
WithEntryIDs(itemIDs...).
WithSorting(model.DefaultSortingOrder, requestModifiers.SortDirection).
GetEntries()
if err != nil {
Expand Down Expand Up @@ -1018,7 +1018,7 @@ func (h *greaderHandler) handleReadingListStreamHandler(w http.ResponseWriter, r
for _, s := range rm.ExcludeTargets {
switch s.Type {
case ReadStream:
builder.WithStatus(model.EntryStatusUnread)
builder.WithStatuses(model.EntryStatusUnread)
default:
slog.Warn("[GoogleReader] Unknown ExcludeTargets filter type",
slog.String("handler", "handleReadingListStreamHandler"),
Expand Down Expand Up @@ -1071,7 +1071,7 @@ func (h *greaderHandler) handleStarredStreamHandler(w http.ResponseWriter, r *ht

func (h *greaderHandler) handleReadStreamHandler(w http.ResponseWriter, r *http.Request, rm requestModifiers) {
builder := h.store.NewEntryQueryBuilder(rm.UserID).
WithStatus(model.EntryStatusRead).
WithStatuses(model.EntryStatusRead).
WithLimit(rm.Count).
WithOffset(rm.Offset).
WithSorting(model.DefaultSortingOrder, rm.SortDirection)
Expand Down
3 changes: 3 additions & 0 deletions internal/http/response/html_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,9 @@ func TestHTMLRedirectRejectsUnsafeTargets(t *testing.T) {
"file:///etc/passwd",
"mailto:victim@example.org",
"//evil.example.org/path",
`/\evil.example.org/path`,
`\evil.example.org\path`,
`/foo\bar`,
"ftp://example.org/file",
"",
}
Expand Down
10 changes: 0 additions & 10 deletions internal/model/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ type UserModificationRequest struct {
Stylesheet *string `json:"stylesheet"`
CustomJS *string `json:"custom_js"`
ExternalFontHosts *string `json:"external_font_hosts"`
GoogleID *string `json:"google_id"`
OpenIDConnectID *string `json:"openid_connect_id"`
EntriesPerPage *int `json:"entries_per_page"`
IsAdmin *bool `json:"is_admin"`
KeyboardShortcuts *bool `json:"keyboard_shortcuts"`
Expand Down Expand Up @@ -134,14 +132,6 @@ func (u *UserModificationRequest) Patch(user *User) {
user.ExternalFontHosts = *u.ExternalFontHosts
}

if u.GoogleID != nil {
user.GoogleID = *u.GoogleID
}

if u.OpenIDConnectID != nil {
user.OpenIDConnectID = *u.OpenIDConnectID
}

if u.EntriesPerPage != nil {
user.EntriesPerPage = *u.EntriesPerPage
}
Expand Down
6 changes: 2 additions & 4 deletions internal/storage/entry_pagination_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,8 @@ func (e *entryPaginationBuilder) WithStatusOrEntryID(status string, entryID int6

func (e *entryPaginationBuilder) WithTags(tags []string) *entryPaginationBuilder {
if len(tags) > 0 {
for _, tag := range tags {
e.conditions = append(e.conditions, fmt.Sprintf("LOWER($%d) = ANY(LOWER(e.tags::text)::text[])", len(e.args)+1))
e.args = append(e.args, tag)
}
e.conditions = append(e.conditions, fmt.Sprintf("LOWER(e.tags::text)::text[] @> LOWER($%d::text)::text[]", len(e.args)+1))
e.args = append(e.args, pq.Array(tags))
}

return e
Expand Down
30 changes: 5 additions & 25 deletions internal/storage/entry_query_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func (e *EntryQueryBuilder) AfterEntryID(entryID int64) *EntryQueryBuilder {
}

// WithEntryIDs filter by entry IDs.
func (e *EntryQueryBuilder) WithEntryIDs(entryIDs []int64) *EntryQueryBuilder {
func (e *EntryQueryBuilder) WithEntryIDs(entryIDs ...int64) *EntryQueryBuilder {
if len(entryIDs) == 1 {
e.conditions = append(e.conditions, fmt.Sprintf("e.id = $%d", len(e.args)+1))
e.args = append(e.args, entryIDs[0])
Expand All @@ -126,15 +126,6 @@ func (e *EntryQueryBuilder) WithEntryIDs(entryIDs []int64) *EntryQueryBuilder {
return e
}

// WithEntryID filter by entry ID.
func (e *EntryQueryBuilder) WithEntryID(entryID int64) *EntryQueryBuilder {
if entryID != 0 {
e.conditions = append(e.conditions, "e.id = $"+strconv.Itoa(len(e.args)+1))
e.args = append(e.args, entryID)
}
return e
}

// WithFeedID filter by feed ID.
func (e *EntryQueryBuilder) WithFeedID(feedID int64) *EntryQueryBuilder {
if feedID > 0 {
Expand All @@ -153,17 +144,8 @@ func (e *EntryQueryBuilder) WithCategoryID(categoryID int64) *EntryQueryBuilder
return e
}

// WithStatus filter by entry status.
func (e *EntryQueryBuilder) WithStatus(status string) *EntryQueryBuilder {
if status != "" {
e.conditions = append(e.conditions, "e.status = $"+strconv.Itoa(len(e.args)+1))
e.args = append(e.args, status)
}
return e
}

// WithStatuses filter by a list of entry statuses.
func (e *EntryQueryBuilder) WithStatuses(statuses []string) *EntryQueryBuilder {
func (e *EntryQueryBuilder) WithStatuses(statuses ...string) *EntryQueryBuilder {
if len(statuses) == 1 {
e.conditions = append(e.conditions, fmt.Sprintf("e.status = $%d", len(e.args)+1))
e.args = append(e.args, statuses[0])
Expand All @@ -175,12 +157,10 @@ func (e *EntryQueryBuilder) WithStatuses(statuses []string) *EntryQueryBuilder {
}

// WithTags filter by a list of entry tags.
func (e *EntryQueryBuilder) WithTags(tags []string) *EntryQueryBuilder {
func (e *EntryQueryBuilder) WithTags(tags ...string) *EntryQueryBuilder {
if len(tags) > 0 {
for _, cat := range tags {
e.conditions = append(e.conditions, fmt.Sprintf("LOWER($%d) = ANY(LOWER(e.tags::text)::text[])", len(e.args)+1))
e.args = append(e.args, cat)
}
e.conditions = append(e.conditions, fmt.Sprintf("LOWER(e.tags::text)::text[] @> LOWER($%d::text)::text[]", len(e.args)+1))
e.args = append(e.args, pq.Array(tags))
}
return e
}
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/category_entries.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func (h *handler) showCategoryEntriesPage(w http.ResponseWriter, r *http.Request
WithCategoryID(category.ID).
WithSorting(user.EntryOrder, user.EntryDirection).
WithSorting("id", user.EntryDirection).
WithStatus(model.EntryStatusUnread).
WithStatuses(model.EntryStatusUnread).
WithoutContent().
WithOffset(offset).
WithLimit(user.EntriesPerPage).
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/entry_category.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func (h *handler) showCategoryEntryPage(w http.ResponseWriter, r *http.Request)

entry, err := h.store.NewEntryQueryBuilder(user.ID).
WithCategoryID(categoryID).
WithEntryID(entryID).
WithEntryIDs(entryID).
GetEntry()
if err != nil {
response.HTMLServerError(w, r, err)
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/entry_feed.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func (h *handler) showFeedEntryPage(w http.ResponseWriter, r *http.Request) {

entry, err := h.store.NewEntryQueryBuilder(user.ID).
WithFeedID(feedID).
WithEntryID(entryID).
WithEntryIDs(entryID).
GetEntry()
if err != nil {
response.HTMLServerError(w, r, err)
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/entry_read.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func (h *handler) showReadEntryPage(w http.ResponseWriter, r *http.Request) {
entryID := request.RouteInt64Param(r, "entryID")

entry, err := h.store.NewEntryQueryBuilder(user.ID).
WithEntryID(entryID).
WithEntryIDs(entryID).
GetEntry()
if err != nil {
response.HTMLServerError(w, r, err)
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/entry_save.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func (h *handler) saveEntry(w http.ResponseWriter, r *http.Request) {
entryID := request.RouteInt64Param(r, "entryID")

entry, err := h.store.NewEntryQueryBuilder(request.UserID(r)).
WithEntryID(entryID).
WithEntryIDs(entryID).
GetEntry()
if err != nil {
response.JSONServerError(w, r, err)
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/entry_scraper.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func (h *handler) fetchContent(w http.ResponseWriter, r *http.Request) {
entryID := request.RouteInt64Param(r, "entryID")

entry, err := h.store.NewEntryQueryBuilder(loggedUserID).
WithEntryID(entryID).
WithEntryIDs(entryID).
GetEntry()
if err != nil {
response.JSONServerError(w, r, err)
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/entry_search.go
10BC8
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func (h *handler) showSearchEntryPage(w http.ResponseWriter, r *http.Request) {

entry, err := h.store.NewEntryQueryBuilder(user.ID).
WithSearchQuery(searchQuery).
WithEntryID(entryID).
WithEntryIDs(entryID).
GetEntry()
if err != nil {
response.HTMLServerError(w, r, err)
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/entry_starred.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func (h *handler) showStarredEntryPage(w http.ResponseWriter, r *http.Request) {
entryID := request.RouteInt64Param(r, "entryID")

entry, err := h.store.NewEntryQueryBuilder(user.ID).
WithEntryID(entryID).
WithEntryIDs(entryID).
GetEntry()
if err != nil {
response.HTMLServerError(w, r, err)
Expand Down
4 changes: 2 additions & 2 deletions internal/ui/entry_tag.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ func (h *handler) showTagEntryPage(w http.ResponseWriter, r *http.Request) {
entryID := request.RouteInt64Param(r, "entryID")

entry, err := h.store.NewEntryQueryBuilder(user.ID).
WithTags([]string{tagName}).
WithEntryID(entryID).
WithTags(tagName).
WithEntryIDs(entryID).
GetEntry()
if err != nil {
response.HTMLServerError(w, r, err)
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/entry_unread.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func (h *handler) showUnreadEntryPage(w http.ResponseWriter, r *http.Request) {
entryID := request.RouteInt64Param(r, "entryID")

entry, err := h.store.NewEntryQueryBuilder(user.ID).
WithEntryID(entryID).
WithEntryIDs(entryID).
GetEntry()
if err != nil {
response.HTMLServerError(w, r, err)
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/feed_entries.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func (h *handler) showFeedEntriesPage(w http.ResponseWriter, r *http.Request) {

entries, count, err := h.store.NewEntryQueryBuilder(user.ID).
WithFeedID(feed.ID).
WithStatus(model.EntryStatusUnread).
WithStatuses(model.EntryStatusUnread).
WithSorting(user.EntryOrder, user.EntryDirection).
WithSorting("id", user.EntryDirection).
WithOffset(offset).
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/history_entries.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func (h *handler) showHistoryPage(w http.ResponseWriter, r *http.Request) {
offset := request.QueryIntParam(r, "offset", 0)

entries, count, err := h.store.NewEntryQueryBuilder(user.ID).
WithStatus(model.EntryStatusRead).
WithStatuses(model.EntryStatusRead).
WithSorting("changed_at", "DESC").
WithSorting("published_at", "DESC").
WithoutContent().
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/search.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func (h *handler) showSearchPage(w http.ResponseWriter, r *http.Request) {
WithLimit(user.EntriesPerPage)

if unreadOnly {
builder.WithStatus(model.EntryStatusUnread)
builder.WithStatuses(model.EntryStatusUnread)
}

entries, entriesCount, err = builder.GetEntriesWithCount()
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/starred_entry_category.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func (h *handler) showStarredCategoryEntryPage(w http.ResponseWriter, r *http.Re

entry, err := h.store.NewEntryQueryBuilder(user.ID).
WithCategoryID(categoryID).
WithEntryID(entryID).
WithEntryIDs(entryID).
GetEntry()
if err != nil {
response.HTMLServerError(w, r, err)
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/tag_entries_all.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func (h *handler) showTagEntriesAllPage(w http.ResponseWriter, r *http.Request)
offset := request.QueryIntParam(r, "offset", 0)

entries, count, err := h.store.NewEntryQueryBuilder(user.ID).
WithTags([]string{tagName}).
WithTags(tagName).
WithSorting("status", "asc").
WithSorting(user.EntryOrder, user.EntryDirection).
WithSorting("id", user.EntryDirection).
Expand Down
Loading
Loading
0