feat: Delete,edit activity

rebelonion · May 27, 2024 · ea75197 · ea75197
1 parent 6878d12
commit ea75197
Show file tree

Hide file tree

Showing 16 changed files with 336 additions and 208 deletions.
diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistMutations.kt b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistMutations.kt
@@ -3,9 +3,9 @@ package ani.dantotsu.connections.anilist
 import ani.dantotsu.connections.anilist.Anilist.executeQuery
 import ani.dantotsu.connections.anilist.api.FuzzyDate
 import ani.dantotsu.connections.anilist.api.Query
+import ani.dantotsu.connections.anilist.api.ToggleLike
 import ani.dantotsu.currContext
 import com.google.gson.Gson
-import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 
 class AnilistMutations {
@@ -76,38 +76,66 @@ class AnilistMutations {
 
 
     suspend fun rateReview(reviewId: Int, rating: String): Query.RateReviewResponse? {
-        val query = "mutation{RateReview(reviewId:$reviewId,rating:$rating){id mediaId mediaType summary body(asHtml:true)rating ratingAmount userRating score private siteUrl createdAt updatedAt user{id name bannerImage avatar{medium large}}}}"
+        val query =
+            "mutation{RateReview(reviewId:$reviewId,rating:$rating){id mediaId mediaType summary body(asHtml:true)rating ratingAmount userRating score private siteUrl createdAt updatedAt user{id name bannerImage avatar{medium large}}}}"
         return executeQuery<Query.RateReviewResponse>(query)
     }
 
-    suspend fun postActivity(text:String): String {
+    suspend fun toggleFollow(id: Int): Query.ToggleFollow? {
+        return executeQuery<Query.ToggleFollow>(
+            """mutation{ToggleFollow(userId:$id){id, isFollowing, isFollower}}"""
+        )
+    }
+
+    suspend fun toggleLike(id: Int, type: String): ToggleLike? {
+        return executeQuery<ToggleLike>(
+            """mutation Like{ToggleLikeV2(id:$id,type:$type){__typename}}"""
+        )
+    }
+
+    suspend fun postActivity(text: String, edit : Int? = null): String {
         val encodedText = text.stringSanitizer()
-        val query = "mutation{SaveTextActivity(text:$encodedText){siteUrl}}"
+        val query = "mutation{SaveTextActivity(${if (edit != null) "id:$edit," else ""} text:$encodedText){siteUrl}}"
+        val result = executeQuery<JsonObject>(query)
+        val errors = result?.get("errors")
+        return errors?.toString()
+            ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
+    }
+    suspend fun postReply(activityId: Int, text: String, edit: Int? = null ): String {
+        val encodedText = text.stringSanitizer()
+        val query = "mutation{SaveActivityReply(${if (edit != null) "id:$edit," else ""} activityId:$activityId,text:$encodedText){id}}"
         val result = executeQuery<JsonObject>(query)
         val errors = result?.get("errors")
         return errors?.toString()
             ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
     }
-
     suspend fun postReview(summary: String, body: String, mediaId: Int, score: Int): String {
         val encodedSummary = summary.stringSanitizer()
         val encodedBody = body.stringSanitizer()
-        val query = "mutation{SaveReview(mediaId:$mediaId,summary:$encodedSummary,body:$encodedBody,score:$score){siteUrl}}"
+        val query =
+            "mutation{SaveReview(mediaId:$mediaId,summary:$encodedSummary,body:$encodedBody,score:$score){siteUrl}}"
         val result = executeQuery<JsonObject>(query)
         val errors = result?.get("errors")
         return errors?.toString()
             ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
     }
 
-    suspend fun postReply(activityId: Int, text: String): String {
-        val encodedText = text.stringSanitizer()
-        val query = "mutation{SaveActivityReply(activityId:$activityId,text:$encodedText){id}}"
+    suspend fun deleteActivityReply(activityId: Int): Boolean {
+        val query = "mutation{DeleteActivityReply(id:$activityId){deleted}}"
         val result = executeQuery<JsonObject>(query)
         val errors = result?.get("errors")
-        return errors?.toString()
-            ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
+        return errors == null
     }
 
+    suspend fun deleteActivity(activityId: Int): Boolean {
+        val query = "mutation{DeleteActivity(id:$activityId){deleted}}"
+        val result = executeQuery<JsonObject>(query)
+        val errors = result?.get("errors")
+        return errors == null
+    }
+
+
+
     private fun String.stringSanitizer(): String {
         val sb = StringBuilder()
         var i = 0

diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt
@@ -1548,18 +1548,6 @@ Page(page:$page,perPage:50) {
         )
     }
 
-    suspend fun toggleFollow(id: Int): Query.ToggleFollow? {
-        return executeQuery<Query.ToggleFollow>(
-            """mutation{ToggleFollow(userId:$id){id, isFollowing, isFollower}}"""
-        )
-    }
-
-    suspend fun toggleLike(id: Int, type: String): ToggleLike? {
-        return executeQuery<ToggleLike>(
-            """mutation Like{ToggleLikeV2(id:$id,type:$type){__typename}}"""
-        )
-    }
-
     suspend fun getUserProfile(id: Int): Query.UserProfileResponse? {
         return executeQuery<Query.UserProfileResponse>(
             """{followerPage:Page{followers(userId:$id){id}pageInfo{total}}followingPage:Page{following(userId:$id){id}pageInfo{total}}user:User(id:$id){id name about(asHtml:true)avatar{medium large}bannerImage isFollowing isFollower isBlocked favourites{anime{nodes{id coverImage{extraLarge large medium color}}}manga{nodes{id coverImage{extraLarge large medium color}}}characters{nodes{id name{first middle last full native alternative userPreferred}image{large medium}isFavourite}}staff{nodes{id name{first middle last full native alternative userPreferred}image{large medium}isFavourite}}studios{nodes{id name isFavourite}}}statistics{anime{count meanScore standardDeviation minutesWatched episodesWatched chaptersRead volumesRead}manga{count meanScore standardDeviation minutesWatched episodesWatched chaptersRead volumesRead}}siteUrl}}""",
@@ -1618,11 +1606,13 @@ Page(page:$page,perPage:50) {
     suspend fun getNotifications(
         id: Int,
         page: Int = 1,
-        resetNotification: Boolean = true
+        resetNotification: Boolean = true,
+        type: Boolean? = null
     ): NotificationResponse? {
+        val type_in = "type_in:[AIRING,MEDIA_MERGE,MEDIA_DELETION,MEDIA_DATA_CHANGE]"
         val reset = if (resetNotification) "true" else "false"
         val res = executeQuery<NotificationResponse>(
-            """{User(id:$id){unreadNotificationCount}Page(page:$page,perPage:$ITEMS_PER_PAGE){pageInfo{currentPage,hasNextPage}notifications(resetNotificationCount:$reset){__typename...on AiringNotification{id,type,animeId,episode,contexts,createdAt,media{id,title{romaji,english,native,userPreferred}bannerImage,coverImage{medium,large}},}...on FollowingNotification{id,userId,type,context,createdAt,user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityMessageNotification{id,userId,type,activityId,context,createdAt,message{id}user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityMentionNotification{id,userId,type,activityId,context,createdAt,activity{__typename}user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityReplyNotification{id,userId,type,activityId,context,createdAt,activity{__typename}user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityReplySubscribedNotification{id,userId,type,activityId,context,createdAt,activity{__typename}user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityLikeNotification{id,userId,type,activityId,context,createdAt,activity{__typename}user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityReplyLikeNotification{id,userId,type,activityId,context,createdAt,activity{__typename}user{id,name,bannerImage,avatar{medium,large,}}}...on ThreadCommentMentionNotification{id,userId,type,commentId,context,createdAt,thread{id}comment{id}user{id,name,bannerImage,avatar{medium,large,}}}...on ThreadCommentReplyNotification{id,userId,type,commentId,context,createdAt,thread{id}comment{id}user{id,name,bannerImage,avatar{medium,large,}}}...on ThreadCommentSubscribedNotification{id,userId,type,commentId,context,createdAt,thread{id}comment{id}user{id,name,bannerImage,avatar{medium,large,}}}...on ThreadCommentLikeNotification{id,userId,type,commentId,context,createdAt,thread{id}comment{id}user{id,name,bannerImage,avatar{medium,large,}}}...on ThreadLikeNotification{id,userId,type,threadId,context,createdAt,thread{id}comment{id}user{id,name,bannerImage,avatar{medium,large,}}}...on RelatedMediaAdditionNotification{id,type,context,createdAt,media{id,title{romaji,english,native,userPreferred}bannerImage,coverImage{medium,large}}}...on MediaDataChangeNotification{id,type,mediaId,context,reason,createdAt,media{id,title{romaji,english,native,userPreferred}bannerImage,coverImage{medium,large}}}...on MediaMergeNotification{id,type,mediaId,deletedMediaTitles,context,reason,createdAt,media{id,title{romaji,english,native,userPreferred}bannerImage,coverImage{medium,large}}}...on MediaDeletionNotification{id,type,deletedMediaTitle,context,reason,createdAt,}}}}""",
+            """{User(id:$id){unreadNotificationCount}Page(page:$page,perPage:$ITEMS_PER_PAGE){pageInfo{currentPage,hasNextPage}notifications(resetNotificationCount:$reset , ${if (type == true) type_in else ""}){__typename...on AiringNotification{id,type,animeId,episode,contexts,createdAt,media{id,title{romaji,english,native,userPreferred}bannerImage,coverImage{medium,large}},}...on FollowingNotification{id,userId,type,context,createdAt,user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityMessageNotification{id,userId,type,activityId,context,createdAt,message{id}user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityMentionNotification{id,userId,type,activityId,context,createdAt,activity{__typename}user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityReplyNotification{id,userId,type,activityId,context,createdAt,activity{__typename}user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityReplySubscribedNotification{id,userId,type,activityId,context,createdAt,activity{__typename}user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityLikeNotification{id,userId,type,activityId,context,createdAt,activity{__typename}user{id,name,bannerImage,avatar{medium,large,}}}...on ActivityReplyLikeNotification{id,userId,type,activityId,context,createdAt,activity{__typename}user{id,name,bannerImage,avatar{medium,large,}}}...on ThreadCommentMentionNotification{id,userId,type,commentId,context,createdAt,thread{id}comment{id}user{id,name,bannerImage,avatar{medium,large,}}}...on ThreadCommentReplyNotification{id,userId,type,commentId,context,createdAt,thread{id}comment{id}user{id,name,bannerImage,avatar{medium,large,}}}...on ThreadCommentSubscribedNotification{id,userId,type,commentId,context,createdAt,thread{id}comment{id}user{id,name,bannerImage,avatar{medium,large,}}}...on ThreadCommentLikeNotification{id,userId,type,commentId,context,createdAt,thread{id}comment{id}user{id,name,bannerImage,avatar{medium,large,}}}...on ThreadLikeNotification{id,userId,type,threadId,context,createdAt,thread{id}comment{id}user{id,name,bannerImage,avatar{medium,large,}}}...on RelatedMediaAdditionNotification{id,type,context,createdAt,media{id,title{romaji,english,native,userPreferred}bannerImage,coverImage{medium,large}}}...on MediaDataChangeNotification{id,type,mediaId,context,reason,createdAt,media{id,title{romaji,english,native,userPreferred}bannerImage,coverImage{medium,large}}}...on MediaMergeNotification{id,type,mediaId,deletedMediaTitles,context,reason,createdAt,media{id,title{romaji,english,native,userPreferred}bannerImage,coverImage{medium,large}}}...on MediaDeletionNotification{id,type,deletedMediaTitle,context,reason,createdAt,}}}}""",
             force = true
         )
         if (res != null && resetNotification) {

diff --git a/app/src/main/java/ani/dantotsu/home/status/RepliesBottomDialog.kt b/app/src/main/java/ani/dantotsu/home/status/RepliesBottomDialog.kt
@@ -74,7 +74,9 @@ class RepliesBottomDialog : BottomSheetDialogFragment() {
                     replies.map {
                         ActivityReplyItem(
                             it,
+                            activityId,
                             requireActivity(),
+                            adapter,
                             clickCallback = { int, _ ->
                                 onClick(int)
                             }
@@ -109,7 +111,6 @@ class RepliesBottomDialog : BottomSheetDialogFragment() {
         super.onResume()
         loading(true)
         lifecycleScope.launch(Dispatchers.IO) {
-            delay(2000)
             loadData()
         }
     }

diff --git a/app/src/main/java/ani/dantotsu/home/status/Stories.kt b/app/src/main/java/ani/dantotsu/home/status/Stories.kt
@@ -422,14 +422,14 @@ class Stories @JvmOverloads constructor(
         }
         val likeColor = ContextCompat.getColor(context, R.color.yt_red)
         val notLikeColor = ContextCompat.getColor(context, R.color.bg_opp)
+        binding.replyCount.text = story.replyCount.toString()
+        binding.activityReplies.setColorFilter(ContextCompat.getColor(context, R.color.bg_opp))
         binding.activityRepliesContainer.setOnClickListener {
             RepliesBottomDialog.newInstance(story.id)
                 .show(activity.supportFragmentManager, "replies")
         }
         binding.activityLike.setColorFilter(if (story.isLiked == true) likeColor else notLikeColor)
-        binding.replyCount.text = story.replyCount.toString()
         binding.activityLikeCount.text = story.likeCount.toString()
-        binding.activityReplies.setColorFilter(ContextCompat.getColor(context, R.color.bg_opp))
         binding.activityLikeContainer.setOnClickListener {
             like()
         }
@@ -451,7 +451,7 @@ class Stories @JvmOverloads constructor(
         val notLikeColor = ContextCompat.getColor(context, R.color.bg_opp)
         val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
         scope.launch {
-            val res = Anilist.query.toggleLike(story.id, "ACTIVITY")
+            val res = Anilist.mutation.toggleLike(story.id, "ACTIVITY")
             withContext(Dispatchers.Main) {
                 if (res != null) {
                     if (story.isLiked == true) {

diff --git a/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt b/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt
@@ -136,7 +136,7 @@ class ProfileActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedListene
 
                     followButton.setOnClickListener {
                         lifecycleScope.launch(Dispatchers.IO) {
-                            val res = Anilist.query.toggleFollow(user.id)
+                            val res = Anilist.mutation.toggleFollow(user.id)
                             if (res?.data?.toggleFollow != null) {
                                 withContext(Dispatchers.Main) {
                                     snackString(R.string.success)
@@ -325,7 +325,7 @@ class ProfileActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedListene
         override fun getItemCount(): Int = 3
         override fun createFragment(position: Int): Fragment = when (position) {
             0 -> ProfileFragment.newInstance(user)
-            1 -> ActivityFragment(ActivityType.OTHER_USER, user.id)
+            1 -> ActivityFragment.newInstance(ActivityType.OTHER_USER, user.id)
             2 -> StatsFragment.newInstance(user)
             else -> ProfileFragment.newInstance(user)
         }

diff --git a/app/src/main/java/ani/dantotsu/profile/activity/ActivityFragment.kt b/app/src/main/java/ani/dantotsu/profile/activity/ActivityFragment.kt
@@ -21,13 +21,13 @@ import ani.dantotsu.navBarHeight
 import ani.dantotsu.profile.ProfileActivity
 import ani.dantotsu.setBaseline
 import com.xwray.groupie.GroupieAdapter
+import eu.kanade.tachiyomi.util.system.getSerializableCompat
 import kotlinx.coroutines.launch
 
-class ActivityFragment(
-    var type: ActivityType,
-    val userId: Int? = null,
-    var activityId: Int? = null,
-) : Fragment() {
+class ActivityFragment : Fragment() {
+    private lateinit var type: ActivityType
+    private var userId: Int? = null
+    private var activityId: Int? = null
     private lateinit var binding: FragmentFeedBinding
     private var adapter: GroupieAdapter = GroupieAdapter()
     private var page: Int = 1
@@ -43,15 +43,13 @@ class ActivityFragment(
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val navBar = if (userId != null) {
-            (activity as ProfileActivity).navBar
-        } else {
-            (activity as FeedActivity).navBar
-        }
-        binding.listRecyclerView.setBaseline(navBar)
+        type = arguments?.getSerializableCompat<ActivityType>("type") as ActivityType
+        userId = arguments?.getInt("userId")
+        activityId = arguments?.getInt("activityId")
         binding.listRecyclerView.adapter = adapter
         binding.listRecyclerView.layoutManager = LinearLayoutManager(context)
         binding.listProgressBar.isVisible = true
+
         binding.feedRefresh.updateLayoutParams<ViewGroup.MarginLayoutParams> {
             bottomMargin = navBarHeight
         }
@@ -94,7 +92,7 @@ class ActivityFragment(
             ActivityType.OTHER_USER -> getActivities(userId = userId)
             ActivityType.ONE -> getActivities(activityId = activityId)
         }
-        adapter.addAll(list.map { ActivityItem(it, ::onActivityClick, requireActivity()) })
+        adapter.addAll(list.map { ActivityItem(it, ::onActivityClick, adapter ,requireActivity()) })
     }
 
     private suspend fun getActivities(
@@ -142,18 +140,23 @@ class ActivityFragment(
         super.onResume()
         if (this::binding.isInitialized) {
             binding.root.requestLayout()
-            val navBar = if (userId != null) {
-                (activity as ProfileActivity).navBar
-            } else {
-                (activity as FeedActivity).navBar
-            }
-            binding.listRecyclerView.setBaseline(navBar)
+
         }
     }
 
     companion object {
         enum class ActivityType {
             GLOBAL, USER, OTHER_USER, ONE
         }
+
+        fun newInstance(type: ActivityType, userId: Int? = null, activityId: Int? = null): ActivityFragment {
+            return ActivityFragment().apply {
+                arguments = Bundle().apply {
+                    putSerializable("type", type)
+                    userId?.let { putInt("userId", it) }
+                    activityId?.let { putInt("activityId", it) }
+                }
+            }
+        }
     }
 }