Add BlurNsfwExceptFromNsfwCommunities to blur types #1229

MakcNmyc · 2023-09-10T10:22:14Z

My first pull request. I will be grateful for every advice

…communities (LemmyNet#957)

MakcNmyc · 2023-09-10T10:31:59Z

It's also needed change nsfw type on server

app/schemas/com.jerboa.db.AppDB/26.json

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

app/src/main/java/com/jerboa/db/AppDBMigrations.kt

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

app/src/main/java/com/jerboa/ui/components/settings/lookandfeel/LookAndFeelActivity.kt

MV-GH · 2023-09-10T15:57:18Z

It's also needed change nsfw type on server

What do you mean by this? Currently it is not even saved server side.

MV-GH · 2023-09-10T16:10:56Z

Also move the listsetting to be below the other list settings

MakcNmyc · 2023-09-11T07:05:09Z

It's also needed change nsfw type on server

What do you mean by this? Currently it is not even saved server side.

I'm sorry. Perhaps I misunderstand how this works. I saw that the data in AccountSettings.kt is taken from siteViewModel.siteRes. There they are initialized as API.getInstance().getSite. Could you tell me where I can see how it works?

My response from the API server

MV-GH · 2023-09-11T07:40:40Z

show_nsfw is a account setting that controls wether you see any nsfw content at all in the feed. It's not about blurring images

…to NSFW communities (LemmyNet#957)" This reverts commit 0101e34.

)

MakcNmyc · 2023-09-11T16:36:43Z

Made changes

MV-GH

Looking better

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

app/src/main/java/com/jerboa/ui/components/settings/lookandfeel/LookAndFeelActivity.kt

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

)

MakcNmyc · 2023-09-12T13:57:12Z

Made changes

MV-GH

Other than that it looks good but until I am home I can't verify if the actual functionality works.

app/src/main/java/com/jerboa/feat/BlurNsfwTypes.kt

)

MakcNmyc · 2023-09-13T16:11:09Z

Made changes

MV-GH

Thanks for the changes, I will have tmmr some time to physically test these changes

app/src/main/java/com/jerboa/feat/BlurNsfwTypes.kt

)

MakcNmyc · 2023-09-14T07:00:00Z

Made changes

# Conflicts: # app/src/main/java/com/jerboa/ui/components/community/list/CommunityListActivity.kt # app/src/main/res/values/strings.xml

MV-GH · 2023-09-14T17:50:59Z

Alright, I have confirmed the functionality and added my changes:

I moved the setting to bottom of the SettingsList
Added a Icon for the SettingsList option
Changed naming for the options again (This is clearer and shorter imo)
Probably by confusion before I had named them opposite (or you had the logic reversed)
Fixed the build errors due to referencings outdated stringRes. Now we use it directly from the enum to satisfy SSOT principles
Included the changes from main (Keep your PR upto date with main, smaller but more often merges keep the complexity lower)

MV-GH

I have tested the functionality and did some changes

app/src/main/java/com/jerboa/ui/components/settings/lookandfeel/LookAndFeelActivity.kt

MV-GH · 2023-09-14T17:54:07Z

Since I have made some changes, @dessalines, could you review my changes

dessalines · 2023-09-15T13:13:47Z

Sure, testing now.

dessalines

I'll allow myself to be overruled, but I don't think this is the right way to handle this. We already have a back-end blur_nsfw user setting, that appears to be ignored right now in favor of an app-specific setting, which we should do away with / deprecate.

I also don't see the additional blur types making too much sense. There's a blur_nsfw boolean, and the only additional one that might make sense, is the addition in the back end of a blur_all_previews setting.

app/src/main/java/com/jerboa/feat/BlurNsfwTypes.kt

app/src/main/java/com/jerboa/db/AppDB.kt

app/src/main/java/com/jerboa/feat/BlurNsfwTypes.kt

)

MakcNmyc · 2023-09-29T09:05:26Z

Made changes

MV-GH

Fix the conflicts too, I'll test it later

MV-GH · 2023-09-29T12:27:56Z

app/src/main/java/com/jerboa/feat/BlurTypes.kt

