Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修正了emoji部分数据结构变更导致的问题 #15

Merged
merged 3 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/main/kotlin/EmojiKitchen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,16 @@ public data class EmojiKitchen internal constructor(val items: Map<String, Emoji
public fun cook(left: String, right: String): Pair<String, String>? {
val l = left.unicode()
val r = right.unicode()
val list = items[l] ?: items[r] ?: return null
val item = list.combinations.find { it.leftEmoji == left && it.rightEmoji == right } ?: return null
// val list = items[l] ?: items[r] ?: return null
// val item = list.combinations.find { it.leftEmoji == left && it.rightEmoji == right } ?: return null

val combinationsLists = items[l]?.combinations?.values?.flatten()
?: items[r]?.combinations?.values?.flatten()
?: return null

val item = combinationsLists.find { it.leftEmoji == left && it.rightEmoji == right }
?: return null

return item.filename to item.gStaticUrl
}

Expand Down
6 changes: 5 additions & 1 deletion src/main/kotlin/EmojiKitchenCombination.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ public data class EmojiKitchenCombination(
@SerialName("rightEmojiCodepoint")
public val rightEmojiCodepoint: String,
@SerialName("date")
public val date: String
public val date: String,
@SerialName("isLatest")
public val isLatest: Boolean,
@SerialName("gBoardOrder")
public val gBoardOrder: Int,
) {
public val filename: String
get() = gStaticUrl.substringAfterLast('/')
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/EmojiKitchenItem.kt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public data class EmojiKitchenItem(
public val category: String,
@SerialName("subcategory")
public val subcategory: String,
//由于json结构发生变化,序列化需要调整
@SerialName("combinations")
public val combinations: List<EmojiKitchenCombination>,
public val combinations: Map<String,List<EmojiKitchenCombination>>,
)
6 changes: 3 additions & 3 deletions src/main/kotlin/impl/MemeEmojiKitchen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,19 @@ public class MemeEmojiKitchen : MemeService {
if (archive.exists().not()) {
try {
download(
urlString = "https://mirror.ghproxy.com/https://github.com/xsalazar/emoji-kitchen/archive/main.zip",
urlString = "https://mirror.ghproxy.com/https://github.com/xsalazar/emoji-kitchen-backend/archive/main.zip",
folder = folder
)
} catch (_: Exception) {
archive.delete()
download(
urlString = "https://github.com/xsalazar/emoji-kitchen/archive/main.zip",
urlString = "https://github.com/xsalazar/emoji-kitchen-backend/archive/main.zip",
folder = folder
)
}.renameTo(archive)
}
val metadata = ZipFile(archive).use { zip ->
val entry = zip.getEntry("emoji-kitchen-main/src/Components/metadata.json")
val entry = zip.getEntry("emoji-kitchen-backend-main/app/metadata.json")
@OptIn(ExperimentalSerializationApi::class)
Json.decodeFromStream<EmojiKitchenMetadata>(stream = zip.getInputStream(entry))
}
Expand Down
Loading