pull · Feb 16, 2026 · Feb 16, 2026 · Feb 15, 2026
diff --git a/internal/reader/encoding/encoding_test.go b/internal/reader/encoding/encoding_test.go
@@ -403,6 +403,37 @@ func TestCharsetReaderWithUppercaseKOI8RLabel(t *testing.T) {
 	}
 }
 
+func TestCharsetReaderWithKOI8RFeedFixture(t *testing.T) {
+	file := "testdata/koi8r.xml"
+
+	f, err := os.Open(file)
+	if err != nil {
+		t.Fatalf("Unable to open file: %v", err)
+	}
+
+	reader, err := CharsetReader("KOI8-R", f)
+	if err != nil {
+		t.Fatalf("Unable to create reader: %v", err)
+	}
+
+	data, err := io.ReadAll(reader)
+	if err != nil {
+		t.Fatalf("Unable to read data: %v", err)
+	}
+
+	if !utf8.Valid(data) {
+		t.Fatalf("Data is not valid UTF-8")
+	}
+
+	if !bytes.Contains(data, []byte("ÐŸÑ€Ð¸Ð¼ÐµÑ€ RSS Ð»ÐµÐ½Ñ‚Ñ‹")) {
+		t.Fatalf("Data does not contain expected unicode string: %s", "ÐŸÑ€Ð¸Ð¼ÐµÑ€ RSS Ð»ÐµÐ½Ñ‚Ñ‹")
+	}
+
+	if !bytes.Contains(data, []byte("ÐŸÑ€Ð¸Ð²ÐµÑ‚ Ð¼Ð¸Ñ€! ÐÐ¶Ð¸Ðº, Ñ‡Ð°Ð¹, ÐœÐ¾ÑÐºÐ²Ð°, Ð¡Ð°Ð½ÐºÑ‚-ÐŸÐµÑ‚ÐµÑ€Ð±ÑƒÑ€Ð³.")) {
+		t.Fatalf("Data does not contain expected unicode string: %s", "ÐŸÑ€Ð¸Ð²ÐµÑ‚ Ð¼Ð¸Ñ€! ÐÐ¶Ð¸Ðº, Ñ‡Ð°Ð¹, ÐœÐ¾ÑÐºÐ²Ð°, Ð¡Ð°Ð½ÐºÑ‚-ÐŸÐµÑ‚ÐµÑ€Ð±ÑƒÑ€Ð³.")
+	}
+}
+
 func TestNewCharsetReaderWithKOI8RContentType(t *testing.T) {
 	expectedUnicodeString := "ÐŸÑ€Ð¸Ð²ÐµÑ‚ Ð¼Ð¸Ñ€"
 
@@ -429,3 +460,34 @@ func TestNewCharsetReaderWithKOI8RContentType(t *testing.T) {
 		t.Fatalf("Data does not match expected unicode string, got %q expected %q", string(data), expectedUnicodeString)
 	}
 }
