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

feat: blacklist items from Discover page #632

Merged
merged 9 commits into from
Sep 16, 2024

Conversation

JoaquinOlivero
Copy link
Contributor

@JoaquinOlivero JoaquinOlivero commented Jan 23, 2024

[Feature Request] Hide Items #490

Description

Allow users with special permissions to add media items to a blacklist to prevent them from being displayed.
The blacklist can be managed on the "Settings" page where media can be removed from it. In addition, if the user has permission to manage and view blacklisted items, there is a button on the movie/series card to remove it from the blacklist.

Screenshot (if UI-related)

output

To-Dos

  • Successful build yarn build
  • Translation keys yarn i18n:extract
  • Database migration (if required)

Issues Fixed or Closed

@Fallenbagel
Copy link
Owner

Fallenbagel commented Feb 23, 2024

Is this PR complete?
@JoaquinOlivero

@JoaquinOlivero
Copy link
Contributor Author

Is this PR complete? @JoaquinOlivero

Yes, it's complete

@Gauvino
Copy link
Contributor

Gauvino commented Feb 23, 2024

Then you should switch the PR from draft to Open ?

@Fallenbagel
Copy link
Owner

Is this PR complete? @JoaquinOlivero

Yes, it's complete

Okay I'm switching it to ready for review and I'll review it sometime this weekend c:

@Fallenbagel Fallenbagel marked this pull request as ready for review February 23, 2024 16:32
@Fallenbagel Fallenbagel self-requested a review as a code owner February 23, 2024 16:32
Copy link
Contributor

@Gauvino Gauvino left a comment

Choose a reason for hiding this comment

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

Test it the only missing point is the translation keys but everything else works fine !

Edit : How can I remove a blacklisted media from blacklist ? @JoaquinOlivero

<Modal
backgroundClickable
title={`Blacklist ${title}`}
subTitle="Are you sure you want to proceed?"
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you add the translation key please ?

@github-actions github-actions bot added the merge conflict Cannot merge due to merge conflicts label May 23, 2024
Copy link

This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.

@github-actions github-actions bot removed the merge conflict Cannot merge due to merge conflicts label May 24, 2024
@github-actions github-actions bot added the merge conflict Cannot merge due to merge conflicts label Jun 23, 2024
Copy link

This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.

@github-actions github-actions bot removed the merge conflict Cannot merge due to merge conflicts label Jul 14, 2024
gauthier-th
gauthier-th previously approved these changes Jul 21, 2024
@gauthier-th gauthier-th mentioned this pull request Aug 12, 2024
15 tasks
@github-actions github-actions bot added the merge conflict Cannot merge due to merge conflicts label Aug 20, 2024
Copy link

This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.

@Gauvino
Copy link
Contributor

Gauvino commented Sep 11, 2024

Hello @JoaquinOlivero could you please solve the merge conflict when #907 is merged so I can test this pull request and it can get reviewed thanks!

@github-actions github-actions bot removed the merge conflict Cannot merge due to merge conflicts label Sep 13, 2024
Copy link
Owner

@Fallenbagel Fallenbagel left a comment

Choose a reason for hiding this comment

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

Lgtm. Haven't tested it though

@gauthier-th gauthier-th merged commit 818aa60 into Fallenbagel:develop Sep 16, 2024
8 checks passed
@Fallenbagel Fallenbagel mentioned this pull request Sep 19, 2024
1 task
@Fallenbagel
Copy link
Owner

🎉 This PR is included in version 2.0.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@oOStroudyOo
Copy link

@JoaquinOlivero My blacklist doesn't seem to act in the way your preview does.

Blacklisted items still appear on the discover pages, unless you remove all blacklist permissions from a user.
But by doing that then they also can not blacklist any items.

Am I missing something?

image
image

@gauthier-th
Copy link
Collaborator

@JoaquinOlivero My blacklist doesn't seem to act in the way your preview does.

Blacklisted items still appear on the discover pages, unless you remove all blacklist permissions from a user. But by doing that then they also can not blacklist any items.

Am I missing something?

image image

This is the intended behavior.

Users with blacklist permissions can see and hide items so that regular users can't see these items anymore in the app.

@oOStroudyOo
Copy link

Understood.

Even as an admin, I'd still quite like these hidden from discover pages.
Maybe in the future we can enhance this feature.

@gauthier-th
Copy link
Collaborator

@oOStroudyOo see #1022 for this feature request

bonswouar pushed a commit to bonswouar/jellyseerr that referenced this pull request Nov 10, 2024
* feat: blacklist media items

re Fallenbagel#490

* feat: blacklist media items

* feat: blacklist media items

* style: formatting

* refactor: close the manage slide-over when the media item is removed from the blacklist

* fix: fix media data in the db when blacklisting an item

* refactor: refactor component to accept show boolean

* refactor: hide watchlist button in the media page when it's blacklisted. Also add a blacklist button

* style: formatting

---------

Co-authored-by: JoaquinOlivero <[email protected]>
thibodelanghe pushed a commit to thibodelanghe/jellyseerr that referenced this pull request Dec 18, 2024
* feat: blacklist media items

re Fallenbagel#490

* feat: blacklist media items

* feat: blacklist media items

* style: formatting

* refactor: close the manage slide-over when the media item is removed from the blacklist

* fix: fix media data in the db when blacklisting an item

* refactor: refactor component to accept show boolean

* refactor: hide watchlist button in the media page when it's blacklisted. Also add a blacklist button

* style: formatting

---------

Co-authored-by: JoaquinOlivero <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Hide Items Reject !
5 participants