Merge branch 'main' into intellijs

internal/locale/translations/de_DE.json

@@ -435,7 +435,7 @@
     "form.integration.pocket_connect_link": "Verbinden Sie Ihr Pocket-Konto",
     "form.integration.wallabag_activate": "Einträge in Wallabag speichern",
     "form.integration.wallabag_only_url": "Nur URL senden (anstelle des vollständigen Inhalts)",
-    "form.integration.wallabag_endpoint": "Wallabag-URL",
+    "form.integration.wallabag_endpoint": "Wallabag-Basis-URL",
     "form.integration.wallabag_client_id": "Wallabag-Client-ID",
     "form.integration.wallabag_client_secret": "Wallabag-Client-Geheimnis",
     "form.integration.wallabag_username": "Wallabag-Benutzername",

internal/locale/translations/el_EL.json

@@ -435,7 +435,7 @@
     "form.integration.pocket_connect_link": "Συνδέστε τον λογαριασμό Pocket σας",
     "form.integration.wallabag_activate": "Αποθήκευση άρθρων στο Wallabag",
     "form.integration.wallabag_only_url": "Αποστολή μόνο URL (αντί για πλήρες περιεχόμενο)",
-    "form.integration.wallabag_endpoint": "Τελικό σημείο Wallabag API ",
+    "form.integration.wallabag_endpoint": "Βασική διεύθυνση URL Wallabag",
     "form.integration.wallabag_client_id": "Ταυτότητα πελάτη Wallabag",
     "form.integration.wallabag_client_secret": "Wallabag Μυστικό Πελάτη",
     "form.integration.wallabag_username": "Όνομα Χρήστη Wallabag",

internal/locale/translations/en_US.json

@@ -433,7 +433,7 @@
     "form.integration.pocket_connect_link": "Connect your Pocket account",
     "form.integration.wallabag_activate": "Save entries to Wallabag",
     "form.integration.wallabag_only_url": "Send only URL (instead of full content)",
-    "form.integration.wallabag_endpoint": "Wallabag API Endpoint",
+    "form.integration.wallabag_endpoint": "Wallabag Base URL",
     "form.integration.wallabag_client_id": "Wallabag Client ID",
     "form.integration.wallabag_client_secret": "Wallabag Client Secret",
     "form.integration.wallabag_username": "Wallabag Username",

internal/locale/translations/es_ES.json

@@ -435,7 +435,7 @@
     "form.integration.pocket_connect_link": "Conectar a la cuenta de Pocket",
     "form.integration.wallabag_activate": "Enviar artículos a Wallabag",
     "form.integration.wallabag_only_url": "Enviar solo URL (en lugar de contenido completo)",
-    "form.integration.wallabag_endpoint": "Acceso API de Wallabag",
+    "form.integration.wallabag_endpoint": "URL base de Wallabag",
     "form.integration.wallabag_client_id": "ID de cliente de Wallabag",
     "form.integration.wallabag_client_secret": "Secreto de cliente de Wallabag",
     "form.integration.wallabag_username": "Nombre de usuario de Wallabag",

internal/locale/translations/fi_FI.json

@@ -435,7 +435,7 @@
     "form.integration.pocket_connect_link": "Yhdistä Pocket-tilisi",
     "form.integration.wallabag_activate": "Tallenna artikkelit Wallabagiin",
     "form.integration.wallabag_only_url": "Lähetä vain URL-osoite (koko sisällön sijaan)",
-    "form.integration.wallabag_endpoint": "Wallabag API -päätepiste",
+    "form.integration.wallabag_endpoint": "Wallabagin perus-URL-osoite",
     "form.integration.wallabag_client_id": "Wallabag Client ID",
     "form.integration.wallabag_client_secret": "Wallabag Client Secret",
     "form.integration.wallabag_username": "Wallabag-käyttäjätunnus",

internal/locale/translations/fr_FR.json

@@ -435,7 +435,7 @@
     "form.integration.pocket_connect_link": "Connectez votre compte Pocket",
     "form.integration.wallabag_activate": "Sauvegarder les articles vers Wallabag",
     "form.integration.wallabag_only_url": "Envoyer uniquement l'URL (au lieu du contenu complet)",
