New: Renamed Blacklist to Blocklist

frontend/src/Store/Actions/Creators/createHandleActions.js

@@ -10,7 +10,7 @@ import {
 import getSectionState from 'Utilities/State/getSectionState';
 import updateSectionState from 'Utilities/State/updateSectionState';
 
-const blacklistedProperties = [
+const omittedProperties = [
   'section',
   'id'
 ];
@@ -31,7 +31,7 @@ export default function createHandleActions(handlers, defaultState, section) {
 
       if (section === baseSection) {
         const newState = Object.assign(getSectionState(state, payloadSection),
-          _.omit(payload, blacklistedProperties));
+          _.omit(payload, omittedProperties));
 
         return updateSectionState(state, payloadSection, newState);
       }

frontend/src/Store/Actions/blocklistActions.js

@@ -15,7 +15,7 @@ import createSetTableOptionReducer from './Creators/Reducers/createSetTableOptio
 //
 // Variables
 
-export const section = 'blacklist';
+export const section = 'blocklist';
 
 //
 // State
@@ -83,41 +83,41 @@ export const defaultState = {
 };
 
 export const persistState = [
-  'blacklist.pageSize',
-  'blacklist.sortKey',
-  'blacklist.sortDirection',
-  'blacklist.columns'
+  'blocklist.pageSize',
+  'blocklist.sortKey',
+  'blocklist.sortDirection',
+  'blocklist.columns'
 ];
 
 //
 // Action Types
 
-export const FETCH_BLACKLIST = 'blacklist/fetchBlacklist';
-export const GOTO_FIRST_BLACKLIST_PAGE = 'blacklist/gotoBlacklistFirstPage';
-export const GOTO_PREVIOUS_BLACKLIST_PAGE = 'blacklist/gotoBlacklistPreviousPage';
-export const GOTO_NEXT_BLACKLIST_PAGE = 'blacklist/gotoBlacklistNextPage';
-export const GOTO_LAST_BLACKLIST_PAGE = 'blacklist/gotoBlacklistLastPage';
-export const GOTO_BLACKLIST_PAGE = 'blacklist/gotoBlacklistPage';
-export const SET_BLACKLIST_SORT = 'blacklist/setBlacklistSort';
-export const SET_BLACKLIST_TABLE_OPTION = 'blacklist/setBlacklistTableOption';
-export const REMOVE_BLACKLIST_ITEM = 'blacklist/removeBlacklistItem';
-export const REMOVE_BLACKLIST_ITEMS = 'blacklist/removeBlacklistItems';
-export const CLEAR_BLACKLIST = 'blacklist/clearBlacklist';
+export const FETCH_BLOCKLIST = 'blocklist/fetchBlocklist';
+export const GOTO_FIRST_BLOCKLIST_PAGE = 'blocklist/gotoBlocklistFirstPage';
+export const GOTO_PREVIOUS_BLOCKLIST_PAGE = 'blocklist/gotoBlocklistPreviousPage';
+export const GOTO_NEXT_BLOCKLIST_PAGE = 'blocklist/gotoBlocklistNextPage';
+export const GOTO_LAST_BLOCKLIST_PAGE = 'blocklist/gotoBlocklistLastPage';
+export const GOTO_BLOCKLIST_PAGE = 'blocklist/gotoBlocklistPage';
+export const SET_BLOCKLIST_SORT = 'blocklist/setBlocklistSort';
+export const SET_BLOCKLIST_TABLE_OPTION = 'blocklist/setBlocklistTableOption';
+export const REMOVE_BLOCKLIST_ITEM = 'blocklist/removeBlocklistItem';
+export const REMOVE_BLOCKLIST_ITEMS = 'blocklist/removeBlocklistItems';
+export const CLEAR_BLOCKLIST = 'blocklist/clearBlocklist';
 
 //
 // Action Creators
 
-export const fetchBlacklist = createThunk(FETCH_BLACKLIST);
-export const gotoBlacklistFirstPage = createThunk(GOTO_FIRST_BLACKLIST_PAGE);
-export const gotoBlacklistPreviousPage = createThunk(GOTO_PREVIOUS_BLACKLIST_PAGE);
-export const gotoBlacklistNextPage = createThunk(GOTO_NEXT_BLACKLIST_PAGE);
-export const gotoBlacklistLastPage = createThunk(GOTO_LAST_BLACKLIST_PAGE);
-export const gotoBlacklistPage = createThunk(GOTO_BLACKLIST_PAGE);
-export const setBlacklistSort = createThunk(SET_BLACKLIST_SORT);
-export const setBlacklistTableOption = createAction(SET_BLACKLIST_TABLE_OPTION);
-export const removeBlacklistItem = createThunk(REMOVE_BLACKLIST_ITEM);
-export const removeBlacklistItems = createThunk(REMOVE_BLACKLIST_ITEMS);
-export const clearBlacklist = createAction(CLEAR_BLACKLIST);
+export const fetchBlocklist = createThunk(FETCH_BLOCKLIST);
+export const gotoBlocklistFirstPage = createThunk(GOTO_FIRST_BLOCKLIST_PAGE);
+export const gotoBlocklistPreviousPage = createThunk(GOTO_PREVIOUS_BLOCKLIST_PAGE);
+export const gotoBlocklistNextPage = createThunk(GOTO_NEXT_BLOCKLIST_PAGE);
+export const gotoBlocklistLastPage = createThunk(GOTO_LAST_BLOCKLIST_PAGE);
+export const gotoBlocklistPage = createThunk(GOTO_BLOCKLIST_PAGE);
+export const setBlocklistSort = createThunk(SET_BLOCKLIST_SORT);
+export const setBlocklistTableOption = createAction(SET_BLOCKLIST_TABLE_OPTION);
+export const removeBlocklistItem = createThunk(REMOVE_BLOCKLIST_ITEM);
+export const removeBlocklistItems = createThunk(REMOVE_BLOCKLIST_ITEMS);
+export const clearBlocklist = createAction(CLEAR_BLOCKLIST);
 
 //
 // Action Handlers
@@ -125,21 +125,21 @@ export const clearBlacklist = createAction(CLEAR_BLACKLIST);
 export const actionHandlers = handleThunks({
   ...createServerSideCollectionHandlers(
     section,
-    '/blacklist',
-    fetchBlacklist,
+    '/blocklist',
+    fetchBlocklist,
     {
-      [serverSideCollectionHandlers.FETCH]: FETCH_BLACKLIST,
-      [serverSideCollectionHandlers.FIRST_PAGE]: GOTO_FIRST_BLACKLIST_PAGE,
-      [serverSideCollectionHandlers.PREVIOUS_PAGE]: GOTO_PREVIOUS_BLACKLIST_PAGE,
-      [serverSideCollectionHandlers.NEXT_PAGE]: GOTO_NEXT_BLACKLIST_PAGE,
-      [serverSideCollectionHandlers.LAST_PAGE]: GOTO_LAST_BLACKLIST_PAGE,
-      [serverSideCollectionHandlers.EXACT_PAGE]: GOTO_BLACKLIST_PAGE,
-      [serverSideCollectionHandlers.SORT]: SET_BLACKLIST_SORT
+      [serverSideCollectionHandlers.FETCH]: FETCH_BLOCKLIST,
+      [serverSideCollectionHandlers.FIRST_PAGE]: GOTO_FIRST_BLOCKLIST_PAGE,
+      [serverSideCollectionHandlers.PREVIOUS_PAGE]: GOTO_PREVIOUS_BLOCKLIST_PAGE,
+      [serverSideCollectionHandlers.NEXT_PAGE]: GOTO_NEXT_BLOCKLIST_PAGE,
+      [serverSideCollectionHandlers.LAST_PAGE]: GOTO_LAST_BLOCKLIST_PAGE,
+      [serverSideCollectionHandlers.EXACT_PAGE]: GOTO_BLOCKLIST_PAGE,
+      [serverSideCollectionHandlers.SORT]: SET_BLOCKLIST_SORT
     }),
 
-  [REMOVE_BLACKLIST_ITEM]: createRemoveItemHandler(section, '/blacklist'),
+  [REMOVE_BLOCKLIST_ITEM]: createRemoveItemHandler(section, '/blocklist'),
 
-  [REMOVE_BLACKLIST_ITEMS]: function(getState, payload, dispatch) {
+  [REMOVE_BLOCKLIST_ITEMS]: function(getState, payload, dispatch) {
     const {
       ids
     } = payload;
@@ -157,7 +157,7 @@ export const actionHandlers = handleThunks({
     ]));
 
     const promise = createAjaxRequest({
-      url: '/blacklist/bulk',
+      url: '/blocklist/bulk',
       method: 'DELETE',
       dataType: 'json',
       data: JSON.stringify({ ids })
@@ -165,7 +165,7 @@ export const actionHandlers = handleThunks({
 
     promise.done((data) => {
       // Don't use batchActions with thunks
-      dispatch(fetchBlacklist());
+      dispatch(fetchBlocklist());
 
       dispatch(set({ section, isRemoving: false }));
     });
@@ -191,9 +191,9 @@ export const actionHandlers = handleThunks({
 
 export const reducers = createHandleActions({
 
-  [SET_BLACKLIST_TABLE_OPTION]: createSetTableOptionReducer(section),
+  [SET_BLOCKLIST_TABLE_OPTION]: createSetTableOptionReducer(section),
 
-  [CLEAR_BLACKLIST]: createClearReducer(section, {
+  [CLEAR_BLOCKLIST]: createClearReducer(section, {
     isFetching: false,
     isPopulated: false,
     error: null,

frontend/src/Store/Actions/index.js

@@ -1,6 +1,6 @@
 import * as addMovie from './addMovieActions';
 import * as app from './appActions';
-import * as blacklist from './blacklistActions';
+import * as blocklist from './blocklistActions';
 import * as calendar from './calendarActions';
 import * as captcha from './captchaActions';
 import * as commands from './commandActions';
@@ -11,7 +11,7 @@ import * as history from './historyActions';
 import * as importMovie from './importMovieActions';
 import * as interactiveImportActions from './interactiveImportActions';
 import * as movies from './movieActions';
-import * as movieBlacklist from './movieBlacklistActions';
+import * as movieBlocklist from './movieBlocklistActions';
 import * as movieCredits from './movieCreditsActions';
 import * as movieFiles from './movieFileActions';
 import * as movieHistory from './movieHistoryActions';
@@ -30,7 +30,7 @@ import * as tags from './tagActions';
 export default [
   addMovie,
   app,
-  blacklist,
+  blocklist,
   calendar,
   captcha,
   commands,
@@ -49,7 +49,7 @@ export default [
   releases,
   rootFolders,
   movies,
-  movieBlacklist,
+  movieBlocklist,
   movieHistory,
   movieIndex,
   movieCredits,

frontend/src/Store/Actions/movieBlocklistActions.js

@@ -8,7 +8,7 @@ import createHandleActions from './Creators/createHandleActions';
 //
 // Variables
 
-export const section = 'movieBlacklist';
+export const section = 'movieBlocklist';
 
 //
 // State
@@ -23,25 +23,25 @@ export const defaultState = {
 //
 // Actions Types
 
-export const FETCH_MOVIE_BLACKLIST = 'movieBlacklist/fetchMovieBlacklist';
-export const CLEAR_MOVIE_BLACKLIST = 'movieBlacklist/clearMovieBlacklist';
+export const FETCH_MOVIE_BLOCKLIST = 'movieBlocklist/fetchMovieBlocklist';
+export const CLEAR_MOVIE_BLOCKLIST = 'movieBlocklist/clearMovieBlocklist';
 
 //
 // Action Creators
 
-export const fetchMovieBlacklist = createThunk(FETCH_MOVIE_BLACKLIST);
-export const clearMovieBlacklist = createAction(CLEAR_MOVIE_BLACKLIST);
+export const fetchMovieBlocklist = createThunk(FETCH_MOVIE_BLOCKLIST);
+export const clearMovieBlocklist = createAction(CLEAR_MOVIE_BLOCKLIST);
 
 //
 // Action Handlers
 
 export const actionHandlers = handleThunks({
 
-  [FETCH_MOVIE_BLACKLIST]: function(getState, payload, dispatch) {
+  [FETCH_MOVIE_BLOCKLIST]: function(getState, payload, dispatch) {
     dispatch(set({ section, isFetching: true }));
 
     const promise = createAjaxRequest({
-      url: '/blacklist/movie',
+      url: '/blocklist/movie',
       data: payload
     }).request;
 
@@ -74,7 +74,7 @@ export const actionHandlers = handleThunks({
 
 export const reducers = createHandleActions({
 
-  [CLEAR_MOVIE_BLACKLIST]: (state) => {
+  [CLEAR_MOVIE_BLOCKLIST]: (state) => {
     return Object.assign({}, state, defaultState);
   }
 

frontend/src/Store/Actions/queueActions.js

@@ -354,13 +354,13 @@ export const actionHandlers = handleThunks({
     const {
       id,
       remove,
-      blacklist
+      blocklist
     } = payload;
 
     dispatch(updateItem({ section: paged, id, isRemoving: true }));
 
     const promise = createAjaxRequest({
-      url: `/queue/${id}?removeFromClient=${remove}&blacklist=${blacklist}`,
+      url: `/queue/${id}?removeFromClient=${remove}&blocklist=${blocklist}`,
       method: 'DELETE'
     }).request;
 
@@ -377,7 +377,7 @@ export const actionHandlers = handleThunks({
     const {
       ids,
       remove,
-      blacklist
+      blocklist
     } = payload;
 
     dispatch(batchActions([
@@ -393,7 +393,7 @@ export const actionHandlers = handleThunks({
     ]));
 
     const promise = createAjaxRequest({
-      url: `/queue/bulk?removeFromClient=${remove}&blacklist=${blacklist}`,
+      url: `/queue/bulk?removeFromClient=${remove}&blocklist=${blocklist}`,
       method: 'DELETE',
       dataType: 'json',
       data: JSON.stringify({ ids })