+
+func TestNewCharsetReaderWithKOI8RFeedFixtureAndContentType(t *testing.T) {
+	file := "testdata/koi8r.xml"
+
+	f, err := os.Open(file)
+	if err != nil {
+		t.Fatalf("Unable to open file: %v", err)
+	}
+
+	reader, err := NewCharsetReader(f, "application/rss+xml; charset=KOI8-R")
+	if err != nil {
+		t.Fatalf("Unable to create reader: %v", err)
+	}
+
+	data, err := io.ReadAll(reader)
+	if err != nil {
+		t.Fatalf("Unable to read data: %v", err)
+	}
+
+	if !utf8.Valid(data) {
+		t.Fatalf("Data is not valid UTF-8")
+	}
+
+	if !bytes.Contains(data, []byte("Ð¢ÐµÑÑ‚Ð¾Ð²Ð°Ñ Ð»ÐµÐ½Ñ‚Ð° Ð² ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐµ KOI8-R")) {
+		t.Fatalf("Data does not contain expected unicode string: %s", "Ð¢ÐµÑÑ‚Ð¾Ð²Ð°Ñ Ð»ÐµÐ½Ñ‚Ð° Ð² ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐµ KOI8-R")
+	}
+
+	if !bytes.Contains(data, []byte("ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° ÑÐ¿ÐµÑ†Ð¸Ð°Ð»ÑŒÐ½Ñ‹Ñ… ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²")) {
+		t.Fatalf("Data does not contain expected unicode string: %s", "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° ÑÐ¿ÐµÑ†Ð¸Ð°Ð»ÑŒÐ½Ñ‹Ñ… ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²")
+	}
+}
diff --git a/internal/reader/encoding/testdata/koi8r.xml b/internal/reader/encoding/testdata/koi8r.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="KOI8-R"?>
+<rss version="2.0">
+  <channel>
+    <title>ðÒÉÍÅÒ RSS ÌÅÎÔÙ</title>
+    <link>http://example.com/</link>
+    <description>ôÅÓÔÏ×ÁÑ ÌÅÎÔÁ × ËÏÄÉÒÏ×ËÅ KOI8-R</description>
+    <language>ru</language>
+    <lastBuildDate>Sat, 15 Feb 2026 12:00:00 +0000</lastBuildDate>
+
+    <item>
+      <title>ðÅÒ×ÁÑ ÎÏ×ÏÓÔØ</title>
+      <link>http://example.com/post1</link>
+      <guid>http://example.com/post1</guid>
+      <pubDate>Sat, 15 Feb 2026 10:00:00 +0000</pubDate>
+      <description>
+        üÔÏ ÔÅÓÔÏ×ÏÅ ÏÐÉÓÁÎÉÅ Ó ÒÕÓÓËÉÍÉ ÓÉÍ×ÏÌÁÍÉ: 
+        ðÒÉ×ÅÔ ÍÉÒ! ³ÖÉË, ÞÁÊ, íÏÓË×Á, óÁÎËÔ-ðÅÔÅÒÂÕÒÇ.
+      </description>
+    </item>
+
+    <item>
+      <title>÷ÔÏÒÁÑ ÎÏ×ÏÓÔØ</title>
+      <link>http://example.com/post2</link>
+      <guid>http://example.com/post2</guid>
+      <pubDate>Sat, 15 Feb 2026 11:00:00 +0000</pubDate>
+      <description>
+        ðÒÏ×ÅÒËÁ ÓÐÅÃÉÁÌØÎÙÈ ÓÉÍ×ÏÌÏ×: &amp; &lt; &gt; 
+        á ÔÁËÖÅ ÞÉÓÌÁ: 1234567890.
+      </description>
+    </item>
+
+  </channel>
+</rss>
diff --git a/internal/reader/urlcleaner/urlcleaner.go b/internal/reader/urlcleaner/urlcleaner.go
@@ -131,20 +131,29 @@ func RemoveTrackingParameters(parsedFeedURL, parsedSiteURL, parsedInputUrl *url.
 		return "", errors.New("urlcleaner: one of the URLs is nil")
 	}
 
+	if parsedInputUrl.RawQuery == "" {
+		return parsedInputUrl.String(), nil
+	}
+
 	queryParams := parsedInputUrl.Query()
 	hasTrackers := false
