@rmdes/indiekit-endpoint-blogroll 1.0.19 → 1.0.21

package/locales/sr.json

@@ -27,15 +27,15 @@
     },
 
     "sync": {
-      "success": "Synced %{blogs} blogs, added %{items} items.",
-      "error": "Sync failed: %{error}",
+      "success": "Synced {{blogs}} blogs, added {{items}} items.",
+      "error": "Sync failed: {{error}}",
       "already_running": "A sync is already in progress.",
-      "cleared_success": "Cleared and re-synced %{blogs} blogs, added %{items} items."
+      "cleared_success": "Cleared and re-synced {{blogs}} blogs, added {{items}} items."
     },
 
     "errors": {
       "title": "Блогови са грешкама",
-      "seeAll": "Погледај свих %{count} блогова са грешкама"
+      "seeAll": "Погледај свих {{count}} блогова са грешкама"
     },
 
     "sources": {
@@ -48,15 +48,15 @@
       "save": "Сачувај",
       "empty": "Нема конфигурисаних OPML извора. Користите ово за масовни увоз блогова из FreshRSS или других читача довода.",
       "recent": "OPML извори",
-      "interval": "Сваких %{minutes} мин",
+      "interval": "Сваких {{minutes}} мин",
       "lastSync": "Последња синхронизација",
       "deleteConfirm": "Обрисати овај OPML извор? Блогови увезени из њега ће остати.",
       "created": "OPML извор успешно креиран.",
       "created_synced": "OPML извор успешно креиран и синхронизован.",
-      "created_sync_failed": "OPML извор креиран, али синхронизација није успела: %{error}",
+      "created_sync_failed": "OPML извор креиран, али синхронизација није успела: {{error}}",
       "updated": "OPML извор успешно ажуриран.",
       "deleted": "OPML извор успешно обрисан.",
-      "synced": "Успешно синхронизовано. Додато: %{added}, Ажурирано: %{updated}",
+      "synced": "Успешно синхронизовано. Додато: {{added}}, Ажурирано: {{updated}}",
       "form": {
         "name": "Назив",
         "type": "Тип увоза",
@@ -70,7 +70,16 @@
         "microsubChannel": "Microsub Channel",
         "microsubChannelHint": "Sync feeds from a specific channel, or all channels",
         "categoryPrefix": "Category Prefix",
-        "categoryPrefixHint": "Optional prefix for blog categories (e.g., 'Following: ')"
+        "categoryPrefixHint": "Optional prefix for blog categories (e.g., 'Following: ')",
+        "feedlandInstance": "FeedLand Instance URL",
+        "feedlandInstanceHint": "FeedLand instance URL (feedland.com or self-hosted)",
+        "feedlandUsername": "FeedLand Username",
+        "feedlandUsernameHint": "Your FeedLand screen name",
+        "feedlandCategory": "FeedLand Category",
+        "feedlandCategoryAll": "All subscriptions",
+        "feedlandCategoryHint": "Optional: sync only feeds from a specific category",
+        "feedlandLoadCategories": "Load",
+        "feedlandRequired": "FeedLand instance URL and username are required"
       }
     },
 
@@ -96,11 +105,11 @@
       "clearFilters": "Обриши филтере",
       "deleteConfirm": "Обрисати овај блог и све његове кеширане ставке?",
       "created": "Блог успешно додат.",
-      "created_synced": "Блог додат и синхронизован. Преузето %{items} ставки.",
-      "created_sync_failed": "Блог додат, али почетно преузимање није успело: %{error}",
+      "created_synced": "Блог додат и синхронизован. Преузето {{items}} ставки.",
+      "created_sync_failed": "Блог додат, али почетно преузимање није успело: {{error}}",
       "updated": "Блог успешно ажуриран.",
       "deleted": "Блог успешно обрисан.",
