Filter auth feeds by authorized podcasts #909
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
cavis
commented
Nov 8, 2023
| # avoid joining podcasts here, as it breaks a bunch of other queries | ||
| def token_auth_episodes | ||
| if token.globally_authorized?("read-private") | ||
| Episode.with_deleted.all | ||
| else | ||
| Episode.where(podcast_id: token_auth_podcasts.pluck(:id)) | ||
| Episode.where("podcast_id IN (SELECT id FROM podcasts WHERE prx_account_uri IN (?))", token_auth_account_uris) |
There was a problem hiding this comment.
Not entirely related - but it's slightly faster to do a subquery here, rather than 2 separate queries.
svevang
approved these changes
Nov 13, 2023
kookster
reviewed
Nov 13, 2023
| @@ -1,4 +1,6 @@ | |||
| class Api::Auth::FeedsController < Api::BaseController | |||
| include ApiAuthenticated | |||
| @@ -40,12 +40,20 @@ def token_auth_podcasts | |||
| end | |||
| end | |||
|
|
|||
| def token_auth_feeds | |||
| if token.globally_authorized?("read-private") | |||
| Feed.with_deleted.all | |||
There was a problem hiding this comment.
deleted? we're returning deleted feeds? I am confused by this....
| # avoid joining podcasts here, as it breaks a bunch of other queries | ||
| def token_auth_episodes | ||
| if token.globally_authorized?("read-private") | ||
| Episode.with_deleted.all | ||
| else | ||
| Episode.where(podcast_id: token_auth_podcasts.pluck(:id)) | ||
| Episode.where("podcast_id IN (SELECT id FROM podcasts WHERE prx_account_uri IN (?))", token_auth_account_uris) |
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.
Feeds were not being filtered correctly.