+	feedHostname := parsedFeedURL.Hostname()
+	siteHostname := parsedSiteURL.Hostname()
 
 	// Remove tracking parameters
 	for param := range queryParams {
 		lowerParam := strings.ToLower(param)
+
 		if isTrackingParam(lowerParam) {
 			queryParams.Del(param)
 			hasTrackers = true
+			continue
 		}
+
 		if trackingParamsOutbound[lowerParam] {
 			// handle duplicate parameters like ?a=b&a=c&a=dâ€¦
 			for _, value := range queryParams[param] {
-				if value == parsedFeedURL.Hostname() || value == parsedSiteURL.Hostname() {
+				if value == feedHostname || value == siteHostname {
 					queryParams.Del(param)
 					hasTrackers = true
 					break

diff --git a/internal/reader/xml/decoder_test.go b/internal/reader/xml/decoder_test.go
@@ -78,6 +78,62 @@ func TestXMLDocumentWithISO88591FileEncodingButUTF8Prolog(t *testing.T) {
 	}
 }
 
+func TestXMLDocumentWithKOI8REncoding(t *testing.T) {
+	fp, err := os.Open("testdata/koi8r.xml")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer fp.Close()
+
+	type item struct {
+		Title       string `xml:"title"`
+		Description string `xml:"description"`
+	}
+
+	type channel struct {
+		Title       string `xml:"title"`
+		Description string `xml:"description"`
+		Items       []item `xml:"item"`
+	}
+
+	type rss struct {
+		XMLName xml.Name `xml:"rss"`
+		Channel channel  `xml:"channel"`
+	}
+
+	var doc rss
+
+	decoder := NewXMLDecoder(fp)
+	err = decoder.Decode(&doc)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if doc.Channel.Title != "ÐŸÑ€Ð¸Ð¼ÐµÑ€ RSS Ð»ÐµÐ½Ñ‚Ñ‹" {
+		t.Errorf("Incorrect channel title, expected: %q, got: %q", "ÐŸÑ€Ð¸Ð¼ÐµÑ€ RSS Ð»ÐµÐ½Ñ‚Ñ‹", doc.Channel.Title)
+	}
+
+	if doc.Channel.Description != "Ð¢ÐµÑÑ‚Ð¾Ð²Ð°Ñ Ð»ÐµÐ½Ñ‚Ð° Ð² ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐµ KOI8-R" {
+		t.Errorf("Incorrect channel description, expected: %q, got: %q", "Ð¢ÐµÑÑ‚Ð¾Ð²Ð°Ñ Ð»ÐµÐ½Ñ‚Ð° Ð² ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐµ KOI8-R", doc.Channel.Description)
+	}
+
+	if len(doc.Channel.Items) != 2 {
+		t.Fatalf("Incorrect number of items, expected: %d, got: %d", 2, len(doc.Channel.Items))
+	
8000
}
+
+	if doc.Channel.Items[0].Title != "ÐŸÐµÑ€Ð²Ð°Ñ Ð½Ð¾Ð²Ð¾ÑÑ‚ÑŒ" {
+		t.Errorf("Incorrect first item title, expected: %q, got: %q", "ÐŸÐµÑ€Ð²Ð°Ñ Ð½Ð¾Ð²Ð¾ÑÑ‚ÑŒ", doc.Channel.Items[0].Title)
+	}
+
+	if !strings.Contains(doc.Channel.Items[0].Description, "ÐŸÑ€Ð¸Ð²ÐµÑ‚ Ð¼Ð¸Ñ€! ÐÐ¶Ð¸Ðº, Ñ‡Ð°Ð¹, ÐœÐ¾ÑÐºÐ²Ð°, Ð¡Ð°Ð½ÐºÑ‚-ÐŸÐµÑ‚ÐµÑ€Ð±ÑƒÑ€Ð³.") {
+		t.Errorf("First item description does not contain expected text, got: %q", doc.Channel.Items[0].Description)
+	}
+
+	if !strings.Contains(doc.Channel.Items[1].Description, "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° ÑÐ¿ÐµÑ†Ð¸Ð°Ð»ÑŒÐ½Ñ‹Ñ… ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²") {
+		t.Errorf("Second item description does not contain expected text, got: %q", doc.Channel.Items[1].Description)
+	}
+}
+
 func TestXMLDocumentWithIllegalUnicodeCharacters(t *testing.T) {
 	type myxml struct {
 		XMLName xml.Name `xml:"rss"`

diff --git a/internal/reader/xml/testdata/koi8r.xml b/internal/reader/xml/testdata/koi8r.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="KOI8-R"?>
+<rss version="2.0">
+  <channel>
+    <title>ðÒÉÍÅÒ RSS ÌÅÎÔÙ</title>
+    <link>http://example.com/</link>
+    <description>ôÅÓÔÏ×ÁÑ ÌÅÎÔÁ × ËÏÄÉÒÏ×ËÅ KOI8-R</description>
+    <language>ru</language>
+    <lastBuildDate>Sat, 15 Feb 2026 12:00:00 +0000</lastBuildDate>
+
+    <item>
+      <title>ðÅÒ×ÁÑ ÎÏ×ÏÓÔØ</title>
+      <link>http://example.com/post1</link>
+      <guid>http://example.com/post1</guid>
+      <pubDate>Sat, 15 Feb 2026 10:00:00 +0000</pubDate>
+      <description>
+            üÔÏ ÔÅÓÔÏ×ÏÅ ÏÐÉÓÁÎÉÅ Ó ÒÕÓÓËÉÍÉ ÓÉÍ×ÏÌÁÍÉ: 
+        ðÒÉ×ÅÔ ÍÉÒ! ³ÖÉË, ÞÁÊ, íÏÓË×Á, óÁÎËÔ-ðÅÔÅÒÂÕÒÇ.
+      </description>
+    </item>
+
+    <item>
+      <title>÷ÔÏÒÁÑ ÎÏ×ÏÓÔØ</title>
+      <link>http://example.com/post2</link>
+      <guid>http://example.com/post2</guid>
+      <pubDate>Sat, 15 Feb 2026 11:00:00 +0000</pubDate>
+      <description>
+        ðÒÏ×ÅÒËÁ ÓÐÅÃÉÁÌØÎÙÈ ÓÉÍ×ÏÌÏ×: &amp; &lt; &gt; 
+        á ÔÁËÖÅ ÞÉÓÌÁ: 1234567890.
+      </description>
+    </item>
+
+  </channel>
+</rss>