-      "refreshed": "Блог освежен. Додато %{items} нових ставки.",
+      "refreshed": "Блог освежен. Додато {{items}} нових ставки.",
       "form": {
         "discoverUrl": "URL веб-сајта",
         "discover": "Открий довод",

package/locales/sv.json

@@ -27,15 +27,15 @@
     },
 
     "sync": {
-      "success": "Synced %{blogs} blogs, added %{items} items.",
-      "error": "Sync failed: %{error}",
+      "success": "Synced {{blogs}} blogs, added {{items}} items.",
+      "error": "Sync failed: {{error}}",
       "already_running": "A sync is already in progress.",
-      "cleared_success": "Cleared and re-synced %{blogs} blogs, added %{items} items."
+      "cleared_success": "Cleared and re-synced {{blogs}} blogs, added {{items}} items."
     },
 
     "errors": {
       "title": "Bloggar med fel",
-      "seeAll": "Se alla %{count} bloggar med fel"
+      "seeAll": "Se alla {{count}} bloggar med fel"
     },
 
     "sources": {
@@ -48,15 +48,15 @@
       "save": "Spara",
       "empty": "Inga OPML-källor konfigurerade. Använd detta för att massimportera bloggar från FreshRSS eller andra flödesläsare.",
       "recent": "OPML-källor",
-      "interval": "Varje %{minutes} min",
+      "interval": "Varje {{minutes}} min",
       "lastSync": "Senast synkroniserad",
       "deleteConfirm": "Ta bort denna OPML-källa? Bloggar importerade från den kommer att finnas kvar.",
       "created": "OPML-källa skapad.",
       "created_synced": "OPML-källa skapad och synkroniserad.",
-      "created_sync_failed": "OPML-källa skapad, men synkronisering misslyckades: %{error}",
+      "created_sync_failed": "OPML-källa skapad, men synkronisering misslyckades: {{error}}",
       "updated": "OPML-källa uppdaterad.",
       "deleted": "OPML-källa borttagen.",
-      "synced": "Synkronisering lyckades. Tillagda: %{added}, Uppdaterade: %{updated}",
+      "synced": "Synkronisering lyckades. Tillagda: {{added}}, Uppdaterade: {{updated}}",
       "form": {
         "name": "Namn",
         "type": "Importtyp",
@@ -70,7 +70,16 @@
         "microsubChannel": "Microsub Channel",
         "microsubChannelHint": "Sync feeds from a specific channel, or all channels",
         "categoryPrefix": "Category Prefix",
-        "categoryPrefixHint": "Optional prefix for blog categories (e.g., 'Following: ')"
+        "categoryPrefixHint": "Optional prefix for blog categories (e.g., 'Following: ')",
+        "feedlandInstance": "FeedLand Instance URL",
+        "feedlandInstanceHint": "FeedLand instance URL (feedland.com or self-hosted)",
+        "feedlandUsername": "FeedLand Username",
+        "feedlandUsernameHint": "Your FeedLand screen name",
+        "feedlandCategory": "FeedLand Category",
+        "feedlandCategoryAll": "All subscriptions",
+        "feedlandCategoryHint": "Optional: sync only feeds from a specific category",
+        "feedlandLoadCategories": "Load",
+        "feedlandRequired": "FeedLand instance URL and username are required"
       }
     },
 
@@ -96,11 +105,11 @@
       "clearFilters": "Rensa filter",
       "deleteConfirm": "Ta bort denna blogg och alla dess cachade poster?",
       "created": "Blogg tillagd.",
-      "created_synced": "Blogg tillagd och synkroniserad. Hämtade %{items} poster.",
-      "created_sync_failed": "Blogg tillagd, men initial hämtning misslyckades: %{error}",
+      "created_synced": "Blogg tillagd och synkroniserad. Hämtade {{items}} poster.",
+      "created_sync_failed": "Blogg tillagd, men initial hämtning misslyckades: {{error}}",
       "updated": "Blogg uppdaterad.",
       "deleted": "Blogg borttagen.",
-      "refreshed": "Blogg uppdaterad. Lade till %{items} nya poster.",
+      "refreshed": "Blogg uppdaterad. Lade till {{items}} nya poster.",
       "form": {
         "discoverUrl": "Webbplats-URL",
         "discover": "Upptäck flöde",

package/locales/zh-Hans-CN.json

@@ -27,15 +27,15 @@
     },
 
     "sync": {
-      "success": "Synced %{blogs} blogs, added %{items} items.",
-      "error": "Sync failed: %{error}",
+      "success": "Synced {{blogs}} blogs, added {{items}} items.",
+      "error": "Sync failed: {{error}}",
       "already_running": "A sync is already in progress.",
-      "cleared_success": "Cleared and re-synced %{blogs} blogs, added %{items} items."
+      "cleared_success": "Cleared and re-synced {{blogs}} blogs, added {{items}} items."
     },
 
     "errors": {
       "title": "有错误的博客",
-      "seeAll": "查看所有 %{count} 个有错误的博客"
+      "seeAll": "查看所有 {{count}} 个有错误的博客"
     },
 
     "sources": {
@@ -48,15 +48,15 @@
       "save": "保存",
       "empty": "未配置 OPML 源。使用此功能从 FreshRSS 或其他订阅阅读器批量导入博客。",
       "recent": "OPML 源",
-      "interval": "每 %{minutes} 分钟",
+      "interval": "每 {{minutes}} 分钟",
       "lastSync": "最后同步",
       "deleteConfirm": "删除此 OPML 源?从中导入的博客将保留。",
       "created": "OPML 源创建成功。",
       "created_synced": "OPML 源创建并同步成功。",
-      "created_sync_failed": "OPML 源已创建,但同步失败:%{error}",
+      "created_sync_failed": "OPML 源已创建,但同步失败:{{error}}",
       "updated": "OPML 源更新成功。",
       "deleted": "OPML 源删除成功。",
-      "synced": "同步成功。已添加:%{added},已更新:%{updated}",
+      "synced": "同步成功。已添加:{{added}},已更新:{{updated}}",
       "form": {
         "name": "名称",
         "type": "导入类型",
@@ -70,7 +70,16 @@
         "microsubChannel": "Microsub Channel",
         "microsubChannelHint": "Sync feeds from a specific channel, or all channels",
         "categoryPrefix": "Category Prefix",
-        "categoryPrefixHint": "Optional prefix for blog categories (e.g., 'Following: ')"
+        "categoryPrefixHint": "Optional prefix for blog categories (e.g., 'Following: ')",
+        "feedlandInstance": "FeedLand Instance URL",
+        "feedlandInstanceHint": "FeedLand instance URL (feedland.com or self-hosted)",
+        "feedlandUsername": "FeedLand Username",
+        "feedlandUsernameHint": "Your FeedLand screen name",
+        "feedlandCategory": "FeedLand Category",
+        "feedlandCategoryAll": "All subscriptions",
+        "feedlandCategoryHint": "Optional: sync only feeds from a specific category",
+        "feedlandLoadCategories": "Load",
+        "feedlandRequired": "FeedLand instance URL and username are required"
       }
     },
 
