Fall back to article ID when URL is missing

jocmp · Oct 27, 2024 · aa86b14 · aa86b14
1 parent adb3bae
commit aa86b14
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 6 deletions.
diff --git a/capy/src/main/java/com/jocmp/capy/accounts/LocalAccountDelegate.kt b/capy/src/main/java/com/jocmp/capy/accounts/LocalAccountDelegate.kt
@@ -164,9 +164,9 @@ class LocalAccountDelegate(
 
                 val withinCutoff = cutoffDate == null || publishedAt > cutoffDate.toEpochSecond()
 
-                if (parsedItem.url != null && withinCutoff) {
+                if (parsedItem.id != null && withinCutoff) {
                     database.articlesQueries.create(
-                        id = item.link!!,
+                        id = parsedItem.id,
                         feed_id = feed.id,
                         title = parsedItem.title,
                         author = item.author,
@@ -179,7 +179,7 @@ class LocalAccountDelegate(
                     )
 
                     database.articlesQueries.updateStatus(
-                        article_id = item.link!!,
+                        article_id = parsedItem.id,
                         updated_at = updatedAtSeconds,
                         read = false
                     )

diff --git a/capy/src/main/java/com/jocmp/capy/accounts/ParsedItem.kt b/capy/src/main/java/com/jocmp/capy/accounts/ParsedItem.kt
@@ -6,6 +6,10 @@ import java.net.URI
 import java.net.URL
 
 internal class ParsedItem(private val item: RssItem, private val siteURL: String?) {
+    val url: String? = cleanedURL(item.link)?.toString()
+
+    val id: String? = url ?: item.guid
+
     val contentHTML: String?
         get() {
             val currentContent = item.content.orEmpty().ifBlank {
@@ -27,12 +31,10 @@ internal class ParsedItem(private val item: RssItem, private val siteURL: String
                 Jsoup.parse(it).text()
             }
         }
-    
+
     val title: String
         get() = Jsoup.parse(item.title.orEmpty()).text()
 
-    val url: String? = cleanedURL(item.link)?.toString()
-
     val imageURL: String?
         get() = cleanedURL(item.image)?.toString()
 

diff --git a/capy/src/test/java/com/jocmp/capy/accounts/ParsedItemTest.kt b/capy/src/test/java/com/jocmp/capy/accounts/ParsedItemTest.kt
@@ -3,6 +3,7 @@ package com.jocmp.capy.accounts
 import com.prof18.rssparser.model.RssItem
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertNull
 
 class ParsedItemTest {
     @Test
@@ -31,6 +32,33 @@ class ParsedItemTest {
         assertEquals(expected = "", actual = parsedItem.title)
     }
 
+    @Test
+    fun id_whenUrlIsPresent() {
+        val url = "https://example.com/article"
+        val item = RssItem.Builder().link(url).build()
+        val parsedItem = ParsedItem(item, siteURL = "")
+
+        assertEquals(expected = url, actual = parsedItem.id)
+    }
+
+    @Test
+    fun id_whenUrlIsMissing() {
+        val id = "https://example.com/article"
+        val item = RssItem.Builder().guid(id).build()
+        val parsedItem = ParsedItem(item, siteURL = "")
+
+        assertEquals(expected = id, actual = parsedItem.id)
+    }
+
+    @Test
+    fun id_whenURLAndGuidAreMissing() {
+        val item = RssItem.Builder().build()
+        val parsedItem = ParsedItem(item, siteURL = "")
+
+        assertNull(parsedItem.id)
+    }
+
+
     @Test
     fun url_whenPresent() {
         val url = "https://example.com/article"