Merge pull request #1937 from samunohito/feature/support_badge_roles

feat: ユーザのプロフィールとノートの名前欄横にロールバッジを出す機能を追加

modules/api/src/main/java/net/pantasystem/milktea/api/mastodon/accounts/MastodonAccountDTO.kt

@@ -100,6 +100,7 @@ data class MastodonAccountDTO(
                 description = note,
             ),
             related = related,
+            badgeRoles = emptyList(),
         )
     }
 }

modules/api/src/main/java/net/pantasystem/milktea/api/misskey/users/UserDTO.kt

@@ -121,6 +121,9 @@ data class UserDTO(
 
     @SerialName("notify")
     val notifyState: String? = null,
+
+    @SerialName("badgeRoles")
+    val badgeRoles: List<BadgeRoleDTO>? = null
 ) : Serializable {
 
     @kotlinx.serialization.Serializable
@@ -161,4 +164,15 @@ data class UserDTO(
         @SerialName("value")
         val value: String)
 
+    @kotlinx.serialization.Serializable
+    data class BadgeRoleDTO(
+        @SerialName("name")
+        val name: String,
+
+        @SerialName("iconUrl")
+        val iconUrl: String?,
+
+        @SerialName("displayOrder")
+        val displayOrder: Int,
+    )
 }

modules/data/src/main/java/net/pantasystem/milktea/data/converters/UserDTOEntityConverter.kt

@@ -60,6 +60,22 @@ class UserDTOEntityConverter @Inject constructor(
             it.name to it.host to it.url to it.uri
         }
 
+        val badgeRoles = if (!userDTO.badgeRoles.isNullOrEmpty()) {
+            userDTO.badgeRoles!!.map { role ->
+                val iconUrl = role.iconUrl?.let {
+                    imageCacheRepository.save(it)
+                }
+
+                User.BadgeRole(
+                    name = role.name,
+                    iconUri = iconUrl?.cachePath,
+                    displayOrder = role.displayOrder
+                )
+            }
+        } else {
+            emptyList()
+        }
+
         if (isDetail) {
             return User.Detail(
                 id = User.Id(account.accountId, userDTO.id),
@@ -105,7 +121,8 @@ class UserDTOEntityConverter @Inject constructor(
                     isNotify = userDTO.notifyState?.let {
                         userDTO.notifyState == "normal"
                     }
-                )
+                ),
+                badgeRoles = badgeRoles
             )
         } else {
             return User.Simple(
@@ -120,7 +137,8 @@ class UserDTOEntityConverter @Inject constructor(
                 nickname = null,
                 isSameHost = userDTO.host == null,
                 instance = instanceInfo,
-                avatarBlurhash = userDTO.avatarBlurhash
+                avatarBlurhash = userDTO.avatarBlurhash,
+                badgeRoles = badgeRoles
             )
         }
     }

modules/data/src/main/java/net/pantasystem/milktea/data/di/module/DbModule.kt

@@ -45,6 +45,7 @@ object DbModule {
             .addMigrations(MIGRATION_8_10)
             .addMigrations(MIGRATION_10_11)
             .addMigrations(MIGRATION_51_52)
+            .addMigrations(MIGRATION_56_57)
             .build()
     }
 

modules/data/src/main/java/net/pantasystem/milktea/data/infrastructure/DataBase.kt

@@ -92,6 +92,7 @@ import net.pantasystem.milktea.data.infrastructure.user.renote.mute.db.RenoteMut
         UserListRecord::class,
         UserListMemberIdRecord::class,
         InstanceInfoRecord::class,
+        BadgeRoleRecord::class,
 
         SearchHistoryRecord::class,
         UserInfoStateRecord::class,
@@ -116,7 +117,7 @@ import net.pantasystem.milktea.data.infrastructure.user.renote.mute.db.RenoteMut
         CustomEmojiRecord::class,
         CustomEmojiAliasRecord::class,
     ],
