feat(feeds): add templated capture paths and inline modal
Build and publish container images / images (push) Successful in 11m2s

This commit is contained in:
Anya Tokugawa committed 2026-11-08 13:44:20 +09:00
1 parent 78da33d549
commit a5f90f933d
12 files changed
+138 -11

No files matched your search

+16
View File
@@ -5,6 +5,7 @@ import (
"net/url"
"strconv"
"strings"
"time"
"github.com/google/uuid"
"pageswiki/internal/store"
@@ -59,6 +60,21 @@ func (s *Server) handleFeeds(w http.ResponseWriter, r *http.Request) {
return
}
switch {
case key == "capture-preview" && r.Method == "POST":
var input struct {
Prefix string `json:"prefix"`
Title string `json:"title"`
}
if !taskJSON(w, r, &input) {
return
}
prefix, e := store.ExpandWikiPrefix(input.Prefix, input.Title, time.Now().In(s.getLocation(domain)))
if e != nil {
taskError(w, e)
return
}
writeEventJSON(w, 200, map[string]string{"prefix": prefix})
return
case key == "catalog" && r.Method == "GET":
catalog, e := s.store.FeedCatalogSnapshot(r.Context(), domain, actor, r.URL.Query().Get("source"))
if e != nil {
@@ -0,0 +1,29 @@
package server
import (
"encoding/json"
"strings"
"testing"
)
func TestFeedCapturePreview(t *testing.T) {
s, token, _, _, _ := feedFixture(t)
for _, tt := range []struct {
prefix string
status int
}{{"/notes/{YYYY}/{MM}/{DD}/{Subject}", 200}, {"/notes/{unknown}", 422}, {"/a/../b", 422}} {
w := feedRequestTest(s, token, "POST", "capture-preview", map[string]string{"prefix": tt.prefix, "title": "日本語 / test"})
if w.Code != tt.status {
t.Fatal(w.Code, w.Body)
}
if w.Code == 200 {
var data map[string]string
if e := json.Unmarshal(w.Body.Bytes(), &data); e != nil || strings.ContainsAny(data["prefix"], "{}") || !strings.HasSuffix(data["prefix"], "/日本語---test") {
t.Fatal(data, e)
}
}
}
if w := feedRequestTest(s, "", "POST", "capture-preview", map[string]string{"prefix": "/notes"}); w.Code != 401 {
t.Fatal(w.Code)
}
}
+1 -1
View File
@@ -535,7 +535,7 @@ func TestFeedsChromium(t *testing.T) {
if err != nil {
t.Fatal(err)
}
prefs.WikiPrefix = "/notes/rss-default"
prefs.WikiPrefix = "/notes/{YYYY}/{MM}/{DD}/{Subject}"
if _, err = s.store.SaveTaskPreferences(context.Background(), domain, actor, prefs, time.Now()); err != nil {
t.Fatal(err)
}
+2 -1
View File
@@ -256,7 +256,8 @@ func (s *Server) handleTaskProductivity(w http.ResponseWriter, r *http.Request,
writeEventJSON(w, 422, map[string]string{"error": "wiki_prefix_required"})
return
}
if !store.ValidTaskWikiPrefix(prefix) {
prefix, err = store.ExpandWikiPrefix(prefix, item.Title, time.Now().In(s.getLocation(domain)))
if err != nil {
taskError(w, store.ErrTaskInvalid)
return
}
+1 -1
View File
@@ -20,7 +20,7 @@
d.dispatchEvent(new w.KeyboardEvent('keydown',{key:'/',bubbles:true}));await wait(()=>d.activeElement.type==='search');d.activeElement.value='119';d.activeElement.dispatchEvent(new w.Event('input',{bubbles:true}));await wait(()=>d.querySelectorAll('.feed-row').length===1);
d.querySelector('.feed-row').click();await wait(()=>d.querySelector('#feed-reader .feed-body'));
d.querySelector('#feed-reader .feed-actions button:last-child').click();await wait(()=>d.querySelector('#feed-reader form'));
const form=d.querySelector('#feed-reader form'),inputs=form.querySelectorAll('input');assert(inputs[2].value==='/notes/rss-default','Wiki default not filled');assert(form.querySelector('a[href="/-/sys/config?panel=organizer"]'),'Default settings link missing');inputs[2].value='/notes/feed-ui';inputs[2].dispatchEvent(new w.Event('input'));inputs[5].checked=true;form.requestSubmit();await wait(()=>d.querySelector('#feed-reader a[href^="/v/uuid:"]'));
const form=d.querySelector('#feed-reader form'),inputs=form.querySelectorAll('input');assert(inputs[2].value==='/notes/{YYYY}/{MM}/{DD}/{Subject}','Wiki default not filled');assert(form.closest('dialog').open&&d.querySelector('#feed-reader .feed-body'),'Capture replaced article');assert(form.querySelector('a[href="/-/sys/config?panel=organizer"]'),'Default settings link missing');await wait(()=>form.querySelector('output').textContent.includes('/rss-'));assert(!form.querySelector('output').textContent.includes('{'),'Template not expanded');inputs[2].value='/notes/feed-ui';inputs[2].dispatchEvent(new w.Event('input'));await wait(()=>form.querySelector('output').textContent.startsWith('/notes/feed-ui/rss-'));inputs[5].checked=true;form.requestSubmit();await wait(()=>d.querySelector('#feed-reader a[href^="/v/uuid:"]'));d.querySelector('.feed-capture button').click();await wait(()=>!d.querySelector('.feed-capture'));assert(d.querySelector('#feed-reader .feed-body'),'Closing capture lost article');
const search=d.querySelector('#feed-toolbar input');search.value='';search.dispatchEvent(new w.Event('input',{bubbles:true}));await wait(()=>d.querySelectorAll('.feed-row').length===100);d.querySelector('.feed-row').click();await wait(()=>d.querySelector('#feed-reader .feed-body'));
assert(d.documentElement.scrollWidth<=w.innerWidth,'Reader overflow');
d.getElementById('feed-opml').click();await wait(()=>d.getElementById('feed-opml-file'));
+28
View File
@@ -35,6 +35,34 @@ func ValidTaskWikiPrefix(p string) bool {
return true
}
// Expand only the documented placeholders. Subject is one safe path component,
// never a source of separators or URI operators. Callers choose the timezone.
func ExpandWikiPrefix(template, subject string, now time.Time) (string, error) {
if len(template) > 500 || !utf8.ValidString(template) || !utf8.ValidString(subject) {
return "", ErrTaskInvalid
}
name := strings.Map(func(r rune) rune {
if unicode.IsControl(r) || unicode.IsSpace(r) || strings.ContainsRune(`/\?#%:{}<>"|`, r) {
return '-'
}
return r
}, subject)
name = strings.Trim(name, " .-_")
for len(name) > 180 {
_, n := utf8.DecodeLastRuneInString(name)
name = name[:len(name)-n]
}
name = strings.Trim(name, " .-_")
if name == "" {
name = "untitled"
}
result := strings.NewReplacer("{YYYY}", now.Format("2006"), "{MM}", now.Format("01"), "{DD}", now.Format("02"), "{Subject}", name).Replace(template)
if strings.ContainsAny(result, "{}") || !ValidTaskWikiPrefix(result) {
return "", ErrTaskInvalid
}
return result, nil
}
// The CLI derives the request UUID from origin, user and Message-ID (or a raw
// mail hash). Keep subjects in the title, never in the URL's identity segment.
func TaskCaptureWikiPath(prefix, title, request string) string {
+1 -1
View File
@@ -120,7 +120,7 @@ func (s *Store) SaveTaskPreferences(ctx context.Context, domain, actor string, p
if s.ReadOnly {
return p, ErrReadOnly
}
if !ValidTaskWikiPrefix(p.WikiPrefix) {
if _, err := ExpandWikiPrefix(p.WikiPrefix, "subject", now); err != nil {
return p, ErrTaskInvalid
}
// Older clients do not send this field. Preserve their default clock.
+32
View File
@@ -0,0 +1,32 @@
package store
import (
"strings"
"testing"
"time"
)
func TestExpandWikiPrefix(t *testing.T) {
now := time.Date(2026, 12, 31, 18, 0, 0, 0, time.UTC).In(time.FixedZone("JST", 9*3600))
for _, tt := range []struct{ template, subject, want string }{
{"/notes/{YYYY}/{MM}/{DD}/{Subject}", "日本語 / ../ x?y#z", "/notes/2027/01/01/日本語---..--x-y-z"},
{"/notes/{Subject}", "../", "/notes/untitled"},
{"/notes/{Subject}", "{YYYY}", "/notes/YYYY"},
{"/notes", "unused", "/notes"},
{"", "", ""},
} {
got, err := ExpandWikiPrefix(tt.template, tt.subject, now)
if err != nil || got != tt.want {
t.Fatalf("%q: %q, %v; want %q", tt.template, got, err, tt.want)
}
}
for _, bad := range []string{"/notes/{YY}", "/notes/{{Subject}}", "/notes/{Subject", "/a/../b/{YYYY}", "/_/api/{Subject}", "relative/{YYYY}"} {
if _, err := ExpandWikiPrefix(bad, "subject", now); err == nil {
t.Fatal("accepted", bad)
}
}
got, err := ExpandWikiPrefix("/notes/{Subject}", strings.Repeat("日本語", 200), now)
if err != nil || len(got) > len("/notes/")+180 || !ValidTaskWikiPrefix(got) {
t.Fatal(got, err)
}
}