feat: basic replying
This commit is contained in:
rebelonion
parent
98b227876b
commit
0c2e2db1dc
6 changed files with 245 additions and 115 deletions
|
|
@ -46,6 +46,24 @@ object CommentsAPI {
|
|||
return parsed
|
||||
}
|
||||
|
||||
suspend fun getRepliesFromId(id: Int, page: Int = 1): CommentResponse? {
|
||||
val url = "$address/comments/parent/$id/$page"
|
||||
val request = requestBuilder()
|
||||
val json = request.get(url)
|
||||
if (!json.text.startsWith("{")) return null
|
||||
val res = json.code == 200
|
||||
if (!res && json.code != 404) {
|
||||
errorReason(json.code, json.text)
|
||||
}
|
||||
val parsed = try {
|
||||
Json.decodeFromString<CommentResponse>(json.text)
|
||||
} catch (e: Exception) {
|
||||
println("comments: $e")
|
||||
return null
|
||||
}
|
||||
return parsed
|
||||
}
|
||||
|
||||
suspend fun vote(commentId: Int, voteType: Int): Boolean {
|
||||
val url = "$address/comments/vote/$commentId/$voteType"
|
||||
val request = requestBuilder()
|
||||
|
|
@ -155,16 +173,13 @@ object CommentsAPI {
|
|||
}
|
||||
|
||||
private fun headerBuilder(): Map<String, String> {
|
||||
return if (authToken != null) {
|
||||
mapOf(
|
||||
"appauth" to BuildConfig.APP_SECRET,
|
||||
"Authorization" to authToken!!
|
||||
)
|
||||
} else {
|
||||
mapOf(
|
||||
"appauth" to BuildConfig.APP_SECRET,
|
||||
)
|
||||
val map = mutableMapOf(
|
||||
"appauth" to "6*45Qp%W2RS@t38jkXoSKY588Ynj%n"
|
||||
)
|
||||
if (authToken != null) {
|
||||
map["Authorization"] = authToken!!
|
||||
}
|
||||
return map
|
||||
}
|
||||
|
||||
private fun requestBuilder(): Requests {
|
||||
|
|
@ -250,7 +265,9 @@ data class Comment(
|
|||
val isMod: Boolean? = null,
|
||||
@SerialName("is_admin")
|
||||
@Serializable(with = NumericBooleanSerializer::class)
|
||||
val isAdmin: Boolean? = null
|
||||
val isAdmin: Boolean? = null,
|
||||
@SerialName("reply_count")
|
||||
val replyCount: Int? = null
|
||||
)
|
||||
|
||||
@Serializable
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package ani.dantotsu.media.comments
|
|||
|
||||
import android.annotation.SuppressLint
|
||||
import android.view.View
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import ani.dantotsu.R
|
||||
import ani.dantotsu.connections.comments.Comment
|
||||
import ani.dantotsu.connections.comments.CommentsAPI
|
||||
|
|
@ -25,11 +26,23 @@ import java.util.TimeZone
|
|||
class CommentItem(val comment: Comment,
|
||||
private val markwon: Markwon,
|
||||
private val section: Section,
|
||||
private val editCallback: (CommentItem) -> Unit
|
||||
private val editCallback: (CommentItem) -> Unit,
|
||||
private val viewReplyCallback: (CommentItem) -> Unit,
|
||||
private val replyCallback: (CommentItem) -> Unit
|
||||
) : BindableItem<ItemCommentsBinding>() {
|
||||
var binding: ItemCommentsBinding? = null
|
||||
val adapter = GroupieAdapter()
|
||||
val repliesSection = Section()
|
||||
|
||||
init {
|
||||
adapter.add(repliesSection)
|
||||
}
|
||||
|
||||
@SuppressLint("SetTextI18n")
|
||||
override fun bind(viewBinding: ItemCommentsBinding, position: Int) {
|
||||
binding = viewBinding
|
||||
viewBinding.commentRepliesList.layoutManager = LinearLayoutManager(currActivity())
|
||||
viewBinding.commentRepliesList.adapter = adapter
|
||||
val isUserComment = CommentsAPI.userId == comment.userId
|
||||
val node = markwon.parse(comment.content)
|
||||
val spanned = markwon.render(node)
|
||||
|
|
@ -37,16 +50,25 @@ class CommentItem(val comment: Comment,
|
|||
viewBinding.commentDelete.visibility = if (isUserComment || CommentsAPI.isAdmin || CommentsAPI.isMod) View.VISIBLE else View.GONE
|
||||
viewBinding.commentBanUser.visibility = if ((CommentsAPI.isAdmin || CommentsAPI.isMod) && !isUserComment) View.VISIBLE else View.GONE
|
||||
viewBinding.commentEdit.visibility = if (isUserComment) View.VISIBLE else View.GONE
|
||||
viewBinding.commentReply.visibility = View.GONE //TODO: implement reply
|
||||
viewBinding.commentTotalReplies.visibility = View.GONE //TODO: implement reply
|
||||
viewBinding.commentReply.setOnClickListener {
|
||||
|
||||
if ((comment.replyCount ?: 0) > 0) {
|
||||
viewBinding.commentTotalReplies.visibility = View.VISIBLE
|
||||
viewBinding.commentTotalReplies.text = "View ${comment.replyCount} repl${if (comment.replyCount == 1) "y" else "ies"}"
|
||||
} else {
|
||||
viewBinding.commentTotalReplies.visibility = View.GONE
|
||||
}
|
||||
viewBinding.commentReply.visibility = View.VISIBLE
|
||||
viewBinding.commentTotalReplies.setOnClickListener {
|
||||
viewBinding.commentTotalReplies.visibility = View.GONE
|
||||
viewReplyCallback(this)
|
||||
}
|
||||
var isEditing = false
|
||||
var isReplying = false
|
||||
viewBinding.commentEdit.setOnClickListener {
|
||||
if (!isEditing) {
|
||||
viewBinding.commentEdit.text = currActivity()!!.getString(R.string.cancel)
|
||||
isEditing = true
|
||||
isReplying = false
|
||||
viewBinding.commentReply.text = "Reply"
|
||||
editCallback(this)
|
||||
} else {
|
||||
viewBinding.commentEdit.text = currActivity()!!.getString(R.string.edit)
|
||||
|
|
@ -55,6 +77,19 @@ class CommentItem(val comment: Comment,
|
|||
}
|
||||
|
||||
}
|
||||
viewBinding.commentReply.setOnClickListener {
|
||||
if (!isReplying) {
|
||||
viewBinding.commentReply.text = currActivity()!!.getString(R.string.cancel)
|
||||
isReplying = true
|
||||
isEditing = false
|
||||
viewBinding.commentEdit.text = currActivity()!!.getString(R.string.edit)
|
||||
replyCallback(this)
|
||||
} else {
|
||||
viewBinding.commentReply.text = "Reply"
|
||||
isReplying = false
|
||||
replyCallback(this)
|
||||
}
|
||||
}
|
||||
viewBinding.modBadge.visibility = if (comment.isMod == true) View.VISIBLE else View.GONE
|
||||
viewBinding.adminBadge.visibility = if (comment.isAdmin == true) View.VISIBLE else View.GONE
|
||||
viewBinding.commentDelete.setOnClickListener {
|
||||
|
|
|
|||
|
|
@ -76,7 +76,11 @@ class CommentsActivity : AppCompatActivity() {
|
|||
binding.commentReplyToContainer.visibility = View.GONE //TODO: implement reply
|
||||
var editing = false
|
||||
var editingCommentId = -1
|
||||
var replying = false
|
||||
var replyingComment: CommentItem? = null
|
||||
fun editCallback(comment: CommentItem) {
|
||||
replying = false
|
||||
replyingComment = null
|
||||
if (editingCommentId == comment.comment.commentId) {
|
||||
editing = false
|
||||
editingCommentId = -1
|
||||
|
|
@ -95,6 +99,42 @@ class CommentsActivity : AppCompatActivity() {
|
|||
|
||||
}
|
||||
|
||||
fun replyCallback(comment: CommentItem) {
|
||||
editing = false
|
||||
editingCommentId = -1
|
||||
if (replyingComment?.comment?.commentId == comment.comment.commentId) {
|
||||
replying = false
|
||||
replyingComment = null
|
||||
binding.commentInput.setText("")
|
||||
val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
|
||||
imm.hideSoftInputFromWindow(binding.commentInput.windowToken, 0)
|
||||
} else {
|
||||
replying = true
|
||||
replyingComment = comment
|
||||
binding.commentInput.requestFocus()
|
||||
binding.commentInput.setSelection(binding.commentInput.text.length)
|
||||
val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
|
||||
imm.showSoftInput(binding.commentInput, InputMethodManager.SHOW_IMPLICIT)
|
||||
}
|
||||
}
|
||||
|
||||
fun viewReplyCallback(comment: CommentItem) {
|
||||
lifecycleScope.launch {
|
||||
val replies = withContext(Dispatchers.IO) {
|
||||
CommentsAPI.getRepliesFromId(comment.comment.commentId)
|
||||
}
|
||||
replies?.comments?.forEach {
|
||||
comment.repliesSection.add(CommentItem(it, buildMarkwon(), comment.repliesSection, { comment ->
|
||||
editCallback(comment)
|
||||
}, { comment ->
|
||||
viewReplyCallback(comment)
|
||||
}, { comment ->
|
||||
replyCallback(comment)
|
||||
}))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
binding.commentsRefresh.setOnRefreshListener {
|
||||
lifecycleScope.launch {
|
||||
binding.commentsList.visibility = View.GONE
|
||||
|
|
@ -123,9 +163,13 @@ class CommentsActivity : AppCompatActivity() {
|
|||
}
|
||||
sorted?.forEach {
|
||||
withContext(Dispatchers.Main) {
|
||||
section.add(CommentItem(it, buildMarkwon(), section) { comment ->
|
||||
section.add(CommentItem(it, buildMarkwon(), section, { comment ->
|
||||
editCallback(comment)
|
||||
})
|
||||
}, { comment ->
|
||||
viewReplyCallback(comment)
|
||||
}, { comment ->
|
||||
replyCallback(comment)
|
||||
}))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -165,9 +209,13 @@ class CommentsActivity : AppCompatActivity() {
|
|||
}
|
||||
sorted?.forEach {
|
||||
withContext(Dispatchers.Main) {
|
||||
section.add(CommentItem(it, buildMarkwon(), section) { comment ->
|
||||
section.add(CommentItem(it, buildMarkwon(), section, { comment ->
|
||||
editCallback(comment)
|
||||
})
|
||||
}, { comment ->
|
||||
viewReplyCallback(comment)
|
||||
}, { comment ->
|
||||
replyCallback(comment)
|
||||
}))
|
||||
}
|
||||
}
|
||||
totalPages = comments?.totalPages ?: 1
|
||||
|
|
@ -254,10 +302,14 @@ class CommentsActivity : AppCompatActivity() {
|
|||
CommentItem(
|
||||
it,
|
||||
buildMarkwon(),
|
||||
section
|
||||
) { comment ->
|
||||
editCallback(comment)
|
||||
})
|
||||
section, { comment ->
|
||||
editCallback(comment)
|
||||
}, { comment ->
|
||||
viewReplyCallback(comment)
|
||||
}, { comment ->
|
||||
replyCallback(comment)
|
||||
})
|
||||
)
|
||||
}
|
||||
}
|
||||
totalPages = comments?.totalPages ?: 1
|
||||
|
|
@ -290,6 +342,76 @@ class CommentsActivity : AppCompatActivity() {
|
|||
snackString("You are banned from commenting :(")
|
||||
return@setOnClickListener
|
||||
}
|
||||
fun onSuccess() {
|
||||
binding.commentInput.text.toString().let {
|
||||
if (it.isNotEmpty()) {
|
||||
binding.commentInput.text.clear()
|
||||
lifecycleScope.launch {
|
||||
if (editing) {
|
||||
val success = withContext(Dispatchers.IO) {
|
||||
CommentsAPI.editComment(editingCommentId, it)
|
||||
}
|
||||
if (success) {
|
||||
val groups = section.groups
|
||||
groups.forEach { item ->
|
||||
if (item is CommentItem) {
|
||||
if (item.comment.commentId == editingCommentId) {
|
||||
item.comment.content = it
|
||||
val dateFormat =
|
||||
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
|
||||
dateFormat.timeZone =
|
||||
TimeZone.getTimeZone("UTC")
|
||||
item.comment.timestamp =
|
||||
dateFormat.format(System.currentTimeMillis())
|
||||
item.notifyChanged()
|
||||
snackString("Comment edited")
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
} else {
|
||||
val success = withContext(Dispatchers.IO) {
|
||||
CommentsAPI.comment(mediaId, if (replying) replyingComment!!.comment.commentId else null, it)
|
||||
}
|
||||
if (success != null)
|
||||
if (replying) {
|
||||
replyingComment?.repliesSection?.add(
|
||||
0,
|
||||
CommentItem(
|
||||
success,
|
||||
buildMarkwon(),
|
||||
replyingComment?.repliesSection!!, { comment ->
|
||||
editCallback(comment)
|
||||
}, { comment ->
|
||||
viewReplyCallback(comment)
|
||||
}, { comment ->
|
||||
replyCallback(comment)
|
||||
})
|
||||
)
|
||||
} else {
|
||||
section.add(
|
||||
0,
|
||||
CommentItem(
|
||||
success,
|
||||
buildMarkwon(),
|
||||
section, { comment ->
|
||||
editCallback(comment)
|
||||
}, { comment ->
|
||||
viewReplyCallback(comment)
|
||||
}, { comment ->
|
||||
replyCallback(comment)
|
||||
})
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
snackString("Comment cannot be empty")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val firstComment = PrefManager.getVal<Boolean>(PrefName.FirstComment)
|
||||
if (firstComment) {
|
||||
//show a dialog explaining the rules
|
||||
|
|
@ -311,53 +433,7 @@ class CommentsActivity : AppCompatActivity() {
|
|||
.setPositiveButton("I Understand") { dialog, _ ->
|
||||
dialog.dismiss()
|
||||
PrefManager.setVal(PrefName.FirstComment, false)
|
||||
binding.commentInput.text.toString().let {
|
||||
if (it.isNotEmpty()) {
|
||||
binding.commentInput.text.clear()
|
||||
lifecycleScope.launch {
|
||||
if (editing) {
|
||||
val success = withContext(Dispatchers.IO) {
|
||||
CommentsAPI.editComment(editingCommentId, it)
|
||||
}
|
||||
if (success) {
|
||||
val groups = section.groups
|
||||
groups.forEach { item ->
|
||||
if (item is CommentItem) {
|
||||
if (item.comment.commentId == editingCommentId) {
|
||||
item.comment.content = it
|
||||
val dateFormat =
|
||||
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
|
||||
dateFormat.timeZone =
|
||||
TimeZone.getTimeZone("UTC")
|
||||
item.comment.timestamp =
|
||||
dateFormat.format(System.currentTimeMillis())
|
||||
item.notifyChanged()
|
||||
snackString("Comment edited")
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
} else {
|
||||
val success = withContext(Dispatchers.IO) {
|
||||
CommentsAPI.comment(mediaId, null, it)
|
||||
}
|
||||
if (success != null)
|
||||
section.add(
|
||||
0,
|
||||
CommentItem(
|
||||
success,
|
||||
buildMarkwon(),
|
||||
section
|
||||
) { comment ->
|
||||
editCallback(comment)
|
||||
})
|
||||
}
|
||||
}
|
||||
} else {
|
||||
snackString("Comment cannot be empty")
|
||||
}
|
||||
}
|
||||
onSuccess()
|
||||
}
|
||||
.setNegativeButton("Cancel") { dialog, _ ->
|
||||
dialog.dismiss()
|
||||
|
|
@ -365,6 +441,8 @@ class CommentsActivity : AppCompatActivity() {
|
|||
val dialog = alertDialog.show()
|
||||
dialog?.window?.setDimAmount(0.8f)
|
||||
|
||||
} else {
|
||||
onSuccess()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue