Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dont show replies / mentions from blocked users. Fixes #4227 #4727

Merged
merged 5 commits into from
May 22, 2024

Conversation

dessalines
Copy link
Member

No description provided.

SleeplessOne1917

This comment was marked as duplicate.

@dullbananas
Copy link
Collaborator

Tests should be added

@dessalines
Copy link
Member Author

Gotcha, I'll add tests shortly.

@dessalines dessalines marked this pull request as draft May 21, 2024 18:47
@dessalines dessalines marked this pull request as ready for review May 21, 2024 21:19
@@ -87,117 +87,3 @@ impl CommentReply {
.optional()
}
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved these tests into the views, since they'd be redundant anyway.

let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
.await
.unwrap();
async fn init_data(pool: &mut DbPool<'_>) -> LemmyResult<Data> {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No logical changes in this file, other than to remove some unecessary unwraps.

Cargo.lock Outdated
Copy link
Member Author

@dessalines dessalines May 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I needed to do cargo update to get rust nightly working again.

@dessalines dessalines enabled auto-merge (squash) May 22, 2024 12:26
@dessalines dessalines merged commit 7d7cd8d into main May 22, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants