[Lib] Fix auth part 2

pull/142/head
Zakhar Timoshenko 3 years ago
parent 04e219ff69
commit c4acb9725f

@ -98,6 +98,7 @@ internal open class MangaLibParser(
if (line.startsWith("window.__DATA__")) {
val json = JSONObject(line.substringAfter('=').substringBeforeLast(';'))
val list = json.getJSONObject("chapters").getJSONArray("list")
val id = json.optJSONObject("user")?.getLong("id")?.toString() ?: "not"
val total = list.length()
chapters = ChaptersListBuilder(total)
for (i in 0 until total) {
@ -105,14 +106,20 @@ internal open class MangaLibParser(
val chapterId = item.getLong("chapter_id")
val scanlator = item.getStringOrNull("username")
val url = buildString {
if (isAuthorized) {
append(manga.url)
append("/v")
append(item.getInt("chapter_volume"))
append("/c")
append(item.getString("chapter_number"))
if (isAuthorized) {
append("?ui=")
append(getUID())
append(id)
} else {
append(manga.url)
append("/v")
append(item.getInt("chapter_volume"))
append("/c")
append(item.getString("chapter_number"))
}
}
val nameChapter = item.getStringOrNull("chapter_name")
@ -242,20 +249,6 @@ internal open class MangaLibParser(
return body.selectFirst(".profile-user__username")?.text() ?: body.parseFailed("Cannot find username")
}
private suspend fun getUID(): String {
val url = "https://${getDomain()}/news/polzovatelskoe-soglasenie"
val body = context.httpGet(url).parseHtml().body()
val scripts = body.select("script")
for (script in scripts) {
val raw = script.html().trim()
if (raw.startsWith("window.__DATA")) {
val json = JSONObject(raw.substringAfter('=').substringBeforeLast(';'))
return json.getJSONObject("user").getInt("id").toString()
}
}
throw AuthRequiredException(source)
}
protected open fun isNsfw(doc: Document): Boolean {
val sidebar = doc.body().run {
selectFirst(".media-sidebar") ?: selectFirst(".media-info")

Loading…
Cancel
Save