Fix import blocked objects #4712
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dessalines
approved these changes
May 8, 2024
| @@ -133,7 +137,8 @@ pub async fn import_settings( | |||
| local_user_view.local_user.id, | |||
| &local_user_form, | |||
| ) | |||
| .await?; | |||
| .await | |||
| .ok(); | |||
There was a problem hiding this comment.
You'll probably see a conflict anyway after the other one gets merged, but the .ok() should be removed.
There was a problem hiding this comment.
bump on this one, then we can merge.
dullbananas
approved these changes
May 8, 2024
Nutomic
force-pushed
the
fix-import-blocked-objects
branch
from
399db18
to
76b2345
Compare
|
This requires #4705 to be merged for tests to pass. |
dessalines
approved these changes
May 15, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It would previously only look in the local database for blocked communities and users. This changes it so that they are actually fetched from the remote instance for blocking.
Depends on #4705