-    "form.integration.wallabag_endpoint": "URL de l'API de Wallabag",
+    "form.integration.wallabag_endpoint": "URL de base de Wallabag",
     "form.integration.wallabag_client_id": "Identifiant unique du client Wallabag",
     "form.integration.wallabag_client_secret": "Clé secrète du client Wallabag",
     "form.integration.wallabag_username": "Nom d'utilisateur de Wallabag",

internal/locale/translations/hi_IN.json

@@ -435,7 +435,7 @@
     "form.integration.pocket_connect_link": "अपना पॉकेट खाता कनेक्ट करें",
     "form.integration.wallabag_activate": "विषय सहेजें वालाबाग में ",
     "form.integration.wallabag_only_url": "केवल URL भेजें (पूर्ण सामग्री के बजाय)",
-    "form.integration.wallabag_endpoint": "वालबैग एपीआई एंडपॉइंट",
+    "form.integration.wallabag_endpoint": "वल्लाबैग बेस यूआरएल",
     "form.integration.wallabag_client_id": "वालाबैग क्लाइंट आईडी",
     "form.integration.wallabag_client_secret": "वालाबैग क्लाइंट सीक्रेट",
     "form.integration.wallabag_username": "वालाबैग उपयोगकर्ता नाम",

internal/locale/translations/id_ID.json

@@ -425,7 +425,7 @@
     "form.integration.pocket_connect_link": "Hubungkan akun Pocket Anda",
     "form.integration.wallabag_activate": "Simpan artikel ke Wallabag",
     "form.integration.wallabag_only_url": "Kirim hanya URL (alih-alih konten penuh)",
-    "form.integration.wallabag_endpoint": "Titik URL API Wallabag",
+    "form.integration.wallabag_endpoint": "URL Dasar Wallabag",
     "form.integration.wallabag_client_id": "ID Klien Wallabag",
     "form.integration.wallabag_client_secret": "Rahasia Klien Wallabag",
     "form.integration.wallabag_username": "Nama Pengguna Wallabag",

internal/locale/translations/it_IT.json

@@ -434,7 +434,7 @@
     "form.integration.pocket_access_token": "Access token dell'account Pocket",
     "form.integration.pocket_connect_link": "Collega il tuo account Pocket",
     "form.integration.wallabag_activate": "Salva gli articoli su Wallabag",
-    "form.integration.wallabag_endpoint": "Endpoint dell'API di Wallabag",
+    "form.integration.wallabag_endpoint": "URL di base di Wallabagg",
     "form.integration.wallabag_only_url": "Invia solo URL (invece del contenuto completo)",
     "form.integration.wallabag_client_id": "Client ID dell'account Wallabag",
     "form.integration.wallabag_client_secret": "Client secret dell'account Wallabag",

internal/locale/translations/ja_JP.json

@@ -425,7 +425,7 @@
     "form.integration.pocket_connect_link": "Pocket account に接続",
     "form.integration.wallabag_activate": "Wallabag に記事を保存する",
     "form.integration.wallabag_only_url": "URL のみを送信 (完全なコンテンツではなく)",
-    "form.integration.wallabag_endpoint": "Wallabag の API Endpoint",
+    "form.integration.wallabag_endpoint": "ワラバッグベースURL",
     "form.integration.wallabag_client_id": "Wallabag の Client ID",
     "form.integration.wallabag_client_secret": "Wallabag の Client Secret",
     "form.integration.wallabag_username": "Wallabag のユーザー名",

internal/locale/translations/nl_NL.json

@@ -435,7 +435,7 @@
     "form.integration.pocket_connect_link": "Verbind je Pocket-account",
     "form.integration.wallabag_activate": "Artikelen opslaan in Wallabag",
     "form.integration.wallabag_only_url": "Alleen URL verzenden (in plaats van volledige inhoud)",
