fix: logout of comments when log out of anilist
This commit is contained in:
parent
c29147a681
commit
e31d2ada4f
2 changed files with 28 additions and 13 deletions
|
@ -7,6 +7,7 @@ import android.util.Log
|
||||||
import androidx.browser.customtabs.CustomTabsIntent
|
import androidx.browser.customtabs.CustomTabsIntent
|
||||||
import ani.dantotsu.R
|
import ani.dantotsu.R
|
||||||
import ani.dantotsu.client
|
import ani.dantotsu.client
|
||||||
|
import ani.dantotsu.connections.comments.CommentsAPI
|
||||||
import ani.dantotsu.currContext
|
import ani.dantotsu.currContext
|
||||||
import ani.dantotsu.openLinkInBrowser
|
import ani.dantotsu.openLinkInBrowser
|
||||||
import ani.dantotsu.settings.saving.PrefManager
|
import ani.dantotsu.settings.saving.PrefManager
|
||||||
|
@ -117,6 +118,9 @@ object Anilist {
|
||||||
episodesWatched = null
|
episodesWatched = null
|
||||||
chapterRead = null
|
chapterRead = null
|
||||||
PrefManager.removeVal(PrefName.AnilistToken)
|
PrefManager.removeVal(PrefName.AnilistToken)
|
||||||
|
//logout from comments api
|
||||||
|
CommentsAPI.logout()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend inline fun <reified T : Any> executeQuery(
|
suspend inline fun <reified T : Any> executeQuery(
|
||||||
|
|
|
@ -24,7 +24,7 @@ import uy.kohesive.injekt.Injekt
|
||||||
import uy.kohesive.injekt.api.get
|
import uy.kohesive.injekt.api.get
|
||||||
|
|
||||||
object CommentsAPI {
|
object CommentsAPI {
|
||||||
val address: String = "https://1224665.xyz:443"
|
private const val ADDRESS: String = "https://1224665.xyz:443"
|
||||||
var authToken: String? = null
|
var authToken: String? = null
|
||||||
var userId: String? = null
|
var userId: String? = null
|
||||||
var isBanned: Boolean = false
|
var isBanned: Boolean = false
|
||||||
|
@ -33,7 +33,7 @@ object CommentsAPI {
|
||||||
var totalVotes: Int = 0
|
var totalVotes: Int = 0
|
||||||
|
|
||||||
suspend fun getCommentsForId(id: Int, page: Int = 1, tag: Int?, sort: String?): CommentResponse? {
|
suspend fun getCommentsForId(id: Int, page: Int = 1, tag: Int?, sort: String?): CommentResponse? {
|
||||||
var url = "$address/comments/$id/$page"
|
var url = "$ADDRESS/comments/$id/$page"
|
||||||
val request = requestBuilder()
|
val request = requestBuilder()
|
||||||
tag?.let {
|
tag?.let {
|
||||||
url += "?tag=$it"
|
url += "?tag=$it"
|
||||||
|
@ -61,7 +61,7 @@ object CommentsAPI {
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun getRepliesFromId(id: Int, page: Int = 1): CommentResponse? {
|
suspend fun getRepliesFromId(id: Int, page: Int = 1): CommentResponse? {
|
||||||
val url = "$address/comments/parent/$id/$page"
|
val url = "$ADDRESS/comments/parent/$id/$page"
|
||||||
val request = requestBuilder()
|
val request = requestBuilder()
|
||||||
val json = try {
|
val json = try {
|
||||||
request.get(url)
|
request.get(url)
|
||||||
|
@ -83,7 +83,7 @@ object CommentsAPI {
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun getSingleComment(id: Int): Comment? {
|
suspend fun getSingleComment(id: Int): Comment? {
|
||||||
val url = "$address/comments/$id"
|
val url = "$ADDRESS/comments/$id"
|
||||||
val request = requestBuilder()
|
val request = requestBuilder()
|
||||||
val json = try {
|
val json = try {
|
||||||
request.get(url)
|
request.get(url)
|
||||||
|
@ -105,7 +105,7 @@ object CommentsAPI {
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun vote(commentId: Int, voteType: Int): Boolean {
|
suspend fun vote(commentId: Int, voteType: Int): Boolean {
|
||||||
val url = "$address/comments/vote/$commentId/$voteType"
|
val url = "$ADDRESS/comments/vote/$commentId/$voteType"
|
||||||
val request = requestBuilder()
|
val request = requestBuilder()
|
||||||
val json = try {
|
val json = try {
|
||||||
request.post(url)
|
request.post(url)
|
||||||
|
@ -121,7 +121,7 @@ object CommentsAPI {
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun comment(mediaId: Int, parentCommentId: Int?, content: String, tag: Int?): Comment? {
|
suspend fun comment(mediaId: Int, parentCommentId: Int?, content: String, tag: Int?): Comment? {
|
||||||
val url = "$address/comments"
|
val url = "$ADDRESS/comments"
|
||||||
val body = FormBody.Builder()
|
val body = FormBody.Builder()
|
||||||
.add("user_id", userId ?: return null)
|
.add("user_id", userId ?: return null)
|
||||||
.add("media_id", mediaId.toString())
|
.add("media_id", mediaId.toString())
|
||||||
|
@ -169,7 +169,7 @@ object CommentsAPI {
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun deleteComment(commentId: Int): Boolean {
|
suspend fun deleteComment(commentId: Int): Boolean {
|
||||||
val url = "$address/comments/$commentId"
|
val url = "$ADDRESS/comments/$commentId"
|
||||||
val request = requestBuilder()
|
val request = requestBuilder()
|
||||||
val json = try {
|
val json = try {
|
||||||
request.delete(url)
|
request.delete(url)
|
||||||
|
@ -185,7 +185,7 @@ object CommentsAPI {
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun editComment(commentId: Int, content: String): Boolean {
|
suspend fun editComment(commentId: Int, content: String): Boolean {
|
||||||
val url = "$address/comments/$commentId"
|
val url = "$ADDRESS/comments/$commentId"
|
||||||
val body = FormBody.Builder()
|
val body = FormBody.Builder()
|
||||||
.add("content", content)
|
.add("content", content)
|
||||||
.build()
|
.build()
|
||||||
|
@ -204,7 +204,7 @@ object CommentsAPI {
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun banUser(userId: String): Boolean {
|
suspend fun banUser(userId: String): Boolean {
|
||||||
val url = "$address/ban/$userId"
|
val url = "$ADDRESS/ban/$userId"
|
||||||
val request = requestBuilder()
|
val request = requestBuilder()
|
||||||
val json = try {
|
val json = try {
|
||||||
request.post(url)
|
request.post(url)
|
||||||
|
@ -225,7 +225,7 @@ object CommentsAPI {
|
||||||
mediaTitle: String,
|
mediaTitle: String,
|
||||||
reportedId: String
|
reportedId: String
|
||||||
): Boolean {
|
): Boolean {
|
||||||
val url = "$address/report/$commentId"
|
val url = "$ADDRESS/report/$commentId"
|
||||||
val body = FormBody.Builder()
|
val body = FormBody.Builder()
|
||||||
.add("username", username)
|
.add("username", username)
|
||||||
.add("mediaName", mediaTitle)
|
.add("mediaName", mediaTitle)
|
||||||
|
@ -247,7 +247,7 @@ object CommentsAPI {
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun getNotifications(client: OkHttpClient): NotificationResponse? {
|
suspend fun getNotifications(client: OkHttpClient): NotificationResponse? {
|
||||||
val url = "$address/notification/reply"
|
val url = "$ADDRESS/notification/reply"
|
||||||
val request = requestBuilder(client)
|
val request = requestBuilder(client)
|
||||||
val json = try {
|
val json = try {
|
||||||
request.get(url)
|
request.get(url)
|
||||||
|
@ -268,7 +268,7 @@ object CommentsAPI {
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun getUserDetails(client: OkHttpClient? = null): User? {
|
private suspend fun getUserDetails(client: OkHttpClient? = null): User? {
|
||||||
val url = "$address/user"
|
val url = "$ADDRESS/user"
|
||||||
val request = if (client != null) requestBuilder(client) else requestBuilder()
|
val request = if (client != null) requestBuilder(client) else requestBuilder()
|
||||||
val json = try {
|
val json = try {
|
||||||
request.get(url)
|
request.get(url)
|
||||||
|
@ -310,7 +310,7 @@ object CommentsAPI {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
val url = "$address/authenticate"
|
val url = "$ADDRESS/authenticate"
|
||||||
val token = PrefManager.getVal(PrefName.AnilistToken, null as String?) ?: return
|
val token = PrefManager.getVal(PrefName.AnilistToken, null as String?) ?: return
|
||||||
repeat(MAX_RETRIES) {
|
repeat(MAX_RETRIES) {
|
||||||
try {
|
try {
|
||||||
|
@ -348,6 +348,17 @@ object CommentsAPI {
|
||||||
snackString("Failed to login after multiple attempts")
|
snackString("Failed to login after multiple attempts")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun logout() {
|
||||||
|
PrefManager.removeVal(PrefName.CommentAuthResponse)
|
||||||
|
PrefManager.removeVal(PrefName.CommentTokenExpiry)
|
||||||
|
authToken = null
|
||||||
|
userId = null
|
||||||
|
isBanned = false
|
||||||
|
isAdmin = false
|
||||||
|
isMod = false
|
||||||
|
totalVotes = 0
|
||||||
|
}
|
||||||
|
|
||||||
private suspend fun authRequest(
|
private suspend fun authRequest(
|
||||||
token: String,
|
token: String,
|
||||||
url: String,
|
url: String,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue