From a5f90f933d822409558369e51604fe792c590f17 Mon Sep 17 00:00:00 2001 From: Anya Tokugawa Date: Sun, 8 Nov 2026 13:44:20 +0900 Subject: [PATCH] feat(feeds): add templated capture paths and inline modal --- docs/design/ja/feeds.md | 11 +++++++ internal/server/feeds.go | 16 ++++++++++ internal/server/feeds_capture_preview_test.go | 29 +++++++++++++++++ internal/server/feeds_test.go | 2 +- internal/server/task_productivity.go | 3 +- internal/server/testdata/feeds.js | 2 +- internal/store/task_capture_wiki.go | 28 ++++++++++++++++ internal/store/task_productivity.go | 2 +- internal/store/wiki_prefix_test.go | 32 +++++++++++++++++++ static/css/feeds.css | 1 + static/js/feeds.js | 21 ++++++++---- static/js/task-productivity.js | 2 +- 12 files changed, 138 insertions(+), 11 deletions(-) create mode 100644 internal/server/feeds_capture_preview_test.go create mode 100644 internal/store/wiki_prefix_test.go diff --git a/docs/design/ja/feeds.md b/docs/design/ja/feeds.md index 53c10f7..80341d0 100644 --- a/docs/design/ja/feeds.md +++ b/docs/design/ja/feeds.md @@ -81,6 +81,7 @@ API prefixは `/_/api/v1/extension/organizer.feeds/`。Domain内の本人専用 | `GET action/export?request_id=…` | 本人の操作記録1件をJSON attachmentで保存。資格情報・本文・worker claimは含めない | | `POST action/check` | request_idで結果不明操作の読取専用再確認を予約 | | `POST note` | 公開範囲確認付きのWiki単独保存。request_idと入力hashで再送を識別 | +| `POST capture-preview` | Wiki親Pathのプレースホルダを展開。保存・外部通信なし | | `GET opml/export` | 本人の内蔵購読をOPML 2.0としてダウンロード | | `POST opml/preview` | ファイルを解析し、追加可能・登録済み・重複・未対応等を返す。保存・外部通信なし | | `POST opml/import` | 選択行を再解析・検査し、確認時の購読設定と一致する場合だけ原子的に追加 | @@ -284,6 +285,16 @@ RSS画面を読み込んだ時点の値を初期表示し、取り込みごと 未設定またはタスク拡張が無効な場合は空欄です。プロジェクトのWiki配下への暗黙の補完はRSSでは行いません。 保存時の公開範囲確認とACL検査は省略しません。既存preferencesを利用するため追加のschema変更はありません。 +親Pathでは`{YYYY}`・`{MM}`・`{DD}`・`{Subject}`を使用できます。日付は取り込み時のドメインの +タイムゾーン、Subjectは編集可能な取り込み件名です。件名中の区切り文字・URI演算子・制御文字・ +空白はハイフンに変換し、180バイト以内の単一Path要素へ整形します。空になる場合は`untitled`です。 +未対応トークンや不正なPathは拒否します。メールcaptureでも同じ展開規則を適用します。 + +RSS取り込みは本文上のdialogで行い、本文を置き換えません。トークン挿入ボタンと実際の保存先を +表示し、件名・親Path・保存種別を変更した場合はプレビューを更新して公開範囲の確認をやり直します。 +展開済みPathを確認後の要求へ固定し、UUIDの末尾(Wiki単独は`rss-`、タスク併設は`mail-`)で +同名記事の衝突を避けます。表示された親Path自体を記事ファイルとして上書きする仕様ではありません。 + Wiki単独は親Path配下の `rss-{request UUID}` に新規作成します。既存Pathを上書きせず、Page・Path・ 初回Revision・活動outbox・再送receiptを同じDB transactionで保存します。権限はtransaction内でも 再確認します。初期版の単独保存は通常Wiki空間のみで、独自所有契約を持つ`/u`・`/g`は対象外です。 diff --git a/internal/server/feeds.go b/internal/server/feeds.go index 8c238a4..6a7ddb5 100644 --- a/internal/server/feeds.go +++ b/internal/server/feeds.go @@ -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 { diff --git a/internal/server/feeds_capture_preview_test.go b/internal/server/feeds_capture_preview_test.go new file mode 100644 index 0000000..6e7e3f7 --- /dev/null +++ b/internal/server/feeds_capture_preview_test.go @@ -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) + } +} diff --git a/internal/server/feeds_test.go b/internal/server/feeds_test.go index 16679e1..060d6c2 100644 --- a/internal/server/feeds_test.go +++ b/internal/server/feeds_test.go @@ -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) } diff --git a/internal/server/task_productivity.go b/internal/server/task_productivity.go index 215fb2b..967dcf5 100644 --- a/internal/server/task_productivity.go +++ b/internal/server/task_productivity.go @@ -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 } diff --git a/internal/server/testdata/feeds.js b/internal/server/testdata/feeds.js index a40d2b3..dfbb5d1 100644 --- a/internal/server/testdata/feeds.js +++ b/internal/server/testdata/feeds.js @@ -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')); diff --git a/internal/store/task_capture_wiki.go b/internal/store/task_capture_wiki.go index 9617821..f690565 100644 --- a/internal/store/task_capture_wiki.go +++ b/internal/store/task_capture_wiki.go @@ -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 { diff --git a/internal/store/task_productivity.go b/internal/store/task_productivity.go index cbdba14..b39b2db 100644 --- a/internal/store/task_productivity.go +++ b/internal/store/task_productivity.go @@ -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. diff --git a/internal/store/wiki_prefix_test.go b/internal/store/wiki_prefix_test.go new file mode 100644 index 0000000..0d33b44 --- /dev/null +++ b/internal/store/wiki_prefix_test.go @@ -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) + } +} diff --git a/static/css/feeds.css b/static/css/feeds.css index a37de58..988129f 100644 --- a/static/css/feeds.css +++ b/static/css/feeds.css @@ -1,5 +1,6 @@ .feeds-page{height:100dvh;overflow:hidden;display:flex;flex-direction:column;background:var(--bg);color:var(--fg)} .feed-help{display:flex;align-items:center;gap:.5rem;padding:.25rem 0;font-size:.78rem;flex-shrink:0}.feed-help[hidden]{display:none}.feed-help span{flex:1;min-width:0;overflow-wrap:anywhere}.feed-help button{flex-shrink:0} +.feed-capture{width:min(42rem,calc(100vw - 2rem));max-height:calc(100dvh - 2rem);box-sizing:border-box;overflow:auto;background:var(--panel,var(--bg));color:var(--fg);border:1px solid var(--border,#8885);border-radius:.6rem;padding:1rem;box-shadow:0 1rem 4rem #0007}.feed-capture::backdrop{background:#0008}.feed-capture-heading{display:flex;align-items:center;justify-content:space-between;gap:.5rem}.feed-capture h2{font-size:1.05rem;margin:0}.feed-capture-heading,.feed-capture-field,.feed-capture-tokens,.feed-capture-destination,.feed-capture-actions,.feed-capture .feed-warning{grid-column:1/-1}#feeds-app .feed-capture form{grid-template-columns:1fr 1fr;gap:.65rem}#feeds-app .feed-capture .feed-capture-check{display:flex;align-items:center;gap:.4rem}#feeds-app .feed-capture input[type=checkbox]{width:1rem;min-height:1rem;flex-shrink:0}.feed-capture-check:has([name=confirm]){grid-column:1/-1}.feed-capture-tokens,.feed-capture-actions{display:flex;gap:.35rem;flex-wrap:wrap}.feed-capture-actions{justify-content:flex-end}.feed-capture-destination{font-size:.75rem;overflow-wrap:anywhere;opacity:.8}.feed-capture .feed-warning:empty{display:none}.feed-capture-field:has([name=prefix]){position:relative}.feed-capture-field:has([name=prefix]) a{position:absolute;right:.1rem;top:0;text-decoration:none}@media(max-width:600px){#feeds-app .feed-capture form{grid-template-columns:1fr}.feed-capture{padding:.75rem}} .feed-folder-row{display:flex;align-items:center;min-width:0}#feeds-app .feed-folder-toggle{flex:0 0 1.7rem;border:0;padding:.15rem;min-width:1.7rem}#feeds-app .feed-folder-name{display:flex;align-items:center;gap:.3rem;flex:1;min-width:0;text-align:left;border:0;font-size:.78rem;padding:.2rem}.feed-folder-name span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.feed-folder-name svg{width:1rem;height:1rem;flex-shrink:0;fill:none;stroke:currentColor;stroke-width:1.6;stroke-linejoin:round}.feed-folder>.feed-subscriptions{padding-left:1.1rem;border-left:1px solid var(--border,#8885);margin-left:.8rem}.feed-catalog .feed-subscriptions[hidden]{display:none}.feed-folder small{font-size:.7rem;opacity:.7;padding:.3rem}.feed-catalog button[aria-current=true]{background:color-mix(in srgb,var(--accent,#659de4) 22%,transparent)!important}.feed-tree-all{width:100%;text-align:left}.feed-folders{min-width:0} .feed-layout.action-history{grid-template-columns:12rem minmax(0,1fr)}.feed-layout.action-history .feed-index{display:none}.feed-layout.action-history #feed-reader{display:block}.feed-history-controls{display:flex;gap:.3rem;flex-wrap:wrap;margin:.4rem 0}.feed-history-controls select{max-width:100%}.feed-history table{width:100%;table-layout:fixed;border-collapse:collapse;font-size:.8rem}.feed-history th,.feed-history td{padding:.3rem .4rem;text-align:left;border-bottom:1px solid var(--border,#8885);vertical-align:middle;overflow-wrap:anywhere}.feed-history th:first-child{width:7.5rem}.feed-history th:nth-child(3){width:6rem}.feed-history th:last-child{width:7rem}.feed-history td:nth-child(2)>span,.feed-history small{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.feed-history small{font-size:.72rem;opacity:.7}.feed-history-buttons{display:flex;gap:.2rem;justify-content:flex-end}.feed-history-buttons a{display:inline-flex;align-items:center;justify-content:center;min-width:1.8rem;min-height:1.8rem;border:1px solid var(--border,#6666);border-radius:.2rem;text-decoration:none}.feed-history [data-state=unknown],.feed-history [data-state=conflict],.feed-history [data-state=failed]{color:var(--danger,#e57a7a)}.feed-history .feed-warning:empty{display:none} @media(max-width:1100px){.feed-layout.action-history{grid-template-columns:10rem minmax(0,1fr)}} diff --git a/static/js/feeds.js b/static/js/feeds.js index 2677099..180f3f4 100644 --- a/static/js/feeds.js +++ b/static/js/feeds.js @@ -175,20 +175,29 @@ form.onsubmit=async event=>{event.preventDefault();save.disabled=true;try{await post('sources',{uuid:sourceID,version:source?.version||0,provider:provider.value,title:title.value,folder:folder.value,url:url.value,interval_seconds:Number(interval.value)*60,enabled:enabled.checked,write_enabled:provider.value==='freshrss'&&write.checked,username:user.value,password:password.value});password.value='';await reload();status.textContent=t('Saved','保存しました');}catch(e){report(e);}finally{save.disabled=false;}};title.focus(); } function captureForm(item){ - editing=true;detailSeq++;reader.replaceChildren();const form=el('form');reader.append(form);form.append(el('h1',t('Attributed Wiki note / task','出典付きWikiメモ・タスク'))); + editing=true;detailSeq++;clearTimeout(actionTimer);const dialog=el('dialog',undefined,'feed-capture'),form=el('form');dialog.ariaLabel=t('Capture Wiki / task','Wiki・タスク追加');reader.append(dialog);dialog.append(form); + const close=()=>{if(!busy)dialog.close();},heading=el('div',undefined,'feed-capture-heading');heading.append(el('h2',t('Capture Wiki / task','Wiki・タスク追加')),button('×',t('Close','閉じる'),close));form.append(heading); + dialog.addEventListener('close',()=>{clearTimeout(previewTimer);generation++;dialog.remove();editing=false;pollAction(item);});dialog.addEventListener('cancel',e=>{if(busy)e.preventDefault();});dialog.addEventListener('keydown',e=>e.stopPropagation()); const title=field(form,t('Title','件名'),item.title.slice(0,250));title.required=true;title.maxLength=300; const task=field(form,t('Also create a task','タスクを作成する'),'','checkbox');task.disabled=root.dataset.tasks!=='true'; const prefix=field(form,t('Wiki parent Path (empty = task only)','Wikiの親Path(空ならタスクのみ)'),root.dataset.wikiPrefix||'');prefix.placeholder='/notes/feeds';prefix.required=true;prefix.maxLength=500; if(root.dataset.tasks==='true'){const settings=el('a','⚙');settings.href='/-/sys/config?panel=organizer';settings.target='_blank';settings.rel='noopener';settings.title=settings.ariaLabel=t('Configure default Wiki parent path in personal settings','個人設定で既定のWiki親Pathを設定');prefix.parentElement.append(settings);} + const tokens=el('div',undefined,'feed-capture-tokens');for(const token of ['{YYYY}','{MM}','{DD}','{Subject}'])tokens.append(button(token,t('Insert ','挿入: ')+token,()=>{prefix.setRangeText(token,prefix.selectionStart??prefix.value.length,prefix.selectionEnd??prefix.value.length,'end');prefix.dispatchEvent(new Event('input',{bubbles:true}));prefix.focus();}));form.append(tokens); + const destination=el('output',undefined,'feed-capture-destination');destination.ariaLabel=t('Destination','保存先');form.append(destination); const notes=field(form,t('Your note','メモ'));const copy=field(form,t('Include cached text (explicit copy)','取得済み本文も保存する(明示コピー)'),'','checkbox'); const confirm=field(form,t('I checked the destination publication policy and the material to copy.','保存先の公開範囲と、コピーする内容を確認しました。'),'','checkbox');confirm.required=true; - const validate=()=>{prefix.required=!task.checked;confirm.required=!!prefix.value.trim()||!task.checked;};task.onchange=prefix.oninput=validate; - const save=el('button',t('Create','作成'));save.type='submit';form.append(save,button(t('Cancel','取消'),'',()=>{editing=false;renderItem(item);}));let pending=null; - form.onsubmit=async event=>{event.preventDefault();const body='Source: '+item.url+'\nFeed: '+item.feed+'\n\n'+notes.value+(copy.checked?'\n\n'+item.body:'');const spec={title:title.value,notes:notes.value,prefix:prefix.value.trim(),body,task:task.checked};const fingerprint=JSON.stringify(spec);if(!pending||pending.fingerprint!==fingerprint)pending={fingerprint,request_id:crypto.randomUUID()};save.disabled=true; + for(const [name,input]of Object.entries({title,task,prefix,notes,copy,confirm})){input.name=name;if(input.type==='checkbox')input.parentElement.classList.add('feed-capture-check');else input.parentElement.classList.add('feed-capture-field');} + const notice=el('p',undefined,'feed-warning');notice.role='status';const actions=el('div',undefined,'feed-capture-actions'),save=el('button',t('Create','作成'));save.type='submit';actions.append(button(t('Cancel','取消'),'',close),save);form.append(notice,actions); + let pending=null,generation=0,previewTimer,resolved=null,busy=false;const requestID=crypto.randomUUID(); + const preview=()=>{clearTimeout(previewTimer);const n=++generation;resolved=null;confirm.checked=false;prefix.required=!task.checked;confirm.required=!!prefix.value.trim()||!task.checked;save.disabled=true;notice.textContent='';destination.textContent=''; + if(!prefix.value.trim()){resolved='';destination.textContent=task.checked?t('Task only','タスクのみ'):'';save.disabled=!task.checked;return;} + previewTimer=setTimeout(async()=>{try{const data=await post('capture-preview',{prefix:prefix.value.trim(),title:title.value});if(n!==generation||!dialog.isConnected)return;resolved=data.prefix;destination.textContent=resolved.replace(/\/$/,'')+'/'+(task.checked?'mail-':'rss-')+requestID;save.disabled=false;}catch(e){if(n===generation&&dialog.isConnected){notice.textContent=t('Check the parent Path and placeholders.','親Pathとプレースホルダを確認してください。');}}},180); + };task.onchange=prefix.oninput=title.oninput=preview;copy.onchange=()=>{confirm.checked=false;};dialog.showModal();preview();title.focus(); + form.onsubmit=async event=>{event.preventDefault();if(busy||resolved===null||!form.reportValidity())return;const body='Source: '+item.url+'\nFeed: '+item.feed+'\n\n'+notes.value+(copy.checked?'\n\n'+item.body:'');const spec={title:title.value,notes:notes.value,prefix:resolved,body,task:task.checked};const fingerprint=JSON.stringify(spec);if(!pending||pending.fingerprint!==fingerprint)pending={fingerprint,request_id:requestID};busy=true;save.disabled=true; try{let data;if(task.checked){const input={request_id:pending.request_id,title:title.value,notes:(notes.value+'\nSource: '+item.url).trim()};if(spec.prefix){input.wiki_prefix=spec.prefix;input.wiki_body=body;}const res=await fetch('/_/api/v1/extension/organizer.tasks/capture',{method:'POST',credentials:'same-origin',headers:{'Content-Type':'application/json'},body:JSON.stringify(input)});data=await res.json().catch(()=>({}));if(!res.ok||res.redirected)throw Error(t('Capture failed: ','作成に失敗: ')+(data.error||res.status));} else data=await post('note',{request_id:pending.request_id,source:item.source,id:item.id,path:spec.prefix.replace(/\/$/,'')+'/rss-'+pending.request_id,title:title.value,body,confirm_publication:confirm.checked}); - reader.replaceChildren(el('p',t('Created.','作成しました。')));if(data.item){const a=el('a',t('Open task','タスクを開く'));a.href='/v/plan/task/'+encodeURIComponent(data.item.uuid);reader.append(a);}const page=data.page_uuid||data.item?.page_uuid;if(page){const a=el('a',t('Open Wiki','Wikiを開く'));a.href='/v/uuid:'+encodeURIComponent(page);reader.append(el('p'),a);}editing=false; - }catch(e){report(e);}finally{save.disabled=false;} + dialog.replaceChildren(el('h2',t('Created','作成しました')));if(data.item){const a=el('a',t('Open task','タスクを開く'));a.href='/v/plan/task/'+encodeURIComponent(data.item.uuid);dialog.append(a);}const page=data.page_uuid||data.item?.page_uuid;if(page){const a=el('a',t('Open Wiki','Wikiを開く'));a.href='/v/uuid:'+encodeURIComponent(page);dialog.append(el('p'),a);}const done=button(t('Close','閉じる'),'',close);dialog.append(el('p'),done);done.focus(); + }catch(e){notice.textContent=e.message;}finally{busy=false;save.disabled=resolved===null;} }; } document.addEventListener('keydown',event=>{if(event.defaultPrevented||event.isComposing||event.ctrlKey||event.altKey||event.metaKey)return;if(event.key==='Escape'&&!help.hidden){hideHelp();event.preventDefault();return;}const input=event.target.closest?.('input,textarea,select,[contenteditable=true]');if(input){if(event.key==='Escape'){event.target.blur();event.preventDefault();}return;}if(event.key==='?'&&!help.hidden){hideHelp();event.preventDefault();return;}if(event.key==='Enter'&&event.target.closest?.('button,a'))return;if(editing){if(event.key==='Escape'){closeReader();event.preventDefault();}return;} diff --git a/static/js/task-productivity.js b/static/js/task-productivity.js index 862fd85..42bab34 100644 --- a/static/js/task-productivity.js +++ b/static/js/task-productivity.js @@ -26,7 +26,7 @@ if(key==='project_uuid')for(const option of input.options)option.defaultSelected=option.selected=option.value===(p.project_uuid||''); else if(input.type==='checkbox')input.defaultChecked=input.checked; else input.defaultValue=input.value; - if(key==='wiki_prefix'){input.placeholder='/notes';input.maxLength=500;const help=el('p',ja?'メール本文・RSSのWiki取り込みに使う親Pathです。RSSでは入力欄の初期値になり、空にすればタスクのみ作成できます。設定が空欄の場合、メールはプロジェクトのWiki配下を使い、RSSは未入力になります。保存内容はそのPathの公開範囲・閲覧権限に従います。':'Parent path for mail / RSS Wiki captures. RSS pre-fills this value; clearing it allows task-only capture. If unset, mail uses the project Wiki subtree and RSS leaves the field blank. Saved content inherits the destination visibility and read permissions.');help.className='productivity-note';form.append(help);} + if(key==='wiki_prefix'){input.placeholder='/notes/{YYYY}/{MM}/{Subject}';input.maxLength=500;const help=el('p',ja?'メール・RSS取り込みの保存先。{YYYY}・{MM}・{DD}は作成日(ドメインのタイムゾーン)、{Subject}は件名です。RSSでは入力欄を空にすればタスクのみ作成できます。設定が空欄の場合、メールはプロジェクトのWiki配下を使い、RSSは未入力になります。保存内容はそのPathの公開範囲・閲覧権限に従います。':'Mail / RSS capture destination. {YYYY}, {MM}, {DD} use the creation date in the Domain timezone; {Subject} uses the title. Clear the RSS field for task-only capture. If unset, mail uses the project Wiki subtree and RSS leaves the field blank. Content inherits destination visibility and permissions.');help.className='productivity-note';form.append(help);} if(key==='reminder_time'){const help=el('p',ja?'新規タスクの対応する日付が設定されている場合だけ通知します。既存タスクは変更しません。通知時刻は保存時のドメインのタイムゾーン('+data.timezone+')を使用します。':'Reminders apply only to new tasks with the corresponding date. Existing tasks are unchanged. Times use the Domain timezone on save ('+data.timezone+').');help.className='productivity-note';form.append(help);} } const note=el('p',ja?'日数は作成日からの暦日です。空欄は未設定、0は当日。担当者の指定では閲覧権限は付与されません。メールは今日の計画・期限到来分を最大100件送ります。SMTPは管理者設定を使用し、配信時刻にはキュー待ちの遅延があります。':'Offsets are calendar days from creation; blank means unset, 0 means today. Assignment does not grant access. Email includes up to 100 tasks planned or due today, using administrator SMTP settings. Queue delays may apply.');note.className='productivity-note';form.append(note);