-    "form.integration.wallabag_endpoint": "Wallabag URL",
+    "form.integration.wallabag_endpoint": "Wallabag basis-URL",
     "form.integration.wallabag_client_id": "Wallabag Client-ID",
     "form.integration.wallabag_client_secret": "Wallabag Client-Secret",
     "form.integration.wallabag_username": "Wallabag gebruikersnaam",

internal/locale/translations/pl_PL.json

@@ -445,7 +445,7 @@
     "form.integration.pocket_connect_link": "Połącz swoje konto Pocket",
     "form.integration.wallabag_activate": "Zapisuj wpisy w Wallabag",
     "form.integration.wallabag_only_url": "Przesyłaj tylko adres URL (zamiast pełnej treści)",
-    "form.integration.wallabag_endpoint": "Punkt końcowy API Wallabag",
+    "form.integration.wallabag_endpoint": "Podstawowy adres URL Wallabag",
     "form.integration.wallabag_client_id": "Identyfikator klienta Wallabag",
     "form.integration.wallabag_client_secret": "Tajny klucz klienta Wallabag",
     "form.integration.wallabag_username": "Login do Wallabag",

internal/locale/translations/pt_BR.json

@@ -435,7 +435,7 @@
     "form.integration.pocket_connect_link": "Conectar a conta do Pocket",
     "form.integration.wallabag_activate": "Salvar itens no Wallabag",
     "form.integration.wallabag_only_url": "Enviar apenas URL (em vez de conteúdo completo)",
-    "form.integration.wallabag_endpoint": "Endpoint da API do Wallabag",
+    "form.integration.wallabag_endpoint": "URL base do Wallabag",
     "form.integration.wallabag_client_id": "ID de cliente (Client ID) do Wallabag",
     "form.integration.wallabag_client_secret": "Segredo do cliente (Client Secret) do Wallabag",
     "form.integration.wallabag_username": "Nome de usuário do Wallabag",

internal/locale/translations/ru_RU.json

@@ -445,7 +445,7 @@
     "form.integration.pocket_connect_link": "Подключить аккаунт Pocket",
     "form.integration.wallabag_only_url": "Отправлять только ссылку (без содержимого)",
     "form.integration.wallabag_activate": "Сохранять статьи в Wallabag",
-    "form.integration.wallabag_endpoint": "Конечная точка Wallabag API",
+    "form.integration.wallabag_endpoint": "URL-адрес базы Валлабаг",
     "form.integration.wallabag_client_id": "Номер клиента Wallabag",
     "form.integration.wallabag_client_secret": "Секретный код клиента Wallabag",
     "form.integration.wallabag_username": "Имя пользователя Wallabag",

internal/locale/translations/tr_TR.json

@@ -265,7 +265,7 @@
   "form.integration.wallabag_activate": "Makaleleri Wallabag'e kaydet",
   "form.integration.wallabag_client_id": "Wallabag Client ID",
   "form.integration.wallabag_client_secret": "Wallabag Client Secret",
-  "form.integration.wallabag_endpoint": "Wallabag API Uç Noktası",
+  "form.integration.wallabag_endpoint": "Wallabag Üssü URL",
   "form.integration.wallabag_only_url": "Yalnızca URL gönder (tam makale yerine)",
   "form.integration.wallabag_password": "Wallabag Parolası",
   "form.integration.wallabag_username": "Wallabag Kullanıcı Adı",

internal/locale/translations/uk_UA.json

@@ -445,7 +445,7 @@
     "form.integration.pocket_connect_link": "Підключити ваш обліковий запис Pocket",
     "form.integration.wallabag_activate": "Зберігати статті до Wallabag",
     "form.integration.wallabag_only_url": "Надіслати лише URL (замість повного вмісту)",
-    "form.integration.wallabag_endpoint": "Wallabag API Endpoint",
+    "form.integration.wallabag_endpoint": "Базова URL-адреса Wallabag",
     "form.integration.wallabag_client_id": "Wallabag Client ID",
     "form.integration.wallabag_client_secret": "Wallabag Client Secret",
     "form.integration.wallabag_username": "Ім’я користувача Wallabag",

