diff --git a/client/components/controls/LibraryFilterSelect.vue b/client/components/controls/LibraryFilterSelect.vue index 62a9b8037..f5eec41a2 100644 --- a/client/components/controls/LibraryFilterSelect.vue +++ b/client/components/controls/LibraryFilterSelect.vue @@ -94,9 +94,6 @@ export default { userIsAdminOrUp() { return this.$store.getters['user/getIsAdminOrUp'] }, - userCanAccessExplicitContent() { - return this.$store.getters['user/getUserCanAccessExplicitContent'] - }, libraryMediaType() { return this.$store.getters['libraries/getCurrentLibraryMediaType'] }, @@ -242,15 +239,6 @@ export default { sublist: false } ] - - if (this.userCanAccessExplicitContent) { - items.push({ - text: this.$strings.LabelExplicit, - value: 'explicit', - sublist: false - }) - } - if (this.userIsAdminOrUp) { items.push({ text: this.$strings.LabelShareOpen, @@ -261,7 +249,7 @@ export default { return items }, podcastItems() { - const items = [ + return [ { text: this.$strings.LabelAll, value: 'all' @@ -295,16 +283,6 @@ export default { sublist: false } ] - - if (this.userCanAccessExplicitContent) { - items.push({ - text: this.$strings.LabelExplicit, - value: 'explicit', - sublist: false - }) - } - - return items }, selectItems() { if (this.isSeries) return this.seriesItems diff --git a/client/store/user.js b/client/store/user.js index 41e12cad5..d5aad19b6 100644 --- a/client/store/user.js +++ b/client/store/user.js @@ -58,9 +58,6 @@ export const getters = { getUserCanAccessAllLibraries: (state) => { return !!state.user?.permissions?.accessAllLibraries }, - getUserCanAccessExplicitContent: (state) => { - return !!state.user?.permissions?.accessExplicitContent - }, getLibrariesAccessible: (state, getters) => { if (!state.user) return [] if (getters.getUserCanAccessAllLibraries) return [] diff --git a/server/utils/queries/libraryItemsBookFilters.js b/server/utils/queries/libraryItemsBookFilters.js index ded712cf1..7fa5eb41c 100644 --- a/server/utils/queries/libraryItemsBookFilters.js +++ b/server/utils/queries/libraryItemsBookFilters.js @@ -186,8 +186,6 @@ module.exports = { mediaWhere['$series.id$'] = null } else if (group === 'abridged') { mediaWhere['abridged'] = true - } else if (group === 'explicit') { - mediaWhere['explicit'] = true } else if (['genres', 'tags', 'narrators'].includes(group)) { mediaWhere[group] = Sequelize.where(Sequelize.literal(`(SELECT count(*) FROM json_each(${group}) WHERE json_valid(${group}) AND json_each.value = :filterValue)`), { [Sequelize.Op.gte]: 1 diff --git a/server/utils/queries/libraryItemsPodcastFilters.js b/server/utils/queries/libraryItemsPodcastFilters.js index 8bb5dc110..33bac28f1 100644 --- a/server/utils/queries/libraryItemsPodcastFilters.js +++ b/server/utils/queries/libraryItemsPodcastFilters.js @@ -59,8 +59,6 @@ module.exports = { replacements.filterValue = value } else if (group === 'languages') { mediaWhere['language'] = value - } else if (group === 'explicit') { - mediaWhere['explicit'] = true } return {