refactor: reorganize api models (#100)

* refactor: reorganize api models * fix build * fix build
MateriiApps · Dec 11, 2022 · d9366c1 · d9366c1
1 parent 20267cb
commit d9366c1
Show file tree

Hide file tree

Showing 91 changed files with 589 additions and 520 deletions.
diff --git a/app/src/main/java/com/xinto/opencord/db/Converters.kt b/app/src/main/java/com/xinto/opencord/db/Converters.kt
@@ -1,7 +1,7 @@
 package com.xinto.opencord.db
 
 import androidx.room.TypeConverter
-import com.xinto.opencord.rest.dto.ApiEmbedField
+import com.xinto.opencord.rest.models.embed.ApiEmbedField
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json

diff --git a/app/src/main/java/com/xinto/opencord/db/entity/channel/EntityChannel.kt b/app/src/main/java/com/xinto/opencord/db/entity/channel/EntityChannel.kt
@@ -4,7 +4,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import com.xinto.opencord.rest.dto.ApiChannel
+import com.xinto.opencord.rest.models.ApiChannel
 
 @Entity(
     tableName = "channels",

diff --git a/app/src/main/java/com/xinto/opencord/db/entity/guild/EntityGuild.kt b/app/src/main/java/com/xinto/opencord/db/entity/guild/EntityGuild.kt
@@ -3,7 +3,7 @@ package com.xinto.opencord.db.entity.guild
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.xinto.opencord.rest.dto.ApiGuild
+import com.xinto.opencord.rest.models.ApiGuild
 
 @Entity(
     tableName = "guilds",

diff --git a/app/src/main/java/com/xinto/opencord/db/entity/message/EntityAttachment.kt b/app/src/main/java/com/xinto/opencord/db/entity/message/EntityAttachment.kt
@@ -4,7 +4,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import com.xinto.opencord.rest.dto.ApiAttachment
+import com.xinto.opencord.rest.models.ApiAttachment
 
 @Entity(
     tableName = "attachments",

diff --git a/app/src/main/java/com/xinto/opencord/db/entity/message/EntityEmbed.kt b/app/src/main/java/com/xinto/opencord/db/entity/message/EntityEmbed.kt
@@ -3,8 +3,8 @@ package com.xinto.opencord.db.entity.message
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
-import com.xinto.opencord.rest.dto.ApiEmbed
-import com.xinto.opencord.rest.dto.ApiEmbedField
+import com.xinto.opencord.rest.models.embed.ApiEmbed
+import com.xinto.opencord.rest.models.embed.ApiEmbedField
 
 @Entity(
     tableName = "embeds",

diff --git a/app/src/main/java/com/xinto/opencord/db/entity/message/EntityMessage.kt b/app/src/main/java/com/xinto/opencord/db/entity/message/EntityMessage.kt
@@ -4,7 +4,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import com.xinto.opencord.rest.dto.ApiMessage
+import com.xinto.opencord.rest.models.message.ApiMessage
 
 @Entity(
     tableName = "messages",

diff --git a/app/src/main/java/com/xinto/opencord/db/entity/user/EntityUser.kt b/app/src/main/java/com/xinto/opencord/db/entity/user/EntityUser.kt
@@ -3,7 +3,7 @@ package com.xinto.opencord.db.entity.user
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.xinto.opencord.rest.dto.ApiUser
+import com.xinto.opencord.rest.models.user.ApiUser
 
 @Entity(
     tableName = "users",

diff --git a/app/src/main/java/com/xinto/opencord/di/GatewayModule.kt b/app/src/main/java/com/xinto/opencord/di/GatewayModule.kt
@@ -1,9 +1,9 @@
 package com.xinto.opencord.di
 
-import com.xinto.opencord.manager.AccountManager
-import com.xinto.opencord.provider.PropertyProvider
 import com.xinto.opencord.gateway.DiscordGateway
 import com.xinto.opencord.gateway.DiscordGatewayImpl
+import com.xinto.opencord.manager.AccountManager
+import com.xinto.opencord.provider.PropertyProvider
 import com.xinto.opencord.util.Logger
 import io.ktor.client.*
 import kotlinx.serialization.json.Json

diff --git a/app/src/main/java/com/xinto/opencord/di/ViewModelModule.kt b/app/src/main/java/com/xinto/opencord/di/ViewModelModule.kt
@@ -1,9 +1,9 @@
 package com.xinto.opencord.di
 
+import com.xinto.opencord.gateway.DiscordGateway
 import com.xinto.opencord.manager.AccountManager
 import com.xinto.opencord.manager.ActivityManager
 import com.xinto.opencord.manager.PersistentDataManager
-import com.xinto.opencord.gateway.DiscordGateway
 import com.xinto.opencord.rest.service.DiscordApiService
 import com.xinto.opencord.rest.service.DiscordAuthService
 import com.xinto.opencord.store.*

diff --git a/app/src/main/java/com/xinto/opencord/domain/activity/DomainActivity.kt b/app/src/main/java/com/xinto/opencord/domain/activity/DomainActivity.kt
@@ -2,7 +2,7 @@ package com.xinto.opencord.domain.activity
 
 import androidx.compose.runtime.Immutable
 import com.xinto.opencord.domain.activity.types.*
-import com.xinto.opencord.rest.dto.ApiActivity
+import com.xinto.opencord.rest.models.activity.ApiActivity
 
 @Immutable
 interface DomainActivity {

diff --git a/app/src/main/java/com/xinto/opencord/domain/activity/DomainActivityAssets.kt b/app/src/main/java/com/xinto/opencord/domain/activity/DomainActivityAssets.kt
@@ -1,7 +1,7 @@
 package com.xinto.opencord.domain.activity
 
 import androidx.compose.runtime.Immutable
-import com.xinto.opencord.rest.dto.ApiActivityAssets
+import com.xinto.opencord.rest.models.activity.ApiActivityAssets
 
 @Immutable
 data class DomainActivityAssets(

diff --git a/app/src/main/java/com/xinto/opencord/domain/activity/DomainActivityEmoji.kt b/app/src/main/java/com/xinto/opencord/domain/activity/DomainActivityEmoji.kt
@@ -1,7 +1,7 @@
 package com.xinto.opencord.domain.activity
 
 import androidx.compose.runtime.Immutable
-import com.xinto.opencord.rest.dto.ApiActivityEmoji
+import com.xinto.opencord.rest.models.activity.ApiActivityEmoji
 
 // TODO: use a partial emoji instead
 @Immutable

diff --git a/app/src/main/java/com/xinto/opencord/domain/activity/DomainActivityMetadata.kt b/app/src/main/java/com/xinto/opencord/domain/activity/DomainActivityMetadata.kt
@@ -1,7 +1,7 @@
 package com.xinto.opencord.domain.activity
 
 import androidx.compose.runtime.Immutable
-import com.xinto.opencord.rest.dto.ApiActivityMetadata
+import com.xinto.opencord.rest.models.activity.ApiActivityMetadata
 
 @Immutable
 data class DomainActivityMetadata(

diff --git a/app/src/main/java/com/xinto/opencord/domain/activity/DomainActivityParty.kt b/app/src/main/java/com/xinto/opencord/domain/activity/DomainActivityParty.kt
@@ -1,7 +1,7 @@
 package com.xinto.opencord.domain.activity
 
 import androidx.compose.runtime.Immutable
-import com.xinto.opencord.rest.dto.ApiActivityParty
+import com.xinto.opencord.rest.models.activity.ApiActivityParty
 
 @Immutable
 data class DomainActivityParty(

diff --git a/app/src/main/java/com/xinto/opencord/domain/activity/DomainActivitySecrets.kt b/app/src/main/java/com/xinto/opencord/domain/activity/DomainActivitySecrets.kt
@@ -1,7 +1,7 @@
 package com.xinto.opencord.domain.activity
 
 import androidx.compose.runtime.Immutable
-import com.xinto.opencord.rest.dto.ApiActivitySecrets
+import com.xinto.opencord.rest.models.activity.ApiActivitySecrets
 
 @Immutable
 data class DomainActivitySecrets(

diff --git a/app/src/main/java/com/xinto/opencord/domain/activity/DomainActivityTimestamp.kt b/app/src/main/java/com/xinto/opencord/domain/activity/DomainActivityTimestamp.kt
@@ -1,7 +1,7 @@
 package com.xinto.opencord.domain.activity
 
 import androidx.compose.runtime.Immutable
-import com.xinto.opencord.rest.dto.ApiActivityTimestamp
+import com.xinto.opencord.rest.models.activity.ApiActivityTimestamp
 import kotlinx.datetime.Instant
 
 @Immutable

diff --git a/app/src/main/java/com/xinto/opencord/domain/attachment/DomainAttachment.kt b/app/src/main/java/com/xinto/opencord/domain/attachment/DomainAttachment.kt
@@ -2,7 +2,7 @@ package com.xinto.opencord.domain.attachment
 
 import androidx.compose.runtime.Immutable
 import com.xinto.opencord.db.entity.message.EntityAttachment
-import com.xinto.opencord.rest.dto.ApiAttachment
+import com.xinto.opencord.rest.models.ApiAttachment
 
 @Immutable
 interface DomainAttachment {

diff --git a/app/src/main/java/com/xinto/opencord/domain/channel/DomainChannel.kt b/app/src/main/java/com/xinto/opencord/domain/channel/DomainChannel.kt
@@ -3,7 +3,7 @@ package com.xinto.opencord.domain.channel
 import androidx.compose.runtime.Immutable
 import com.xinto.opencord.db.entity.channel.EntityChannel
 import com.xinto.opencord.domain.Mentionable
-import com.xinto.opencord.rest.dto.ApiChannel
+import com.xinto.opencord.rest.models.ApiChannel
 
 @Immutable
 abstract class DomainChannel : Comparable<DomainChannel>, Mentionable {

diff --git a/app/src/main/java/com/xinto/opencord/domain/embed/DomainEmbed.kt b/app/src/main/java/com/xinto/opencord/domain/embed/DomainEmbed.kt
@@ -3,7 +3,7 @@ package com.xinto.opencord.domain.embed
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color
 import com.xinto.opencord.db.entity.message.EntityEmbed
-import com.xinto.opencord.rest.dto.ApiEmbed
+import com.xinto.opencord.rest.models.embed.ApiEmbed
 
 @Immutable
 data class DomainEmbed(

diff --git a/app/src/main/java/com/xinto/opencord/domain/embed/DomainEmbedAuthor.kt b/app/src/main/java/com/xinto/opencord/domain/embed/DomainEmbedAuthor.kt
@@ -1,7 +1,7 @@
 package com.xinto.opencord.domain.embed
 
 import androidx.compose.runtime.Immutable
-import com.xinto.opencord.rest.dto.ApiEmbedAuthor
+import com.xinto.opencord.rest.models.embed.ApiEmbedAuthor
 
 @Immutable
 data class DomainEmbedAuthor(

diff --git a/app/src/main/java/com/xinto/opencord/domain/embed/DomainEmbedField.kt b/app/src/main/java/com/xinto/opencord/domain/embed/DomainEmbedField.kt
@@ -1,7 +1,7 @@
 package com.xinto.opencord.domain.embed
 
 import androidx.compose.runtime.Immutable
-import com.xinto.opencord.rest.dto.ApiEmbedField
+import com.xinto.opencord.rest.models.embed.ApiEmbedField
 
 @Immutable
 data class DomainEmbedField(

diff --git a/app/src/main/java/com/xinto/opencord/domain/guild/DomainGuild.kt b/app/src/main/java/com/xinto/opencord/domain/guild/DomainGuild.kt
@@ -2,7 +2,7 @@ package com.xinto.opencord.domain.guild
 
 import androidx.compose.runtime.Immutable
 import com.xinto.opencord.db.entity.guild.EntityGuild
-import com.xinto.opencord.rest.dto.ApiGuild
+import com.xinto.opencord.rest.models.ApiGuild
 import com.xinto.opencord.rest.service.DiscordCdnServiceImpl
 
 @Immutable

diff --git a/app/src/main/java/com/xinto/opencord/domain/login/DomainLogin.kt b/app/src/main/java/com/xinto/opencord/domain/login/DomainLogin.kt
@@ -1,7 +1,7 @@
 package com.xinto.opencord.domain.login
 
 import androidx.compose.runtime.Immutable
-import com.xinto.opencord.rest.dto.ApiLogin
+import com.xinto.opencord.rest.models.login.ApiLogin
 
 @Immutable
 sealed interface DomainLogin {

diff --git a/app/src/main/java/com/xinto/opencord/domain/mapper/RestDomainApiMapper.kt b/app/src/main/java/com/xinto/opencord/domain/mapper/RestDomainApiMapper.kt
diff --git a/app/src/main/java/com/xinto/opencord/domain/member/DomainGuildMember.kt b/app/src/main/java/com/xinto/opencord/domain/member/DomainGuildMember.kt
@@ -3,7 +3,7 @@ package com.xinto.opencord.domain.member
 import androidx.compose.runtime.Immutable
 import com.xinto.opencord.domain.user.DomainUser
 import com.xinto.opencord.domain.user.toDomain
-import com.xinto.opencord.rest.dto.ApiGuildMember
+import com.xinto.opencord.rest.models.ApiGuildMember
 import com.xinto.opencord.rest.service.DiscordCdnServiceImpl
 
 @Immutable