internal/locale/translations/zh_CN.json

@@ -425,7 +425,7 @@
     "form.integration.pocket_connect_link": "连接您的 Pocket 帐户",
     "form.integration.wallabag_activate": "保存文章到 Wallabag",
     "form.integration.wallabag_only_url": "仅发送 URL（而不是完整内容）",
-    "form.integration.wallabag_endpoint": "Wallabag URL",
+    "form.integration.wallabag_endpoint": "Wallabag 基本 URL",
     "form.integration.wallabag_client_id": "Wallabag 客户端 ID",
     "form.integration.wallabag_client_secret": "Wallabag 客户端 密钥",
     "form.integration.wallabag_username": "Wallabag 用户名",

internal/locale/translations/zh_TW.json

@@ -425,7 +425,7 @@
     "form.integration.pocket_connect_link": "連線您的 Pocket 帳戶",
     "form.integration.wallabag_activate": "儲存文章到 Wallabag",
     "form.integration.wallabag_only_url": "仅发送 URL（而不是完整内容）",
-    "form.integration.wallabag_endpoint": "Wallabag URL",
+    "form.integration.wallabag_endpoint": "Wallabag 基本 URL",
     "form.integration.wallabag_client_id": "Wallabag 客戶端 ID",
     "form.integration.wallabag_client_secret": "Wallabag 客戶端 Secret",
     "form.integration.wallabag_username": "Wallabag 使用者名稱",

internal/reader/atom/atom_10.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 
 	"miniflux.app/v2/internal/reader/media"
-	"miniflux.app/v2/internal/reader/sanitizer"
 )
 
 // The "atom:feed" element is the document (i.e., top-level) element of
@@ -188,7 +187,6 @@ func (a *Atom10Text) Title() string {
 		content = a.CharData
 	}
 
-	content = sanitizer.StripTags(content)
 	return strings.TrimSpace(content)
 }
 

internal/reader/atom/atom_10_test.go

@@ -492,14 +492,22 @@ func TestParseEntryWithHTMLTitle(t *testing.T) {
 		</title>
 		<link href="http://example.org/c"/>
 	  </entry>
+	  <entry>
+		<title type="html"><![CDATA[Test with self-closing &lt;tag&gt;]]></title>
+		<link href="http://example.org/d"/>
+	  </entry>
 	</feed>`
 
 	feed, err := Parse("https://example.org/", bytes.NewReader([]byte(data)), "10")
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if feed.Entries[0].Title != "Code Test" {
+	if len(feed.Entries) != 4 {
+		t.Fatalf("Incorrect number of entries, got: %d", len(feed.Entries))
+	}
+
+	if feed.Entries[0].Title != "<code>Code</code> Test" {
 		t.Errorf("Incorrect entry title, got: %q", feed.Entries[0].Title)
 	}
 
@@ -510,6 +518,10 @@ func TestParseEntryWithHTMLTitle(t *testing.T) {
 	if feed.Entries[2].Title != "Entry title with space around CDATA" {
 		t.Errorf("Incorrect entry title, got: %q", feed.Entries[2].Title)
 	}
+
+	if feed.Entries[3].Title != "Test with self-closing <tag>" {
+		t.Errorf("Incorrect entry title, got: %q", feed.Entries[3].Title)
+	}
 }
 
 func TestParseEntryWithXHTMLTitle(t *testing.T) {
@@ -537,7 +549,7 @@ func TestParseEntryWithXHTMLTitle(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if feed.Entries[0].Title != `This is XHTML content.` {
+	if feed.Entries[0].Title != `This is <b>XHTML</b> content.` {
 		t.Errorf("Incorrect entry title, got: %q", feed.Entries[0].Title)
 	}
 }
@@ -643,7 +655,7 @@ func TestParseEntryWithDoubleEncodedEntitiesTitle(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if feed.Entries[0].Title != `'AT&T'` {
+	if feed.Entries[0].Title != `&#39;AT&amp;T&#39;` {
 		t.Errorf("Incorrect entry title, got: %q", feed.Entries[0].Title)
 	}
 }

