Merge pull request #371 from stakwork/tt/feature/youtube-search

Youtube search
stakwork · Dec 24, 2021 · e4bd55a · e4bd55a
2 parents 005633a + 059b3d8
commit e4bd55a
Show file tree

Hide file tree

Showing 75 changed files with 998 additions and 400 deletions.
diff --git a/settings.gradle b/settings.gradle
@@ -95,8 +95,8 @@ include ':sphinx:application:network:concepts:concept-socket-io'
 include ':sphinx:application:network:features:feature-socket-io'
 include ':sphinx:application:network:concepts:tor:concept-network-tor'
 include ':sphinx:application:network:features:tor:feature-network-tor'
-include ':sphinx:application:network:concepts:queries:concept-network-query-podcast-search'
-include ':sphinx:application:network:features:queries:feature-network-query-podcast-search'
+include ':sphinx:application:network:concepts:queries:concept-network-query-feed-search'
+include ':sphinx:application:network:features:queries:feature-network-query-feed-search'
 
 // Activity
 include ':sphinx:activity:hilt-qualifiers'

diff --git a/...ain/java/chat/sphinx/activitymain/navigation/navigators/primary/DashboardNavigatorImpl.kt b/...ain/java/chat/sphinx/activitymain/navigation/navigators/primary/DashboardNavigatorImpl.kt
@@ -76,18 +76,18 @@ internal class DashboardNavigatorImpl @Inject constructor(
         detailDriver.submitNavigationRequest(ToPodcastPlayerScreen(chatId, feedId, feedUrl, currentEpisodeDuration))
     }
 