+        }
+
+        fun changeBlurTypeInsideCommunity(blurTypes: Int): Int =
+            if (blurTypes.toEnum<BlurTypes>() == NsfwExceptFromNsfwCommunities) {


compare on ordinal

and blurType

MV-GH · 2023-09-29T12:29:57Z

app/src/main/java/com/jerboa/feat/BlurTypes.kt

+enum class BlurTypes(@StringRes val resId: Int) : Parcelable {
+    Nothing(R.string.app_settings_nothing),
+    NSFW(R.string.app_settings_blur_nsfw),
+    NsfwExceptFromNsfwCommunities(R.string.app_settings_blur_nsfw_except_from_nsfw_communities),


Remove this type, as discussed we keep only, blur nothing, blur nsfw and blur nsfw but not in community view

@MV-GH I didn't understand you, only these 3 options remain. 4 option (ExceptFromNsfwInsideCommunity) it technical option. In community activity I swap NsfwExceptFromNsfwCommunities option for it.

That's not how I meant that second approach. The second approach was, turn NSFWExceptInsideCommunity into Nothing if passed to communityActiviity else convert it to NSFW and then you only have to handle those two cases

else convert it to NSFW and then you only have to handle those two cases

I can't figure out how and where to do this. In Main Activity for every Activity?

yes but you can do it once under appsetting and pass that. except for community activity where you then pass the other option. But first I have to know if Dessalines would accept such approach.

@dessalines Would you be against the above approach or do you rather that we have a extra param indicating that this is community view. Or do you have a better approach in mind?

NSFWExceptInsideCommunity into Nothing if passed to communityActiviity

Yes that seems fine. No point in adding an extra enum when it can figure that out by context, in the CommunityActivity.

@MV-GH Am I understanding correctly that "NsfwExceptFromNsfwCommunities" works as "Nothing" only for nsfw communities, otherwise it works as "NSFW"? If this is true then I can't change it in MainActivity because I need the community type.

For what do you need the communityType? You map it there either to Nothing or NSFW ordinals depending if its for CommunityView

@MV-GH what behavior should there be with the nsfw posts if Community.nsfw = false and blur option = "NsfwExceptFromNsfwCommunities"? Doesn't it then transform into, a "NSFW" not in "Nothing"?
I mean not communityType but Community.nsfw parameter

Remove the community nsfw option, we don't care anymore if the post comes from a nsfw community or not. And if the function receives NsfwExceptFromNsfwCommunity then throw with message likr this type should ve already been transformed into another

)

MakcNmyc · 2023-10-10T17:21:42Z

Pushed. I left only 3 options. "NsfwExceptFromNsfwCommunity" works like "Nsfw". And I transform "NsfwExceptFromNsfwCommunity" in "CommunityActivity" to "Nothing"

MV-GH · 2023-10-10T21:04:24Z

You still need to resolve the conflicts,

Edit: i resolved them for you, If I did anything wrong, you can fix it.

dessalines · 2023-10-11T16:30:23Z

Once CI passes I'll test to make sure its good too.

)

dessalines

Lots of errors in PostListing.kt

)

MakcNmyc · 2023-10-15T11:47:42Z

@dessalines fixed

dessalines · 2023-10-17T14:21:28Z

app/src/main/java/com/jerboa/ui/components/community/CommunityActivity.kt

