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

[pull] main from miniflux:main #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jan 5, 2026
Merged < 8000 /div>

[pull] main from miniflux:main #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 12 additions & 11 deletions internal/storage/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,36 +53,37 @@ func (s *Storage) createAppSession(session *model.Session) (*model.Session, erro
return session, nil
}

// UpdateAppSessionField updates only one session field.
func (s *Storage) UpdateAppSessionField(sessionID, field string, value any) error {
// SetAppSessionTextField sets a text field in the session data.
func (s *Storage) SetAppSessionTextField(sessionID, field string, value any) error {
query := `
UPDATE
sessions
SET
data = jsonb_set(data, '{%s}', to_jsonb($1::text), true)
data = jsonb_set(data, ARRAY[$2::text], to_jsonb($1::text), true)
WHERE
id=$2
id=$3
`
_, err := s.db.Exec(fmt.Sprintf(query, field), value, sessionID)
_, err := s.db.Exec(query, value, field, sessionID)
if err != nil {
return fmt.Errorf(`store: unable to update session field: %v`, err)
return fmt.Errorf(`store: unable to update session text field %q: %v`, field, err)
}

return nil
}

func (s *Storage) UpdateAppSessionObjectField(sessionID, field string, value any) error {
// SetAppSessionJSONField sets a JSON field in the session data.
func (s *Storage) SetAppSessionJSONField(sessionID, field string, value any) error {
query := `
UPDATE
sessions
SET
data = jsonb_set(data, '{%s}', $1, true)
data = jsonb_set(data, ARRAY[$2::text], $1, true)
WHERE
id=$2
id=$3
`
_, err := s.db.Exec(fmt.Sprintf(query, field), value, sessionID)
_, err := s.db.Exec(query, value, field, sessionID)
if err != nil {
return fmt.Errorf(`store: unable to update session field: %v`, err)
return fmt.Errorf(`store: unable to update session JSON field %q: %v`, field, err)
}

return nil
Expand Down
3 changes: 2 additions & 1 deletion internal/storage/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,8 @@ func (s *Storage) UserByField(field, value string) (*model.User, error) {
// AnotherUserWithFieldExists returns true if a user has the value set for the given field.
func (s *Storage) AnotherUserWithFieldExists(userID int64, field, value string) bool {
var result bool
s.db.QueryRow(fmt.Sprintf(`SELECT true FROM users WHERE id <> $1 AND %s=$2 LIMIT 1`, pq.QuoteIdentifier(field)), userID, value).Scan(&result)
query := `SELECT true FROM users WHERE id <> $1 AND ` + pq.QuoteIdentifier(field) + `=$2 LIMIT 1`
s.db.QueryRow(query, userID, value).Scan(&result)
return result
}

Expand Down
21 changes: 11 additions & 10 deletions internal/ui/session/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,53 +22,54 @@ func New(store *storage.Storage, sessionID string) *Session {
}

func (s *Session) SetLastForceRefresh() {
s.store.UpdateAppSessionField(s.sessionID, "last_force_refresh", time.Now().UTC().Unix())
s.store.SetAppSessionTextField(s.sessionID, "last_force_refresh", time.Now().UTC().Unix())
}

func (s *Session) SetOAuth2State(state string) {
s.store.UpdateAppSessionField(s.sessionID, "oauth2_state", state)
s.store.SetAppSessionTextField(s.sessionID, "oauth2_state", state)
}

func (s *Session) SetOAuth2CodeVerifier(codeVerfier string) {
s.store.UpdateAppSessionField(s.sessionID, "oauth2_code_verifier", codeVerfier)
s.store.SetAppSessionTextField(s.sessionID, "oauth2_code_verifier", codeVerfier)
}

// NewFlashMessage creates a new flash message.
func (s *Session) NewFlashMessage(message string) {
s.store.UpdateAppSessionField(s.sessionID, "flash_message", message)
s.store.SetAppSessionTextField(s.sessionID, "flash_message", message)
}

// FlashMessage returns the current flash message if any.
func (s *Session) FlashMessage(message string) string {
if message != "" {
s.store.UpdateAppSessionField(s.sessionID, "flash_message", "")
s.store.SetAppSessionTextField(s.sessionID, "flash_message", "")
}
return message
}

// NewFlashErrorMessage creates a new flash error message.
func (s *Session) NewFlashErrorMessage(message string) {
s.store.UpdateAppSessionField(s.sessionID, "flash_error_message", message)
s.store.SetAppSessionTextField(s.sessionID, "flash_error_message", message)
}

// FlashErrorMessage returns the last flash error message if any.
func (s *Session) FlashErrorMessage(message string) string {
if message != "" {
s.store.UpdateAppSessionField(s.sessionID, "flash_error_message", "")
s.store.SetAppSessionTextField(s.sessionID, "flash_error_message", "")
}
return message
}

// SetLanguage updates the language field in session.
func (s *Session) SetLanguage(language string) {
s.store.UpdateAppSessionField(s.sessionID, "language", language)
s.store.SetAppSessionTextField(s.sessionID, "language", language)
}

// SetTheme updates the theme field in session.
func (s *Session) SetTheme(theme string) {
s.store.UpdateAppSessionField(s.sessionID, "theme", theme)
s.store.SetAppSessionTextField(s.sessionID, "theme", theme)
}

// SetWebAuthnSessionData sets the WebAuthn session data.
func (s *Session) SetWebAuthnSessionData(sessionData *model.WebAuthnSession) {
s.store.UpdateAppSessionObjectField(s.sessionID, "webauthn_session_data", sessionData)
s.store.SetAppSessionJSONField(s.sessionID, "webauthn_session_data", sessionData)
}
Loading
0