Compare commits
2 Commits
4ea7fdc562
...
7afbf1bff8
| Author | SHA1 | Date | |
|---|---|---|---|
| 7afbf1bff8 | |||
| 8dec0fe2e5 |
@@ -1578,6 +1578,21 @@ class SodaMessageSource {
|
|||||||
Lang.EN to "yyyy.MM.dd E hh:mm a",
|
Lang.EN to "yyyy.MM.dd E hh:mm a",
|
||||||
Lang.JA to "yyyy.MM.dd E hh:mm a"
|
Lang.JA to "yyyy.MM.dd E hh:mm a"
|
||||||
),
|
),
|
||||||
|
"live.room.language_tag.korean" to mapOf(
|
||||||
|
Lang.KO to "한국어",
|
||||||
|
Lang.EN to "Korean",
|
||||||
|
Lang.JA to "韓国語"
|
||||||
|
),
|
||||||
|
"live.room.language_tag.japanese" to mapOf(
|
||||||
|
Lang.KO to "일본어",
|
||||||
|
Lang.EN to "Japanese",
|
||||||
|
Lang.JA to "日本語"
|
||||||
|
),
|
||||||
|
"live.room.language_tag.english" to mapOf(
|
||||||
|
Lang.KO to "영어",
|
||||||
|
Lang.EN to "English",
|
||||||
|
Lang.JA to "英語"
|
||||||
|
),
|
||||||
"live.room.fcm.message.started" to mapOf(
|
"live.room.fcm.message.started" to mapOf(
|
||||||
Lang.KO to "라이브를 시작했습니다. - %s",
|
Lang.KO to "라이브를 시작했습니다. - %s",
|
||||||
Lang.EN to "Live started. - %s",
|
Lang.EN to "Live started. - %s",
|
||||||
|
|||||||
@@ -154,13 +154,7 @@ class LiveRoomService(
|
|||||||
.maxByOrNull { it.updatedAt ?: LocalDateTime.MIN }
|
.maxByOrNull { it.updatedAt ?: LocalDateTime.MIN }
|
||||||
?.languageCode
|
?.languageCode
|
||||||
|
|
||||||
val languageTag = when (languageCode?.lowercase()?.take(2)) {
|
return resolveLanguageTag(languageCode)
|
||||||
"ko" -> "한국어"
|
|
||||||
"ja" -> "일본어"
|
|
||||||
"en" -> "영어"
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
return languageTag
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun buildLanguageTagMap(memberIds: List<Long>): Map<Long, String?> {
|
private fun buildLanguageTagMap(memberIds: List<Long>): Map<Long, String?> {
|
||||||
@@ -175,13 +169,19 @@ class LiveRoomService(
|
|||||||
}
|
}
|
||||||
|
|
||||||
return latestTokenByMemberId.mapValues { (_, token) ->
|
return latestTokenByMemberId.mapValues { (_, token) ->
|
||||||
when (token?.languageCode?.lowercase()?.take(2)) {
|
resolveLanguageTag(token?.languageCode)
|
||||||
"ko" -> "한국어"
|
}
|
||||||
"ja" -> "일본어"
|
}
|
||||||
"en" -> "영어"
|
|
||||||
|
private fun resolveLanguageTag(languageCode: String?): String? {
|
||||||
|
val key = when (languageCode?.lowercase()?.take(2)) {
|
||||||
|
"ko" -> "live.room.language_tag.korean"
|
||||||
|
"ja" -> "live.room.language_tag.japanese"
|
||||||
|
"en" -> "live.room.language_tag.english"
|
||||||
else -> null
|
else -> null
|
||||||
}
|
} ?: return null
|
||||||
}
|
|
||||||
|
return messageSource.getMessage(key, langContext.lang)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional(readOnly = true)
|
@Transactional(readOnly = true)
|
||||||
@@ -963,12 +963,12 @@ class LiveRoomService(
|
|||||||
}
|
}
|
||||||
|
|
||||||
val menuPan = menuService.getLiveMenu(creatorId = room.member!!.id!!)
|
val menuPan = menuService.getLiveMenu(creatorId = room.member!!.id!!)
|
||||||
val languageTagByMemberId = buildLanguageTagMap(listOfNotNull(room.member?.id))
|
val creatorLanguageCode = pushTokenRepository.findByMemberId(room.member!!.id!!)
|
||||||
|
.filterNot { it.languageCode.isNullOrBlank() }
|
||||||
val tags = room.tags
|
.maxByOrNull { it.updatedAt ?: LocalDateTime.MIN }
|
||||||
.filter { it.tag.isActive }
|
?.languageCode
|
||||||
.map { it.tag.tag }
|
?.lowercase()
|
||||||
.let { tags -> applyLanguageTagToRoomTags(room.member?.id, tags, languageTagByMemberId) }
|
?.take(2)
|
||||||
|
|
||||||
return GetRoomInfoResponse(
|
return GetRoomInfoResponse(
|
||||||
roomId = roomId,
|
roomId = roomId,
|
||||||
@@ -1007,7 +1007,7 @@ class LiveRoomService(
|
|||||||
managerList = roomInfo.managerList,
|
managerList = roomInfo.managerList,
|
||||||
donationRankingTop3UserIds = donationRankingTop3UserIds,
|
donationRankingTop3UserIds = donationRankingTop3UserIds,
|
||||||
menuPan = menuPan?.menu ?: "",
|
menuPan = menuPan?.menu ?: "",
|
||||||
tags = tags,
|
creatorLanguageCode = creatorLanguageCode,
|
||||||
isPrivateRoom = room.type == LiveRoomType.PRIVATE,
|
isPrivateRoom = room.type == LiveRoomType.PRIVATE,
|
||||||
password = room.password,
|
password = room.password,
|
||||||
isActiveRoulette = isActiveRoulette
|
isActiveRoulette = isActiveRoulette
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ data class GetRoomInfoResponse(
|
|||||||
val managerList: List<LiveRoomMember>,
|
val managerList: List<LiveRoomMember>,
|
||||||
val donationRankingTop3UserIds: List<Long>,
|
val donationRankingTop3UserIds: List<Long>,
|
||||||
val menuPan: String,
|
val menuPan: String,
|
||||||
val tags: List<String>,
|
val creatorLanguageCode: String?,
|
||||||
val isPrivateRoom: Boolean = false,
|
val isPrivateRoom: Boolean = false,
|
||||||
val password: String? = null,
|
val password: String? = null,
|
||||||
val isActiveRoulette: Boolean = false
|
val isActiveRoulette: Boolean = false
|
||||||
|
|||||||
Reference in New Issue
Block a user