Introduce new link api and bring back old link api

Author: rubengees

library/src/main/kotlin/me/proxer/library/api/anime/AnimeApi.kt

@@ -25,4 +25,11 @@ class AnimeApi internal constructor(retrofit: Retrofit) {
     fun link(streamId: String): LinkEndpoint {
         return LinkEndpoint(internalApi, streamId)
     }
+
+    /**
+     * Returns the respective endpoint.
+     */
+    fun vastLink(streamId: String): VastLinkEndpoint {
+        return VastLinkEndpoint(internalApi, streamId)
+    }
 }

library/src/main/kotlin/me/proxer/library/api/anime/InternalApi.kt

@@ -27,9 +27,13 @@ internal interface InternalApi {
         @Query("language") language: AnimeLanguage?
     ): ProxerCall<List<Stream>>
 
-    @GET("anime/link2")
+    @GET("anime/link")
     fun link(
-        @Query("id") id: String?,
-        @Query("adFlag") adFlag: Int?
+        @Query("id") id: String?
+    ): ProxerCall<String>
+
+    @GET("anime/linkvast")
+    fun vastLink(
+        @Query("id") id: String?
     ): ProxerCall<LinkContainer>
 }

library/src/main/kotlin/me/proxer/library/api/anime/LinkEndpoint.kt

@@ -2,8 +2,6 @@ package me.proxer.library.api.anime
 
 import me.proxer.library.ProxerCall
 import me.proxer.library.api.Endpoint
-import me.proxer.library.entity.anime.LinkContainer
-import me.proxer.library.internal.util.toIntOrNull
 
 /**
  * Endpoint for retrieving the link to the uploaded anime. This may be null, if the link is broken or has been deleted.
@@ -15,19 +13,9 @@ import me.proxer.library.internal.util.toIntOrNull
 class LinkEndpoint internal constructor(
     private val internalApi: InternalApi,
     private val id: String
-) : Endpoint<LinkContainer> {
+) : Endpoint<String> {
 
-    private var enableAds: Boolean? = null
-
-    /**
-     * Sets if the ad system of Proxer is supported and should be enabled.
-     * Requires a special permission from the administration.
-     */
-    fun enableAds(enableAds: Boolean? = false) = this.apply {
-        this.enableAds = enableAds
-    }
-
-    override fun build(): ProxerCall<LinkContainer> {
-        return internalApi.link(id, enableAds.toIntOrNull())
+    override fun build(): ProxerCall<String> {
+        return internalApi.link(id)
     }
 }

library/src/main/kotlin/me/proxer/library/api/anime/VastLinkEndpoint.kt

@@ -0,0 +1,21 @@
+package me.proxer.library.api.anime
+
+import me.proxer.library.ProxerCall
+import me.proxer.library.api.Endpoint
+import me.proxer.library.entity.anime.LinkContainer
+
+/**
+ * Endpoint similar to [LinkEndpoint], but additionally returns a VAST ad tag. This requires the highest authorization
+ * level and should only be used by official applications.
+ *
+ * @author Ruben Gees
+ */
+class VastLinkEndpoint internal constructor(
+    private val internalApi: InternalApi,
+    private val id: String
+) : Endpoint<LinkContainer> {
+
+    override fun build(): ProxerCall<LinkContainer> {
+        return internalApi.vastLink(id)
+    }
+}

library/src/main/kotlin/me/proxer/library/entity/anime/LinkContainer.kt

@@ -7,11 +7,10 @@ import com.squareup.moshi.JsonClass
  * Entity representing a link to an anime.
  *
  * @property link The actual link. This does point to the HTML embed and not the video itself.
- * @property shouldShowAd If an ad should be shown for this stream. This is part of the Proxers ad system and needs
- *                        special permission to use.
+ * @property adTag The VAST tag of the ad to show. Is empty if no ad is available or none should be shown.
  */
 @JsonClass(generateAdapter = true)
 data class LinkContainer(
     @Json(name = "link") val link: String,
-    @Json(name = "adFlag") val shouldShowAd: Boolean
+    @Json(name = "adTag") val adTag: String
 )

library/src/test/kotlin/me/proxer/library/api/anime/LinkEndpointTest.kt

@@ -1,7 +1,6 @@
 package me.proxer.library.api.anime
 
 import me.proxer.library.ProxerTest
-import me.proxer.library.entity.anime.LinkContainer
 import me.proxer.library.fromResource
 import okhttp3.mockwebserver.MockResponse
 import org.assertj.core.api.Assertions.assertThat
@@ -21,22 +20,17 @@ class LinkEndpointTest : ProxerTest() {
             .build()
             .execute()
 
-        assertThat(result).isEqualTo(buildTestLink())
+        assertThat(result).isEqualTo("//www.dailymotion.com/embed/video/k4D1tfdhKG")
     }
 
     @Test
     fun testPath() {
         server.enqueue(MockResponse().setBody(fromResource("link.json")))
 
         api.anime.link("13")
-            .enableAds(true)
             .build()
             .execute()
 
-        assertThat(server.takeRequest().path).isEqualTo("/api/v1/anime/link2?id=13&adFlag=1")
-    }
-
-    private fun buildTestLink(): LinkContainer {
-        return LinkContainer("//www.dailymotion.com/embed/video/k4D1tfdhKG", true)
+        assertThat(server.takeRequest().path).isEqualTo("/api/v1/anime/link?id=13")
     }
 }

library/src/test/kotlin/me/proxer/library/api/anime/VastLinkEndpointTest.kt

@@ -0,0 +1,38 @@
+package me.proxer.library.api.anime
+
+import me.proxer.library.ProxerTest
+import me.proxer.library.entity.anime.LinkContainer
+import me.proxer.library.fromResource
+import okhttp3.mockwebserver.MockResponse
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+
+class VastLinkEndpointTest : ProxerTest() {
+
+    @Test
+    fun testDefault() {
+        server.enqueue(MockResponse().setBody(fromResource("link_vast.json")))
+
+        val result = api.anime
+            .vastLink("4")
+            .build()
+            .execute()
+
+        assertThat(result).isEqualTo(buildTestLinkContainer())
+    }
+
+    @Test
+    fun testPath() {
+        server.enqueue(MockResponse().setBody(fromResource("link_vast.json")))
+
+        api.anime.vastLink("9")
+            .build()
+            .execute()
+
+        assertThat(server.takeRequest().path).isEqualTo("/api/v1/anime/linkvast?id=9")
+    }
+
+    private fun buildTestLinkContainer(): LinkContainer {
+        return LinkContainer("//www.dailymotion.com/embed/video/k4D1tLdhKG", "https://example.com")
+    }
+}

library/src/test/resources/link.json

@@ -1,8 +1,5 @@
 {
   "error": 0,
   "message": "Abfrage erfolgreich",
-  "data": {
-    "link": "//www.dailymotion.com/embed/video/k4D1tfdhKG",
-    "adFlag": true
-  }
+  "data": "//www.dailymotion.com/embed/video/k4D1tfdhKG"
 }

library/src/test/resources/link_vast.json

@@ -0,0 +1,8 @@
+{
+  "error": 0,
+  "message": "Abfrage erfolgreich",
+  "data": {
+    "link": "//www.dailymotion.com/embed/video/k4D1tLdhKG",
+    "adTag": "https://example.com"
+  }
+}