feat: add Atom feeds and JSON/CSV import/export
Phase 5 — Feeds & Import/Export:
- Atom feeds: global (/feed.xml), per-user (/u/{name}/feed.xml),
per-tag (/tags/{name}/feed.xml). Uses gorilla/feeds.
- JSON export: all user's faves with tags, pretty-printed
- CSV export: standard format with header row
- JSON import: validates and creates faves with tags
- CSV import: flexible column mapping from header row
- Import/export pages with format documentation
- Feed items include enclosure for images, author info
- Limited-visibility profiles excluded from feeds
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
13aec5be6e
commit
4e9db3f995
7 changed files with 463 additions and 0 deletions
160
internal/handler/feed.go
Normal file
160
internal/handler/feed.go
Normal file
|
|
@ -0,0 +1,160 @@
|
|||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
package handler
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/gorilla/feeds"
|
||||
|
||||
"kode.naiv.no/olemd/favoritter/internal/model"
|
||||
"kode.naiv.no/olemd/favoritter/internal/store"
|
||||
)
|
||||
|
||||
const feedPageSize = 50
|
||||
|
||||
// handleFeedGlobal generates an Atom feed of all public faves.
|
||||
func (h *Handler) handleFeedGlobal(w http.ResponseWriter, r *http.Request) {
|
||||
baseURL := h.deps.Config.BaseURL(r.Host)
|
||||
|
||||
faves, _, err := h.deps.Faves.ListPublic(feedPageSize, 0)
|
||||
if err != nil {
|
||||
slog.Error("feed: list public error", "error", err)
|
||||
http.Error(w, "Internal error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.deps.Faves.LoadTags(faves); err != nil {
|
||||
slog.Error("feed: load tags error", "error", err)
|
||||
}
|
||||
|
||||
settings, _ := h.deps.Settings.Get()
|
||||
siteName := "Favoritter"
|
||||
if settings != nil {
|
||||
siteName = settings.SiteName
|
||||
}
|
||||
|
||||
feed := &feeds.Feed{
|
||||
Title: siteName + " — Siste favoritter",
|
||||
Link: &feeds.Link{Href: baseURL},
|
||||
Description: "Siste offentlige favoritter",
|
||||
Updated: time.Now(),
|
||||
}
|
||||
|
||||
feed.Items = favesToFeedItems(faves, baseURL)
|
||||
h.writeAtom(w, feed)
|
||||
}
|
||||
|
||||
// handleFeedUser generates an Atom feed for a user's public faves.
|
||||
func (h *Handler) handleFeedUser(w http.ResponseWriter, r *http.Request) {
|
||||
username := r.PathValue("username")
|
||||
baseURL := h.deps.Config.BaseURL(r.Host)
|
||||
|
||||
user, err := h.deps.Users.GetByUsername(username)
|
||||
if err != nil {
|
||||
if errors.Is(err, store.ErrUserNotFound) {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
slog.Error("feed: get user error", "error", err)
|
||||
http.Error(w, "Internal error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if user.Disabled || user.ProfileVisibility == "limited" {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
faves, _, err := h.deps.Faves.ListPublicByUser(user.ID, feedPageSize, 0)
|
||||
if err != nil {
|
||||
slog.Error("feed: list user faves error", "error", err)
|
||||
http.Error(w, "Internal error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.deps.Faves.LoadTags(faves); err != nil {
|
||||
slog.Error("feed: load tags error", "error", err)
|
||||
}
|
||||
|
||||
feed := &feeds.Feed{
|
||||
Title: user.DisplayNameOrUsername() + " sine favoritter",
|
||||
Link: &feeds.Link{Href: baseURL + "/u/" + user.Username},
|
||||
Updated: time.Now(),
|
||||
}
|
||||
|
||||
feed.Items = favesToFeedItems(faves, baseURL)
|
||||
h.writeAtom(w, feed)
|
||||
}
|
||||
|
||||
// handleFeedTag generates an Atom feed for a tag's public faves.
|
||||
func (h *Handler) handleFeedTag(w http.ResponseWriter, r *http.Request) {
|
||||
tagName := r.PathValue("name")
|
||||
baseURL := h.deps.Config.BaseURL(r.Host)
|
||||
|
||||
faves, _, err := h.deps.Faves.ListByTag(tagName, feedPageSize, 0)
|
||||
if err != nil {
|
||||
slog.Error("feed: list by tag error", "error", err)
|
||||
http.Error(w, "Internal error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.deps.Faves.LoadTags(faves); err != nil {
|
||||
slog.Error("feed: load tags error", "error", err)
|
||||
}
|
||||
|
||||
feed := &feeds.Feed{
|
||||
Title: "Favoritter med merkelapp: " + tagName,
|
||||
Link: &feeds.Link{Href: baseURL + "/tags/" + tagName},
|
||||
Updated: time.Now(),
|
||||
}
|
||||
|
||||
feed.Items = favesToFeedItems(faves, baseURL)
|
||||
h.writeAtom(w, feed)
|
||||
}
|
||||
|
||||
func favesToFeedItems(faves []*model.Fave, baseURL string) []*feeds.Item {
|
||||
items := make([]*feeds.Item, 0, len(faves))
|
||||
for _, f := range faves {
|
||||
item := &feeds.Item{
|
||||
Title: f.Description,
|
||||
Link: &feeds.Link{Href: baseURL + "/faves/" + itoa(f.ID)},
|
||||
Author: &feeds.Author{Name: f.DisplayName},
|
||||
Created: f.CreatedAt,
|
||||
Updated: f.UpdatedAt,
|
||||
}
|
||||
|
||||
if f.URL != "" {
|
||||
item.Content = `<p><a href="` + f.URL + `">` + f.URL + `</a></p>`
|
||||
}
|
||||
|
||||
if f.ImagePath != "" {
|
||||
item.Enclosure = &feeds.Enclosure{
|
||||
Url: baseURL + "/uploads/" + f.ImagePath,
|
||||
Type: "image/jpeg",
|
||||
}
|
||||
}
|
||||
|
||||
items = append(items, item)
|
||||
}
|
||||
return items
|
||||
}
|
||||
|
||||
func (h *Handler) writeAtom(w http.ResponseWriter, feed *feeds.Feed) {
|
||||
atom, err := feed.ToAtom()
|
||||
if err != nil {
|
||||
slog.Error("feed: generate atom error", "error", err)
|
||||
http.Error(w, "Internal error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/atom+xml; charset=utf-8")
|
||||
w.Write([]byte(atom))
|
||||
}
|
||||
|
||||
func itoa(n int64) string {
|
||||
return strconv.FormatInt(n, 10)
|
||||
}
|
||||
|
|
@ -112,6 +112,18 @@ func (h *Handler) Routes() *http.ServeMux {
|
|||
mux.Handle("POST /settings/avatar", requireLogin(http.HandlerFunc(h.handleAvatarPost)))
|
||||
mux.Handle("POST /settings/password", requireLogin(http.HandlerFunc(h.handleSettingsPasswordPost)))
|
||||
|
||||
// Feeds (public, no auth required).
|
||||
mux.HandleFunc("GET /feed.xml", h.handleFeedGlobal)
|
||||
mux.HandleFunc("GET /u/{username}/feed.xml", h.handleFeedUser)
|
||||
mux.HandleFunc("GET /tags/{name}/feed.xml", h.handleFeedTag)
|
||||
|
||||
// Import/Export (authenticated).
|
||||
mux.Handle("GET /export", requireLogin(http.HandlerFunc(h.handleExportPage)))
|
||||
mux.Handle("GET /export/json", requireLogin(http.HandlerFunc(h.handleExportJSON)))
|
||||
mux.Handle("GET /export/csv", requireLogin(http.HandlerFunc(h.handleExportCSV)))
|
||||
mux.Handle("GET /import", requireLogin(http.HandlerFunc(h.handleImportPage)))
|
||||
mux.Handle("POST /import", requireLogin(http.HandlerFunc(h.handleImportPost)))
|
||||
|
||||
// Admin panel (requires admin role).
|
||||
admin := func(hf http.HandlerFunc) http.Handler {
|
||||
return requireLogin(middleware.RequireAdmin(http.HandlerFunc(hf)))
|
||||
|
|
|
|||
229
internal/handler/import_export.go
Normal file
229
internal/handler/import_export.go
Normal file
|
|
@ -0,0 +1,229 @@
|
|||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
package handler
|
||||
|
||||
import (
|
||||
"encoding/csv"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"kode.naiv.no/olemd/favoritter/internal/middleware"
|
||||
"kode.naiv.no/olemd/favoritter/internal/render"
|
||||
)
|
||||
|
||||
// ExportFave is the JSON representation for export/import.
|
||||
type ExportFave struct {
|
||||
Description string `json:"description"`
|
||||
URL string `json:"url,omitempty"`
|
||||
Privacy string `json:"privacy"`
|
||||
Tags []string `json:"tags,omitempty"`
|
||||
CreatedAt string `json:"created_at"`
|
||||
}
|
||||
|
||||
// handleExportPage shows the export options page.
|
||||
func (h *Handler) handleExportPage(w http.ResponseWriter, r *http.Request) {
|
||||
h.deps.Renderer.Page(w, r, "export", render.PageData{
|
||||
Title: "Eksporter favoritter",
|
||||
})
|
||||
}
|
||||
|
||||
// handleExportJSON exports the user's faves as JSON.
|
||||
func (h *Handler) handleExportJSON(w http.ResponseWriter, r *http.Request) {
|
||||
user := middleware.UserFromContext(r.Context())
|
||||
|
||||
faves, _, err := h.deps.Faves.ListByUser(user.ID, 10000, 0)
|
||||
if err != nil {
|
||||
slog.Error("export: list faves error", "error", err)
|
||||
http.Error(w, "Internal error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.deps.Faves.LoadTags(faves); err != nil {
|
||||
slog.Error("export: load tags error", "error", err)
|
||||
}
|
||||
|
||||
export := make([]ExportFave, len(faves))
|
||||
for i, f := range faves {
|
||||
tags := make([]string, len(f.Tags))
|
||||
for j, t := range f.Tags {
|
||||
tags[j] = t.Name
|
||||
}
|
||||
export[i] = ExportFave{
|
||||
Description: f.Description,
|
||||
URL: f.URL,
|
||||
Privacy: f.Privacy,
|
||||
Tags: tags,
|
||||
CreatedAt: f.CreatedAt.Format("2006-01-02T15:04:05Z"),
|
||||
}
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
w.Header().Set("Content-Disposition", "attachment; filename=favoritter.json")
|
||||
enc := json.NewEncoder(w)
|
||||
enc.SetIndent("", " ")
|
||||
enc.Encode(export)
|
||||
}
|
||||
|
||||
// handleExportCSV exports the user's faves as CSV.
|
||||
func (h *Handler) handleExportCSV(w http.ResponseWriter, r *http.Request) {
|
||||
user := middleware.UserFromContext(r.Context())
|
||||
|
||||
faves, _, err := h.deps.Faves.ListByUser(user.ID, 10000, 0)
|
||||
if err != nil {
|
||||
slog.Error("export: list faves error", "error", err)
|
||||
http.Error(w, "Internal error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.deps.Faves.LoadTags(faves); err != nil {
|
||||
slog.Error("export: load tags error", "error", err)
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Type", "text/csv; charset=utf-8")
|
||||
w.Header().Set("Content-Disposition", "attachment; filename=favoritter.csv")
|
||||
|
||||
cw := csv.NewWriter(w)
|
||||
cw.Write([]string{"description", "url", "privacy", "tags", "created_at"})
|
||||
|
||||
for _, f := range faves {
|
||||
tags := make([]string, len(f.Tags))
|
||||
for j, t := range f.Tags {
|
||||
tags[j] = t.Name
|
||||
}
|
||||
cw.Write([]string{
|
||||
f.Description,
|
||||
f.URL,
|
||||
f.Privacy,
|
||||
strings.Join(tags, ","),
|
||||
f.CreatedAt.Format("2006-01-02T15:04:05Z"),
|
||||
})
|
||||
}
|
||||
cw.Flush()
|
||||
}
|
||||
|
||||
// handleImportPage shows the import page.
|
||||
func (h *Handler) handleImportPage(w http.ResponseWriter, r *http.Request) {
|
||||
h.deps.Renderer.Page(w, r, "import", render.PageData{
|
||||
Title: "Importer favoritter",
|
||||
})
|
||||
}
|
||||
|
||||
// handleImportPost processes an uploaded JSON or CSV file.
|
||||
func (h *Handler) handleImportPost(w http.ResponseWriter, r *http.Request) {
|
||||
user := middleware.UserFromContext(r.Context())
|
||||
|
||||
if err := r.ParseMultipartForm(h.deps.Config.MaxUploadSize); err != nil {
|
||||
h.flash(w, r, "import", "Filen er for stor.", "error", nil)
|
||||
return
|
||||
}
|
||||
|
||||
file, header, err := r.FormFile("file")
|
||||
if err != nil {
|
||||
h.flash(w, r, "import", "Velg en fil å importere.", "error", nil)
|
||||
return
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
var faves []ExportFave
|
||||
filename := strings.ToLower(header.Filename)
|
||||
|
||||
switch {
|
||||
case strings.HasSuffix(filename, ".json"):
|
||||
faves, err = parseImportJSON(file)
|
||||
case strings.HasSuffix(filename, ".csv"):
|
||||
faves, err = parseImportCSV(file)
|
||||
default:
|
||||
h.flash(w, r, "import", "Ugyldig filformat. Bruk JSON eller CSV.", "error", nil)
|
||||
return
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
slog.Error("import parse error", "error", err)
|
||||
h.flash(w, r, "import", "Kunne ikke lese filen. Sjekk formatet.", "error", nil)
|
||||
return
|
||||
}
|
||||
|
||||
imported := 0
|
||||
for _, ef := range faves {
|
||||
if ef.Description == "" {
|
||||
continue
|
||||
}
|
||||
privacy := ef.Privacy
|
||||
if privacy != "public" && privacy != "private" {
|
||||
privacy = user.DefaultFavePrivacy
|
||||
}
|
||||
|
||||
fave, err := h.deps.Faves.Create(user.ID, ef.Description, ef.URL, "", privacy)
|
||||
if err != nil {
|
||||
slog.Error("import: create fave error", "error", err)
|
||||
continue
|
||||
}
|
||||
|
||||
if len(ef.Tags) > 0 {
|
||||
if err := h.deps.Tags.SetFaveTags(fave.ID, ef.Tags); err != nil {
|
||||
slog.Error("import: set tags error", "error", err)
|
||||
}
|
||||
}
|
||||
imported++
|
||||
}
|
||||
|
||||
h.flash(w, r, "import",
|
||||
fmt.Sprintf("Importert %d av %d favoritter.", imported, len(faves)),
|
||||
"success", nil)
|
||||
}
|
||||
|
||||
func parseImportJSON(r io.Reader) ([]ExportFave, error) {
|
||||
var faves []ExportFave
|
||||
if err := json.NewDecoder(r).Decode(&faves); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return faves, nil
|
||||
}
|
||||
|
||||
func parseImportCSV(r io.Reader) ([]ExportFave, error) {
|
||||
cr := csv.NewReader(r)
|
||||
records, err := cr.ReadAll()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if len(records) < 2 {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
// Find column indices from header row.
|
||||
header := records[0]
|
||||
colMap := make(map[string]int)
|
||||
for i, col := range header {
|
||||
colMap[strings.ToLower(strings.TrimSpace(col))] = i
|
||||
}
|
||||
|
||||
var faves []ExportFave
|
||||
for _, row := range records[1:] {
|
||||
f := ExportFave{}
|
||||
if idx, ok := colMap["description"]; ok && idx < len(row) {
|
||||
f.Description = row[idx]
|
||||
}
|
||||
if idx, ok := colMap["url"]; ok && idx < len(row) {
|
||||
f.URL = row[idx]
|
||||
}
|
||||
if idx, ok := colMap["privacy"]; ok && idx < len(row) {
|
||||
f.Privacy = row[idx]
|
||||
}
|
||||
if idx, ok := colMap["tags"]; ok && idx < len(row) && row[idx] != "" {
|
||||
f.Tags = strings.Split(row[idx], ",")
|
||||
for i := range f.Tags {
|
||||
f.Tags[i] = strings.TrimSpace(f.Tags[i])
|
||||
}
|
||||
}
|
||||
if idx, ok := colMap["created_at"]; ok && idx < len(row) {
|
||||
f.CreatedAt = row[idx]
|
||||
}
|
||||
faves = append(faves, f)
|
||||
}
|
||||
return faves, nil
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue