Reformat code

KSoft-Si · Sep 6, 2020 · 261908c · 261908c
1 parent 41ee01c
commit 261908c
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 33 deletions.
diff --git a/src/main/kotlin/si/ksoft/ksoftlin/builder/Ksoftlin.kt b/src/main/kotlin/si/ksoft/ksoftlin/builder/Ksoftlin.kt
@@ -1,9 +1,8 @@
 package si.ksoft.ksoftlin.builder
 
-import io.ktor.client.HttpClient
-import io.ktor.client.engine.apache.Apache
-import io.ktor.client.features.json.GsonSerializer
-import io.ktor.client.features.json.Json
+import io.ktor.client.*
+import io.ktor.client.engine.apache.*
+import io.ktor.client.features.json.*
 import si.ksoft.ksoftlin.endpoints.KsoftEndpoints
 
 /**

diff --git a/src/main/kotlin/si/ksoft/ksoftlin/data/dbl/vote/list/ListVoteData.kt b/src/main/kotlin/si/ksoft/ksoftlin/data/dbl/vote/list/ListVoteData.kt
@@ -3,6 +3,11 @@ package si.ksoft.ksoftlin.data.dbl.vote.list
 import com.google.gson.annotations.SerializedName
 import si.ksoft.ksoftlin.data.dbl.vote.Vote
 
-data class Vote(val expiry: String, val extras: List<String>, @SerializedName("user") val id: Long, val isWeekend: Boolean)
+data class Vote(
+    val expiry: String,
+    val extras: List<String>,
+    @SerializedName("user") val id: Long,
+    val isWeekend: Boolean
+)
 
 data class ListVoteResponse(val votes: List<Vote>)
diff --git a/src/main/kotlin/si/ksoft/ksoftlin/data/kumo/location/LocationData.kt b/src/main/kotlin/si/ksoft/ksoftlin/data/kumo/location/LocationData.kt
@@ -2,14 +2,16 @@ package si.ksoft.ksoftlin.data.kumo.location
 
 import com.google.gson.annotations.SerializedName
 
-data class Location(val address: String,
-                    @SerializedName("lat")
-                    val latitude: Double,
-                    @SerializedName("lon")
-                    val longitude: Double,
-                    @SerializedName("bounding_box")
-                    val boundingBox: List<String>,
-                    val type: List<String>,
-                    val map: String)
+data class Location(
+    val address: String,
+    @SerializedName("lat")
+    val latitude: Double,
+    @SerializedName("lon")
+    val longitude: Double,
+    @SerializedName("bounding_box")
+    val boundingBox: List<String>,
+    val type: List<String>,
+    val map: String
+)
 
 data class LocationResponse(val error: Boolean, val code: Int, val message: String? = null, val data: Location)
diff --git a/src/main/kotlin/si/ksoft/ksoftlin/data/kumo/location/geoip/LocationData.kt b/src/main/kotlin/si/ksoft/ksoftlin/data/kumo/location/geoip/LocationData.kt
@@ -4,7 +4,9 @@ import com.google.gson.annotations.SerializedName
 
 data class LocationLinks(
     val weather: String,
-    val gis: String, @SerializedName("openstreetmap") val openStreetMap: String, @SerializedName("googlemaps") val googleMaps: String
+    val gis: String,
+    @SerializedName("openstreetmap") val openStreetMap: String,
+    @SerializedName("googlemaps") val googleMaps: String
 )
 
 data class Location(
@@ -31,4 +33,9 @@ data class Location(
     val apis: LocationLinks
 )
 
-data class GeoIPLocationResponse(val error: Boolean, val code: Int, @SerializedName("data") val location: Location, val message: String? = null)
+data class GeoIPLocationResponse(
+    val error: Boolean,
+    val code: Int,
+    @SerializedName("data") val location: Location,
+    val message: String? = null
+)
diff --git a/src/main/kotlin/si/ksoft/ksoftlin/endpoints/DiscordBotListEndpoint.kt b/src/main/kotlin/si/ksoft/ksoftlin/endpoints/DiscordBotListEndpoint.kt
@@ -1,8 +1,6 @@
 package si.ksoft.ksoftlin.endpoints
 
-import io.ktor.client.request.get
-import io.ktor.client.request.header
-import io.ktor.client.request.parameter
+import io.ktor.client.request.*
 import si.ksoft.ksoftlin.builder.client
 import si.ksoft.ksoftlin.data.dbl.vote.VoteResponse
 import si.ksoft.ksoftlin.data.dbl.vote.list.ListVoteResponse

diff --git a/src/main/kotlin/si/ksoft/ksoftlin/endpoints/ImageEndpoint.kt b/src/main/kotlin/si/ksoft/ksoftlin/endpoints/ImageEndpoint.kt
@@ -1,8 +1,6 @@
 package si.ksoft.ksoftlin.endpoints
 
-import io.ktor.client.request.get
-import io.ktor.client.request.header
-import io.ktor.client.request.parameter
+import io.ktor.client.request.*
 import si.ksoft.ksoftlin.builder.client
 import si.ksoft.ksoftlin.data.image.ImageResponse
 import si.ksoft.ksoftlin.data.image.reddit.RedditPost
@@ -19,11 +17,12 @@ import si.ksoft.ksoftlin.util.api
  */
 
 class ImageEndpoint(private val token: String) {
-    suspend fun getRandomImage(tag: String, isNsfw: Boolean = false) = client.get<ImageResponse>("$api/images/random-image") {
-        parameter("tag", tag)
-        parameter("nsfw", isNsfw)
-        header("Authorization", token)
-    }
+    suspend fun getRandomImage(tag: String, isNsfw: Boolean = false) =
+        client.get<ImageResponse>("$api/images/random-image") {
+            parameter("tag", tag)
+            parameter("nsfw", isNsfw)
+            header("Authorization", token)
+        }
 
     suspend fun getTags() = client.get<TagResponse>("$api/images/tags") { header("Authorization", token) }
 

diff --git a/src/main/kotlin/si/ksoft/ksoftlin/endpoints/KumoEndpoint.kt b/src/main/kotlin/si/ksoft/ksoftlin/endpoints/KumoEndpoint.kt
@@ -1,8 +1,6 @@
 package si.ksoft.ksoftlin.endpoints
 
-import io.ktor.client.request.get
-import io.ktor.client.request.header
-import io.ktor.client.request.parameter
+import io.ktor.client.request.*
 import si.ksoft.ksoftlin.builder.client
 import si.ksoft.ksoftlin.data.kumo.currency.CurrencyResponse
 import si.ksoft.ksoftlin.data.kumo.location.LocationResponse

diff --git a/src/main/kotlin/si/ksoft/ksoftlin/endpoints/LyricsEndpoint.kt b/src/main/kotlin/si/ksoft/ksoftlin/endpoints/LyricsEndpoint.kt
@@ -1,8 +1,6 @@
 package si.ksoft.ksoftlin.endpoints
 
-import io.ktor.client.request.get
-import io.ktor.client.request.header
-import io.ktor.client.request.parameter
+import io.ktor.client.request.*
 import si.ksoft.ksoftlin.builder.client
 import si.ksoft.ksoftlin.data.music.artist.Artist
 import si.ksoft.ksoftlin.data.music.track.Track