-    version = 56,
+    version = 57,
     exportSchema = true,
     autoMigrations = [
         AutoMigration(from = 11, to = 12),
@@ -163,6 +164,7 @@ import net.pantasystem.milktea.data.infrastructure.user.renote.mute.db.RenoteMut
         AutoMigration(from = 53, to = 54),
         AutoMigration(from = 54, to = 55),
         AutoMigration(from = 55, to = 56),
+        AutoMigration(from = 56, to = 57),
     ],
     views = [UserView::class, GroupMemberView::class, UserListMemberView::class]
 )

modules/data/src/main/java/net/pantasystem/milktea/data/infrastructure/Migrations.kt

@@ -114,4 +114,11 @@ val MIGRATION_51_52 = object : Migration(51, 52) {
         database.execSQL("DROP TABLE IF EXISTS 'emoji_alias_table'")
         database.execSQL("DROP TABLE IF EXISTS 'emoji_table'")
     }
+}
+
+val MIGRATION_56_57 = object : Migration(56, 57) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("CREATE TABLE IF NOT EXISTS 'user_badge_role' ('name' TEXT NOT NULL, 'iconUrl' TEXT NULL, 'displayOrder' INTEGER NOT NULL, 'userId' INTEGER NOT NULL, 'id' INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)")
+        database.execSQL("CREATE INDEX IF NOT EXISTS 'index_user_badge_role' ON 'user_badge_role' ('userId')")
+    }
 }

modules/data/src/main/java/net/pantasystem/milktea/data/infrastructure/user/MediatorUserDataSource.kt

@@ -16,6 +16,7 @@ import net.pantasystem.milktea.common.Logger
 import net.pantasystem.milktea.common.collection.LRUCache
 import net.pantasystem.milktea.common.runCancellableCatching
 import net.pantasystem.milktea.common_android.hilt.IODispatcher
+import net.pantasystem.milktea.data.infrastructure.user.db.BadgeRoleRecord
 import net.pantasystem.milktea.data.infrastructure.user.db.PinnedNoteIdRecord
 import net.pantasystem.milktea.data.infrastructure.user.db.UserDao
 import net.pantasystem.milktea.data.infrastructure.user.db.UserEmojiRecord
@@ -25,6 +26,7 @@ import net.pantasystem.milktea.data.infrastructure.user.db.UserProfileFieldRecor
 import net.pantasystem.milktea.data.infrastructure.user.db.UserRecord
 import net.pantasystem.milktea.data.infrastructure.user.db.UserRelated
 import net.pantasystem.milktea.data.infrastructure.user.db.UserRelatedStateRecord
+import net.pantasystem.milktea.data.infrastructure.user.db.isEqualToBadgeRoleModels
 import net.pantasystem.milktea.data.infrastructure.user.db.isEqualToModels
 import net.pantasystem.milktea.model.AddResult
 import net.pantasystem.milktea.model.user.Acct
