Revert previous change(just uncommenting code).

Ashinch · Jan 21, 2025 · 4f09f4a · 4f09f4a
1 parent a3b4d7f
commit 4f09f4a
Showing 1 changed file with 34 additions and 58 deletions.
diff --git a/app/src/main/java/me/ash/reader/infrastructure/rss/OPMLDataSource.kt b/app/src/main/java/me/ash/reader/infrastructure/rss/OPMLDataSource.kt
@@ -50,45 +50,32 @@ class OPMLDataSource @Inject constructor(
                         )
                     }
                 } else {
-//                    val feedUrl = outline.extractUrl()
-//                    val feedToAdd = if (feedUrl?.isNostrUri() == true) {
-//                        val feedMetadata = NostrFeed.fetchFeedMetadata(feedUrl, Client())
-//                        Feed(
-//                            id = targetAccountId.spacerDollar(UUID.randomUUID().toString()),
-//                            name = outline.extractName(),
-//                            url = outline.extractUrl() ?: continue,
-//                            icon = feedMetadata.imageUrl,
-//                            groupId = defaultGroup.id,
-//                            accountId = targetAccountId,
-//                            isNotification = outline.extractPresetNotification(),
-//                            isFullContent = outline.extractPresetFullContent(),
-//                        )
-//                    }
-//                    else {
-//                        Feed(
-//                            id = targetAccountId.spacerDollar(UUID.randomUUID().toString()),
-//                            name = outline.extractName(),
-//                            url = outline.extractUrl() ?: continue,
-//                            groupId = defaultGroup.id,
-//                            accountId = targetAccountId,
-//                            isNotification = outline.extractPresetNotification(),
-//                            isFullContent = outline.extractPresetFullContent(),
-//                        )
-//                    }
-
-
-                    groupWithFeedList.addFeedToDefault(
-//                        feedToAdd
+                    val feedUrl = outline.extractUrl()
+                    val feedToAdd = if (feedUrl?.isNostrUri() == true) {
+                        val feedMetadata = NostrFeed.fetchFeedMetadata(feedUrl, Client())
                         Feed(
                             id = targetAccountId.spacerDollar(UUID.randomUUID().toString()),
                             name = outline.extractName(),
                             url = outline.extractUrl() ?: continue,
+                            icon = feedMetadata.imageUrl,
                             groupId = defaultGroup.id,
                             accountId = targetAccountId,
                             isNotification = outline.extractPresetNotification(),
                             isFullContent = outline.extractPresetFullContent(),
                         )
-                    )
+                    }
+                    else {
+                        Feed(
+                            id = targetAccountId.spacerDollar(UUID.randomUUID().toString()),
+                            name = outline.extractName(),
+                            url = outline.extractUrl() ?: continue,
+                            groupId = defaultGroup.id,
+                            accountId = targetAccountId,
+                            isNotification = outline.extractPresetNotification(),
+                            isFullContent = outline.extractPresetFullContent(),
+                        )
+                    }
+                    groupWithFeedList.addFeedToDefault(feedToAdd)
                 }
             } else {
                 var groupId = defaultGroup.id
@@ -104,43 +91,32 @@ class OPMLDataSource @Inject constructor(
                 }
                 for (subOutline in outline.subElements) {
                     if (subOutline != null && subOutline.attributes != null) {
-//                        val feedUrl = outline.extractUrl()
-//                        val feedToAdd = if (feedUrl?.isNostrUri() == true) {
-//                            val feedMetadata = NostrFeed.fetchFeedMetadata(feedUrl, Client())
-//                            Feed(
-//                                id = targetAccountId.spacerDollar(UUID.randomUUID().toString()),
-//                                name = subOutline.extractName(),
-//                                url = subOutline.extractUrl() ?: continue,
-//                                icon = feedMetadata.imageUrl,
-//                                groupId = groupId,
-//                                accountId = targetAccountId,
-//                                isNotification = subOutline.extractPresetNotification(),
-//                                isFullContent = subOutline.extractPresetFullContent(),
-//                            )
-//                        }
-//                        else {
-//                            Feed(
-//                                id = targetAccountId.spacerDollar(UUID.randomUUID().toString()),
-//                                name = subOutline.extractName(),
-//                                url = subOutline.extractUrl() ?: continue,
-//                                groupId = groupId,
-//                                accountId = targetAccountId,
-//                                isNotification = subOutline.extractPresetNotification(),
-//                                isFullContent = subOutline.extractPresetFullContent(),
-//                            )
-//                        }
-                        groupWithFeedList.addFeed(
-//                            feedToAdd
+                        val feedUrl = outline.extractUrl()
+                        val feedToAdd = if (feedUrl?.isNostrUri() == true) {
+                            val feedMetadata = NostrFeed.fetchFeedMetadata(feedUrl, Client())
                             Feed(
                                 id = targetAccountId.spacerDollar(UUID.randomUUID().toString()),
                                 name = subOutline.extractName(),
                                 url = subOutline.extractUrl() ?: continue,
+                                icon = feedMetadata.imageUrl,
                                 groupId = groupId,
                                 accountId = targetAccountId,
                                 isNotification = subOutline.extractPresetNotification(),
                                 isFullContent = subOutline.extractPresetFullContent(),
                             )
-                        )
+                        }
+                        else {
+                            Feed(
+                                id = targetAccountId.spacerDollar(UUID.randomUUID().toString()),
+                                name = subOutline.extractName(),
+                                url = subOutline.extractUrl() ?: continue,
+                                groupId = groupId,
+                                accountId = targetAccountId,
+                                isNotification = subOutline.extractPresetNotification(),
+                                isFullContent = subOutline.extractPresetFullContent(),
+                            )
+                        }
+                        groupWithFeedList.addFeed(feedToAdd)
                     }
                 }
             }