-    override suspend fun toVideoFeedScreen(chatId: ChatId, feedUrl: FeedUrl) {
+    override suspend fun toVideoFeedScreen(chatId: ChatId, feedId: FeedId, feedUrl: FeedUrl) {
         detailDriver.submitNavigationRequest(
             ToVideoFeedDetailScreen(
-                chatId, feedUrl
+                chatId, feedId, feedUrl
             )
         )
     }
 
-    override suspend fun toVideoWatchScreen(chatId: ChatId, feedUrl: FeedUrl) {
+    override suspend fun toVideoWatchScreen(chatId: ChatId, feedId: FeedId, feedUrl: FeedUrl) {
         detailDriver.submitNavigationRequest(
             ToVideoWatchScreen(
-                chatId, feedUrl
+                chatId, feedId, feedUrl
             )
         )
     }

diff --git a/sphinx/application/common/resources/src/main/res/values-es/strings.xml b/sphinx/application/common/resources/src/main/res/values-es/strings.xml
@@ -31,4 +31,9 @@
     <string name="failed_to_reject_member">No se ha podido denegar la solicitud</string>
 
     <string name="newsletter_article">ARTÍCULO NEWSLETTER</string>
+
+    <string name="subscribe">SUSCRIBIRSE</string>
+    <string name="unsubscribe">DESUSCRIBIRSE</string>
+    <string name="feed_search_following_section">SIGUIENDO</string>
+    <string name="feed_search_directory_section">DIRECTORIO</string>
 </resources>
diff --git a/sphinx/application/common/resources/src/main/res/values-ja/strings.xml b/sphinx/application/common/resources/src/main/res/values-ja/strings.xml
@@ -32,4 +32,9 @@
     <string name="failed_to_reject_member">メンバーを拒否できませんでした</string>
 
     <string name="newsletter_article">NEWSLETTER ARTICLE</string>
+
+    <string name="subscribe">SUBSCRIBE</string>
+    <string name="unsubscribe">UNSUBSCRIBE</string>
+    <string name="feed_search_following_section">FOLLOWING</string>
+    <string name="feed_search_directory_section">DIRECTORY</string>
 </resources>
diff --git a/sphinx/application/common/resources/src/main/res/values-zh/strings.xml b/sphinx/application/common/resources/src/main/res/values-zh/strings.xml
@@ -31,4 +31,9 @@
     <string name="failed_to_reject_member">拒絕會員失敗</string>
 
     <string name="newsletter_article">NEWSLETTER ARTICLE</string>
+
+    <string name="subscribe">SUBSCRIBE</string>
+    <string name="unsubscribe">UNSUBSCRIBE</string>
+    <string name="feed_search_following_section">FOLLOWING</string>
+    <string name="feed_search_directory_section">DIRECTORY</string>
 </resources>
diff --git a/sphinx/application/common/resources/src/main/res/values/strings.xml b/sphinx/application/common/resources/src/main/res/values/strings.xml
@@ -105,4 +105,9 @@
     <string name="failed_to_reject_member">Failed to reject member</string>
 
     <string name="newsletter_article">NEWSLETTER ARTICLE</string>
+
+    <string name="subscribe">SUBSCRIBE</string>
+    <string name="unsubscribe">UNSUBSCRIBE</string>
+    <string name="feed_search_following_section">FOLLOWING</string>
+    <string name="feed_search_directory_section">DIRECTORY</string>
 </resources>
diff --git a/...on/common/wrappers/wrapper-common/src/main/java/chat/sphinx/wrapper_common/feed/FeedId.kt b/...on/common/wrappers/wrapper-common/src/main/java/chat/sphinx/wrapper_common/feed/FeedId.kt
@@ -12,6 +12,14 @@ inline fun String.toFeedId(): FeedId? =
 inline fun FeedId.youtubeVideoId(): String =
     value.replace("yt:video:","")
 
+@Suppress("NOTHING_TO_INLINE")
+inline fun FeedId.youtubeFeedIds(): List<FeedId> =
+    listOf(
+        this,
+        FeedId("yt:channel:${value}"),
+        FeedId("yt:playlist:${value}")
+    )
+
 @JvmInline
 value class FeedId(val value: String) {
     init {

diff --git a/...plication/common/wrappers/wrapper-feed/src/main/java/chat/sphinx/wrapper_feed/FeedItem.kt b/...plication/common/wrappers/wrapper-feed/src/main/java/chat/sphinx/wrapper_feed/FeedItem.kt
@@ -40,7 +40,7 @@ data class FeedItem(
             imageUrl?.let {
                 return it
             }
-            return null
+            return thumbnailUrlToShow
         }
 
     var imageUrlToShow: PhotoUrl? = null

diff --git a/...nx/wrapper_podcast/PodcastSearchResult.kt → ...phinx/wrapper_podcast/FeedSearchResult.kt b/...nx/wrapper_podcast/PodcastSearchResult.kt → ...phinx/wrapper_podcast/FeedSearchResult.kt
@@ -1,6 +1,6 @@
 package chat.sphinx.wrapper_podcast
 
-data class PodcastSearchResult(
+data class FeedSearchResult(
     val id: String,
     val feedType: Long,
     val title: String,

diff --git a/...wrappers/wrapper-podcast/src/main/java/chat/sphinx/wrapper_podcast/FeedSearchResultRow.kt b/...wrappers/wrapper-podcast/src/main/java/chat/sphinx/wrapper_podcast/FeedSearchResultRow.kt
@@ -0,0 +1,8 @@
+package chat.sphinx.wrapper_podcast
+
+data class FeedSearchResultRow(
+    val feedSearchResult: FeedSearchResult?,
+    val isSectionHeader: Boolean,
+    val isFollowingSection: Boolean,
+    val isLastOnSection: Boolean
+)
diff --git a/...mmon/wrappers/wrapper-podcast/src/main/java/chat/sphinx/wrapper_podcast/PodcastEpisode.kt b/...mmon/wrappers/wrapper-podcast/src/main/java/chat/sphinx/wrapper_podcast/PodcastEpisode.kt
@@ -21,6 +21,14 @@ data class PodcastEpisode(
 
     var playing: Boolean = false
 
+    var imageUrlToShow: PhotoUrl? = null
+        get() {
+            image?.let {
+                return it
+            }
+            return null
+        }
+
     val downloaded: Boolean
         get()= localFile != null
 

diff --git a/...ppers/wrapper-podcast/src/main/java/chat/sphinx/wrapper_podcast/PodcastSearchResultRow.kt b/...ppers/wrapper-podcast/src/main/java/chat/sphinx/wrapper_podcast/PodcastSearchResultRow.kt
diff --git a/.../concepts/concept-coredb/src/main/sqldelight/chat/sphinx/concept_coredb/SphinxDatabase.sq b/.../concepts/concept-coredb/src/main/sqldelight/chat/sphinx/concept_coredb/SphinxDatabase.sq
@@ -947,10 +947,8 @@ feedUpsert {
     UPDATE feedDbo
     SET feed_type = :feed_type,
         title = :title,
-        description = :description,
         feed_url = :feed_url,
         author = :author,
-        image_url = :image_url,
         owner_url = :owner_url,
         link = :link,
         date_published = :date_published,
@@ -1008,6 +1006,11 @@ feedUpsert {
 feedGetAll:
 SELECT *
 FROM feedDbo
+ORDER BY id DESC;
+
+feedGetAllSubscribed:
+SELECT *
+FROM feedDbo
 WHERE subscribed = 1
 ORDER BY id DESC;
 
@@ -1049,11 +1052,21 @@ SELECT *
 FROM feedDbo
 WHERE id = ?;
 
+feedGetByIds:
+SELECT *
+FROM feedDbo
+WHERE id IN ?;
+
 feedGetAllByTitle:
 SELECT *
 FROM feedDbo
-WHERE subscribed = 1
-AND (title LIKE :title);
+WHERE (title LIKE :title);
+
+feedGetAllByTitleAndType:
+SELECT *
+FROM feedDbo
+WHERE (title LIKE :title)
+AND feed_type = :feed_type;
 
 feedUpdateCurrentItemId:
 UPDATE feedDbo

diff --git a/...ncept-repository-chat/src/main/java/chat/sphinx/concept_repository_chat/ChatRepository.kt b/...ncept-repository-chat/src/main/java/chat/sphinx/concept_repository_chat/ChatRepository.kt
@@ -8,18 +8,11 @@ import chat.sphinx.kotlin_response.Response
 import chat.sphinx.kotlin_response.ResponseError
 import chat.sphinx.wrapper_chat.Chat
 import chat.sphinx.wrapper_chat.ChatAlias
-import chat.sphinx.wrapper_chat.ChatHost
 import chat.sphinx.wrapper_chat.TribeData
-import chat.sphinx.wrapper_common.feed.FeedUrl
 import chat.sphinx.wrapper_common.chat.ChatUUID
 import chat.sphinx.wrapper_common.dashboard.ChatId
 import chat.sphinx.wrapper_common.dashboard.ContactId
-import chat.sphinx.wrapper_common.feed.FeedId
-import chat.sphinx.wrapper_common.feed.Subscribed
-import chat.sphinx.wrapper_feed.Feed
 import chat.sphinx.wrapper_meme_server.PublicAttachmentInfo
-import chat.sphinx.wrapper_podcast.Podcast
-import chat.sphinx.wrapper_podcast.PodcastSearchResultRow
 import kotlinx.coroutines.flow.Flow
 
 /**

diff --git a/...ncept-repository-feed/src/main/java/chat/sphinx/concept_repository_feed/FeedRepository.kt b/...ncept-repository-feed/src/main/java/chat/sphinx/concept_repository_feed/FeedRepository.kt
@@ -1,25 +1,34 @@
 package chat.sphinx.concept_repository_feed
 
 import chat.sphinx.wrapper_chat.ChatHost
+import chat.sphinx.wrapper_common.PhotoUrl
 import chat.sphinx.wrapper_common.chat.ChatUUID
 import chat.sphinx.wrapper_common.dashboard.ChatId
 import chat.sphinx.wrapper_common.feed.FeedId
+import chat.sphinx.wrapper_common.feed.FeedType
 import chat.sphinx.wrapper_common.feed.FeedUrl
 import chat.sphinx.wrapper_common.feed.Subscribed
 import chat.sphinx.wrapper_feed.Feed
+import chat.sphinx.wrapper_feed.FeedDescription
 import chat.sphinx.wrapper_podcast.Podcast
-import chat.sphinx.wrapper_podcast.PodcastSearchResultRow
+import chat.sphinx.wrapper_podcast.FeedSearchResultRow
 import kotlinx.coroutines.flow.Flow
 
 interface FeedRepository {
     fun getPodcastByChatId(chatId: ChatId): Flow<Podcast?>
     fun getPodcastById(feedId: FeedId): Flow<Podcast?>
-    fun searchPodcastBy(searchTerm: String): Flow<List<PodcastSearchResultRow>>
+
+    fun searchFeedsBy(
+        searchTerm: String,
+        feedType: FeedType?,
+    ): Flow<List<FeedSearchResultRow>>
 
     suspend fun updateFeedContent(
         chatId: ChatId,
         host: ChatHost,
         feedUrl: FeedUrl,
+        searchResultDescription: FeedDescription? = null,
+        searchResultImageUrl: PhotoUrl? = null,
         chatUUID: ChatUUID?,
         subscribed: Subscribed,
         currentEpisodeId: FeedId?

diff --git a/...y-android/src/main/java/chat/sphinx/feature_repository_android/SphinxRepositoryAndroid.kt b/...y-android/src/main/java/chat/sphinx/feature_repository_android/SphinxRepositoryAndroid.kt
@@ -12,7 +12,7 @@ import chat.sphinx.concept_network_query_invite.NetworkQueryInvite
 import chat.sphinx.concept_network_query_lightning.NetworkQueryLightning
 import chat.sphinx.concept_network_query_meme_server.NetworkQueryMemeServer
 import chat.sphinx.concept_network_query_message.NetworkQueryMessage
-import chat.sphinx.concept_network_query_podcast_search.NetworkQueryPodcastSearch
+import chat.sphinx.concept_network_query_feed_search.NetworkQueryFeedSearch
 import chat.sphinx.concept_network_query_save_profile.NetworkQuerySaveProfile
 import chat.sphinx.concept_network_query_subscription.NetworkQuerySubscription
 import chat.sphinx.concept_network_query_verify_external.NetworkQueryAuthorizeExternal
@@ -58,7 +58,7 @@ class SphinxRepositoryAndroid(
     networkQueryAuthorizeExternal: NetworkQueryAuthorizeExternal,
     networkQuerySaveProfile: NetworkQuerySaveProfile,
     networkQuerySubscription: NetworkQuerySubscription,
-    networkQueryPodcastSearch: NetworkQueryPodcastSearch,
+    networkQueryFeedSearch: NetworkQueryFeedSearch,
     rsa: RSA,
     socketIOManager: SocketIOManager,
     sphinxNotificationManager: SphinxNotificationManager,
@@ -83,7 +83,7 @@ class SphinxRepositoryAndroid(
     networkQueryAuthorizeExternal,
     networkQuerySaveProfile,
     networkQuerySubscription,
-    networkQueryPodcastSearch,
+    networkQueryFeedSearch,
     rsa,
     socketIOManager,
     sphinxNotificationManager,

diff --git a/sphinx/application/data/features/feature-repository/build.gradle b/sphinx/application/data/features/feature-repository/build.gradle
@@ -36,7 +36,7 @@ dependencies {
     api project(path: ':sphinx:application:network:concepts:queries:concept-network-query-lightning')
     api project(path: ':sphinx:application:network:concepts:queries:concept-network-query-message')
     api project(path: ':sphinx:application:network:concepts:queries:concept-network-query-authorize-external')
-    api project(path: ':sphinx:application:network:concepts:queries:concept-network-query-podcast-search')
+    api project(path: ':sphinx:application:network:concepts:queries:concept-network-query-feed-search')
     api project(path: ':sphinx:application:network:concepts:queries:concept-network-query-save-profile')
 
     api project(path: ':sphinx:application:network:concepts:concept-socket-io')