aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/ui/controller
diff options
context:
space:
mode:
Diffstat (limited to 'server/ui/controller')
-rw-r--r--server/ui/controller/category.go2
-rw-r--r--server/ui/controller/controller.go2
-rw-r--r--server/ui/controller/entry.go24
-rw-r--r--server/ui/controller/feed.go2
-rw-r--r--server/ui/controller/history.go2
-rw-r--r--server/ui/controller/starred.go2
-rw-r--r--server/ui/controller/unread.go4
7 files changed, 19 insertions, 19 deletions
diff --git a/server/ui/controller/category.go b/server/ui/controller/category.go
index 9bb12fb..cf378c6 100644
--- a/server/ui/controller/category.go
+++ b/server/ui/controller/category.go
@@ -51,7 +51,7 @@ func (c *Controller) ShowCategoryEntries(ctx *core.Context, request *core.Reques
return
}
- builder := c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder := c.store.NewEntryQueryBuilder(user.ID)
builder.WithCategoryID(category.ID)
builder.WithOrder(model.DefaultSortingOrder)
builder.WithDirection(user.EntryDirection)
diff --git a/server/ui/controller/controller.go b/server/ui/controller/controller.go
index 8f1f415..8a45912 100644
--- a/server/ui/controller/controller.go
+++ b/server/ui/controller/controller.go
@@ -35,7 +35,7 @@ type Controller struct {
func (c *Controller) getCommonTemplateArgs(ctx *core.Context) (tplParams, error) {
user := ctx.LoggedUser()
- builder := c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder := c.store.NewEntryQueryBuilder(user.ID)
builder.WithStatus(model.EntryStatusUnread)
countUnread, err := builder.CountEntries()
diff --git a/server/ui/controller/entry.go b/server/ui/controller/entry.go
index 9a1ed8f..ca9f44a 100644
--- a/server/ui/controller/entry.go
+++ b/server/ui/controller/entry.go
@@ -27,7 +27,7 @@ func (c *Controller) FetchContent(ctx *core.Context, request *core.Request, resp
}
user := ctx.LoggedUser()
- builder := c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder := c.store.NewEntryQueryBuilder(user.ID)
builder.WithEntryID(entryID)
builder.WithoutStatus(model.EntryStatusRemoved)
@@ -63,7 +63,7 @@ func (c *Controller) SaveEntry(ctx *core.Context, request *core.Request, respons
}
user := ctx.LoggedUser()
- builder := c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder := c.store.NewEntryQueryBuilder(user.ID)
builder.WithEntryID(entryID)
builder.WithoutStatus(model.EntryStatusRemoved)
@@ -107,7 +107,7 @@ func (c *Controller) ShowFeedEntry(ctx *core.Context, request *core.Request, res
return
}
- builder := c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder := c.store.NewEntryQueryBuilder(user.ID)
builder.WithFeedID(feedID)
builder.WithEntryID(entryID)
builder.WithoutStatus(model.EntryStatusRemoved)
@@ -138,7 +138,7 @@ func (c *Controller) ShowFeedEntry(ctx *core.Context, request *core.Request, res
return
}
- builder = c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder = c.store.NewEntryQueryBuilder(user.ID)
builder.WithFeedID(feedID)
prevEntry, nextEntry, err := c.getEntryPrevNext(user, builder, entry.ID)
@@ -183,7 +183,7 @@ func (c *Controller) ShowCategoryEntry(ctx *core.Context, request *core.Request,
return
}
- builder := c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder := c.store.NewEntryQueryBuilder(user.ID)
builder.WithCategoryID(categoryID)
builder.WithEntryID(entryID)
builder.WithoutStatus(model.EntryStatusRemoved)
@@ -214,7 +214,7 @@ func (c *Controller) ShowCategoryEntry(ctx *core.Context, request *core.Request,
return
}
- builder = c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder = c.store.NewEntryQueryBuilder(user.ID)
builder.WithCategoryID(categoryID)
prevEntry, nextEntry, err := c.getEntryPrevNext(user, builder, entry.ID)
@@ -253,7 +253,7 @@ func (c *Controller) ShowUnreadEntry(ctx *core.Context, request *core.Request, r
return
}
- builder := c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder := c.store.NewEntryQueryBuilder(user.ID)
builder.WithEntryID(entryID)
builder.WithoutStatus(model.EntryStatusRemoved)
@@ -274,7 +274,7 @@ func (c *Controller) ShowUnreadEntry(ctx *core.Context, request *core.Request, r
return
}
- builder = c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder = c.store.NewEntryQueryBuilder(user.ID)
builder.WithStatus(model.EntryStatusUnread)
prevEntry, nextEntry, err := c.getEntryPrevNext(user, builder, entry.ID)
@@ -323,7 +323,7 @@ func (c *Controller) ShowReadEntry(ctx *core.Context, request *core.Request, res
return
}
- builder := c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder := c.store.NewEntryQueryBuilder(user.ID)
builder.WithEntryID(entryID)
builder.WithoutStatus(model.EntryStatusRemoved)
@@ -344,7 +344,7 @@ func (c *Controller) ShowReadEntry(ctx *core.Context, request *core.Request, res
return
}
- builder = c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder = c.store.NewEntryQueryBuilder(user.ID)
builder.WithStatus(model.EntryStatusRead)
prevEntry, nextEntry, err := c.getEntryPrevNext(user, builder, entry.ID)
@@ -383,7 +383,7 @@ func (c *Controller) ShowStarredEntry(ctx *core.Context, request *core.Request,
return
}
- builder := c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder := c.store.NewEntryQueryBuilder(user.ID)
builder.WithEntryID(entryID)
builder.WithoutStatus(model.EntryStatusRemoved)
@@ -413,7 +413,7 @@ func (c *Controller) ShowStarredEntry(ctx *core.Context, request *core.Request,
return
}
- builder = c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder = c.store.NewEntryQueryBuilder(user.ID)
builder.WithStarred()
prevEntry, nextEntry, err := c.getEntryPrevNext(user, builder, entry.ID)
diff --git a/server/ui/controller/feed.go b/server/ui/controller/feed.go
index 99bb956..7dfc56e 100644
--- a/server/ui/controller/feed.go
+++ b/server/ui/controller/feed.go
@@ -68,7 +68,7 @@ func (c *Controller) ShowFeedEntries(ctx *core.Context, request *core.Request, r
return
}
- builder := c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder := c.store.NewEntryQueryBuilder(user.ID)
builder.WithFeedID(feed.ID)
builder.WithoutStatus(model.EntryStatusRemoved)
builder.WithOrder(model.DefaultSortingOrder)
diff --git a/server/ui/controller/history.go b/server/ui/controller/history.go
index cadc65e..7347bac 100644
--- a/server/ui/controller/history.go
+++ b/server/ui/controller/history.go
@@ -20,7 +20,7 @@ func (c *Controller) ShowHistoryPage(ctx *core.Context, request *core.Request, r
return
}
- builder := c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder := c.store.NewEntryQueryBuilder(user.ID)
builder.WithStatus(model.EntryStatusRead)
builder.WithOrder(model.DefaultSortingOrder)
builder.WithDirection(user.EntryDirection)
diff --git a/server/ui/controller/starred.go b/server/ui/controller/starred.go
index c035157..e9da241 100644
--- a/server/ui/controller/starred.go
+++ b/server/ui/controller/starred.go
@@ -21,7 +21,7 @@ func (c *Controller) ShowStarredPage(ctx *core.Context, request *core.Request, r
return
}
- builder := c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder := c.store.NewEntryQueryBuilder(user.ID)
builder.WithoutStatus(model.EntryStatusRemoved)
builder.WithStarred()
builder.WithOrder(model.DefaultSortingOrder)
diff --git a/server/ui/controller/unread.go b/server/ui/controller/unread.go
index 8cf8a38..1dd7b07 100644
--- a/server/ui/controller/unread.go
+++ b/server/ui/controller/unread.go
@@ -14,7 +14,7 @@ func (c *Controller) ShowUnreadPage(ctx *core.Context, request *core.Request, re
user := ctx.LoggedUser()
offset := request.QueryIntegerParam("offset", 0)
- builder := c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder := c.store.NewEntryQueryBuilder(user.ID)
builder.WithStatus(model.EntryStatusUnread)
countUnread, err := builder.CountEntries()
if err != nil {
@@ -26,7 +26,7 @@ func (c *Controller) ShowUnreadPage(ctx *core.Context, request *core.Request, re
offset = 0
}
- builder = c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+ builder = c.store.NewEntryQueryBuilder(user.ID)
builder.WithStatus(model.EntryStatusUnread)
builder.WithOrder(model.DefaultSortingOrder)
builder.WithDirection(user.EntryDirection)
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 01:57:43 +0000