mirror of
https://github.com/miniflux/v2.git
synced 2025-09-15 18:57:04 +00:00
refactor: remove model.UserSessions
struct
This commit is contained in:
parent
84078c7c20
commit
f2976bff5d
3 changed files with 5 additions and 13 deletions
|
@ -28,13 +28,3 @@ func (u *UserSession) String() string {
|
||||||
func (u *UserSession) UseTimezone(tz string) {
|
func (u *UserSession) UseTimezone(tz string) {
|
||||||
u.CreatedAt = timezone.Convert(tz, u.CreatedAt)
|
u.CreatedAt = timezone.Convert(tz, u.CreatedAt)
|
||||||
}
|
}
|
||||||
|
|
||||||
// UserSessions represents a list of sessions.
|
|
||||||
type UserSessions []UserSession
|
|
||||||
|
|
||||||
// UseTimezone converts creation date of all sessions to the given timezone.
|
|
||||||
func (u UserSessions) UseTimezone(tz string) {
|
|
||||||
for _, session := range u {
|
|
||||||
session.UseTimezone(tz)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
// UserSessions returns the list of sessions for the given user.
|
// UserSessions returns the list of sessions for the given user.
|
||||||
func (s *Storage) UserSessions(userID int64) (model.UserSessions, error) {
|
func (s *Storage) UserSessions(userID int64) ([]model.UserSession, error) {
|
||||||
query := `
|
query := `
|
||||||
SELECT
|
SELECT
|
||||||
id,
|
id,
|
||||||
|
@ -33,7 +33,7 @@ func (s *Storage) UserSessions(userID int64) (model.UserSessions, error) {
|
||||||
}
|
}
|
||||||
defer rows.Close()
|
defer rows.Close()
|
||||||
|
|
||||||
var sessions model.UserSessions
|
var sessions []model.UserSession
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var session model.UserSession
|
var session model.UserSession
|
||||||
err := rows.Scan(
|
err := rows.Scan(
|
||||||
|
|
|
@ -25,7 +25,9 @@ func (h *handler) showSessionsPage(w http.ResponseWriter, r *http.Request) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
sessions.UseTimezone(user.Timezone)
|
for _, sess := range sessions {
|
||||||
|
sess.UseTimezone(user.Timezone)
|
||||||
|
}
|
||||||
|
|
||||||
sess := session.New(h.store, request.SessionID(r))
|
sess := session.New(h.store, request.SessionID(r))
|
||||||
view := view.New(h.tpl, r, sess)
|
view := view.New(h.tpl, r, sess)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue