Add ability to Ban and Ban from Community for posts and comments. #1325

dessalines · 2024-01-20T16:24:38Z

Adding appropriate viewModels and activities.
Adds functions to search for and update lists of posts and comments
Context: List of moderator actions / moderation abilities #1182

Edit: Should come after #1324

- Adding appropriate viewModels and activities. - Adds functions to search for and update lists of posts and comments - Context: #1182

dessalines · 2024-01-21T15:37:52Z

app/src/main/java/com/jerboa/datatypes/Others.kt

+ * A wrapper to store extra community ban info
+ */
+@Serializable
+data class BanFromCommunityData(


This is necessary to bundle some info for community bans. site bans don't need this cause PersonView has all the data you need.

dessalines · 2024-01-21T15:38:45Z

app/src/main/java/com/jerboa/Utils.kt

@@ -281,7 +284,8 @@ fun commentsToFlatNodes(comments: List<CommentView>): ImmutableList<CommentNode>
 */
 fun buildCommentsTree(
    comments: List<CommentView>,
-    rootCommentId: Int?, // If it's in CommentView, then we need to know the root comment id
+    // If it's in CommentView, then we need to know the root comment id


kotlinter complains about all same-line comments now, so I fixed these up.

dessalines · 2024-01-21T15:40:48Z

app/src/main/java/com/jerboa/Utils.kt

+    person: Person,
+): List<PostView> {
+    val newPosts = posts.toMutableList()
+    newPosts.replaceAll {


I couldn't find a better way to alter several items for an immutable list.

I would've liked to use .filter { }.forEach { }, but it didn't work since the internal items are immutable.

dessalines · 2024-01-21T15:41:29Z

app/src/main/java/com/jerboa/Utils.kt

@@ -1568,3 +1633,9 @@ fun canMod(
        false
    }
 }
+
+fun futureDaysToUnixTime(days: Int?): Int? {


Copied from lemmy-ui. The back end requires a unix epoch, but the front end should just use days in its fields.

dessalines · 2024-01-21T15:43:59Z

app/src/main/java/com/jerboa/model/PostViewModel.kt

@@ -267,6 +268,62 @@ class PostViewModel(val id: Either<PostId, CommentId>) : ViewModel() {
        }
    }

+    fun updateBanned(personView: PersonView) {


Wasn't sure what to name this one. Its only used for banning a user currently, but could potentially be used for any updates for every person in a post.

dessalines · 2024-01-21T15:49:32Z

app/src/main/java/com/jerboa/ui/components/comment/CommentNode.kt

@@ -692,7 +705,7 @@ fun CommentFooterLine(
    var showMoreOptions by remember { mutableStateOf(false) }

    val canMod =
-        remember {
+        remember(admins) {


Need your help with this one.

This was an error with the last PR. On first app load, it would incorrectly not should the extra mod actions, because admins hadn't loaded yet.

This fixes it, but it might cause a lot of recompositions when admins show up? I'm having trouble deciphering when to use derivedState vs remember(key).

Also, should this remember also include account, IE remember(account, admins) { ...

I'm having trouble deciphering when to use derivedState vs remember(key).

derivedState is to prevent recompositions when the result is the same. Here i have rather that the computation (the function call itself) is skipped as much as possible too. So I prefer a remember.

This fixes it, but it might cause a lot of recompositions when admins show up

As long as the key doesn't change it shouldn't cause any recompositions, so as long as the list stays the same it shouldnt be a problem.

Also, should this remember also include account

if this needs to change when the account changes then the account needs to be included in the key. But I think account change would force it to fully rebuild the compose tree due to navigation. So it wouldn't be necessary

Gotcha, thx.

dessalines · 2024-01-21T15:50:54Z

app/src/main/java/com/jerboa/ui/components/common/InputFields.kt

+    OutlinedTextField(
+        modifier = Modifier.fillMaxWidth(),
+        value = value?.toString() ?: "",
+        onValueChange = {


Some weird logic here, but it seems to work. Mostly copied from stackoverflow. The expire days needs positive integers, or if its empty, send null.

dessalines · 2024-01-21T15:52:21Z

app/src/main/java/com/jerboa/ui/components/common/PopupItems.kt

+import it.vercruysse.lemmyapi.v0x19.datatypes.Person
+
+@Composable
+fun BanPersonPopupMenuItem(


Externalized these to a common composable, since both post and comment items use them. Should maybe do the same thing for post / comment Removes

dessalines · 2024-01-21T15:54:14Z

app/src/main/java/com/jerboa/ui/components/post/composables/PostComposables.kt

@@ -228,26 +224,6 @@ fun PostCommunitySelector(
    }
 }

-@Composable
-fun CheckboxIsNsfw(


I externalized this to a common CheckBoxField composable.

dessalines · 2024-01-21T15:54:40Z

app/src/main/java/com/jerboa/ui/theme/Color.kt

@@ -1236,7 +1236,6 @@ fun dracula(): Pair<JerboaColorScheme, JerboaColorScheme> {
    val md_theme_light_inverseOnSurface = Color(0xFFF3F0F4)
    val md_theme_light_inverseSurface = Color(0xFF303034)
    val md_theme_light_inversePrimary = Color(0xFFB9C3FF)
-    val md_theme_light_shadow = Color(0xFF000000)


Compiler complaints.

dessalines · 2024-01-24T02:53:27Z

@MV-GH This should probably be the next to merge, since its getting cumbersome to deal with conflicts.

MV-GH · 2024-01-24T21:47:22Z

app/src/main/java/com/jerboa/Utils.kt

@@ -1569,6 +1634,12 @@ fun canMod(
    }
 }

+fun futureDaysToUnixTime(days: Int?): Int? {
+    return days?.let {
+        (Date.from(Instant.now().plus(Duration.ofDays(it.toLong()))).time / 1000L).toInt()


Seems overly complex

Why not Instant.now().plus(3, DAYS).toEpochMilli() ?

Thx, looks like this one works:

Instant.now().plus(it.toLong(), ChronoUnit.DAYS).epochSecond.toInt()

There is reason that is a long, this will overflow in 2038

👀 Then we'll also need to change that in the api-client also. Rust uses an i64 so it should be fine there.

api-client? lemmy-js-client? thats not gonna be a problem since its a float which has a much bigger range and will only start to lose precision in about 300k years

https://github.com/MV-GH/LemmyBackwardsCompatibleAPI/blob/master/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x18/datatypes/BanPerson.kt#L11 and the same for BanPersonFromCommunity

Those could be Long , but if you're auto-generating them, we might need to figure out a smart way to do it, because javascript had too many issues with BigInt when we tried to do that the first time.

Hmm that is annoying, I am guessing what ever tool you use to generate those TS types can't annotate its actual type for numbers?

I'll keep a manual list for now

I commented over on your recent pr, but imo you might as well just replace every int with long.

dessalines and others added 14 commits January 9, 2024 17:36

Adding ability to remove and restore comments. #1182

2191a31

Fix weird formatting miss.

d75f59c

Use ImmutableList instead of List.

f5b8516

Surrounding canMod with remember.

dd03905

Merge branch 'main' into comment_removing

88338a1

Adding ability to remove and restore posts. #1182

5af719a

Merge branch 'main' into post_removing

3aa5a96

Fixing jerboaappstate.

8d65682

Removing extra RemoveViewModel.

2832a72

Changing remove icon to gavel.

1551685

Change a few strings to non-contextual.

436a240

Add remove comment to commentmentionnode.

53cdaba

Remove non-optional body from compiler warning.

151868d

Adding ban and ban from community.

13a18d7

- Adding appropriate viewModels and activities. - Adds functions to search for and update lists of posts and comments - Context: #1182

dessalines requested review from twizmwazin and MV-GH as code owners January 20, 2024 16:24

dessalines marked this pull request as draft January 20, 2024 16:25

dessalines added 3 commits January 20, 2024 11:36

Fixing some formatting issues.

09f643e

Adding admin key to canMod remember.

dec131f

Merge branch 'main' into ban_users

4db5cdd

dessalines marked this pull request as ready for review January 21, 2024 04:52

dessalines commented Jan 21, 2024

View reviewed changes

dessalines added 2 commits January 21, 2024 21:25

Merge remote-tracking branch 'origin/main' into ban_users

7f156af

Merge remote-tracking branch 'origin/main' into ban_users

430d7a0

MV-GH reviewed Jan 24, 2024

View reviewed changes

MV-GH approved these changes Jan 24, 2024

View reviewed changes

Simplifying futureDaysToUnixTime function.

1a3e7dd

dessalines enabled auto-merge (squash) January 25, 2024 17:03

dessalines merged commit d1b348e into main Jan 25, 2024
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add ability to Ban and Ban from Community for posts and comments. #1325

Add ability to Ban and Ban from Community for posts and comments. #1325

dessalines commented Jan 20, 2024 •

edited

Loading

dessalines Jan 21, 2024

dessalines Jan 21, 2024

dessalines Jan 21, 2024

dessalines Jan 21, 2024

dessalines Jan 21, 2024

dessalines Jan 21, 2024

MV-GH Jan 21, 2024

dessalines Jan 22, 2024

dessalines Jan 21, 2024

dessalines Jan 21, 2024

dessalines Jan 21, 2024

dessalines Jan 21, 2024

dessalines commented Jan 24, 2024

MV-GH Jan 24, 2024

dessalines Jan 25, 2024

MV-GH Jan 25, 2024

dessalines Jan 25, 2024

MV-GH Jan 25, 2024

dessalines Jan 25, 2024

MV-GH Jan 25, 2024

dessalines Jan 26, 2024

Add ability to Ban and Ban from Community for posts and comments. #1325

Add ability to Ban and Ban from Community for posts and comments. #1325

Conversation

dessalines commented Jan 20, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dessalines commented Jan 24, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dessalines commented Jan 20, 2024 •

edited

Loading