diff --git a/apps/vbox/backend/src/main/kotlin/ru/shadowsparky/vbox/backend/BackendModule.kt b/apps/vbox/backend/src/main/kotlin/ru/shadowsparky/vbox/backend/BackendModule.kt index 04ab935..48deeef 100644 --- a/apps/vbox/backend/src/main/kotlin/ru/shadowsparky/vbox/backend/BackendModule.kt +++ b/apps/vbox/backend/src/main/kotlin/ru/shadowsparky/vbox/backend/BackendModule.kt @@ -6,7 +6,6 @@ import org.koin.core.annotation.Single import ru.shadowsparky.backend.data.EnvFetcher import ru.shadowsparky.backend.domain.JwtInfo import ru.shadowsparky.vbox.backend.di.DbModule -import ru.shadowsparky.vbox.backend.di.EventModule import ru.shadowsparky.vbox.backend.di.HttpModule @Module @@ -27,7 +26,6 @@ class VboxModule { includes = [ DbModule::class, HttpModule::class, - EventModule::class, VboxModule::class ] ) diff --git a/apps/vbox/backend/src/main/kotlin/ru/shadowsparky/vbox/backend/data/http/SessionVideoApi.kt b/apps/vbox/backend/src/main/kotlin/ru/shadowsparky/vbox/backend/data/http/SessionVideoApi.kt index a49d88f..b1b829a 100644 --- a/apps/vbox/backend/src/main/kotlin/ru/shadowsparky/vbox/backend/data/http/SessionVideoApi.kt +++ b/apps/vbox/backend/src/main/kotlin/ru/shadowsparky/vbox/backend/data/http/SessionVideoApi.kt @@ -22,11 +22,16 @@ class SessionVideoApi(private val wrapper: VideoApi) : VideoApi { private val linksMutex = Mutex() override suspend fun fetchNewVideos(query: String?): VideosResponse { - val cacheKey = query ?: "" + val cacheKey = query.orEmpty() videosCache.getValid(cacheKey)?.let { return it } return videosMutex.withLock { videosCache.getValid(cacheKey) ?: run { - val remoteData = wrapper.fetchNewVideos(query) + var remoteData = wrapper.fetchNewVideos(query) + remoteData = if (remoteData == videosCache[""]?.data) { + VideosResponse(false, emptyList(), 1) + } else { + remoteData + } videosCache[cacheKey] = CacheEntry(remoteData) remoteData } diff --git a/apps/vbox/backend/src/main/kotlin/ru/shadowsparky/vbox/backend/di/EventModule.kt b/apps/vbox/backend/src/main/kotlin/ru/shadowsparky/vbox/backend/di/EventModule.kt deleted file mode 100644 index 41c8cba..0000000 --- a/apps/vbox/backend/src/main/kotlin/ru/shadowsparky/vbox/backend/di/EventModule.kt +++ /dev/null @@ -1,9 +0,0 @@ -package ru.shadowsparky.vbox.backend.di - -import org.koin.core.annotation.Module - -@Module -class EventModule { - - -} diff --git a/apps/vbox/client/shared/src/commonMain/composeResources/values/strings.xml b/apps/vbox/client/shared/src/commonMain/composeResources/values/strings.xml index 7007660..2264d57 100644 --- a/apps/vbox/client/shared/src/commonMain/composeResources/values/strings.xml +++ b/apps/vbox/client/shared/src/commonMain/composeResources/values/strings.xml @@ -68,6 +68,5 @@ Настроить теги Не фильтровать Поиск обновлений - Братан СвинGPT - СвинGPT + СвинGPT diff --git a/libs/http-client/src/commonMain/kotlin/ru/shadowsparky/http/data/HttpClientSettings.kt b/libs/http-client/src/commonMain/kotlin/ru/shadowsparky/http/data/HttpClientSettings.kt index 81d8677..4e8c1aa 100644 --- a/libs/http-client/src/commonMain/kotlin/ru/shadowsparky/http/data/HttpClientSettings.kt +++ b/libs/http-client/src/commonMain/kotlin/ru/shadowsparky/http/data/HttpClientSettings.kt @@ -76,7 +76,7 @@ class HttpClientSettings( } } install(Logging) { - val isDebug = koin.getOrNull()?.debug ?: true + val isDebug = koin.getOrNull()?.debug ?: false if (isDebug) { this.level = LogLevel.ALL this.logger = object : Logger {