Adopt new link api

Author: rubengees

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

@@ -1,6 +1,7 @@
 package me.proxer.library.api.anime
 
 import me.proxer.library.ProxerCall
+import me.proxer.library.entity.anime.LinkContainer
 import me.proxer.library.entity.anime.Stream
 import me.proxer.library.enums.AnimeLanguage
 import retrofit2.http.GET
@@ -26,6 +27,9 @@ internal interface InternalApi {
         @Query("language") language: AnimeLanguage?
     ): ProxerCall<List<Stream>>
 
-    @GET("anime/link")
-    fun link(@Query("id") id: String?): ProxerCall<String>
+    @GET("anime/link2")
+    fun link(
+        @Query("id") id: String?,
+        @Query("adFlag") adFlag: Int?
+    ): ProxerCall<LinkContainer>
 }

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

@@ -2,6 +2,8 @@ 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.
@@ -13,9 +15,19 @@ import me.proxer.library.api.Endpoint
 class LinkEndpoint internal constructor(
     private val internalApi: InternalApi,
     private val id: String
-) : Endpoint<String> {
+) : Endpoint<LinkContainer> {
 
-    override fun build(): ProxerCall<String> {
-        return internalApi.link(id)
+    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())
     }
 }

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

@@ -0,0 +1,17 @@
+package me.proxer.library.entity.anime
+
+import com.squareup.moshi.Json
+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.
+ */
+@JsonClass(generateAdapter = true)
+data class LinkContainer(
+    @Json(name = "link") val link: String,
+    @Json(name = "adFlag") val shouldShowAd: Boolean
+)

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

@@ -1,6 +1,7 @@
 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
@@ -20,17 +21,22 @@ class LinkEndpointTest : ProxerTest() {
             .build()
             .execute()
 
-        assertThat(result).isEqualTo("//www.dailymotion.com/embed/video/k4D1tfdhKG")
+        assertThat(result).isEqualTo(buildTestLink())
     }
 
     @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/link?id=13")
+        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)
     }
 }

library/src/test/resources/link.json

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