@@ -139,6 +141,22 @@ class MediatorUserDataSource @Inject constructor(
             // NOTE: 比較した上で同一でなければキャッシュの更新処理を行う
             replaceEmojisIfNeed(dbId, user, record)
 
+            if (!record?.badgeRoles.isEqualToBadgeRoleModels(user.badgeRoles)) {
+                if (record != null) {
+                    userDao.detachAllUserBadgeRoles(dbId)
+                }
+                userDao.insertUserBadgeRoles(
+                    user.badgeRoles.map {
+                        BadgeRoleRecord(
+                            userId = dbId,
+                            name = it.name,
+                            iconUrl = it.iconUri,
+                            displayOrder = it.displayOrder,
+                        )
+                    }
+                )
+            }
+
             if (user is User.Detail) {
                 userDao.insert(
                     UserInfoStateRecord.from(dbId, user.info)

modules/data/src/main/java/net/pantasystem/milktea/data/infrastructure/user/db/UserDao.kt

@@ -35,6 +35,9 @@ abstract class UserDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract suspend fun insertUserProfileFields(fields: List<UserProfileFieldRecord>): List<Long>
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract suspend fun insertUserBadgeRoles(fields: List<BadgeRoleRecord>): List<Long>
+
     @Query("delete from pinned_note_id where userId = :userId")
     abstract suspend fun detachAllPinnedNoteIds(userId: Long)
 
@@ -44,6 +47,9 @@ abstract class UserDao {
     @Query("delete from user_profile_field where userId = :userId")
     abstract suspend fun detachUserFields(userId: Long)
 
+    @Query("delete from user_badge_role where userId = :userId")
+    abstract suspend fun detachAllUserBadgeRoles(userId: Long)
+
     @Update
     abstract suspend fun update(user: UserRecord)
 

modules/data/src/main/java/net/pantasystem/milktea/data/infrastructure/user/db/UserRecord.kt

@@ -383,6 +383,18 @@ fun List<UserEmojiRecord>?.isEqualToModels(models: List<CustomEmoji>): Boolean {
     }
 }
 
+fun List<BadgeRoleRecord>?.isEqualToBadgeRoleModels(models: List<User.BadgeRole>): Boolean {
+    if (this == null && models.isEmpty()) return true
+    if (this == null) return false
+    if (size != models.size) return false
+    val records = this.toSet()
+    return models.all {  model ->
+        records.any { record ->
+            record.isEqualToModel(model)
+        }
+    }
+}
+
 @Entity(
     tableName = "user_instance_info",
     foreignKeys = [
@@ -533,6 +545,44 @@ data class UserView(
     val avatarBlurhash: String?
 )
 
+@Entity(
+    tableName = "user_badge_role",
+    foreignKeys = [
+        ForeignKey(
+            parentColumns = ["id"],
+            childColumns = ["userId"],
+            entity = UserRecord::class,
+            onUpdate = ForeignKey.CASCADE,
+            onDelete = ForeignKey.CASCADE,
+        )
+    ],
+    indices = [
+        Index("userId")
+    ]
+)
+data class BadgeRoleRecord(
+    @ColumnInfo("name")
+    val name: String,
+
+    @ColumnInfo("iconUrl")
+    val iconUrl: String?,
+
+    @ColumnInfo("displayOrder")
+    val displayOrder: Int,
+
+    @ColumnInfo("userId")
+    val userId: Long,
+
+    @ColumnInfo(name = "id")
+    @PrimaryKey(autoGenerate = true) val id: Long = 0,
+) {
+    fun isEqualToModel(model: User.BadgeRole): Boolean {
+        return name == model.name &&
+                iconUrl == model.iconUri &&
+                displayOrder == model.displayOrder
+    }
+}
+
 interface HasUserModel {
     fun toModel(): User
 }
@@ -549,6 +599,11 @@ data class UserSimpleRelated(
         entityColumn = "userId"
     )
     val instance: UserInstanceInfoRecord?,
+    @Relation(
+        parentColumn = "id",
+        entityColumn = "userId"
+    )
+    val badgeRoles: List<BadgeRoleRecord>,
 ) : HasUserModel {
     override fun toModel(): User.Simple {
         val instanceInfo = instance?.let {
@@ -584,6 +639,13 @@ data class UserSimpleRelated(
             },
             instance = instanceInfo,
             avatarBlurhash = user.avatarBlurhash,
+            badgeRoles = badgeRoles.map {
+                User.BadgeRole(
+                    name = it.name,
+                    iconUri = it.iconUrl,
+                    displayOrder = it.displayOrder,
+                )
+            }
         )
     }
 }
@@ -625,8 +687,13 @@ data class UserRelated(
         parentColumn = "id",
         entityColumn = "userId",
     )
-    val fields: List<UserProfileFieldRecord>?
+    val fields: List<UserProfileFieldRecord>?,
 
+    @Relation(
+        parentColumn = "id",
+        entityColumn = "userId"
+    )
+    val badgeRoles: List<BadgeRoleRecord>,
 ) : HasUserModel {
     override fun toModel(): User {
         val instanceInfo = instance?.let {
@@ -663,6 +730,13 @@ data class UserRelated(
                 },
                 instance = instanceInfo,
                 avatarBlurhash = user.avatarBlurhash,
+                badgeRoles = badgeRoles.map {
+                    User.BadgeRole(
+                        name = it.name,
+                        iconUri = it.iconUrl,
+                        displayOrder = it.displayOrder,
+                    )
+                }
             )
         } else {
             return User.Detail(
@@ -720,6 +794,13 @@ data class UserRelated(
                         hasPendingFollowRequestToYou = related.hasPendingFollowRequestToYou,
                         isNotify = related.isNotify ?: false,
                     )
+                },
+                badgeRoles = badgeRoles.map {
+                    User.BadgeRole(
+                        name = it.name,
+                        iconUri = it.iconUrl,
+                        displayOrder = it.displayOrder,
+                    )
                 }
             )
         }

modules/features/note/build.gradle

@@ -98,6 +98,7 @@ dependencies {
     implementation libs.accompanist.pager
     implementation libs.accompanist.pager.indicators
     implementation libs.coil.compose
+    implementation libs.coil.svg
     implementation libs.compose.constraintlayout
 
     // hilt

modules/features/note/src/main/java/net/pantasystem/milktea/note/timeline/TimelineListAdapter.kt

@@ -20,6 +20,7 @@ import com.bumptech.glide.RequestBuilder
 import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader
 import com.bumptech.glide.util.FixedPreloadSizeProvider
 import com.google.android.flexbox.FlexboxLayout
+import com.google.android.material.composethemeadapter.MdcTheme
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -34,6 +35,8 @@ import net.pantasystem.milktea.note.databinding.ItemTimelineEmptyBinding
 import net.pantasystem.milktea.note.databinding.ItemTimelineErrorBinding
 import net.pantasystem.milktea.note.reaction.ReactionViewData
 import net.pantasystem.milktea.note.timeline.viewmodel.TimelineListItem
+import net.pantasystem.milktea.note.view.NoteBadgeRoleData
+import net.pantasystem.milktea.note.view.NoteBadgeRoles
 import net.pantasystem.milktea.note.view.NoteCardAction
 import net.pantasystem.milktea.note.view.NoteCardActionListenerAdapter
 import net.pantasystem.milktea.note.viewmodel.HasReplyToNoteViewData
@@ -186,7 +189,21 @@ class TimelineListAdapter(
         override fun onBind(note: PlaneNoteViewData) {
             binding.note = note
             binding.noteCardActionListener = noteCardActionListenerAdapter
-
+            binding.simpleNote.badgeRoles.apply {
+                setContent {
+                    MdcTheme {
+                        NoteBadgeRoles(
+                            badgeRoles = note.note.user.badgeRoles.map {
+                                NoteBadgeRoleData(
+                                    name = it.name,
+                                    iconUri = it.iconUri,
+                                    displayOrder = it.displayOrder
+                                )
+                            }
+                        )
+                    }
+                }
+            }
         }
 
 
@@ -209,9 +226,22 @@ class TimelineListAdapter(
         override fun onBind(note: PlaneNoteViewData) {
             if (note is HasReplyToNoteViewData) {
                 binding.hasReplyToNote = note
-
                 binding.noteCardActionListener = noteCardActionListenerAdapter
-
+                binding.simpleNote.badgeRoles.apply {
+                    setContent {
+                        MdcTheme {
+                            NoteBadgeRoles(
+                                badgeRoles = note.note.user.badgeRoles.map {
+                                    NoteBadgeRoleData(
+                                        name = it.name,
+                                        iconUri = it.iconUri,
+                                        displayOrder = it.displayOrder
+                                    )
+                                }
+                            )
+                        }
+                    }
+                }
             }
         }