@@ -96,11 +105,11 @@
       "clearFilters": "清除筛选",
       "deleteConfirm": "删除此博客及其所有缓存条目?",
       "created": "博客添加成功。",
-      "created_synced": "博客已添加并同步。获取了 %{items} 个条目。",
-      "created_sync_failed": "博客已添加,但初始获取失败:%{error}",
+      "created_synced": "博客已添加并同步。获取了 {{items}} 个条目。",
+      "created_sync_failed": "博客已添加,但初始获取失败:{{error}}",
       "updated": "博客更新成功。",
       "deleted": "博客删除成功。",
-      "refreshed": "博客已刷新。添加了 %{items} 个新条目。",
+      "refreshed": "博客已刷新。添加了 {{items}} 个新条目。",
       "form": {
         "discoverUrl": "网站 URL",
         "discover": "发现订阅源",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-blogroll",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "Blogroll endpoint for Indiekit. Aggregates blog feeds from OPML, JSON feeds, or manual entry.",
   "keywords": [
     "indiekit",

package/views/blogroll-source-edit.njk

@@ -15,6 +15,7 @@
         {% if microsubAvailable %}
         <option value="microsub" {% if source.type == 'microsub' %}selected{% endif %}>Microsub Subscriptions</option>
         {% endif %}
+        <option value="feedland" {% if source.type == 'feedland' %}selected{% endif %}>FeedLand</option>
       </select>
       <span class="hint">{{ __("blogroll.sources.form.typeHint") }}</span>
     </div>
@@ -48,6 +49,32 @@
       <span class="hint">{{ __("blogroll.sources.form.categoryPrefixHint") | default("Optional prefix for blog categories (e.g., 'Following: ')") }}</span>
     </div>
 
+    <div class="blogroll-field" id="feedlandInstanceField" style="display: none;">
+      <label class="label" for="feedlandInstance">{{ __("blogroll.sources.form.feedlandInstance") | default("FeedLand Instance URL") }}</label>
+      <input class="input" type="url" id="feedlandInstance" name="feedlandInstance" value="{{ source.feedlandInstance if source else 'https://feedland.com' }}" placeholder="https://feedland.com">
+      <span class="hint">{{ __("blogroll.sources.form.feedlandInstanceHint") | default("FeedLand instance URL (feedland.com or self-hosted)") }}</span>
+    </div>
+
+    <div class="blogroll-field" id="feedlandUsernameField" style="display: none;">
+      <label class="label" for="feedlandUsername">{{ __("blogroll.sources.form.feedlandUsername") | default("FeedLand Username") }}</label>
+      <input class="input" type="text" id="feedlandUsername" name="feedlandUsername" value="{{ source.feedlandUsername if source else '' }}" placeholder="e.g., davewiner">
+      <span class="hint">{{ __("blogroll.sources.form.feedlandUsernameHint") | default("Your FeedLand screen name") }}</span>
+    </div>
+
+    <div class="blogroll-field" id="feedlandCategoryField" style="display: none;">
+      <label class="label" for="feedlandCategory">{{ __("blogroll.sources.form.feedlandCategory") | default("FeedLand Category") }}</label>
+      <div style="display: flex; gap: 0.5rem; align-items: flex-start;">
+        <select class="select" id="feedlandCategory" name="feedlandCategory" style="flex: 1;">
+          <option value="">{{ __("blogroll.sources.form.feedlandCategoryAll") | default("All subscriptions") }}</option>
+          {% if source.feedlandCategory %}
+          <option value="{{ source.feedlandCategory }}" selected>{{ source.feedlandCategory }}</option>
+          {% endif %}
+        </select>
+        <button type="button" class="button button--secondary" onclick="loadFeedlandCategories()" id="feedlandLoadBtn">{{ __("blogroll.sources.form.feedlandLoadCategories") | default("Load") }}</button>
+      </div>
+      <span class="hint" id="feedlandCategoryHint">{{ __("blogroll.sources.form.feedlandCategoryHint") | default("Optional: sync only feeds from a specific category") }}</span>
+    </div>
+
     <div class="blogroll-field">
       <label class="label" for="syncInterval">{{ __("blogroll.sources.form.syncInterval") }}</label>
       <select class="select" id="syncInterval" name="syncInterval">
@@ -78,12 +105,18 @@ function toggleTypeFields() {
   const opmlContentField = document.getElementById('opmlContentField');
   const microsubChannelField = document.getElementById('microsubChannelField');
   const categoryPrefixField = document.getElementById('categoryPrefixField');
+  const feedlandInstanceField = document.getElementById('feedlandInstanceField');
+  const feedlandUsernameField = document.getElementById('feedlandUsernameField');
+  const feedlandCategoryField = document.getElementById('feedlandCategoryField');
 
   // Hide all type-specific fields first
   urlField.style.display = 'none';
   opmlContentField.style.display = 'none';
   if (microsubChannelField) microsubChannelField.style.display = 'none';
   if (categoryPrefixField) categoryPrefixField.style.display = 'none';
+  if (feedlandInstanceField) feedlandInstanceField.style.display = 'none';
+  if (feedlandUsernameField) feedlandUsernameField.style.display = 'none';
+  if (feedlandCategoryField) feedlandCategoryField.style.display = 'none';
 
   // Show fields based on type
   if (type === 'opml_url') {
@@ -93,7 +126,66 @@ function toggleTypeFields() {
   } else if (type === 'microsub') {
     if (microsubChannelField) microsubChannelField.style.display = 'flex';
     if (categoryPrefixField) categoryPrefixField.style.display = 'flex';
+  } else if (type === 'feedland') {
+    if (feedlandInstanceField) feedlandInstanceField.style.display = 'flex';
+    if (feedlandUsernameField) feedlandUsernameField.style.display = 'flex';
+    if (feedlandCategoryField) feedlandCategoryField.style.display = 'flex';
+  }
+}
+
+function loadFeedlandCategories() {
+  const instance = document.getElementById('feedlandInstance').value;
+  const username = document.getElementById('feedlandUsername').value;
+  const select = document.getElementById('feedlandCategory');
+  const btn = document.getElementById('feedlandLoadBtn');
+  const hint = document.getElementById('feedlandCategoryHint');
+  const currentValue = select.value;
+
+  if (!instance || !username) {
+    hint.textContent = 'Please enter instance URL and username first';
+    return;
   }
+
+  btn.disabled = true;
+  btn.textContent = '...';
+  hint.textContent = 'Loading categories...';
+
+  const baseUrl = '{{ baseUrl }}';
+  const url = baseUrl + '/api/feedland-categories?instance=' + encodeURIComponent(instance) + '&username=' + encodeURIComponent(username);
+
+  fetch(url, { credentials: 'same-origin' })
+    .then(function(r) { return r.json(); })
+    .then(function(data) {
+      if (data.error) {
+        hint.textContent = 'Error: ' + data.error;
+        return;
+      }
+
+      // Clear existing options and rebuild safely using DOM methods
+      while (select.options.length > 0) select.remove(0);
+      var allOpt = document.createElement('option');
+      allOpt.value = '';
+      allOpt.textContent = '{{ __("blogroll.sources.form.feedlandCategoryAll") | default("All subscriptions") }}';
+      select.appendChild(allOpt);
+
+      var cats = data.categories || [];
+      cats.forEach(function(cat) {
+        var opt = document.createElement('option');
+        opt.value = cat;
+        opt.textContent = cat;
+        if (cat === currentValue) opt.selected = true;
+        select.appendChild(opt);
+      });
+
+      hint.textContent = cats.length + ' categories found' + (data.screenname ? ' for ' + data.screenname : '');
+    })
+    .catch(function(err) {
+      hint.textContent = 'Failed to load: ' + err.message;
+    })
+    .finally(function() {
+      btn.disabled = false;
+      btn.textContent = '{{ __("blogroll.sources.form.feedlandLoadCategories") | default("Load") }}';
+    });
 }
 
 // Initialize on load