Plume/Plume
9
18
Fork 24
Code Issues 180 Pull requests 8 Releases 8 Wiki Activity

Fix moderation issues #1156 #1157

Merged
trinity-1686a merged 5 commits from gro2bl/Plume:fix_moderation_issues into main 2024-07-08 23:54:36 +00:00
Conversation 0 Commits 5 Files changed 9 +53 -47
gro2bl commented 2024-06-12 17:00:47 +00:00
Contributor
Copy link

This PR includes the fixes for issues mentioned in #1156

This PR includes the fixes for issues mentioned in #1156
gro2bl added 3 commits 2024-06-12 17:00:52 +00:00
gro2bl added 1 commit 2024-06-12 17:10:31 +00:00
trinity-1686a requested changes 2024-06-29 10:14:42 +00:00
trinity-1686a left a comment
Owner
Copy link

the changes looks sensible, but i have a few codestyle issues

the changes looks sensible, but i have a few codestyle issues
templates/base.rs.html Outdated
@ -90,0 +90,4 @@
} else {
@if ctx.2.clone().map(|u| u.is_moderator()).unwrap_or(false) {
<a href="@uri!(instance::admin_mod)">@i18n!(ctx.1, "Moderation")</a>
}
trinity-1686a commented 2024-06-29 09:54:06 +00:00
Owner
Copy link

codestyle:

-                } else {
-                    @if ctx.2.clone().map(|u| u.is_moderator()).unwrap_or(false) {
-                        <a href="@uri!(instance::admin_mod)">@i18n!(ctx.1, "Moderation")</a>
-                    }
+                } else if ctx.2.clone().map(|u| u.is_moderator()).unwrap_or(false) {
+                   <a href="@uri!(instance::admin_mod)">@i18n!(ctx.1, "Moderation")</a>
codestyle: ```diff - } else { - @if ctx.2.clone().map(|u| u.is_moderator()).unwrap_or(false) { - <a href="@uri!(instance::admin_mod)">@i18n!(ctx.1, "Moderation")</a> - } + } else if ctx.2.clone().map(|u| u.is_moderator()).unwrap_or(false) { + <a href="@uri!(instance::admin_mod)">@i18n!(ctx.1, "Moderation")</a> ```
👍 1
gro2bl commented 2024-07-04 18:40:43 +00:00
Author
Contributor
Copy link

done

done
gro2bl marked this conversation as resolved
templates/instance/admin_header.rs.html Outdated
@ -0,0 +7,4 @@
<h1>@i18n!(ctx.1, title)</h1>
@tabs(&[
(&uri!(instance::admin).to_string(), i18n!(ctx.1, "Configuration"), if selected_tab == 1 {true} else {false}),
trinity-1686a commented 2024-06-29 10:09:01 +00:00
Owner
Copy link

can you replace all the if selected_tab == 1 {true} else {false} to simple selected_tab == 1 please?

can you replace all the `if selected_tab == 1 {true} else {false}` to simple `selected_tab == 1` please?
👍 1
gro2bl commented 2024-07-04 18:40:57 +00:00
Author
Contributor
Copy link

done

done
gro2bl marked this conversation as resolved
templates/instance/admin_header.rs.html Outdated
@ -0,0 +18,4 @@
@tabs(&[
(&uri!(instance::admin_instances: page = _).to_string(), i18n!(ctx.1, "Instances"), if selected_tab == 1 {true} else {false}),
(&uri!(instance::admin_users: page = _).to_string(), i18n!(ctx.1, "Users"), if selected_tab == 2 {true} else {false}),
(&uri!(instance::admin_email_blocklist: page=_).to_string(), i18n!(ctx.1, "Email blocklist"), if selected_tab == 3 {true} else {false})
trinity-1686a commented 2024-06-29 10:08:23 +00:00
Owner
Copy link

oh, i get why the conditions elsewhere. This would be a lot easier to understand if the numbers used for the moderation half be the same (2,3,4) as the admin half. No needs for branch everywhere

oh, i get why the conditions elsewhere. This would be a lot easier to understand if the numbers used for the moderation half be the same (2,3,4) as the admin half. No needs for branch everywhere
👍 1
gro2bl commented 2024-07-04 18:41:10 +00:00
Author
Contributor
Copy link

done

done
gro2bl marked this conversation as resolved
templates/instance/admin_mod.rs.html
@ -12,3 +7,1 @@
(&uri!(instance::admin_instances: page = _).to_string(), i18n!(ctx.1, "Instances"), false),
(&uri!(instance::admin_users: page = _).to_string(), i18n!(ctx.1, "Users"), false),
])
@:admin_header(ctx, "Moderation", 0)
trinity-1686a commented 2024-06-29 09:55:19 +00:00
Owner
Copy link

shouldn't it be 1 instead of 0?

shouldn't it be 1 instead of 0?
gro2bl commented 2024-07-04 18:51:54 +00:00
Author
Contributor
Copy link

There is an inconsistency problem on how admin.rs.html handles default tab and how admin_mod.rs.html does it. Actually the Configuration tab has been hardcoded inside admin.rs.html which is not available in admin_mod.rs.html. Also other tabs have their own layout (i.e. they are not a child template) so it's not feasible to include the first moderation tab (Instances) by default to be loaded in /admin when the user is a moderator. I just left it as is for you to make a decision:

  1. We can just redirect the /admin to their first tab route, both for admin and moderator, this needs the creation of a separate template for Configuration tab and then both admin.rs.html and admin_mod.rs.html would be useless.
  2. We can leave it as is, and later show some dashboard like stuff as the default content of the /admin and instead of tabs on the top, use some other type of UX component to show different pages.
  3. For now we can just show a welcome message to admins and moderators as the default content of the /admin route and do the #1.

If you want I can go for one of these or any other idea you have but the 0, 1 or even 2 doesn't make any difference here, the result would be an empty admin page with some tabs.

There is an inconsistency problem on how `admin.rs.html` handles default tab and how `admin_mod.rs.html` does it. Actually the Configuration tab has been hardcoded inside `admin.rs.html` which is not available in `admin_mod.rs.html`. Also other tabs have their own layout (i.e. they are not a child template) so it's not feasible to include the first moderation tab (Instances) by default to be loaded in `/admin` when the user is a moderator. I just left it as is for you to make a decision: 1. We can just redirect the `/admin` to their first tab route, both for admin and moderator, this needs the creation of a separate template for Configuration tab and then both `admin.rs.html` and `admin_mod.rs.html` would be useless. 2. We can leave it as is, and later show some dashboard like stuff as the default content of the `/admin` and instead of tabs on the top, use some other type of UX component to show different pages. 3. For now we can just show a welcome message to admins and moderators as the default content of the `/admin` route and do the #1. If you want I can go for one of these or any other idea you have but the `0`, `1` or even `2` doesn't make any difference here, the result would be an empty admin page with some tabs.
trinity-1686a commented 2024-07-07 14:41:23 +00:00
Owner
Copy link

I agree that 0 or 1 changes nothing, i just find it more coherent. We are in a way on the configuration tab which refused to load. But yeah, the html generated is the same either way (2 would change slightly the result, showing Instances as the selected tab i believe)

I agree that 0 or 1 changes nothing, i just find it more coherent. We are in a way on the configuration tab which refused to load. But yeah, the html generated is the same either way (2 would change slightly the result, showing `Instances` as the selected tab i believe)
gro2bl commented 2024-07-08 11:01:35 +00:00
Author
Contributor
Copy link

2 It shows Instances as selected tab but without the instances page template because "Instances" template is a whole page template not a partial template and we cannot include it as a child inside admin_mod. that's why we might need to do one of those 3 solutions I mentioned above.

2 It shows Instances as selected tab but without the instances page template because "Instances" template is a whole page template not a partial template and we cannot include it as a child inside admin_mod. that's why we might need to do one of those 3 solutions I mentioned above.
templates/instance/emailblocklist.rs.html Outdated
@ -13,2 +7,2 @@
(&uri!(instance::admin_email_blocklist:page=_).to_string(), i18n!(ctx.1, "Email blocklist"), true),
])
@:base(ctx, i18n!(ctx.1, "Blocklisted Emails"), {}, {}, {
@:admin_header(ctx, "Blocklisted Emails", (if ctx.2.clone().map(|u| u.is_admin()).unwrap() {4} else {3}))
trinity-1686a commented 2024-06-29 10:03:02 +00:00
Owner
Copy link

it looks to me like it was always 4th entry before, why is it now sometime 3rd?

it looks to me like it was always 4th entry before, why is it now sometime 3rd?
gro2bl marked this conversation as resolved
templates/instance/list.rs.html Outdated
@ -14,3 +9,1 @@
(&uri!(instance::admin_users: page = _).to_string(), i18n!(ctx.1, "Users"), false),
(&uri!(instance::admin_email_blocklist:page=_).to_string(), i18n!(ctx.1, "Email blocklist"), false),
])
@:admin_header(ctx, "Instances", (if ctx.2.clone().map(|u| u.is_admin()).unwrap() {2} else {1}))
trinity-1686a commented 2024-06-29 10:04:13 +00:00
Owner
Copy link

why not always 2?

why not always 2?
gro2bl marked this conversation as resolved
templates/instance/users.rs.html Outdated
@ -14,3 +9,1 @@
(&uri!(instance::admin_users: page = _).to_string(), i18n!(ctx.1, "Users"), true),
(&uri!(instance::admin_email_blocklist: page=_).to_string(), i18n!(ctx.1, "Email blocklist"), false)
])
@:admin_header(ctx, "Users", (if ctx.2.clone().map(|u| u.is_admin()).unwrap() {3} else {2}))
trinity-1686a commented 2024-06-29 10:04:32 +00:00
Owner
Copy link

