Motd implementation (#37)

ShiftHackZ · web-flow · commit 986a1a4b49c1 · 2023-05-20T12:25:32.000+03:00
diff --git a/app/src/main/java/com/shifthackz/aisdv1/app/di/ProvidersModule.kt b/app/src/main/java/com/shifthackz/aisdv1/app/di/ProvidersModule.kt
@@ -26,7 +26,7 @@ val providersModule = module {
     single<ApiUrlProvider> {
         object : ApiUrlProvider {
             override val stableDiffusionAutomaticApiUrl: String = DEFAULT_SERVER_URL
-            override val stableDiffusionAppUpdateApiUrl: String = BuildConfig.UPDATE_API_URL
+            override val stableDiffusionAppApiUrl: String = BuildConfig.UPDATE_API_URL
             override val stableDiffusionCloudAiApiUrl: String = BuildConfig.CLOUD_AI_URL
         }
     }
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        appVersion = "0.3.1"
+        appVersion = "0.3.2"
         minSdk = 26
         targetSdk = 33
     }
diff --git a/core/common/src/main/java/com/shifthackz/aisdv1/core/common/extensions/StringExtensions.kt b/core/common/src/main/java/com/shifthackz/aisdv1/core/common/extensions/StringExtensions.kt
@@ -0,0 +1,10 @@
+package com.shifthackz.aisdv1.core.common.extensions
+
+private const val PROTOCOL_DELIMITER = "://"
+
+fun String.withoutUrlProtocol(): String {
+    if (!this.contains(PROTOCOL_DELIMITER)) return this
+    val decomposed = this.split(PROTOCOL_DELIMITER)
+    if (decomposed.size < 2) return this
+    return decomposed.last()
+}
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/di/RemoteDataSourceModule.kt b/data/src/main/java/com/shifthackz/aisdv1/data/di/RemoteDataSourceModule.kt
@@ -3,8 +3,20 @@ package com.shifthackz.aisdv1.data.di
 import com.shifthackz.aisdv1.core.common.links.LinksProvider
 import com.shifthackz.aisdv1.data.gateway.ServerConnectivityGatewayImpl
 import com.shifthackz.aisdv1.data.provider.ServerUrlProvider
-import com.shifthackz.aisdv1.data.remote.*
-import com.shifthackz.aisdv1.domain.datasource.*
+import com.shifthackz.aisdv1.data.remote.AppVersionRemoteDataSource
+import com.shifthackz.aisdv1.data.remote.CoinRemoteDateSource
+import com.shifthackz.aisdv1.data.remote.MotdRemoteDataSource
+import com.shifthackz.aisdv1.data.remote.ServerConfigurationRemoteDataSource
+import com.shifthackz.aisdv1.data.remote.StableDiffusionGenerationRemoteDataSource
+import com.shifthackz.aisdv1.data.remote.StableDiffusionModelsRemoteDataSource
+import com.shifthackz.aisdv1.data.remote.StableDiffusionSamplersRemoteDataSource
+import com.shifthackz.aisdv1.domain.datasource.AppVersionDataSource
+import com.shifthackz.aisdv1.domain.datasource.CoinDataSource
+import com.shifthackz.aisdv1.domain.datasource.MotdDataSource
+import com.shifthackz.aisdv1.domain.datasource.ServerConfigurationDataSource
+import com.shifthackz.aisdv1.domain.datasource.StableDiffusionGenerationDataSource
+import com.shifthackz.aisdv1.domain.datasource.StableDiffusionModelsDataSource
+import com.shifthackz.aisdv1.domain.datasource.StableDiffusionSamplersDataSource
 import com.shifthackz.aisdv1.domain.gateway.ServerConnectivityGateway
 import com.shifthackz.aisdv1.domain.preference.PreferenceManager
 import com.shifthackz.aisdv1.network.connectivity.ConnectivityMonitor
@@ -31,6 +43,7 @@ val remoteDataSourceModule = module {
     factoryOf(::ServerConfigurationRemoteDataSource) bind ServerConfigurationDataSource.Remote::class
     factoryOf(::AppVersionRemoteDataSource) bind AppVersionDataSource.Remote::class
     factoryOf(::CoinRemoteDateSource) bind CoinDataSource.Remote::class
+    factoryOf(::MotdRemoteDataSource) bind MotdDataSource.Remote::class
 
     factory<ServerConnectivityGateway> {
         val lambda: () -> Boolean = { get<PreferenceManager>().useSdAiCloud }
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/di/RepositoryModule.kt b/data/src/main/java/com/shifthackz/aisdv1/data/di/RepositoryModule.kt
@@ -1,7 +1,21 @@
 package com.shifthackz.aisdv1.data.di
 
-import com.shifthackz.aisdv1.data.repository.*
-import com.shifthackz.aisdv1.domain.repository.*
+import com.shifthackz.aisdv1.data.repository.AppVersionRepositoryImpl
+import com.shifthackz.aisdv1.data.repository.CoinRepositoryImpl
+import com.shifthackz.aisdv1.data.repository.GenerationResultRepositoryImpl
+import com.shifthackz.aisdv1.data.repository.MotdRepositoryImpl
+import com.shifthackz.aisdv1.data.repository.ServerConfigurationRepositoryImpl
+import com.shifthackz.aisdv1.data.repository.StableDiffusionGenerationRepositoryImpl
+import com.shifthackz.aisdv1.data.repository.StableDiffusionModelsRepositoryImpl
+import com.shifthackz.aisdv1.data.repository.StableDiffusionSamplersRepositoryImpl
+import com.shifthackz.aisdv1.domain.repository.AppVersionRepository
+import com.shifthackz.aisdv1.domain.repository.CoinRepository
+import com.shifthackz.aisdv1.domain.repository.GenerationResultRepository
+import com.shifthackz.aisdv1.domain.repository.MotdRepository
+import com.shifthackz.aisdv1.domain.repository.ServerConfigurationRepository
+import com.shifthackz.aisdv1.domain.repository.StableDiffusionGenerationRepository
+import com.shifthackz.aisdv1.domain.repository.StableDiffusionModelsRepository
+import com.shifthackz.aisdv1.domain.repository.StableDiffusionSamplersRepository
 import org.koin.core.module.dsl.factoryOf
 import org.koin.dsl.bind
 import org.koin.dsl.module
@@ -14,4 +28,5 @@ val repositoryModule = module {
     factoryOf(::GenerationResultRepositoryImpl) bind GenerationResultRepository::class
     factoryOf(::AppVersionRepositoryImpl) bind AppVersionRepository::class
     factoryOf(::CoinRepositoryImpl) bind CoinRepository::class
+    factoryOf(::MotdRepositoryImpl) bind MotdRepository::class
 }
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/mappers/MotdMapper.kt b/data/src/main/java/com/shifthackz/aisdv1/data/mappers/MotdMapper.kt
@@ -0,0 +1,12 @@
+package com.shifthackz.aisdv1.data.mappers
+
+import com.shifthackz.aisdv1.domain.entity.Motd
+import com.shifthackz.aisdv1.network.response.MotdResponse
+
+fun MotdResponse.toDomain(): Motd = with(this) {
+    Motd(
+        display = display ?: false,
+        title = title ?: "",
+        subTitle = subTitle ?: "",
+    )
+}
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/remote/AppVersionRemoteDataSource.kt b/data/src/main/java/com/shifthackz/aisdv1/data/remote/AppVersionRemoteDataSource.kt
@@ -3,12 +3,12 @@ package com.shifthackz.aisdv1.data.remote
 import com.shifthackz.aisdv1.core.common.appbuild.BuildInfoProvider
 import com.shifthackz.aisdv1.core.common.appbuild.BuildVersion
 import com.shifthackz.aisdv1.domain.datasource.AppVersionDataSource
-import com.shifthackz.aisdv1.network.api.StableDiffusionAppUpdateRestApi
+import com.shifthackz.aisdv1.network.api.sdai.AppUpdateRestApi
 import io.reactivex.rxjava3.core.Single
 
 internal class AppVersionRemoteDataSource(
     private val buildInfoProvider: BuildInfoProvider,
-    private val api: StableDiffusionAppUpdateRestApi,
+    private val api: AppUpdateRestApi,
 ) : AppVersionDataSource.Remote {
 
     override fun get(): Single<BuildVersion> = api
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/remote/CoinRemoteDateSource.kt b/data/src/main/java/com/shifthackz/aisdv1/data/remote/CoinRemoteDateSource.kt
@@ -1,11 +1,11 @@
 package com.shifthackz.aisdv1.data.remote
 
 import com.shifthackz.aisdv1.domain.datasource.CoinDataSource
-import com.shifthackz.aisdv1.network.api.StableDiffusionCoinsRestApi
+import com.shifthackz.aisdv1.network.api.sdai.CoinsRestApi
 import io.reactivex.rxjava3.core.Single
 
 internal class CoinRemoteDateSource(
-    private val api: StableDiffusionCoinsRestApi,
+    private val api: CoinsRestApi,
 ) : CoinDataSource.Remote {
 
     override fun fetchCoinsConfig(): Single<Int> = api
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/remote/MotdRemoteDataSource.kt b/data/src/main/java/com/shifthackz/aisdv1/data/remote/MotdRemoteDataSource.kt
@@ -0,0 +1,15 @@
+package com.shifthackz.aisdv1.data.remote
+
+import com.shifthackz.aisdv1.data.mappers.toDomain
+import com.shifthackz.aisdv1.domain.datasource.MotdDataSource
+import com.shifthackz.aisdv1.network.api.sdai.MotdRestApi
+import com.shifthackz.aisdv1.network.response.MotdResponse
+
+class MotdRemoteDataSource(
+    private val api: MotdRestApi,
+) : MotdDataSource.Remote {
+
+    override fun fetch() = api
+        .fetchMotd()
+        .map(MotdResponse::toDomain)
+}
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/remote/ServerConfigurationRemoteDataSource.kt b/data/src/main/java/com/shifthackz/aisdv1/data/remote/ServerConfigurationRemoteDataSource.kt
@@ -5,13 +5,13 @@ import com.shifthackz.aisdv1.data.mappers.mapToRequest
 import com.shifthackz.aisdv1.data.provider.ServerUrlProvider
 import com.shifthackz.aisdv1.domain.datasource.ServerConfigurationDataSource
 import com.shifthackz.aisdv1.domain.entity.ServerConfiguration
-import com.shifthackz.aisdv1.network.api.StableDiffusionWebUiAutomaticRestApi
-import com.shifthackz.aisdv1.network.api.StableDiffusionWebUiAutomaticRestApi.Companion.PATH_SD_OPTIONS
+import com.shifthackz.aisdv1.network.api.automatic1111.Automatic1111RestApi
+import com.shifthackz.aisdv1.network.api.automatic1111.Automatic1111RestApi.Companion.PATH_SD_OPTIONS
 import com.shifthackz.aisdv1.network.model.ServerConfigurationRaw
 
 internal class ServerConfigurationRemoteDataSource(
     private val serverUrlProvider: ServerUrlProvider,
-    private val api: StableDiffusionWebUiAutomaticRestApi,
+    private val api: Automatic1111RestApi,
 ) : ServerConfigurationDataSource.Remote {
 
     override fun fetchConfiguration() = serverUrlProvider(PATH_SD_OPTIONS)
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/remote/StableDiffusionGenerationRemoteDataSource.kt b/data/src/main/java/com/shifthackz/aisdv1/data/remote/StableDiffusionGenerationRemoteDataSource.kt
@@ -6,15 +6,15 @@ import com.shifthackz.aisdv1.data.provider.ServerUrlProvider
 import com.shifthackz.aisdv1.domain.datasource.StableDiffusionGenerationDataSource
 import com.shifthackz.aisdv1.domain.entity.ImageToImagePayload
 import com.shifthackz.aisdv1.domain.entity.TextToImagePayload
-import com.shifthackz.aisdv1.network.api.StableDiffusionWebUiAutomaticRestApi
-import com.shifthackz.aisdv1.network.api.StableDiffusionWebUiAutomaticRestApi.Companion.PATH_IMG_TO_IMG
-import com.shifthackz.aisdv1.network.api.StableDiffusionWebUiAutomaticRestApi.Companion.PATH_TXT_TO_IMG
+import com.shifthackz.aisdv1.network.api.automatic1111.Automatic1111RestApi
+import com.shifthackz.aisdv1.network.api.automatic1111.Automatic1111RestApi.Companion.PATH_IMG_TO_IMG
+import com.shifthackz.aisdv1.network.api.automatic1111.Automatic1111RestApi.Companion.PATH_TXT_TO_IMG
 import com.shifthackz.aisdv1.network.extensions.withExceptionMapper
 import com.shifthackz.aisdv1.network.response.SdGenerationResponse
 
 internal class StableDiffusionGenerationRemoteDataSource(
     private val serverUrlProvider: ServerUrlProvider,
-    private val api: StableDiffusionWebUiAutomaticRestApi,
+    private val api: Automatic1111RestApi,
 ) : StableDiffusionGenerationDataSource.Remote {
 
     override fun checkAvailability() = serverUrlProvider("/")
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/remote/StableDiffusionModelsRemoteDataSource.kt b/data/src/main/java/com/shifthackz/aisdv1/data/remote/StableDiffusionModelsRemoteDataSource.kt
@@ -3,13 +3,13 @@ package com.shifthackz.aisdv1.data.remote
 import com.shifthackz.aisdv1.data.mappers.mapRawToDomain
 import com.shifthackz.aisdv1.data.provider.ServerUrlProvider
 import com.shifthackz.aisdv1.domain.datasource.StableDiffusionModelsDataSource
-import com.shifthackz.aisdv1.network.api.StableDiffusionWebUiAutomaticRestApi
-import com.shifthackz.aisdv1.network.api.StableDiffusionWebUiAutomaticRestApi.Companion.PATH_SD_MODELS
+import com.shifthackz.aisdv1.network.api.automatic1111.Automatic1111RestApi
+import com.shifthackz.aisdv1.network.api.automatic1111.Automatic1111RestApi.Companion.PATH_SD_MODELS
 import com.shifthackz.aisdv1.network.model.StableDiffusionModelRaw
 
 internal class StableDiffusionModelsRemoteDataSource(
     private val serverUrlProvider: ServerUrlProvider,
-    private val api: StableDiffusionWebUiAutomaticRestApi,
+    private val api: Automatic1111RestApi,
 ) : StableDiffusionModelsDataSource.Remote {
 
     override fun fetchSdModels() = serverUrlProvider(PATH_SD_MODELS)
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/remote/StableDiffusionSamplersRemoteDataSource.kt b/data/src/main/java/com/shifthackz/aisdv1/data/remote/StableDiffusionSamplersRemoteDataSource.kt
@@ -3,13 +3,13 @@ package com.shifthackz.aisdv1.data.remote
 import com.shifthackz.aisdv1.data.mappers.mapRawToDomain
 import com.shifthackz.aisdv1.data.provider.ServerUrlProvider
 import com.shifthackz.aisdv1.domain.datasource.StableDiffusionSamplersDataSource
-import com.shifthackz.aisdv1.network.api.StableDiffusionWebUiAutomaticRestApi
-import com.shifthackz.aisdv1.network.api.StableDiffusionWebUiAutomaticRestApi.Companion.PATH_SAMPLERS
+import com.shifthackz.aisdv1.network.api.automatic1111.Automatic1111RestApi
+import com.shifthackz.aisdv1.network.api.automatic1111.Automatic1111RestApi.Companion.PATH_SAMPLERS
 import com.shifthackz.aisdv1.network.model.StableDiffusionSamplerRaw
 
 internal class StableDiffusionSamplersRemoteDataSource(
     private val serverUrlProvider: ServerUrlProvider,
-    private val api: StableDiffusionWebUiAutomaticRestApi,
+    private val api: Automatic1111RestApi,
 ) : StableDiffusionSamplersDataSource.Remote {
 
     override fun fetchSamplers() = serverUrlProvider(PATH_SAMPLERS)
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/repository/MotdRepositoryImpl.kt b/data/src/main/java/com/shifthackz/aisdv1/data/repository/MotdRepositoryImpl.kt
@@ -0,0 +1,11 @@
+package com.shifthackz.aisdv1.data.repository
+
+import com.shifthackz.aisdv1.domain.datasource.MotdDataSource
+import com.shifthackz.aisdv1.domain.repository.MotdRepository
+
+internal class MotdRepositoryImpl(
+    private val remoteDataSource: MotdDataSource.Remote,
+) : MotdRepository {
+
+    override fun fetchMotd() = remoteDataSource.fetch()
+}
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/datasource/MotdDataSource.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/datasource/MotdDataSource.kt
@@ -0,0 +1,11 @@
+package com.shifthackz.aisdv1.domain.datasource
+
+import com.shifthackz.aisdv1.domain.entity.Motd
+import io.reactivex.rxjava3.core.Single
+
+sealed interface MotdDataSource {
+
+    interface Remote {
+        fun fetch(): Single<Motd>
+    }
+}
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/di/DomainModule.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/di/DomainModule.kt
@@ -8,9 +8,28 @@ import com.shifthackz.aisdv1.domain.usecase.coin.EarnRewardedCoinsUseCase
 import com.shifthackz.aisdv1.domain.usecase.coin.EarnRewardedCoinsUseCaseImpl
 import com.shifthackz.aisdv1.domain.usecase.coin.ObserveCoinsUseCase
 import com.shifthackz.aisdv1.domain.usecase.coin.ObserveCoinsUseCaseImpl
-import com.shifthackz.aisdv1.domain.usecase.connectivity.*
-import com.shifthackz.aisdv1.domain.usecase.gallery.*
-import com.shifthackz.aisdv1.domain.usecase.generation.*
+import com.shifthackz.aisdv1.domain.usecase.connectivity.ObserveSeverConnectivityUseCase
+import com.shifthackz.aisdv1.domain.usecase.connectivity.ObserveSeverConnectivityUseCaseImpl
+import com.shifthackz.aisdv1.domain.usecase.connectivity.PingStableDiffusionServiceUseCase
+import com.shifthackz.aisdv1.domain.usecase.connectivity.PingStableDiffusionServiceUseCaseImpl
+import com.shifthackz.aisdv1.domain.usecase.connectivity.TestConnectivityUseCase
+import com.shifthackz.aisdv1.domain.usecase.connectivity.TestConnectivityUseCaseImpl
+import com.shifthackz.aisdv1.domain.usecase.gallery.DeleteGalleryItemUseCase
+import com.shifthackz.aisdv1.domain.usecase.gallery.DeleteGalleryItemUseCaseImpl
+import com.shifthackz.aisdv1.domain.usecase.gallery.GetAllGalleryUseCase
+import com.shifthackz.aisdv1.domain.usecase.gallery.GetAllGalleryUseCaseImpl
+import com.shifthackz.aisdv1.domain.usecase.gallery.GetGalleryItemUseCase
+import com.shifthackz.aisdv1.domain.usecase.gallery.GetGalleryItemUseCaseImpl
+import com.shifthackz.aisdv1.domain.usecase.gallery.GetGalleryPageUseCase
+import com.shifthackz.aisdv1.domain.usecase.gallery.GetGalleryPageUseCaseImpl
+import com.shifthackz.aisdv1.domain.usecase.generation.ImageToImageUseCase
+import com.shifthackz.aisdv1.domain.usecase.generation.ImageToImageUseCaseImpl
+import com.shifthackz.aisdv1.domain.usecase.generation.SaveGenerationResultUseCase
+import com.shifthackz.aisdv1.domain.usecase.generation.SaveGenerationResultUseCaseImpl
+import com.shifthackz.aisdv1.domain.usecase.generation.TextToImageUseCase
+import com.shifthackz.aisdv1.domain.usecase.generation.TextToImageUseCaseImpl
+import com.shifthackz.aisdv1.domain.usecase.motd.ObserveMotdUseCase
+import com.shifthackz.aisdv1.domain.usecase.motd.ObserveMotdUseCaseImpl
 import com.shifthackz.aisdv1.domain.usecase.sdmodel.GetStableDiffusionModelsUseCase
 import com.shifthackz.aisdv1.domain.usecase.sdmodel.GetStableDiffusionModelsUseCaseImpl
 import com.shifthackz.aisdv1.domain.usecase.sdmodel.SelectStableDiffusionModelUseCase
@@ -51,4 +70,5 @@ val domainModule = module {
     factoryOf(::CheckAppVersionUpdateUseCaseImpl) bind CheckAppVersionUpdateUseCase::class
     factoryOf(::ObserveCoinsUseCaseImpl) bind ObserveCoinsUseCase::class
     factoryOf(::EarnRewardedCoinsUseCaseImpl) bind EarnRewardedCoinsUseCase::class
+    factoryOf(::ObserveMotdUseCaseImpl) bind ObserveMotdUseCase::class
 }
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/entity/Motd.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/entity/Motd.kt
@@ -0,0 +1,22 @@
+package com.shifthackz.aisdv1.domain.entity
+
+/**
+ * Represents server message model.
+ *
+ * MOTD: Message Of The Day
+ *
+ * @param display defines if message should be visible
+ * @param title string with message header
+ * @param subTitle string with message body
+ */
+data class Motd(
+    val display: Boolean = false,
+    val title: String = "",
+    val subTitle: String = "",
+) {
+    val isEmpty: Boolean
+        get() = title.isEmpty() && subTitle.isEmpty()
+
+    val isNotEmpty: Boolean
+        get() = !isEmpty
+}
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/repository/MotdRepository.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/repository/MotdRepository.kt
@@ -0,0 +1,8 @@
+package com.shifthackz.aisdv1.domain.repository
+
+import com.shifthackz.aisdv1.domain.entity.Motd
+import io.reactivex.rxjava3.core.Single
+
+interface MotdRepository {
+    fun fetchMotd(): Single<Motd>
+}
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/usecase/motd/ObserveMotdUseCase.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/usecase/motd/ObserveMotdUseCase.kt
@@ -0,0 +1,8 @@
+package com.shifthackz.aisdv1.domain.usecase.motd
+
+import com.shifthackz.aisdv1.domain.entity.Motd
+import io.reactivex.rxjava3.core.Flowable
+
+interface ObserveMotdUseCase {
+    operator fun invoke(): Flowable<Motd>
+}
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/usecase/motd/ObserveMotdUseCaseImpl.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/usecase/motd/ObserveMotdUseCaseImpl.kt
@@ -0,0 +1,38 @@
+package com.shifthackz.aisdv1.domain.usecase.motd
+
+import com.shifthackz.aisdv1.domain.entity.Motd
+import com.shifthackz.aisdv1.domain.repository.MotdRepository
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Observable
+import java.util.concurrent.TimeUnit
+
+internal class ObserveMotdUseCaseImpl(
+    private val motdRepository: MotdRepository,
+) : ObserveMotdUseCase {
+
+    private val motdProducer: (Long) -> Observable<Motd> = {
+        motdRepository
+            .fetchMotd()
+            .onErrorReturn { motd }
+            .doOnSuccess { motd = it }
+            .toObservable()
+    }
+
+    private var motd: Motd = Motd()
+
+    override operator fun invoke(): Flowable<Motd> {
+        val refreshProducer: () -> Observable<Motd> = {
+            Observable
+                .interval(30L, TimeUnit.SECONDS)
+                .flatMap(motdProducer::invoke)
+        }
+
+        val merged = Observable.merge(
+            refreshProducer(),
+            motdProducer(-1L),
+        )
+
+        return merged.toFlowable(BackpressureStrategy.LATEST)
+    }
+}
diff --git a/network/src/main/java/com/shifthackz/aisdv1/network/api/automatic1111/Automatic1111RestApi.kt b/network/src/main/java/com/shifthackz/aisdv1/network/api/automatic1111/Automatic1111RestApi.kt
@@ -1,4 +1,4 @@
-package com.shifthackz.aisdv1.network.api
+package com.shifthackz.aisdv1.network.api.automatic1111
 
 import com.shifthackz.aisdv1.network.model.ServerConfigurationRaw
 import com.shifthackz.aisdv1.network.model.StableDiffusionModelRaw
@@ -13,7 +13,7 @@ import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Url
 
-interface StableDiffusionWebUiAutomaticRestApi {
+interface Automatic1111RestApi {
 
     @GET
     fun healthCheck(@Url url: String): Completable
diff --git a/network/src/main/java/com/shifthackz/aisdv1/network/api/sdai/AppUpdateRestApi.kt b/network/src/main/java/com/shifthackz/aisdv1/network/api/sdai/AppUpdateRestApi.kt
@@ -1,10 +1,10 @@
-package com.shifthackz.aisdv1.network.api
+package com.shifthackz.aisdv1.network.api.sdai
 
 import com.shifthackz.aisdv1.network.response.AppVersionResponse
 import io.reactivex.rxjava3.core.Single
 import retrofit2.http.GET
 
-interface StableDiffusionAppUpdateRestApi {
+interface AppUpdateRestApi {
 
     @GET("/version.json")
     fun fetchAppVersion(): Single<AppVersionResponse>
diff --git a/network/src/main/java/com/shifthackz/aisdv1/network/api/sdai/CoinsRestApi.kt b/network/src/main/java/com/shifthackz/aisdv1/network/api/sdai/CoinsRestApi.kt
diff --git a/network/src/main/java/com/shifthackz/aisdv1/network/api/sdai/MotdRestApi.kt b/network/src/main/java/com/shifthackz/aisdv1/network/api/sdai/MotdRestApi.kt
diff --git a/network/src/main/java/com/shifthackz/aisdv1/network/di/NetworkModule.kt b/network/src/main/java/com/shifthackz/aisdv1/network/di/NetworkModule.kt
diff --git a/network/src/main/java/com/shifthackz/aisdv1/network/interceptor/LoggingInterceptor.kt b/network/src/main/java/com/shifthackz/aisdv1/network/interceptor/LoggingInterceptor.kt
diff --git a/network/src/main/java/com/shifthackz/aisdv1/network/qualifiers/ApiUrlProvider.kt b/network/src/main/java/com/shifthackz/aisdv1/network/qualifiers/ApiUrlProvider.kt
diff --git a/network/src/main/java/com/shifthackz/aisdv1/network/response/MotdResponse.kt b/network/src/main/java/com/shifthackz/aisdv1/network/response/MotdResponse.kt
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/di/ViewModelModule.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/di/ViewModelModule.kt
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/home/HomeNavigationScreen.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/home/HomeNavigationScreen.kt
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/motd/MotdComposable.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/motd/MotdComposable.kt
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/motd/MotdState.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/motd/MotdState.kt
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/motd/MotdViewModel.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/motd/MotdViewModel.kt

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ val providersModule = module {`
`26`	`26`	`single<ApiUrlProvider> {`
`27`	`27`	`object : ApiUrlProvider {`
`28`	`28`	`override val stableDiffusionAutomaticApiUrl: String = DEFAULT_SERVER_URL`
`29`		`- override val stableDiffusionAppUpdateApiUrl: String = BuildConfig.UPDATE_API_URL`
	`29`	`+ override val stableDiffusionAppApiUrl: String = BuildConfig.UPDATE_API_URL`
`30`	`30`	`override val stableDiffusionCloudAiApiUrl: String = BuildConfig.CLOUD_AI_URL`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`ext {`
`3`		`- appVersion = "0.3.1"`
	`3`	`+ appVersion = "0.3.2"`
`4`	`4`	`minSdk = 26`
`5`	`5`	`targetSdk = 33`
`6`	`6`	`}`