Added displayRarity and setText to /cosmetics/br/search/all and cosmetics

Added refundable and giftable to shop entries
Added optional API key

Author: thoo0224

com/thoo/api/FortniteAPI.kt

@@ -1,20 +1,32 @@
 package com.thoo.api
 
+import com.thoo.api.interceptors.DefaultInterceptor
 import com.thoo.api.match.MatchBuilder
 import com.thoo.api.model.*
 import com.thoo.api.service.FortniteAPIService
+import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import java.lang.reflect.Field
 import java.util.*
 
-class FortniteAPI {
+class FortniteAPI constructor(val key: String) {
+    constructor(): this("null")
 
     private var retrofit: Retrofit? = null
     private var service: FortniteAPIService? = null
+    private var httpClient: OkHttpClient? = null
 
     init {
-        retrofit = Retrofit.Builder().baseUrl("https://fortnite-api.com").addConverterFactory(GsonConverterFactory.create()).build()
+        httpClient = OkHttpClient.Builder()
+            .addInterceptor(DefaultInterceptor(key)).build()
+
+        retrofit = Retrofit.Builder()
+            .baseUrl("https://fortnite-api.com")
+            .addConverterFactory(GsonConverterFactory.create())
+            .client(httpClient)
+            .build()
+
         service = retrofit?.create(FortniteAPIService::class.java)
     }
 

com/thoo/api/interceptors/DefaultInterceptor.kt

@@ -0,0 +1,18 @@
+package com.thoo.api.interceptors
+
+import okhttp3.Interceptor
+import okhttp3.Response
+
+class DefaultInterceptor(private val key: String) : Interceptor {
+
+    override fun intercept(chain: Interceptor.Chain?): Response? {
+        val request = chain?.request()
+        if(key == "null"){
+            request?.newBuilder()?.build()
+        } else {
+            request?.newBuilder()?.addHeader("x-api-key", key)?.build()
+        }
+        return chain?.proceed(request)
+    }
+
+}

com/thoo/api/match/MatchBuilder.kt

@@ -21,6 +21,18 @@ class MatchBuilder {
     private var hasVariants: Boolean? = null
     private var hasGameplayTags: Boolean? = null
     private var gameplayTag: String? = null
+    private var displayRarity: String? = null
+    private var setText: String? = null
+
+    fun setDisplayRarity(displayRarity: String):MatchBuilder {
+        this.displayRarity = displayRarity
+        return this
+    }
+
+    fun setText(setText: String):MatchBuilder {
+        this.setText = setText
+        return this
+    }
 
     fun setType(type: String):MatchBuilder {
         this.type = type

com/thoo/api/model/BRCosmeticData.kt

@@ -12,6 +12,8 @@ class BRCosmeticData {
     val name: String = ""
     val shortDescription: String = ""
     val description: String = ""
+    val displayRarity: String = ""
+    val setText: String = ""
     val set: String = ""
     val series: String = ""
     val backendSeries: String = ""

com/thoo/api/model/BRShopEntry.kt

@@ -5,6 +5,8 @@ class BRShopEntry {
     val regularPrice: Int = 0
     val finalPrice: Int = 0
     val isBundle: Boolean = false
+    val refundable: Boolean = false
+    val giftable: Boolean = false
     val panel: Int = 0
     val sortPriority: Int = 0
     val banner:String = ""

example/Main.kt

@@ -4,7 +4,7 @@ import com.thoo.api.FortniteAPI
 import com.thoo.api.match.MatchBuilder
 
 fun main(args :  Array<String>){
-    val api: FortniteAPI = FortniteAPI()
+    val api: FortniteAPI = FortniteAPI("")
 
     // Returns an Array<BRCosmeticData> of cosmetics which is an outfit and has a rare rarity
     val matchBuilder = MatchBuilder().setRarity("rare").setType("outfit")