why not always 3?

why not always 3?
gro2bl marked this conversation as resolved
gro2bl added 1 commit 2024-07-04 18:40:19 +00:00
requested review from trinity-1686a 2024-07-06 14:13:36 +00:00
trinity-1686a approved these changes 2024-07-07 14:41:27 +00:00
trinity-1686a merged commit d9464d1dbb into main 2024-07-08 23:54:36 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
trinity-1686a
Labels
Clear labels   
A: API

Related to the REST API

  
A: Backend

Code running on the server

  
A: Federation

Stuff related to Federation

  
A: Front-End

Related to the front-end

  
A: I18N

Translations, and related code

  
A: Meta

More about project management or code than the project itself

  
A: Security

   
Build

The building, or installation process of Plume

  
C: Bug

Something isn't working

  
C: Discussion

We need to talk

  
C: Enhancement

New feature or request

  
C: Feature

This is a new feature

  
Compatibility

Compatibility with different browsers, readers and OS

  
Dependency

Related to an external package that Plume uses

  
Design

UI/UX related issues and PRs

  
Documentation

   
Good first issue

Good for newcomers

  
Help welcome

Extra attention is needed

  
Mobile

Issues affecting only mobile UX

  
Rendering

How elements're rendered out for the end user

  
S: Blocked

Something else needs to be fixed first

  
S: Duplicate

This issue or pull request already exists

  
S: Incomplete

This PR is not complete yet

  
S: Instance specific

Issues concern a limited number of instances

  
S: Invalid

This doesn't seem right

  
S: Needs Voting/Discussion

Need to be discussed by the community (on Loomio)

  
S: Ready for review

This PR is ready to be reviewed

  
Suggestion

Proposed ideas worth considering

  
S: Voted on Loomio

This is issue has been created after a vote on Loomio

  
S: Wontfix

This will not be worked on

No labels
A: API
A: Backend
A: Federation
A: Front-End
A: I18N
A: Meta
A: Security
Build
C: Bug
C: Discussion
C: Enhancement
C: Feature
Compatibility
Dependency
Design
Documentation
Good first issue
Help welcome
Mobile
Rendering
S: Blocked
S: Duplicate
S: Incomplete
S: Instance specific
S: Invalid
S: Needs Voting/Discussion
S: Ready for review
Suggestion
S: Voted on Loomio
S: Wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Plume/Plume#1157
No description provided.
Delete branch "gro2bl/Plume:fix_moderation_issues"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?