diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4e558ec6..b7fa6b04 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,7 +73,7 @@ jobs: echo ZSHOW_API=$ZSHOW_API >> local.properties echo SFMOVIES_API=$SFMOVIES_API >> local.properties echo CINEMATV_API=$CINEMATV_API >> local.properties - echo OMOVIES_API=$OMOVIES_API >> local.properties + echo GHOSTX_API=$GHOSTX_API >> local.properties echo SUPERSTREAM_FIRST_API=$SUPERSTREAM_FIRST_API >> local.properties echo SUPERSTREAM_SECOND_API=$SUPERSTREAM_SECOND_API >> local.properties echo SUPERSTREAM_THIRD_API=$SUPERSTREAM_THIRD_API >> local.properties diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts index f5e85a9f..41837eab 100644 --- a/SoraStream/build.gradle.kts +++ b/SoraStream/build.gradle.kts @@ -9,7 +9,7 @@ android { properties.load(project.rootProject.file("local.properties").inputStream()) buildConfigField("String", "TMDB_API", "\"${properties.getProperty("TMDB_API")}\"") - buildConfigField("String", "OMOVIES_API", "\"${properties.getProperty("OMOVIES_API")}\"") + buildConfigField("String", "GHOSTX_API", "\"${properties.getProperty("GHOSTX_API")}\"") buildConfigField("String", "CINEMATV_API", "\"${properties.getProperty("CINEMATV_API")}\"") buildConfigField("String", "SFMOVIES_API", "\"${properties.getProperty("SFMOVIES_API")}\"") buildConfigField("String", "ZSHOW_API", "\"${properties.getProperty("ZSHOW_API")}\"") diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt index 26b3d960..6a0422a7 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt @@ -1,7 +1,6 @@ package com.hexated import com.lagradost.cloudstream3.* -import com.lagradost.cloudstream3.APIHolder.unixTime import com.lagradost.cloudstream3.APIHolder.unixTimeMS import com.lagradost.cloudstream3.utils.* import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson @@ -2150,7 +2149,7 @@ object SoraExtractor : SoraStream() { } - suspend fun invokeOmovies( + suspend fun invokeGhostx( title: String? = null, year: Int? = null, season: Int? = null, @@ -2163,7 +2162,7 @@ object SoraExtractor : SoraStream() { season, episode, callback, - BuildConfig.OMOVIES_API, + BuildConfig.GHOSTX_API, "Ghostx", base64Decode("X3NtUWFtQlFzRVRi"), base64Decode("X3NCV2NxYlRCTWFU") diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt index ce4508ff..045ad668 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt @@ -36,16 +36,14 @@ import com.hexated.SoraExtractor.invokeEmovies import com.hexated.SoraExtractor.invokeHdmovies4u import com.hexated.SoraExtractor.invokeMultimovies import com.hexated.SoraExtractor.invokeNetmovies -import com.hexated.SoraExtractor.invokeSFMovies import com.hexated.SoraExtractor.invokeShowflix import com.hexated.SoraExtractor.invokeTvMovies import com.hexated.SoraExtractor.invokeUhdmovies import com.hexated.SoraExtractor.invokeVegamovies import com.hexated.SoraExtractor.invokeVidsrcto import com.hexated.SoraExtractor.invokeCinemaTv -import com.hexated.SoraExtractor.invokeMMovies import com.hexated.SoraExtractor.invokeMoflix -import com.hexated.SoraExtractor.invokeOmovies +import com.hexated.SoraExtractor.invokeGhostx import com.hexated.SoraExtractor.invokeWatchCartoon import com.hexated.SoraExtractor.invokeWatchsomuch import com.hexated.SoraExtractor.invokeZshow @@ -468,7 +466,7 @@ open class SoraStream : TmdbProvider() { ) }, { - if (!res.isAnime) invokeOmovies( + if (!res.isAnime) invokeGhostx( res.title, res.year, res.season, diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt index b4f38a3d..ace55c04 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt @@ -24,14 +24,12 @@ import com.hexated.SoraExtractor.invokeDumpStream import com.hexated.SoraExtractor.invokeEmovies import com.hexated.SoraExtractor.invokeMultimovies import com.hexated.SoraExtractor.invokeNetmovies -import com.hexated.SoraExtractor.invokeSFMovies import com.hexated.SoraExtractor.invokeShowflix import com.hexated.SoraExtractor.invokeVidSrc import com.hexated.SoraExtractor.invokeVidsrcto import com.hexated.SoraExtractor.invokeCinemaTv -import com.hexated.SoraExtractor.invokeMMovies import com.hexated.SoraExtractor.invokeMoflix -import com.hexated.SoraExtractor.invokeOmovies +import com.hexated.SoraExtractor.invokeGhostx import com.hexated.SoraExtractor.invokeWatchCartoon import com.hexated.SoraExtractor.invokeWatchsomuch import com.hexated.SoraExtractor.invokeZshow @@ -141,7 +139,7 @@ class SoraStreamLite : SoraStream() { ) }, { - if (!res.isAnime) invokeOmovies( + if (!res.isAnime) invokeGhostx( res.title, res.year, res.season,