@@ -82,7 +83,7 @@ fun CommunityActivity(
    showVotingArrowsInListView: Boolean,
    useCustomTabs: Boolean,
    usePrivateTabs: Boolean,
-    blurNSFW: Boolean,
+    blurNSFW: Int,


Why can't these use the BlurType enum?

We don't do it either for other enums, see postActionMode below it

mmk, I'll test this shortly.

dessalines

K I tested and its working fine. @MV-GH you're still on "request changes" btw.

MakcNmyc · 2023-10-24T17:13:17Z

@MV-GH Do I need to do anything else?

MV-GH · 2023-10-24T17:19:45Z

Lemme test this and I'll merge

Change NSFW Blur toggle to drop-down menu which applies only to NSFW …

0101e34

…communities (LemmyNet#957)

MakcNmyc requested review from dessalines, twizmwazin and MV-GH as code owners September 10, 2023 10:22

MV-GH requested changes Sep 10, 2023

View reviewed changes

app/schemas/com.jerboa.db.AppDB/26.json Outdated Show resolved Hide resolved

MV-GH requested changes Sep 10, 2023

View reviewed changes

MakcNmyc added 2 commits September 11, 2023 16:54

Revert "Change NSFW Blur toggle to drop-down menu which applies only …

6ff1a1c

…to NSFW communities (LemmyNet#957)" This reverts commit 0101e34.

Change NSFW Blur toggle to drop-down menu with new options (LemmyNet#957

3dbe8e3

)

MV-GH requested changes Sep 11, 2023

View reviewed changes

app/src/main/java/com/jerboa/ui/components/post/PostListing.kt Outdated Show resolved Hide resolved

app/src/main/java/com/jerboa/ui/components/settings/lookandfeel/LookAndFeelActivity.kt Outdated Show resolved Hide resolved

app/src/main/java/com/jerboa/Utils.kt Outdated Show resolved Hide resolved

Change NSFW Blur toggle to drop-down menu with new options (LemmyNet#957

a4470e7

)

MV-GH requested changes Sep 12, 2023

View reviewed changes

app/src/main/java/com/jerboa/feat/BlurNsfwTypes.kt Outdated Show resolved Hide resolved

MV-GH changed the title ~~Change NSFW Blur toggle to drop-down menu which applies only to NSFW communities (#957)~~ Change NSFW Blur toggle to drop-down menu with additional nsfwCommunityOnly and exceptNsfwCommunity options (#957) Sep 12, 2023

Change NSFW Blur toggle to drop-down menu with new options (LemmyNet#957

1ea34d7

)

MV-GH requested changes Sep 13, 2023

View reviewed changes

app/src/main/java/com/jerboa/feat/BlurNsfwTypes.kt Outdated Show resolved Hide resolved

Change NSFW Blur toggle to drop-down menu with new options (LemmyNet#957

316e331

)

MV-GH added 2 commits September 14, 2023 19:40

Merge branch 'main' into blur_dropdown

f9f0ac4

# Conflicts: # app/src/main/java/com/jerboa/ui/components/community/list/CommunityListActivity.kt # app/src/main/res/values/strings.xml

Add my changes + include main changes

61759d4

MV-GH approved these changes Sep 14, 2023

View reviewed changes

app/src/main/java/com/jerboa/ui/components/settings/lookandfeel/LookAndFeelActivity.kt Outdated Show resolved Hide resolved

Merge branch 'main' into main

ff6cef1

dessalines reviewed Sep 15, 2023

View reviewed changes

MakcNmyc added 2 commits September 29, 2023 12:02

Change NSFW Blur toggle to drop-down menu with new options (LemmyNet#957

128aa70

)

Merge remote-tracking branch 'origin/main'

9bceb34

MV-GH requested changes Sep 29, 2023

View reviewed changes

Change NSFW Blur toggle to drop-down menu with new options (LemmyNet#957

0119777

)

Merge branch 'main' into main

f31569a

MakcNmyc and others added 2 commits October 11, 2023 20:55

Change NSFW Blur toggle to drop-down menu with new options (LemmyNet#957

128d263

)

Merge branch 'main' into main

4bca117

dessalines reviewed Oct 13, 2023

View reviewed changes

Change NSFW Blur toggle to drop-down menu with new options (LemmyNet#957

c69b050

)

dessalines reviewed Oct 17, 2023

View reviewed changes

Merge branch 'main' into main

a50b8d2

dessalines approved these changes Oct 18, 2023

View reviewed changes

dessalines enabled auto-merge (squash) October 18, 2023 14:40

Merge branch 'main' into main

a109d6b

MV-GH changed the title ~~Change NSFW Blur toggle to drop-down menu with additional nsfwCommunityOnly and exceptNsfwCommunity options (#957)~~ Add BlurNsfwExceptFromNsfwCommunities to blur types Oct 24, 2023

MV-GH approved these changes Oct 24, 2023

View reviewed changes

dessalines merged commit 4e89bbd into LemmyNet:main Oct 24, 2023

Add BlurNsfwExceptFromNsfwCommunities to blur types #1229

Add BlurNsfwExceptFromNsfwCommunities to blur types #1229

Conversation

MakcNmyc commented Sep 10, 2023

MakcNmyc commented Sep 10, 2023

MV-GH commented Sep 10, 2023

MV-GH commented Sep 10, 2023

MakcNmyc commented Sep 11, 2023 • edited Loading

MV-GH commented Sep 11, 2023

MakcNmyc commented Sep 11, 2023

MV-GH left a comment

Choose a reason for hiding this comment

MakcNmyc commented Sep 12, 2023

MV-GH left a comment

Choose a reason for hiding this comment

MakcNmyc commented Sep 13, 2023

MV-GH left a comment

Choose a reason for hiding this comment

MakcNmyc commented Sep 14, 2023

MV-GH commented Sep 14, 2023

MV-GH left a comment

Choose a reason for hiding this comment

MV-GH commented Sep 14, 2023

dessalines commented Sep 15, 2023

dessalines left a comment

Choose a reason for hiding this comment

MakcNmyc commented Sep 29, 2023

MV-GH left a 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

MakcNmyc Oct 9, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MakcNmyc commented Oct 10, 2023 • edited Loading

MV-GH commented Oct 10, 2023 • edited Loading

dessalines commented Oct 11, 2023

dessalines left a comment

Choose a reason for hiding this comment

MakcNmyc commented Oct 15, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dessalines left a comment

Choose a reason for hiding this comment

MakcNmyc commented Oct 24, 2023

MV-GH commented Oct 24, 2023

MakcNmyc commented Sep 11, 2023 •

edited

Loading

MakcNmyc Oct 9, 2023 •

edited

Loading

MakcNmyc commented Oct 10, 2023 •

edited

Loading

MV-GH commented Oct 10, 2023 •

edited

Loading