Adding a post_view mode. Fixes #3730 #3731
Conversation
| @@ -2,23 +2,6 @@ diff --git a/crates/db_schema/src/schema.rs b/crates/db_schema/src/schema.rs | |||
| index 255c6422..f2ccf5e2 100644 | |||
| --- a/crates/db_schema/src/schema.rs | |||
| +++ b/crates/db_schema/src/schema.rs | |||
| @@ -2,16 +2,12 @@ | |||
There was a problem hiding this comment.
I had to remove this, because this PR adds the PostViewModeEnum in some conflicting lines.
This patch still retains the use diesel_ltree below, and it did work locally.
| @@ -0,0 +1,3 @@ | |||
| create type post_view_mode_enum as enum ('List', 'Card', 'SmallCard'); | |||
|
|
|||
| alter table local_user add column post_view_mode post_view_mode_enum default 'List' not null; | |||
There was a problem hiding this comment.
Not sure whether this should be called default_post_view_mode, or just post_view_mode
|
|
Nutomic
force-pushed
the
add_post_view_mode
branch
from
b453b51 to
e351d49
Compare
| @@ -94,9 +96,10 @@ pub fn is_top_mod( | |||
| .map(|cm| cm.moderator.id) | |||
| .unwrap_or(PersonId(0)) | |||
| { | |||
| Err(LemmyErrorType::NotTopMod)?; | |||
There was a problem hiding this comment.
@Nutomic I found a bunch of these, that clippy fixed earlier, that could be scary, and I have no idea why rust isn't catching them.
Maybe I'm being paranoid, but it seems like the ; means that it wouldn't actually return the Err, even if it hit an Error result, and just continue on to the Ok(()) condition. If that's the case clippy should not be ignoring Err 's with a ;
This is why default Ok returns are really scary to me.
I went through all the ones I could find, and removed the semicolons, and removed the default returns where it was easy to do so.
There was a problem hiding this comment.
the ? does an early return so the ; doesn't matter
There was a problem hiding this comment.
Gotcha, then rust is doing a good job of keeping us safe there.
| @@ -29,7 +29,7 @@ pub async fn add_mod_to_community( | |||
| is_mod_or_admin(&mut context.pool(), local_user_view.person.id, community_id).await?; | |||
| let community = Community::read(&mut context.pool(), community_id).await?; | |||
| if local_user_view.local_user.admin && !community.local { | |||
| return Err(LemmyErrorType::NotAModerator)?; | |||
| Err(LemmyErrorType::NotAModerator)? | |||
There was a problem hiding this comment.
I finished going through the codebase, and removed most of the return Err ... ; and changed them to Err ... (no semicolon) where possible. If you'd like, I can move that to a different PR.
There was a problem hiding this comment.
This kind of code will be added right back if we dont prevent it via clippy. Closest I could find in this regard is try_err which only allows the way with return. To be honest that also looks clearer to me so I would prefer to keep the returns and add the lint.
There was a problem hiding this comment.
Gotcha. In that case I'll revert those last commits, and do a new PR to add try_err .
There was a problem hiding this comment.
I also ran the try_err --fix just to test it, and it conflicts with the needless_return lint, which then throws a ton of warnings.
There was a problem hiding this comment.
I'll merge this as is then, since I did a lot of manual work to make those returns more logical.
|
All the api_tests seem to be passing locally, can't figure out why this keeps failing CI. |
No description provided.