diff --git a/modules/data/src/main/java/net/pantasystem/milktea/data/converters/NotificationDTOEntityConverter.kt b/modules/data/src/main/java/net/pantasystem/milktea/data/converters/NotificationDTOEntityConverter.kt index f41ce12c3b..05d652fe80 100644 --- a/modules/data/src/main/java/net/pantasystem/milktea/data/converters/NotificationDTOEntityConverter.kt +++ b/modules/data/src/main/java/net/pantasystem/milktea/data/converters/NotificationDTOEntityConverter.kt @@ -5,7 +5,20 @@ import net.pantasystem.milktea.data.infrastructure.toGroup import net.pantasystem.milktea.model.account.Account import net.pantasystem.milktea.model.group.InvitationId import net.pantasystem.milktea.model.note.Note -import net.pantasystem.milktea.model.notification.* +import net.pantasystem.milktea.model.notification.FollowNotification +import net.pantasystem.milktea.model.notification.FollowRequestAcceptedNotification +import net.pantasystem.milktea.model.notification.GroupInvitedNotification +import net.pantasystem.milktea.model.notification.MentionNotification +import net.pantasystem.milktea.model.notification.Notification +import net.pantasystem.milktea.model.notification.PollEndedNotification +import net.pantasystem.milktea.model.notification.PollVoteNotification +import net.pantasystem.milktea.model.notification.QuoteNotification +import net.pantasystem.milktea.model.notification.ReactionNotification +import net.pantasystem.milktea.model.notification.ReceiveFollowRequestNotification +import net.pantasystem.milktea.model.notification.RenoteNotification +import net.pantasystem.milktea.model.notification.ReplyNotification +import net.pantasystem.milktea.model.notification.PostNotification +import net.pantasystem.milktea.model.notification.UnknownNotification import net.pantasystem.milktea.model.user.User import javax.inject.Inject import javax.inject.Singleton @@ -144,6 +157,18 @@ class NotificationDTOEntityConverter @Inject constructor( InvitationId(account.accountId, notificationDTO.invitation!!.id), ) } + "note" -> { + PostNotification( + id, + notificationDTO.createdAt, + User.Id(account.accountId, notificationDTO.userId!!), + Note.Id( + account.accountId, + notificationDTO.note?.id ?: throw IllegalStateException("noteId参照不能") + ), + notificationDTO.isRead ?: true + ) + } else -> { return UnknownNotification( id, diff --git a/modules/data/src/main/java/net/pantasystem/milktea/data/infrastructure/TootEntityConverters.kt b/modules/data/src/main/java/net/pantasystem/milktea/data/infrastructure/TootEntityConverters.kt index 5e384c8f1d..d67d439d17 100644 --- a/modules/data/src/main/java/net/pantasystem/milktea/data/infrastructure/TootEntityConverters.kt +++ b/modules/data/src/main/java/net/pantasystem/milktea/data/infrastructure/TootEntityConverters.kt @@ -114,7 +114,7 @@ fun MstNotificationDTO.toModel(a: Account, isRead: Boolean): Notification { ) } MstNotificationDTO.NotificationType.Status -> { - StatusNotification( + PostNotification( createdAt = createdAt, id = id, userId = userId, diff --git a/modules/features/notification/src/main/java/net/pantasystem/milktea/notification/notification_message_helper.kt b/modules/features/notification/src/main/java/net/pantasystem/milktea/notification/notification_message_helper.kt index a7f682c28e..1cfedc890b 100644 --- a/modules/features/notification/src/main/java/net/pantasystem/milktea/notification/notification_message_helper.kt +++ b/modules/features/notification/src/main/java/net/pantasystem/milktea/notification/notification_message_helper.kt @@ -64,7 +64,7 @@ class NotificationMessageScope(val context: Context) { R.string.notification_favorited_by, user?.displayUserName ?: "" ) - is StatusNotification -> context.getString( + is PostNotification -> context.getString( R.string.notification_posted_by, user?.displayUserName ?: "" ) diff --git a/modules/features/notification/src/main/java/net/pantasystem/milktea/notification/viewmodel/NotificationViewData.kt b/modules/features/notification/src/main/java/net/pantasystem/milktea/notification/viewmodel/NotificationViewData.kt index b24a34c47b..202c5df951 100644 --- a/modules/features/notification/src/main/java/net/pantasystem/milktea/notification/viewmodel/NotificationViewData.kt +++ b/modules/features/notification/src/main/java/net/pantasystem/milktea/notification/viewmodel/NotificationViewData.kt @@ -50,7 +50,7 @@ class NotificationViewData( is GroupInvitedNotification -> Type.GROUP_INVITED is UnknownNotification -> Type.UNKNOWN is FavoriteNotification -> Type.FAVORITE - is StatusNotification -> Type.STATUS + is PostNotification -> Type.STATUS } val statusType: String = type.default diff --git a/modules/model/src/main/java/net/pantasystem/milktea/model/notification/Notification.kt b/modules/model/src/main/java/net/pantasystem/milktea/model/notification/Notification.kt index 9fabb246fd..c7478175ab 100644 --- a/modules/model/src/main/java/net/pantasystem/milktea/model/notification/Notification.kt +++ b/modules/model/src/main/java/net/pantasystem/milktea/model/notification/Notification.kt @@ -82,7 +82,7 @@ data class MentionNotification( } } -data class StatusNotification( +data class PostNotification( override val id: Id, override val createdAt: Instant,