chat theme change event

mark messages as important
refactoring

app/src/main/kotlin/com/meloda/fast/api/model/VkMessage.kt

@@ -24,7 +24,8 @@ data class VkMessage(
     val actionText: String? = null,
     val actionConversationMessageId: Int? = null,
     val actionMessage: String? = null,
-    val geoType: String? = null
+    val geoType: String? = null,
+    val important: Boolean = false
 ) : Parcelable {
 
     @IgnoredOnParcel
@@ -61,7 +62,8 @@ data class VkMessage(
         actionText = actionText,
         actionConversationMessageId = actionConversationMessageId,
         actionMessage = actionMessage,
-        geoType = geoType
+        geoType = geoType,
+        important = important
     )
 
     enum class Action(val value: String) {
@@ -78,7 +80,8 @@ data class VkMessage(
 
         // TODO: 9/11/2021 catch this shit
         CHAT_INVITE_USER_BY_CALL("chat_invite_user_by_call"),
-        CHAT_INVITE_USER_BY_CALL_LINK("chat_invite_user_by_call_join_link");
+        CHAT_INVITE_USER_BY_CALL_LINK("chat_invite_user_by_call_join_link"),
+        CHAT_STYLE_UPDATE("conversation_style_update");
 
         companion object {
             fun parse(value: String) = values().first { it.value == value }

app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkAttachment.kt

@@ -1,3 +1,5 @@
 package com.meloda.fast.api.model.attachments
 
-abstract class VkAttachment
+import android.os.Parcelable
+
+abstract class VkAttachment : Parcelable

app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkAudio.kt

@@ -1,5 +1,8 @@
 package com.meloda.fast.api.model.attachments
 
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class VkAudio(
     val link: String
 ) : VkAttachment()

app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkCall.kt

@@ -1,5 +1,8 @@
 package com.meloda.fast.api.model.attachments
 
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class VkCall(
     val initiatorId: Int
 ) : VkAttachment()

app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkFile.kt

@@ -1,5 +1,8 @@
 package com.meloda.fast.api.model.attachments
 
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class VkFile(
     val link: String
 ) : VkAttachment()

app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkGift.kt

@@ -1,5 +1,8 @@
 package com.meloda.fast.api.model.attachments
 
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class VkGift(
     val link: String
 ) : VkAttachment()

app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkGraffiti.kt

@@ -1,5 +1,8 @@
 package com.meloda.fast.api.model.attachments
 
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class VkGraffiti(
     val link: String
 ) : VkAttachment()

app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkGroupCall.kt

@@ -1,5 +1,8 @@
 package com.meloda.fast.api.model.attachments
 
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class VkGroupCall(
     val initiatorId: Int
 ) : VkAttachment()

app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkLink.kt

@@ -1,5 +1,8 @@
 package com.meloda.fast.api.model.attachments
 
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class VkLink(
     val link: String
 ) : VkAttachment()

app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkMiniApp.kt

@@ -1,5 +1,8 @@
 package com.meloda.fast.api.model.attachments
 
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class VkMiniApp(
     val link: String
 ) : VkAttachment()

app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkPhoto.kt

@@ -1,5 +1,28 @@
 package com.meloda.fast.api.model.attachments
 
+import com.meloda.fast.api.model.base.attachments.Size
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class VkPhoto(
-    val link: String
-) : VkAttachment()
+    val albumId: Int,
+    val date: Int,
+    val id: Int,
+    val ownerId: Int,
+    val hasTags: Boolean,
+    val accessKey: String?,
+    val sizes: List<Size>,
+    val text: String,
+    val userId: Int?
+) : VkAttachment() {
+
+    fun sizeOfType(type: Char): Size? {
+        for (size in sizes) {
+            if (size.type == type.toString())
+                return size
+        }
+
+        return null
+    }
+
+}

app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkPoll.kt

@@ -1,5 +1,8 @@
 package com.meloda.fast.api.model.attachments
 
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class VkPoll(
     val id: Int
 ) : VkAttachment()

app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkSticker.kt

@@ -1,5 +1,8 @@
 package com.meloda.fast.api.model.attachments
 
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class VkSticker(
     val link: String
 ) : VkAttachment()

app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkVideo.kt

@@ -1,5 +1,8 @@
 package com.meloda.fast.api.model.attachments
 
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class VkVideo(
     val link: String
 ) : VkAttachment()

app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkVoiceMessage.kt

@@ -1,5 +1,8 @@
 package com.meloda.fast.api.model.attachments
 
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class VkVoiceMessage(
     val link: String
 ) : VkAttachment()

app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkWall.kt

@@ -1,5 +1,8 @@
 package com.meloda.fast.api.model.attachments
 
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class VkWall(
     val id: Int
 ) : VkAttachment()

app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkWallReply.kt

@@ -1,5 +1,8 @@
 package com.meloda.fast.api.model.attachments
 
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class VkWallReply(
     val id: Int
 ) : VkAttachment()

app/src/main/kotlin/com/meloda/fast/api/model/base/BaseVkMessage.kt

@@ -46,7 +46,8 @@ data class BaseVkMessage(
         actionText = action?.text,
         actionConversationMessageId = action?.conversationMessageId,
         actionMessage = action?.message,
-        geoType = geo?.type
+        geoType = geo?.type,
+        important = important
     ).also {
         it.attachments = VkUtils.parseAttachments(attachments)
         it.forwards = VkUtils.parseForwards(fwdMessages)

app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkPhoto.kt

@@ -2,6 +2,7 @@ package com.meloda.fast.api.model.base.attachments
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
+import com.meloda.fast.api.model.attachments.VkPhoto
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
@@ -15,12 +16,26 @@ data class BaseVkPhoto(
     @SerializedName("has_tags")
     val hasTags: Boolean,
     @SerializedName("access_key")
-    val accessKey: String,
+    val accessKey: String?,
     val sizes: List<Size>,
     val text: String,
     @SerializedName("user_id")
     val userId: Int?
-) : BaseVkAttachment()
+) : BaseVkAttachment() {
+
+    fun asVkPhoto() = VkPhoto(
+        albumId = albumId,
+        date = date,
+        id = id,
+        ownerId = ownerId,
+        hasTags = hasTags,
+        accessKey = accessKey,
+        sizes = sizes,
+        text = text,
+        userId = userId
+    )
+
+}
 
 @Parcelize
 data class Size(

app/src/main/kotlin/com/meloda/fast/api/model/request/AuthRequest.kt

@@ -0,0 +1,37 @@
+package com.meloda.fast.api.model.request
+
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class RequestAuthDirect(
+    @SerializedName("grant_type") val grantType: String,
+    @SerializedName("client_id") val clientId: String,
+    @SerializedName("client_secret") val clientSecret: String,
+    @SerializedName("username") val username: String,
+    @SerializedName("password") val password: String,
+    @SerializedName("scope") val scope: String,
+    @SerializedName("2fa_supported") val twoFaSupported: Boolean = true,
+    @SerializedName("force_sms") val twoFaForceSms: Boolean = false,
+    @SerializedName("code") val twoFaCode: String? = null,
+    @SerializedName("captcha_sid") val captchaSid: String? = null,
+    @SerializedName("captcha_key") val captchaKey: String? = null,
+) : Parcelable {
+    val map
+        get() = mutableMapOf(
+            "grant_type" to grantType,
+            "client_id" to clientId,
+            "client_secret" to clientSecret,
+            "username" to username,
+            "password" to password,
+            "scope" to scope,
+            "2fa_supported" to if (twoFaSupported) "1" else "0",
+            "force_sms" to if (twoFaForceSms) "1" else "0"
+            )
+            .apply {
+                twoFaCode?.let { this["code"] = it }
+                captchaSid?.let { this["captcha_sid"] = it }
+                captchaKey?.let { this["captcha_key"] = it }
+            }
+}

app/src/main/kotlin/com/meloda/fast/api/model/request/ConversationsRequest.kt

@@ -0,0 +1,26 @@
+package com.meloda.fast.api.model.request
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class ConversationsGetRequest(
+    val count: Int? = null,
+    val offset: Int? = null,
+    val fields: String = "",
+    val filter: String = "all",
+    val extended: Boolean? = true,
+    val startMessageId: Int? = null
+) : Parcelable {
+
+    val map
+        get() = mutableMapOf(
+            "fields" to fields,
+            "filter" to filter
+        ).apply {
+            count?.let { this["count"] = it.toString() }
+            offset?.let { this["offset"] = it.toString() }
+            extended?.let { this["extended"] = it.toString() }
+            startMessageId?.let { this["start_message_id"] = it.toString() }
+        }
+}

app/src/main/kotlin/com/meloda/fast/api/model/request/MessagesRequest.kt

@@ -0,0 +1,73 @@
+package com.meloda.fast.api.model.request
+
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class MessagesGetHistoryRequest(
+    val count: Int? = null,
+    val offset: Int? = null,
+    val peerId: Int,
+    val extended: Boolean? = null,
+    val startMessageId: Int? = null,
+    val rev: Boolean? = null,
+    val fields: String? = null,
+) : Parcelable {
+
+    val map
+        get() = mutableMapOf(
+            "peer_id" to peerId.toString()
+        ).apply {
+            count?.let { this["count"] = it.toString() }
+            offset?.let { this["offset"] = it.toString() }
+            extended?.let { this["extended"] = (if (it) 1 else 0).toString() }
+            startMessageId?.let { this["start_message_id"] = it.toString() }
+            rev?.let { this["rev"] = (if (it) 1 else 0).toString() }
+            fields?.let { this["fields"] = it }
+        }
+
+}
+
+@Parcelize
+data class MessagesSendRequest(
+    val peerId: Int,
+    val randomId: Int = 0,
+    val message: String? = null,
+    val lat: Int? = null,
+    val lon: Int? = null,
+    val replyTo: Int? = null,
+    val stickerId: Int? = null,
+    val disableMentions: Boolean? = null,
+    val dontParseLinks: Boolean? = null
+) : Parcelable {
+
+    val map
+        get() = mutableMapOf(
+            "peer_id" to peerId.toString(),
+            "random_id" to randomId.toString()
+        ).apply {
+            message?.let { this["message"] = it }
+            lat?.let { this["lat"] = it.toString() }
+            lon?.let { this["lon"] = it.toString() }
+            replyTo?.let { this["reply_to"] = it.toString() }
+            stickerId?.let { this["sticker_id"] = it.toString() }
+            disableMentions?.let { this["disable_mentions"] = (if (it) 1 else 0).toString() }
+            dontParseLinks?.let { this["dont_parse_links"] = (if (it) 1 else 0).toString() }
+        }
+}
+
+@Parcelize
+data class MessagesMarkAsImportantRequest(
+    @SerializedName("message_ids")
+    val messagesIds: List<Int>,
+    val important: Boolean
+) : Parcelable {
+
+    val map
+        get() = mutableMapOf(
+            "message_ids" to messagesIds.joinToString { it.toString() },
+            "important" to (if (important) 1 else 0).toString()
+        )
+
+}

app/src/main/kotlin/com/meloda/fast/api/model/request/UsersRequest.kt

@@ -0,0 +1,21 @@
+package com.meloda.fast.api.model.request
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class UsersGetRequest(
+    val usersIds: List<Int>? = null,
+    val fields: String? = null,
+    val nomCase: String? = null
+) : Parcelable {
+
+    val map
+        get() = mutableMapOf<String, String>()
+            .apply {
+                usersIds?.let { this["user_ids"] = it.joinToString { id -> id.toString() } }
+                fields?.let { this["fields"] = it }
+                nomCase?.let { this["nom_case"] = it }
+            }
+
+}

app/src/main/kotlin/com/meloda/fast/api/model/response/AuthResponse.kt

@@ -0,0 +1,21 @@
+package com.meloda.fast.api.model.response
+
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class ResponseAuthDirect(
+    @SerializedName("access_token") val accessToken: String? = null,
+    @SerializedName("user_id") val userId: Int? = null,
+    @SerializedName("trusted_hash") val twoFaHash: String? = null,
+    @SerializedName("validation_sid") val validationSid: String? = null
+) : Parcelable
+
+@Parcelize
+data class ResponseSendSms(
+    @SerializedName("sid") val validationSid: String?,
+    @SerializedName("delay") val delay: Int?,
+    @SerializedName("validation_type") val validationType: String?,
+    @SerializedName("validation_resend") val validationResend: String?
+) : Parcelable

app/src/main/kotlin/com/meloda/fast/api/model/response/ConversationsResponse.kt

@@ -0,0 +1,26 @@
+package com.meloda.fast.api.model.response
+
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+import com.meloda.fast.api.model.base.BaseVkConversation
+import com.meloda.fast.api.model.base.BaseVkGroup
+import com.meloda.fast.api.model.base.BaseVkMessage
+import com.meloda.fast.api.model.base.BaseVkUser
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class ConversationsGetResponse(
+    val count: Int,
+    val items: List<ConversationsResponseItems>,
+    @SerializedName("unread_count")
+    val unreadCount: Int?,
+    val profiles: List<BaseVkUser>?,
+    val groups: List<BaseVkGroup>?
+) : Parcelable
+
+@Parcelize
+data class ConversationsResponseItems(
+    val conversation: BaseVkConversation,
+    @SerializedName("last_message")
+    val lastMessage: BaseVkMessage?
+) : Parcelable

app/src/main/kotlin/com/meloda/fast/api/model/response/MessagesResponse.kt

@@ -0,0 +1,17 @@
+package com.meloda.fast.api.model.response
+
+import android.os.Parcelable
+import com.meloda.fast.api.model.base.BaseVkConversation
+import com.meloda.fast.api.model.base.BaseVkGroup
+import com.meloda.fast.api.model.base.BaseVkMessage
+import com.meloda.fast.api.model.base.BaseVkUser
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class MessagesGetHistoryResponse(
+    val count: Int,
+    val items: List<BaseVkMessage> = listOf(),
+    val conversations: List<BaseVkConversation>?,
+    val profiles: List<BaseVkUser>?,
+    val groups: List<BaseVkGroup>?
+) : Parcelable

app/src/main/kotlin/com/meloda/fast/api/model/response/UsersResponse.kt

@@ -0,0 +1,2 @@
+package com.meloda.fast.api.model.response
+