internal/storage/entry_pagination_builder.go

@@ -112,13 +112,13 @@ func (e *EntryPaginationBuilder) getPrevNextID(tx *sql.Tx) (prevID int64, nextID
 		WITH entry_pagination AS (
 			SELECT
 				e.id,
-				lag(e.id) over (order by e.%[1]s asc, e.id desc) as prev_id,
-				lead(e.id) over (order by e.%[1]s asc, e.id desc) as next_id
+				lag(e.id) over (order by e.%[1]s asc, e.created_at asc, e.id desc) as prev_id,
+				lead(e.id) over (order by e.%[1]s asc, e.created_at asc, e.id desc) as next_id
 			FROM entries AS e
 			JOIN feeds AS f ON f.id=e.feed_id
 			JOIN categories c ON c.id = f.category_id
 			WHERE %[2]s
-			ORDER BY e.%[1]s asc, e.id desc
+			ORDER BY e.%[1]s asc, e.created_at asc, e.id desc
 		)
 		SELECT prev_id, next_id FROM entry_pagination AS ep WHERE %[3]s;
 	`

internal/template/templates/views/integrations.html

@@ -581,7 +581,7 @@ <h1 id="page-header-title">{{ t "page.integrations.title" }}</h1>
             </label>
 
             <label for="form-wallabag-url">{{ t "form.integration.wallabag_endpoint" }}</label>
-            <input type="url" name="wallabag_url" id="form-wallabag-url" value="{{ .form.WallabagURL }}" placeholder="http://v2.wallabag.org/" spellcheck="false">
+            <input type="url" name="wallabag_url" id="form-wallabag-url" value="{{ .form.WallabagURL }}" spellcheck="false">
 
             <label for="form-wallabag-client-id">{{ t "form.integration.wallabag_client_id" }}</label>
             <input type="text" name="wallabag_client_id" id="form-wallabag-client-id" value="{{ .form.WallabagClientID }}" spellcheck="false">

internal/ui/bookmark_entries.go

@@ -26,6 +26,7 @@ func (h *handler) showStarredPage(w http.ResponseWriter, r *http.Request) {
 	builder.WithoutStatus(model.EntryStatusRemoved)
 	builder.WithStarred(true)
 	builder.WithSorting(user.EntryOrder, user.EntryDirection)
+	builder.WithSorting("id", user.EntryDirection)
 	builder.WithOffset(offset)
 	builder.WithLimit(user.EntriesPerPage)
 

internal/ui/category_entries.go

@@ -37,6 +37,7 @@ func (h *handler) showCategoryEntriesPage(w http.ResponseWriter, r *http.Request
 	builder := h.store.NewEntryQueryBuilder(user.ID)
 	builder.WithCategoryID(category.ID)
 	builder.WithSorting(user.EntryOrder, user.EntryDirection)
+	builder.WithSorting("id", user.EntryDirection)
 	builder.WithStatus(model.EntryStatusUnread)
 	builder.WithOffset(offset)
 	builder.WithLimit(user.EntriesPerPage)

internal/ui/category_entries_all.go

@@ -37,6 +37,7 @@ func (h *handler) showCategoryEntriesAllPage(w http.ResponseWriter, r *http.Requ
 	builder := h.store.NewEntryQueryBuilder(user.ID)
 	builder.WithCategoryID(category.ID)
 	builder.WithSorting(user.EntryOrder, user.EntryDirection)
+	builder.WithSorting("id", user.EntryDirection)
 	builder.WithoutStatus(model.EntryStatusRemoved)
 	builder.WithOffset(offset)
 	builder.WithLimit(user.EntriesPerPage)

internal/ui/category_entries_starred.go

@@ -37,6 +37,7 @@ func (h *handler) showCategoryEntriesStarredPage(w http.ResponseWriter, r *http.
 	builder := h.store.NewEntryQueryBuilder(user.ID)
 	builder.WithCategoryID(category.ID)
 	builder.WithSorting(user.EntryOrder, user.EntryDirection)
+	builder.WithSorting("id", user.EntryDirection)
 	builder.WithoutStatus(model.EntryStatusRemoved)
 	builder.WithStarred(true)
 	builder.WithOffset(offset)

internal/ui/feed_entries.go

@@ -38,6 +38,7 @@ func (h *handler) showFeedEntriesPage(w http.ResponseWriter, r *http.Request) {
 	builder.WithFeedID(feed.ID)
 	builder.WithStatus(model.EntryStatusUnread)
 	builder.WithSorting(user.EntryOrder, user.EntryDirection)
+	builder.WithSorting("id", user.EntryDirection)
 	builder.WithOffset(offset)
 	builder.WithLimit(user.EntriesPerPage)
 

internal/ui/feed_entries_all.go

@@ -38,6 +38,7 @@ func (h *handler) showFeedEntriesAllPage(w http.ResponseWriter, r *http.Request)
 	builder.WithFeedID(feed.ID)
 	builder.WithoutStatus(model.EntryStatusRemoved)
 	builder.WithSorting(user.EntryOrder, user.EntryDirection)
+	builder.WithSorting("id", user.EntryDirection)
 	builder.WithOffset(offset)
 	builder.WithLimit(user.EntriesPerPage)
 

internal/ui/shared_entries.go

@@ -24,6 +24,7 @@ func (h *handler) sharedEntries(w http.ResponseWriter, r *http.Request) {
 	builder := h.store.NewEntryQueryBuilder(user.ID)
 	builder.WithShareCodeNotEmpty()
 	builder.WithSorting(user.EntryOrder, user.EntryDirection)
+	builder.WithSorting("id", user.EntryDirection)
 	builder.WithOffset(offset)
 	builder.WithLimit(user.EntriesPerPage)
 

internal/ui/static/js/.eslintrc.json

@@ -1,7 +1,7 @@
 {
     "env": {
         "browser": true,
-        "es2017": true
+        "es2020": true
     },
     "rules": {
         "indent": ["error", 4]

internal/ui/static/js/.jshintrc

@@ -1,15 +1,15 @@
 {
-  "esversion": 11,
   "bitwise": true,
+  "browser": true,
   "eqeqeq": true,
+  "esversion": 11,
   "freeze": true,
   "latedef": "nofunc",
   "noarg": true,
   "nocomma": true,
   "nonbsp": true,
   "nonew": true,
-  "browser": true,
+  "noreturnawait": true,
   "shadow": true,
-  "varstmt": true,
-  "noreturnawait": true
-}
+  "varstmt": true
+}

internal/ui/static/static.go

@@ -139,7 +139,7 @@ func GenerateJavascriptBundles() error {
 	JavascriptBundles = make(map[string][]byte)
 	JavascriptBundleChecksums = make(map[string]string)
 
-	jsMinifier := js.Minifier{Version: 2017}
+	jsMinifier := js.Minifier{Version: 2020}
 
 	minifier := minify.New()
 	minifier.AddFunc("text/javascript", jsMinifier.Minify)

internal/ui/tag_entries_all.go

@@ -34,6 +34,7 @@ func (h *handler) showTagEntriesAllPage(w http.ResponseWriter, r *http.Request)
 	builder.WithTags([]string{tagName})
 	builder.WithSorting("status", "asc")
 	builder.WithSorting(user.EntryOrder, user.EntryDirection)
+	builder.WithSorting("id", user.EntryDirection)
 	builder.WithOffset(offset)
 	builder.WithLimit(user.EntriesPerPage)
 

internal/ui/unread_entries.go

@@ -45,6 +45,7 @@ func (h *handler) showUnreadPage(w http.ResponseWriter, r *http.Request) {
 	builder = h.store.NewEntryQueryBuilder(user.ID)
 	builder.WithStatus(model.EntryStatusUnread)
 	builder.WithSorting(user.EntryOrder, user.EntryDirection)
+	builder.WithSorting("id", user.EntryDirection)
 	builder.WithOffset(offset)
 	builder.WithLimit(user.EntriesPerPage)
 	builder.WithGloballyVisible()