+
+
{{ t('article.content.fetchingArticleContent') }}
+
diff --git a/frontend/src/components/modals/feed/AddFeedModal.vue b/frontend/src/components/modals/feed/AddFeedModal.vue
index cf2bc73e2..fa7b0cbe0 100644
--- a/frontend/src/components/modals/feed/AddFeedModal.vue
+++ b/frontend/src/components/modals/feed/AddFeedModal.vue
@@ -3,15 +3,15 @@ import FeedFormModal from './FeedFormModal.vue';
const emit = defineEmits<{
close: [];
- added: [];
+ added: [feedId?: number];
}>();
function handleClose() {
emit('close');
}
-function handleAdded() {
- emit('added');
+function handleAdded(feedId?: number) {
+ emit('added', feedId);
}
diff --git a/frontend/src/components/modals/feed/FeedFormModal.vue b/frontend/src/components/modals/feed/FeedFormModal.vue
index 55081fa5b..a0b1378be 100644
--- a/frontend/src/components/modals/feed/FeedFormModal.vue
+++ b/frontend/src/components/modals/feed/FeedFormModal.vue
@@ -89,7 +89,7 @@ const {
const emit = defineEmits<{
close: [];
- added: [];
+ added: [feedId?: number];
updated: [];
}>();
@@ -194,7 +194,8 @@ async function submit() {
if (res.ok) {
if (props.mode === 'add') {
- emit('added');
+ const result = await res.json().catch(() => ({}));
+ emit('added', result.feed_id);
resetForm();
window.showToast(t('modal.feed.feedAddedSuccess'), 'success');
} else {
@@ -208,7 +209,21 @@ async function submit() {
// Check if it's a duplicate URL error (409 Conflict)
if (res.status === 409 || errorText.includes('already exists')) {
- window.showToast(t('modal.feed.duplicateFeedURL'), 'error');
+ let existingFeedId: number | undefined;
+ try {
+ const errorData = JSON.parse(errorText);
+ existingFeedId = errorData.existing_feed_id;
+ } catch {
+ existingFeedId = undefined;
+ }
+
+ if (existingFeedId) {
+ emit('added', existingFeedId);
+ close();
+ window.showToast(t('modal.feed.duplicateFeedSelected'), 'info');
+ } else {
+ window.showToast(t('modal.feed.duplicateFeedURL'), 'error');
+ }
return;
}
diff --git a/frontend/src/components/modals/settings/content/SummarySettings.vue b/frontend/src/components/modals/settings/content/SummarySettings.vue
index 6eef11ea5..2529be96e 100644
--- a/frontend/src/components/modals/settings/content/SummarySettings.vue
+++ b/frontend/src/components/modals/settings/content/SummarySettings.vue
@@ -92,6 +92,7 @@ const isClearingCache = ref(false);
import { useAppStore } from '@/stores/app';
import { useI18n } from 'vue-i18n';
-import { ref, computed, onMounted, onUnmounted, type Ref } from 'vue';
+import { ref, computed, watch, onMounted, onUnmounted, type Ref } from 'vue';
import {
PhRss,
PhPlus,
@@ -187,17 +187,26 @@ const sortedFeeds = computed(() => {
return feeds;
});
+const selectableSortedFeeds = computed(() =>
+ sortedFeeds.value.filter((f) => !f.is_freshrss_source)
+);
+
+watch(
+ () => selectableSortedFeeds.value.map((feed) => feed.id),
+ (visibleIds) => {
+ const visibleIdSet = new Set(visibleIds);
+ selectedFeeds.value = selectedFeeds.value.filter((id) => visibleIdSet.has(id));
+ }
+);
+
// Feed count statistics
const totalFeeds = computed(() => store.feeds?.length || 0);
const selectedCount = computed(() => selectedFeeds.value.length);
const isAllSelected = computed(() => {
- if (!store.feeds || store.feeds.length === 0) return false;
- // Get non-FreshRSS feeds (RSSHub feeds can be selected)
- const nonManagedFeeds = store.feeds.filter((f) => !f.is_freshrss_source);
- if (nonManagedFeeds.length === 0) return false;
+ if (selectableSortedFeeds.value.length === 0) return false;
// Check if all non-managed feeds are selected
- return nonManagedFeeds.every((f) => selectedFeeds.value.includes(f.id));
+ return selectableSortedFeeds.value.every((f) => selectedFeeds.value.includes(f.id));
});
function toggleSort(field: SortField) {
@@ -211,10 +220,9 @@ function toggleSort(field: SortField) {
function toggleSelectAll(e: Event) {
const target = e.target as HTMLInputElement;
- if (!store.feeds) return;
if (target.checked) {
- // Select only non-FreshRSS feeds (RSSHub feeds can be selected)
- selectedFeeds.value = store.feeds.filter((f) => !f.is_freshrss_source).map((f) => f.id);
+ // Select only visible non-FreshRSS feeds (RSSHub feeds can be selected)
+ selectedFeeds.value = selectableSortedFeeds.value.map((f) => f.id);
} else {
selectedFeeds.value = [];
}
diff --git a/frontend/src/components/modals/settings/general/UpdateSettings.vue b/frontend/src/components/modals/settings/general/UpdateSettings.vue
index f7da05eb4..0510f9e7c 100644
--- a/frontend/src/components/modals/settings/general/UpdateSettings.vue
+++ b/frontend/src/components/modals/settings/general/UpdateSettings.vue
@@ -1,8 +1,9 @@
`,
+ }
+ if err := db.SaveArticle(art); err != nil {
+ t.Fatalf("SaveArticle failed: %v", err)
+ }
+
+ var articleID int64
+ if err := db.QueryRow("SELECT id FROM articles WHERE url = ?", art.URL).Scan(&articleID); err != nil {
+ t.Fatalf("failed to query article id: %v", err)
+ }
+
+ h := core.NewHandler(db, nil, nil, nil)
+ payload := []byte(`{"article_id": ` + fmt.Sprintf("%d", articleID) + `, "length": "short"}`)
+ req := httptest.NewRequest(http.MethodPost, "/summary/article", bytes.NewReader(payload))
+ rr := httptest.NewRecorder()
+
+ HandleSummarizeArticle(h, rr, req)
+
+ if rr.Code != http.StatusOK {
+ t.Fatalf("expected %d got %d; body: %s", http.StatusOK, rr.Code, rr.Body.String())
+ }
+ if !bytes.Contains(rr.Body.Bytes(), []byte("RSS provided")) {
+ t.Fatalf("expected RSS original summary, got: %s", rr.Body.String())
+ }
+ if bytes.Contains(rr.Body.Bytes(), []byte("generated summary cache")) {
+ t.Fatalf("expected generated summary cache to be ignored, got: %s", rr.Body.String())
+ }
+ if bytes.Contains(rr.Body.Bytes(), []byte("