Fix '0' viewers count on some goodgame channels

Author: onoderis

src/main/kotlin/failchat/Dependencies.kt

@@ -354,8 +354,7 @@ class Dependencies {
     // Goodgame
     val ggApi2Client = GgApi2Client(
             httpClient = okHttpClient,
-            objectMapper = objectMapper,
-            apiUrl = configuration.getString("goodgame.api2-url")
+            objectMapper = objectMapper
     )
     val ggBadgeHandler = { channel: GgChannel ->
         GgBadgeHandler(channel, configuration)

src/main/kotlin/failchat/goodgame/GgApi2Client.kt

@@ -11,36 +11,33 @@ import okhttp3.Request
 
 class GgApi2Client(
         private val httpClient: OkHttpClient,
-        private val objectMapper: ObjectMapper,
-        apiUrl: String
+        private val objectMapper: ObjectMapper
 ) {
 
-    // http://api2.goodgame.ru/apigility/documentation/Goodgame-v2
-
-    private val apiUrl = apiUrl.removeSuffix("/")
+    private companion object {
+        // Documentation: https://api2.goodgame.ru/apigility/documentation/Goodgame-v2
+        const val apiUrl = "https://api2.goodgame.ru/v2"
+    }
 
-    /** @return viewers count for only a goodgame player. */
+    /** @return viewers count for a goodgame video player. */
     suspend fun requestViewersCount(channelName: String): Int {
         val request = Request.Builder()
                 .get()
                 .url("$apiUrl/streams/$channelName")
                 .header("Accept", "application/vnd.goodgame.v2+json")
                 .build()
 
-        val response = httpClient.newCall(request).await()
-
-        if (response.code != 200) throw UnexpectedResponseCodeException(response.code)
-        val responseBody = response.body ?: throw UnexpectedResponseException("null body")
-        val responseNode = objectMapper.readTree(responseBody.string())
-
-
-        val streamLive = responseNode.get("status").textValue() == "Live"
-        val ggPlayerLive = responseNode.get("is_broadcast").booleanValue()
+        val response = httpClient.newCall(request).await().use { response ->
+            if (response.code != 200) throw UnexpectedResponseCodeException(response.code)
+            val responseBody = response.body ?: throw UnexpectedResponseException("null body")
+            objectMapper.readValue(responseBody.charStream(), StreamResponse::class.java)
+        }
 
-        if (!streamLive) throw ChannelOfflineException(GOODGAME, channelName)
-        if (!ggPlayerLive) return 0
+        if (response.status != "Live") {
+            throw ChannelOfflineException(GOODGAME, channelName)
+        }
 
-        return responseNode.get("player_viewers").asInt()
+        return response.playerViewers
     }
 
 }

src/main/kotlin/failchat/goodgame/GgApiClient.kt

@@ -2,9 +2,6 @@ package failchat.goodgame
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.ObjectMapper
-import failchat.Origin
-import failchat.exception.ChannelNotFoundException
-import failchat.exception.ChannelOfflineException
 import failchat.exception.UnexpectedResponseCodeException
 import failchat.exception.UnexpectedResponseException
 import failchat.util.await
@@ -62,16 +59,6 @@ class GgApiClient(
         )
     }
 
-    /** @return viewers count on all players. */
-    suspend fun requestViewersCount(channelName: String): Int {
-        // https://github.com/GoodGame/API/blob/master/Streams/stream_api.md
-        val response = requestChannelStatus(channelName)
-        val statusNode = response.firstOrNull()
-                ?: throw ChannelNotFoundException("goodgame: $channelName")
-        if (statusNode.get("status").asText() != "Live") throw ChannelOfflineException(Origin.GOODGAME, channelName)
-        return statusNode.get("viewers").asText().toInt()
-    }
-
     private suspend fun requestChannelStatus(channelName: String): JsonNode {
         val parameters = "?fmt=json&id=$channelName"
 

src/main/kotlin/failchat/goodgame/StreamResponse.kt

@@ -0,0 +1,9 @@
+package failchat.goodgame
+
+import com.fasterxml.jackson.annotation.JsonProperty
+
+data class StreamResponse(
+        val status: String,
+        @JsonProperty("player_viewers")
+        val playerViewers: Int
+)

src/main/resources/config/default.properties

@@ -75,7 +75,6 @@ bttv.api-url = https://api.betterttv.net/
 frankerfacez.api-url = https://api.frankerfacez.com/v1/
 goodgame.ws-url = wss://chat-1.goodgame.ru/chat2/
 goodgame.api-url = http://goodgame.ru/api/
-goodgame.api2-url = https://api2.goodgame.ru/v2/
 goodgame.emoticon-js-url = https://goodgame.ru/js/minified/global.js
 goodgame.badge-url = https://static.goodgame.ru/files/icons/
 

src/test/kotlin/failchat/goodgame/GgApi2ClientTest.kt

@@ -1,19 +1,28 @@
 package failchat.goodgame
 
-import failchat.defaultConfig
+import failchat.exception.ChannelOfflineException
 import failchat.okHttpClient
 import failchat.testObjectMapper
 import kotlinx.coroutines.runBlocking
+import mu.KotlinLogging
+import kotlin.test.Test
 
 class GgApi2ClientTest {
 
-    private val client = GgApi2Client(okHttpClient, testObjectMapper, defaultConfig.getString("goodgame.api2-url"))
+    private companion object {
+        val logger = KotlinLogging.logger {}
+    }
+
+    private val client = GgApi2Client(okHttpClient, testObjectMapper)
 
-//    todo
-//    @Test
+    @Test
     fun requestViewersCountTest() = runBlocking<Unit> {
-        val count = client.requestViewersCount("Miker")
-        println(count)
+        try {
+            val count = client.requestViewersCount("Fotos")
+            logger.debug("gg viewers count: {}", count)
+        } catch (ignored: ChannelOfflineException) {
+            logger.debug("gg channel is offline")
+        }
     }
 
 }

…st/kotlin/failchat/goodgame/GgApiTest.kt …lin/failchat/goodgame/GgApiClientTest.ktsrc/test/kotlin/failchat/goodgame/GgApiTest.kt renamed to src/test/kotlin/failchat/goodgame/GgApiClientTest.kt src/test/kotlin/failchat/goodgame/GgApiTest.kt renamed to src/test/kotlin/failchat/goodgame/GgApiClientTest.kt

@@ -1,7 +1,6 @@
 package failchat.goodgame
 
 import failchat.defaultConfig
-import failchat.exception.ChannelOfflineException
 import failchat.okHttpClient
 import failchat.testObjectMapper
 import kotlinx.coroutines.runBlocking
@@ -10,10 +9,10 @@ import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import kotlin.system.measureTimeMillis
 
-class GgApiTest {
+class GgApiClientTest {
 
     private companion object {
-        val log: Logger = LoggerFactory.getLogger(GgApiTest::class.java)
+        val log: Logger = LoggerFactory.getLogger(GgApiClientTest::class.java)
     }
 
     private val apiClient = GgApiClient(
@@ -37,16 +36,6 @@ class GgApiTest {
         log.debug("gg emoticons load time: {} ms", t)
     }
 
-    @Test
-    fun viewersCountTest() = runBlocking<Unit> {
-        try {
-            val count = apiClient.requestViewersCount("Miker")
-            log.debug("gg viewers count: {}", count)
-        } catch (ignored: ChannelOfflineException) {
-            log.debug("gg channel is offline")
-        }
-    }
-
     @Test
     fun requestChannelInfoTest() = runBlocking<Unit> {
         val c = apiClient.requestChannelInfo("Miker")