From 9465803e5bc64f9ec6c195e70c394a67001700c6 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Fri, 15 Jan 2021 22:20:25 -0500 Subject: [PATCH] Cleanup NHentai tags code --- .../kanade/tachiyomi/source/online/all/NHentai.kt | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt index 4fc61d02c..c891ac334 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt @@ -106,14 +106,11 @@ class NHentai(delegate: HttpSource, val context: Context) : scanlator = jsonResponse.scanlator - jsonResponse.tags.map { - it.type to it.name - }.apply { - tags.clear() - }.forEach { - if (it.first != null && it.second != null) { - tags.add(RaisedTag(it.first!!, it.second!!, if (it.first == NHentaiSearchMetadata.NHENTAI_CATEGORIES_NAMESPACE) RaisedSearchMetadata.TAG_TYPE_VIRTUAL else NHentaiSearchMetadata.TAG_TYPE_DEFAULT)) - } + tags.clear() + jsonResponse.tags.filter { + it.type != null && it.name != null + }.mapTo(tags) { + RaisedTag(it.type!!, it.name!!, if (it.type == NHentaiSearchMetadata.NHENTAI_CATEGORIES_NAMESPACE) RaisedSearchMetadata.TAG_TYPE_VIRTUAL else NHentaiSearchMetadata.TAG_TYPE_DEFAULT) } } }