Rename blacklist/whitelist to mute/unmute

- Follow @roschaefer suggestion in issue
- This can be reverted if we decide otherwise

backend/src/middleware/permissionsMiddleware.js

@@ -99,7 +99,7 @@ export default shield(
       Badge: allow,
       PostsEmotionsCountByEmotion: allow,
       PostsEmotionsByCurrentUser: isAuthenticated,
-      blacklistedUsers: isAuthenticated,
+      mutedUsers: isAuthenticated,
       notifications: isAuthenticated,
       Donations: isAuthenticated,
     },
@@ -135,8 +135,8 @@ export default shield(
       resetPassword: allow,
       AddPostEmotions: isAuthenticated,
       RemovePostEmotions: isAuthenticated,
-      blacklistUserContent: isAuthenticated,
+      muteUser: isAuthenticated,
-      whitelistUserContent: isAuthenticated,
+      unmuteUser: isAuthenticated,
       markAsRead: isAuthenticated,
       AddEmailAddress: isAuthenticated,
       VerifyEmailAddress: isAuthenticated,

backend/src/models/User.js

@@ -78,9 +78,9 @@ module.exports = {
     target: 'User',
     direction: 'out',
   },
-  blacklisted: {
+  muted: {
     type: 'relationship',
-    relationship: 'BLACKLISTED',
+    relationship: 'MUTED',
     target: 'User',
     direction: 'out',
   },

backend/src/schema/resolvers/posts.js

@@ -1,21 +1,21 @@
 import uuid from 'uuid/v4'
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import fileUpload from './fileUpload'
-import { getBlacklistedUsers } from './users.js'
+import { getMutedUsers } from './users.js'
 import { mergeWith, isArray, isEmpty } from 'lodash'
 import { UserInputError } from 'apollo-server'
 import Resolver from './helpers/Resolver'
 
-const filterForBlacklistedUsers = async (params, context) => {
+const filterForMutedUsers = async (params, context) => {
   if (!context.user) return params
-  const [blacklistedUsers] = await Promise.all([getBlacklistedUsers(context)])
+  const [mutedUsers] = await Promise.all([getMutedUsers(context)])
-  const blacklistedUsersIds = [...blacklistedUsers.map(user => user.id)]
+  const mutedUsersIds = [...mutedUsers.map(user => user.id)]
-  if (!blacklistedUsersIds.length) return params
+  if (!mutedUsersIds.length) return params
 
   params.filter = mergeWith(
     params.filter,
     {
-      author_not: { id_in: blacklistedUsersIds },
+      author_not: { id_in: mutedUsersIds },
     },
     (objValue, srcValue) => {
       if (isArray(objValue)) {
@@ -39,16 +39,16 @@ const maintainPinnedPosts = params => {
 export default {
   Query: {
     Post: async (object, params, context, resolveInfo) => {
-      params = await filterForBlacklistedUsers(params, context)
+      params = await filterForMutedUsers(params, context)
       params = await maintainPinnedPosts(params)
       return neo4jgraphql(object, params, context, resolveInfo)
     },
     findPosts: async (object, params, context, resolveInfo) => {
-      params = await filterForBlacklistedUsers(params, context)
+      params = await filterForMutedUsers(params, context)
       return neo4jgraphql(object, params, context, resolveInfo)
     },
     profilePagePosts: async (object, params, context, resolveInfo) => {
-      params = await filterForBlacklistedUsers(params, context)
+      params = await filterForMutedUsers(params, context)
       return neo4jgraphql(object, params, context, resolveInfo)
     },
     PostsEmotionsCountByEmotion: async (object, params, context, resolveInfo) => {

backend/src/schema/resolvers/users.js

@@ -8,26 +8,26 @@ import createOrUpdateLocations from './users/location'
 
 const neode = getNeode()
 
-export const getBlacklistedUsers = async context => {
+export const getMutedUsers = async context => {
   const { neode } = context
   const userModel = neode.model('User')
-  let blacklistedUsers = neode
+  let mutedUsers = neode
     .query()
     .match('user', userModel)
     .where('user.id', context.user.id)
-    .relationship(userModel.relationships().get('blacklisted'))
+    .relationship(userModel.relationships().get('muted'))
-    .to('blacklisted', userModel)
+    .to('muted', userModel)
-    .return('blacklisted')
+    .return('muted')
-  blacklistedUsers = await blacklistedUsers.execute()
+  mutedUsers = await mutedUsers.execute()
-  blacklistedUsers = blacklistedUsers.records.map(r => r.get('blacklisted').properties)
+  mutedUsers = mutedUsers.records.map(r => r.get('muted').properties)
-  return blacklistedUsers
+  return mutedUsers
 }
 
 export default {
   Query: {
-    blacklistedUsers: async (object, args, context, resolveInfo) => {
+    mutedUsers: async (object, args, context, resolveInfo) => {
       try {
-        return getBlacklistedUsers(context)
+        return getMutedUsers(context)
       } catch (e) {
         throw new UserInputError(e.message)
       }
@@ -56,7 +56,7 @@ export default {
     },
   },
   Mutation: {
-    blacklistUserContent: async (_parent, params, context, _resolveInfo) => {
+    muteUser: async (_parent, params, context, _resolveInfo) => {
       const { user: currentUser } = context
       if (currentUser.id === params.id) return null
       await neode.cypher(
@@ -66,25 +66,25 @@ export default {
         `,
         { currentUser, params },
       )
-      const [user, blacklistedUser] = await Promise.all([
+      const [user, mutedUser] = await Promise.all([
         neode.find('User', currentUser.id),
         neode.find('User', params.id),
       ])
-      await user.relateTo(blacklistedUser, 'blacklisted')
+      await user.relateTo(mutedUser, 'muted')
-      return blacklistedUser.toJson()
+      return mutedUser.toJson()
     },
-    whitelistUserContent: async (_parent, params, context, _resolveInfo) => {
+    unmuteUser: async (_parent, params, context, _resolveInfo) => {
       const { user: currentUser } = context
       if (currentUser.id === params.id) return null
       await neode.cypher(
         `
-          MATCH(u:User {id: $currentUser.id})-[previousRelationship:BLACKLISTED]->(b:User {id: $params.id})
+          MATCH(u:User {id: $currentUser.id})-[previousRelationship:MUTED]->(b:User {id: $params.id})
           DELETE previousRelationship
         `,
         { currentUser, params },
       )
-      const whitelistedUser = await neode.find('User', params.id)
+      const unmutedUser = await neode.find('User', params.id)
-      return whitelistedUser.toJson()
+      return unmutedUser.toJson()
     },
     block: async (object, args, context, resolveInfo) => {
       const { user: currentUser } = context
@@ -231,8 +231,8 @@ export default {
           'MATCH (this)<-[:FOLLOWS]-(u:User {id: $cypherParams.currentUserId}) RETURN COUNT(u) >= 1',
         isBlocked:
           'MATCH (this)<-[:BLOCKED]-(u:User {id: $cypherParams.currentUserId}) RETURN COUNT(u) >= 1',
-        isBlacklisted:
+        isMuted:
-          'MATCH (this)<-[:BLACKLISTED]-(u:User {id: $cypherParams.currentUserId}) RETURN COUNT(u) >= 1',
+          'MATCH (this)<-[:MUTED]-(u:User {id: $cypherParams.currentUserId}) RETURN COUNT(u) >= 1',
       },
       count: {
         contributionsCount:

backend/src/schema/resolvers/users/mutedUsers.spec.js

@@ -9,7 +9,7 @@ const factory = Factory()
 const neode = getNeode()
 
 let currentUser
-let blacklistedUser
+let mutedUser
 let authenticatedUser
 let server
 
@@ -33,15 +33,15 @@ afterEach(async () => {
   await factory.cleanDatabase()
 })
 
-describe('blacklistedUsers', () => {
+describe('mutedUsers', () => {
-  let blacklistedUserQuery
+  let mutedUserQuery
   beforeEach(() => {
-    blacklistedUserQuery = gql`
+    mutedUserQuery = gql`
       query {
-        blacklistedUsers {
+        mutedUsers {
           id
           name
-          isBlacklisted
+          isMuted
         }
       }
     `
@@ -49,34 +49,34 @@ describe('blacklistedUsers', () => {
 
   it('throws permission error', async () => {
     const { query } = createTestClient(server)
-    const result = await query({ query: blacklistedUserQuery })
+    const result = await query({ query: mutedUserQuery })
     expect(result.errors[0]).toHaveProperty('message', 'Not Authorised!')
   })
 
-  describe('authenticated and given a blacklisted user', () => {
+  describe('authenticated and given a muted user', () => {
     beforeEach(async () => {
       currentUser = await neode.create('User', {
         name: 'Current User',
         id: 'u1',
       })
-      blacklistedUser = await neode.create('User', {
+      mutedUser = await neode.create('User', {
-        name: 'Blacklisted User',
+        name: 'Muted User',
         id: 'u2',
       })
-      await currentUser.relateTo(blacklistedUser, 'blacklisted')
+      await currentUser.relateTo(mutedUser, 'muted')
       authenticatedUser = await currentUser.toJson()
     })
 
-    it('returns a list of blacklisted users', async () => {
+    it('returns a list of muted users', async () => {
       const { query } = createTestClient(server)
-      await expect(query({ query: blacklistedUserQuery })).resolves.toEqual(
+      await expect(query({ query: mutedUserQuery })).resolves.toEqual(
         expect.objectContaining({
           data: {
-            blacklistedUsers: [
+            mutedUsers: [
               {
-                name: 'Blacklisted User',
+                name: 'Muted User',
                 id: 'u2',
-                isBlacklisted: true,
+                isMuted: true,
               },
             ],
           },
@@ -86,28 +86,28 @@ describe('blacklistedUsers', () => {
   })
 })
 
-describe('blacklistUserContent', () => {
+describe('muteUser', () => {
-  let blacklistAction
+  let muteAction
 
   beforeEach(() => {
     currentUser = undefined
-    blacklistAction = variables => {
+    muteAction = variables => {
       const { mutate } = createTestClient(server)
-      const blacklistUserContentMutation = gql`
+      const muteUserMutation = gql`
         mutation($id: ID!) {
-          blacklistUserContent(id: $id) {
+          muteUser(id: $id) {
             id
             name
-            isBlacklisted
+            isMuted
           }
         }
       `
-      return mutate({ mutation: blacklistUserContentMutation, variables })
+      return mutate({ mutation: muteUserMutation, variables })
     }
   })
 
   it('throws permission error', async () => {
-    const result = await blacklistAction({ id: 'u2' })
+    const result = await muteAction({ id: 'u2' })
     expect(result.errors[0]).toHaveProperty('message', 'Not Authorised!')
   })
 
@@ -120,47 +120,47 @@ describe('blacklistUserContent', () => {
       authenticatedUser = await currentUser.toJson()
     })
 
-    describe('blacklist yourself', () => {
+    describe('mute yourself', () => {
       it('returns null', async () => {
-        await expect(blacklistAction({ id: 'u1' })).resolves.toEqual(
+        await expect(muteAction({ id: 'u1' })).resolves.toEqual(
-          expect.objectContaining({ data: { blacklistUserContent: null } }),
+          expect.objectContaining({ data: { muteUser: null } }),
         )
       })
     })
 
-    describe('blacklist not existing user', () => {
+    describe('mute not existing user', () => {
       it('returns null', async () => {
-        await expect(blacklistAction({ id: 'u2' })).resolves.toEqual(
+        await expect(muteAction({ id: 'u2' })).resolves.toEqual(
-          expect.objectContaining({ data: { blacklistUserContent: null } }),
+          expect.objectContaining({ data: { muteUser: null } }),
         )
       })
     })
 
-    describe('given a to-be-blacklisted user', () => {
+    describe('given a to-be-muted user', () => {
       beforeEach(async () => {
-        blacklistedUser = await neode.create('User', {
+        mutedUser = await neode.create('User', {
-          name: 'Blacklisted User',
+          name: 'Muted User',
           id: 'u2',
         })
       })
 
-      it('blacklists a user', async () => {
+      it('mutes a user', async () => {
-        await expect(blacklistAction({ id: 'u2' })).resolves.toEqual(
+        await expect(muteAction({ id: 'u2' })).resolves.toEqual(
           expect.objectContaining({
             data: {
-              blacklistUserContent: { id: 'u2', name: 'Blacklisted User', isBlacklisted: true },
+              muteUser: { id: 'u2', name: 'Muted User', isMuted: true },
             },
           }),
         )
       })
 
       it('unfollows the user', async () => {
-        await currentUser.relateTo(blacklistedUser, 'following')
+        await currentUser.relateTo(mutedUser, 'following')
         const queryUser = gql`
           query {
             User(id: "u2") {
               id
-              isBlacklisted
+              isMuted
               followedByCurrentUser
             }
           }
@@ -168,18 +168,18 @@ describe('blacklistUserContent', () => {
         const { query } = createTestClient(server)
         await expect(query({ query: queryUser })).resolves.toEqual(
           expect.objectContaining({
-            data: { User: [{ id: 'u2', isBlacklisted: false, followedByCurrentUser: true }] },
+            data: { User: [{ id: 'u2', isMuted: false, followedByCurrentUser: true }] },
           }),
         )
-        await blacklistAction({ id: 'u2' })
+        await muteAction({ id: 'u2' })
         await expect(query({ query: queryUser })).resolves.toEqual(
           expect.objectContaining({
-            data: { User: [{ id: 'u2', isBlacklisted: true, followedByCurrentUser: false }] },
+            data: { User: [{ id: 'u2', isMuted: true, followedByCurrentUser: false }] },
           }),
         )
       })
 
-      describe('given both the current user and the to-be-blacklisted user write a post', () => {
+      describe('given both the current user and the to-be-muted user write a post', () => {
         let postQuery
 
         beforeEach(async () => {
@@ -189,11 +189,11 @@ describe('blacklistUserContent', () => {
           })
           const post2 = await neode.create('Post', {
             id: 'p23',
-            title: 'A post written by the blacklisted user',
+            title: 'A post written by the muted user',
           })
           await Promise.all([
             post1.relateTo(currentUser, 'author'),
-            post2.relateTo(blacklistedUser, 'author'),
+            post2.relateTo(mutedUser, 'author'),
           ])
           postQuery = gql`
             query {
@@ -225,9 +225,9 @@ describe('blacklistUserContent', () => {
                   },
                   {
                     id: 'p23',
-                    title: 'A post written by the blacklisted user',
+                    title: 'A post written by the muted user',
                     author: {
-                      name: 'Blacklisted User',
+                      name: 'Muted User',
                       id: 'u2',
                     },
                   },
@@ -240,12 +240,12 @@ describe('blacklistUserContent', () => {
         describe('from the perspective of the current user', () => {
           it('both posts are in the newsfeed', bothPostsAreInTheNewsfeed)
 
-          describe('but if the current user blacklists the other user', () => {
+          describe('but if the current user mutes the other user', () => {
             beforeEach(async () => {
-              await currentUser.relateTo(blacklistedUser, 'blacklisted')
+              await currentUser.relateTo(mutedUser, 'muted')
             })
 
-            it("the blacklisted user's post won't show up in the newsfeed of the current user", async () => {
+            it("the muted user's post won't show up in the newsfeed of the current user", async () => {
               const { query } = createTestClient(server)
               await expect(query({ query: postQuery })).resolves.toEqual(
                 expect.objectContaining({
@@ -264,18 +264,18 @@ describe('blacklistUserContent', () => {
           })
         })
 
-        describe('from the perspective of the blacklisted user', () => {
+        describe('from the perspective of the muted user', () => {
           beforeEach(async () => {
-            authenticatedUser = await blacklistedUser.toJson()
+            authenticatedUser = await mutedUser.toJson()
           })
 
           it('both posts are in the newsfeed', bothPostsAreInTheNewsfeed)
-          describe('but if the current user blacklists the other user', () => {
+          describe('but if the current user mutes the other user', () => {
             beforeEach(async () => {
-              await currentUser.relateTo(blacklistedUser, 'blacklisted')
+              await currentUser.relateTo(mutedUser, 'muted')
             })
 
-            it("the current user's post will show up in the newsfeed of the blacklisted user", async () => {
+            it("the current user's post will show up in the newsfeed of the muted user", async () => {
               const { query } = createTestClient(server)
               await expect(query({ query: postQuery })).resolves.toEqual(
                 expect.objectContaining({
@@ -283,8 +283,8 @@ describe('blacklistUserContent', () => {
                     Post: expect.arrayContaining([
                       {
                         id: 'p23',
-                        title: 'A post written by the blacklisted user',
+                        title: 'A post written by the muted user',
-                        author: { name: 'Blacklisted User', id: 'u2' },
+                        author: { name: 'Muted User', id: 'u2' },
                       },
                       {
                         id: 'p12',
@@ -303,28 +303,28 @@ describe('blacklistUserContent', () => {
   })
 })
 
-describe('whitelistUserContent', () => {
+describe('unmuteUser', () => {
-  let whitelistAction
+  let unmuteAction
 
   beforeEach(() => {
     currentUser = undefined
-    whitelistAction = variables => {
+    unmuteAction = variables => {
       const { mutate } = createTestClient(server)
-      const whitelistUserContentMutation = gql`
+      const unmuteUserMutation = gql`
         mutation($id: ID!) {
-          whitelistUserContent(id: $id) {
+          unmuteUser(id: $id) {
             id
             name
-            isBlacklisted
+            isMuted
           }
         }
       `
-      return mutate({ mutation: whitelistUserContentMutation, variables })
+      return mutate({ mutation: unmuteUserMutation, variables })
     }
   })
 
   it('throws permission error', async () => {
-    const result = await whitelistAction({ id: 'u2' })
+    const result = await unmuteAction({ id: 'u2' })
     expect(result.errors[0]).toHaveProperty('message', 'Not Authorised!')
   })
 
@@ -337,67 +337,67 @@ describe('whitelistUserContent', () => {
       authenticatedUser = await currentUser.toJson()
     })
 
-    describe('whitelist yourself', () => {
+    describe('unmute yourself', () => {
       it('returns null', async () => {
-        await expect(whitelistAction({ id: 'u1' })).resolves.toEqual(
+        await expect(unmuteAction({ id: 'u1' })).resolves.toEqual(
-          expect.objectContaining({ data: { whitelistUserContent: null } }),
+          expect.objectContaining({ data: { unmuteUser: null } }),
         )
       })
     })
 
-    describe('whitelist not-existing user', () => {
+    describe('unmute not-existing user', () => {
       it('returns null', async () => {
-        await expect(whitelistAction({ id: 'lksjdflksfdj' })).resolves.toEqual(
+        await expect(unmuteAction({ id: 'lksjdflksfdj' })).resolves.toEqual(
-          expect.objectContaining({ data: { whitelistUserContent: null } }),
+          expect.objectContaining({ data: { unmuteUser: null } }),
         )
       })
     })
 
     describe('given another user', () => {
       beforeEach(async () => {
-        blacklistedUser = await neode.create('User', {
+        mutedUser = await neode.create('User', {
-          name: 'Blacklisted User',
+          name: 'Muted User',
           id: 'u2',
         })
       })
 
-      describe('whitelisting a not yet blacklisted user', () => {
+      describe('unmuting a not yet muted user', () => {
         it('does not hurt', async () => {
-          await expect(whitelistAction({ id: 'u2' })).resolves.toEqual(
+          await expect(unmuteAction({ id: 'u2' })).resolves.toEqual(
             expect.objectContaining({
               data: {
-                whitelistUserContent: { id: 'u2', name: 'Blacklisted User', isBlacklisted: false },
+                unmuteUser: { id: 'u2', name: 'Muted User', isMuted: false },
               },
             }),
           )
         })
       })
 
-      describe('given a blacklisted user', () => {
+      describe('given a muted user', () => {
         beforeEach(async () => {
-          await currentUser.relateTo(blacklistedUser, 'blacklisted')
+          await currentUser.relateTo(mutedUser, 'muted')
         })
 
-        it('whitelists a user', async () => {
+        it('unmutes a user', async () => {
-          await expect(whitelistAction({ id: 'u2' })).resolves.toEqual(
+          await expect(unmuteAction({ id: 'u2' })).resolves.toEqual(
             expect.objectContaining({
               data: {
-                whitelistUserContent: { id: 'u2', name: 'Blacklisted User', isBlacklisted: false },
+                unmuteUser: { id: 'u2', name: 'Muted User', isMuted: false },
               },
             }),
           )
         })
 
-        describe('whitelisting twice', () => {
+        describe('unmuting twice', () => {
           it('has no effect', async () => {
-            await whitelistAction({ id: 'u2' })
+            await unmuteAction({ id: 'u2' })
-            await expect(whitelistAction({ id: 'u2' })).resolves.toEqual(
+            await expect(unmuteAction({ id: 'u2' })).resolves.toEqual(
               expect.objectContaining({
                 data: {
-                  whitelistUserContent: {
+                  unmuteUser: {
                     id: 'u2',
-                    name: 'Blacklisted User',
+                    name: 'Muted User',
-                    isBlacklisted: false,
+                    isMuted: false,
                   },
                 },
               }),

backend/src/schema/types/type/User.gql

@@ -75,9 +75,9 @@ type User {
   """
   )
 
-  isBlacklisted: Boolean! @cypher(
+  isMuted: Boolean! @cypher(
   statement: """
-  MATCH (this)<-[: BLACKLISTED]-(u: User { id: $cypherParams.currentUserId})
+  MATCH (this)<-[: MUTED]-(u: User { id: $cypherParams.currentUserId})
   RETURN COUNT(u) >= 1
   """
   )
@@ -167,7 +167,7 @@ type Query {
   filter: _UserFilter
   ): [User]
 
-  blacklistedUsers: [User]
+  mutedUsers: [User]
   currentUser: User
 }
 
@@ -192,8 +192,8 @@ type Mutation {
 
   DeleteUser(id: ID!, resource: [Deletable]): User
 
-  blacklistUserContent(id: ID!): User
+  muteUser(id: ID!): User
-  whitelistUserContent(id: ID!): User
+  unmuteUser(id: ID!): User
   block(id: ID!): User
   unblock(id: ID!): User
 }

backend/src/seed/seed-db.js

@@ -226,9 +226,9 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       dewey.relateTo(huey, 'following'),
       louie.relateTo(jennyRostock, 'following'),
 
-      huey.relateTo(dagobert, 'blacklisted'),
+      huey.relateTo(dagobert, 'muted'),
-      dewey.relateTo(dagobert, 'blacklisted'),
+      dewey.relateTo(dagobert, 'muted'),
-      louie.relateTo(dagobert, 'blacklisted'),
+      louie.relateTo(dagobert, 'muted'),
 
       dagobert.relateTo(huey, 'blocked'),
       dagobert.relateTo(dewey, 'blocked'),

cypress/integration/common/report.js

@@ -7,7 +7,7 @@ import { gql } from '../../../backend/src/helpers/jest'
 let lastReportTitle
 let davidIrvingPostTitle = 'The Truth about the Holocaust'
 let davidIrvingPostSlug = 'the-truth-about-the-holocaust'
-let annoyingUserWhoBlacklistedModeratorTitle = 'Fake news'
+let annoyingUserWhoMutedModeratorTitle = 'Fake news'
 
 const savePostTitle = $post => {
   return $post
@@ -147,9 +147,9 @@ Then('I see all the reported posts including the one from above', () => {
   })
 })
 
-Then('I see all the reported posts including from the user who blacklisted me', () => {
+Then('I see all the reported posts including from the user who muted me', () => {
   cy.get('table tbody').within(() => {
-    cy.contains('tr', annoyingUserWhoBlacklistedModeratorTitle)
+    cy.contains('tr', annoyingUserWhoMutedModeratorTitle)
   })
 })
 
@@ -159,9 +159,9 @@ Then('each list item links to the post page', () => {
 })
 
 Then('I can visit the post page', () => {
-  cy.contains(annoyingUserWhoBlacklistedModeratorTitle).click()
+  cy.contains(annoyingUserWhoMutedModeratorTitle).click()
   cy.location('pathname').should('contain', '/post')
-    .get('h3').should('contain', annoyingUserWhoBlacklistedModeratorTitle)
+    .get('h3').should('contain', annoyingUserWhoMutedModeratorTitle)
 })
 
 When("they have a post someone has reported", () => {

cypress/integration/common/steps.js

@@ -39,7 +39,7 @@ Given("I am logged in", () => {
   cy.login(loginCredentials);
 });
 
-Given("I am logged in as the blacklisted user", () => {
+Given("I am logged in as the muted user", () => {
   cy.login({ email: annoyingParams.email, password: '1234' });
 });
 
@@ -424,17 +424,17 @@ Given("there is an annoying user called {string}", name => {
   });
 });
 
-Given("there is an annoying user who has blacklisted me", () => {
+Given("there is an annoying user who has muted me", () => {
   cy.neode()
     .first("User", {
       role: 'moderator'
     })
-    .then(blacklisted => {
+    .then(mutedUser => {
       cy.neode()
         .first("User", {
           id: 'annoying-user'
         })
-        .relateTo(blacklisted, "blacklisted");
+        .relateTo(mutedUser, "muted");
     });
 });
 
@@ -518,17 +518,17 @@ Given("I wrote a post {string}", title => {
     });
 });
 
-When("I blacklist the user {string}", name => {
+When("I mute the user {string}", name => {
   cy.neode()
     .first("User", {
       name
     })
-    .then(blacklistedUser => {
+    .then(mutedUser => {
       cy.neode()
         .first("User", {
           name: narratorParams.name
         })
-        .relateTo(blacklistedUser, "blacklisted");
+        .relateTo(mutedUser, "muted");
     });
 });
 

cypress/integration/moderation/ReportContent.feature

@@ -11,7 +11,7 @@ Feature: Report and Moderate
     Given we have the following user accounts:
       | id            | name                                           | 
       | u67           | David Irving                                   |
-      | annoying-user | I'm gonna blacklist Moderators and Admins HA HA HA |
+      | annoying-user | I'm gonna mute Moderators and Admins HA HA HA |
     
     Given we have the following posts in our database:
       | authorId      | id | title                         | content                                              |
@@ -58,16 +58,16 @@ Feature: Report and Moderate
     Then I see all the reported posts including the one from above
     And each list item links to the post page
 
-  Scenario: Review reported posts of a user who's blacklisted a moderator
+  Scenario: Review reported posts of a user who's muted a moderator
     Given somebody reported the following posts:
       | submitterEmail           | resourceId | reasonCategory | reasonDescription |
       | p2.submitter@example.org | p2         | other          | Offensive content |
     And my user account has the role "moderator"
-    And there is an annoying user who has blacklisted me
+    And there is an annoying user who has muted me
     And I am logged in
     When I click on the avatar menu in the top right corner
     And I click on "Moderation"
-    Then I see all the reported posts including from the user who blacklisted me
+    Then I see all the reported posts including from the user who muted me
     And I can visit the post page
 
   Scenario: Normal user can't see the moderation page

cypress/integration/user_profile/mute-users/Content.feature

@@ -1,4 +1,4 @@
-Feature: Blacklist a User
+Feature: Mute a User
   As a user
   I'd like to have a button to block another user
   To prevent him from seeing and interacting with my contributions and also to avoid seeing his/her posts
@@ -7,10 +7,10 @@ Feature: Blacklist a User
     Given I have a user account
     And there is an annoying user called "Spammy Spammer"
 
-  Scenario Outline: Blacklisted users cannot see each others posts
+  Scenario Outline: Muted users cannot see each others posts
     Given "Spammy Spammer" wrote a post "Spam Spam Spam"
     And I wrote a post "I hate spammers"
-    And I I blacklist the user "Spammy Spammer"
+    And I mute the user "Spammy Spammer"
     When I log in with:
       | Email   | Password   |
       | <email> | <password> |

cypress/integration/user_profile/mute-users/Mute.feature

@@ -1,6 +1,6 @@
-Feature: Blacklist a User
+Feature: Mute a User
   As a user
-  I'd like to have a button to blacklist another user
+  I'd like to have a button to mute another user
   To prevent him from seeing and interacting with my contributions and also to avoid seeing his/her posts
 
   Background:
@@ -8,45 +8,45 @@ Feature: Blacklist a User
     And there is an annoying user called "Spammy Spammer"
     And I am logged in
 
-  Scenario: Blacklist a user
+  Scenario: Mute a user
     Given I am on the profile page of the annoying user
-    When I click on "Blacklist user" from the content menu in the user info box
+    When I click on "Mute user" from the content menu in the user info box
-    And I navigate to my "Blacklisted users" settings page
+    And I navigate to my "Muted users" settings page
     Then I can see the following table:
       | Avatar | Name           |
       |        | Spammy Spammer |
 
-  Scenario: Blacklist a previously followed user
+  Scenario: Mute a previously followed user
     Given I follow the user "Spammy Spammer"
     And "Spammy Spammer" wrote a post "Spam Spam Spam"
     When I visit the profile page of the annoying user
-    And I click on "Blacklist user" from the content menu in the user info box
+    And I click on "Mute user" from the content menu in the user info box
     Then the list of posts of this user is empty
     And nobody is following the user profile anymore
 
-  Scenario: Posts of blacklisted users are filtered from search results
+  Scenario: Posts of muted users are filtered from search results
     Given we have the following posts in our database:
       | id                 | title                    | content                   |
-      | im-not-blacklisted | Post that should be seen | cause I'm not blacklisted |
+      | im-not-muted | Post that should be seen | cause I'm not muted |
     Given "Spammy Spammer" wrote a post "Spam Spam Spam"
     When I search for "Spam"
     Then I should see the following posts in the select dropdown:
       | title          |
       | Spam Spam Spam |
-    When I blacklist the user "Spammy Spammer"
+    When I mute the user "Spammy Spammer"
     And I refresh the page
     And I search for "Spam"
     Then the search has no results
-    But I search for "not blacklisted"
+    But I search for "not muted"
     Then I should see the following posts in the select dropdown:
       | title                    |
       | Post that should be seen |
 
-  Scenario: Blacklisted users can still see my posts
+  Scenario: Muted users can still see my posts
     Given I previously created a post
-    And I blacklist the user "Spammy Spammer"
+    And I mute the user "Spammy Spammer"
     Given I log out
-    And I am logged in as the blacklisted user 
+    And I am logged in as the muted user 
     When I search for "previously created"
     Then I should see the following posts in the select dropdown:
       | title                   |

package.json

@@ -14,7 +14,7 @@
     "cypress:backend": "cd backend && yarn run dev",
     "cypress:webapp": "cd webapp && yarn run dev",
     "cypress:setup": "run-p cypress:backend cypress:webapp",
-    "cypress:run": "cross-env cypress run --browser chromium",
+    "cypress:run": "cross-env cypress run",
     "cypress:open": "cross-env cypress open --browser chromium",
     "cucumber:setup": "cd backend && yarn run dev",
     "cucumber": "wait-on tcp:4000 && cucumber-js --require-module @babel/register --exit",

webapp/components/ContentMenu/ContentMenu.spec.js

@@ -407,49 +407,49 @@ describe('ContentMenu.vue', () => {
         ).toBe('/settings')
       })
 
-      it('can blacklist other users', () => {
+      it('can mute other users', () => {
         const wrapper = openContentMenu({
           isOwner: false,
           resourceType: 'user',
           resource: {
             id: 'd23a4265-f5f7-4e17-9f86-85f714b4b9f8',
-            isBlacklisted: false,
+            isMuted: false,
           },
         })
         wrapper
           .findAll('.ds-menu-item')
-          .filter(item => item.text() === 'settings.blacklisted-users.blacklist')
+          .filter(item => item.text() === 'settings.muted-users.mute')
           .at(0)
           .trigger('click')
-        expect(wrapper.emitted('blacklist')).toEqual([
+        expect(wrapper.emitted('mute')).toEqual([
           [
             {
               id: 'd23a4265-f5f7-4e17-9f86-85f714b4b9f8',
-              isBlacklisted: false,
+              isMuted: false,
             },
           ],
         ])
       })
 
-      it('can whitelist blacklisted users', () => {
+      it('can unmute muted users', () => {
         const wrapper = openContentMenu({
           isOwner: false,
           resourceType: 'user',
           resource: {
             id: 'd23a4265-f5f7-4e17-9f86-85f714b4b9f8',
-            isBlacklisted: true,
+            isMuted: true,
           },
         })
         wrapper
           .findAll('.ds-menu-item')
-          .filter(item => item.text() === 'settings.blacklisted-users.whitelist')
+          .filter(item => item.text() === 'settings.muted-users.unmute')
           .at(0)
           .trigger('click')
-        expect(wrapper.emitted('whitelist')).toEqual([
+        expect(wrapper.emitted('unmute')).toEqual([
           [
             {
               id: 'd23a4265-f5f7-4e17-9f86-85f714b4b9f8',
-              isBlacklisted: true,
+              isMuted: true,
             },
           ],
         ])

webapp/components/ContentMenu/ContentMenu.vue

@@ -150,19 +150,19 @@ export default {
             icon: 'edit',
           })
         } else {
-          if (this.resource.isBlacklisted) {
+          if (this.resource.isMuted) {
             routes.push({
-              label: this.$t(`settings.blacklisted-users.whitelist`),
+              label: this.$t(`settings.muted-users.unmute`),
               callback: () => {
-                this.$emit('whitelist', this.resource)
+                this.$emit('unmute', this.resource)
               },
               icon: 'user-plus',
             })
           } else {
             routes.push({
-              label: this.$t(`settings.blacklisted-users.blacklist`),
+              label: this.$t(`settings.muted-users.mute`),
               callback: () => {
-                this.$emit('blacklist', this.resource)
+                this.$emit('mute', this.resource)
               },
               icon: 'user-times',
             })

webapp/components/User/User.story.js

@@ -48,7 +48,7 @@ export const user = {
   ],
   followedByCount: 0,
   followedByCurrentUser: false,
-  isBlacklisted: false,
+  isMuted: false,
   followedBy: [],
   socialMedia: [],
 }

webapp/graphql/User.js

@@ -23,7 +23,7 @@ export default i18n => {
         locationName
         createdAt
         followedByCurrentUser
-        isBlacklisted
+        isMuted
         following(first: 7) {
           ...user
           ...userCounts

webapp/graphql/settings/MutedUsers.js

@@ -1,9 +1,9 @@
 import gql from 'graphql-tag'
 
-export const blacklistedUsers = () => {
+export const mutedUsers = () => {
   return gql`
     {
-      blacklistedUsers {
+      mutedUsers {
         id
         name
         slug
@@ -16,26 +16,26 @@ export const blacklistedUsers = () => {
   `
 }
 
-export const blacklistUserContent = () => {
+export const muteUser = () => {
   return gql`
     mutation($id: ID!) {
-      blacklistUserContent(id: $id) {
+      muteUser(id: $id) {
         id
         name
-        isBlacklisted
+        isMuted
         followedByCurrentUser
       }
     }
   `
 }
 
-export const whitelistUserContent = () => {
+export const unmuteUser = () => {
   return gql`
     mutation($id: ID!) {
-      whitelistUserContent(id: $id) {
+      unmuteUser(id: $id) {
         id
         name
-        isBlacklisted
+        isMuted
         followedByCurrentUser
       }
     }

webapp/locales/de.json

@@ -145,7 +145,7 @@
             "successAdd": "Social-Media hinzugefügt. Profil aktualisiert!",
             "successDelete": "Social-Media gelöscht. Profil aktualisiert!"
         },
-        "blacklisted-users": {
+        "muted-users": {
             "name": "Blockierte Benutzer",
             "explanation": {
                 "intro": "Wenn ein anderer Benutzer von dir blockiert wurde, dann passiert folgendes:",
@@ -158,12 +158,12 @@
             "columns": {
                 "name": "Name",
                 "slug": "Alias",
-                "whitelist": "Entsperren"
+                "unmute": "Entsperren"
             },
             "empty": "Bislang hast du niemanden blockiert.",
             "how-to": "Du kannst andere Benutzer auf deren Profilseite über das Inhaltsmenü blockieren.",
-            "blacklist": "Nutzer blockieren",
+            "mute": "Nutzer blockieren",
-            "whitelist": "Nutzer entblocken",
+            "unmute": "Nutzer entblocken",
             "unblocked": "{name} ist wieder entsperrt"
         },
         "privacy": {

webapp/locales/en.json

@@ -309,26 +309,26 @@
       "successAdd": "Added social media. Updated user profile!",
       "successDelete": "Deleted social media. Updated user profile!"
     },
-    "blacklisted-users": {
+    "muted-users": {
-      "name": "Blacklisted users",
+      "name": "Muted users",
       "explanation": {
-        "intro": "If another user has been blacklisted by you, this is what happens:",
+        "intro": "If another user has been muted by you, this is what happens:",
-        "your-perspective": "The blacklisted person's posts will no longer appear in your news feed.",
+        "your-perspective": "The muted person's posts will no longer appear in your news feed.",
-        "their-perspective": "However: The blacklisted person will still be able to see your posts in their news feed.",
+        "their-perspective": "However: The muted person will still be able to see your posts in their news feed.",
-        "search": "Posts of blacklisted people disappear from your search results.",
+        "search": "Posts of muted people disappear from your search results.",
-        "notifications": "Blacklisted users will still receive notifications if they are mentioned in your posts.",
+        "notifications": "Muted users will still receive notifications if they are mentioned in your posts.",
-        "closing": "This should be sufficient for filtering out content from blacklisted users."
+        "closing": "This should be sufficient for filtering out content from muted users."
       },
       "columns": {
         "name": "Name",
         "slug": "Slug",
-        "whitelist": "Whitelist"
+        "unmute": "Unmute"
       },
-      "empty": "So far, you have not blacklisted anybody.",
+      "empty": "So far, you have not muted anybody.",
-      "how-to": "You can blacklist other users on their profile page via the content menu.",
+      "how-to": "You can mute other users on their profile page via the content menu.",
-      "blacklist": "Blacklist user",
+      "mute": "Mute user",
-      "whitelist": "Whitelist user",
+      "unmute": "Unmute user",
-      "whitelisted": "{name} is whitelisted again"
+      "unmuted": "{name} is unmuted again"
     }
   },
   "admin": {

webapp/locales/es.json

@@ -145,7 +145,7 @@
             "successAdd": "Social-Media agregó. Perfil actualizado!",
             "successDelete": "Social-Media borrado. Perfil actualizado!"
         },
-        "blacklisted-users": {
+        "muted-users": {
             "name": "Usuarios bloqueados",
             "explanation": {
                 "intro": "Si otro usuario ha sido bloqueado por usted, esto es lo que sucede:",
@@ -158,12 +158,12 @@
             "columns": {
                 "name": "Nombre",
                 "slug": "Alias",
-                "whitelist": "Desbloquear"
+                "unmute": "Desbloquear"
             },
             "empty": "Hasta ahora, no ha bloqueado a nadie.",
             "how-to": "Puede bloquear a otros usuarios en la página de perfil de aquellos a través del menú de contenido.",
-            "blacklist": "Bloquear usuario",
+            "mute": "Bloquear usuario",
-            "whitelist": "Desbloquear usuario",
+            "unmute": "Desbloquear usuario",
             "unblocked": "{name} está desbloqueado nuevamente"
         },
         "privacy": {

webapp/locales/fr.json

@@ -145,7 +145,7 @@
             "successAdd": "Les médias sociaux ont été ajoutés. Profil mis à jour !",
             "successDelete": "Médias sociaux supprimé. Profil mis à jour !"
         },
-        "blacklisted-users": {
+        "muted-users": {
             "name": "Utilisateurs bloqués",
             "explanation": {
                 "intro": "Si vous avez bloqué un autre utilisateur, voici ce qui se passe:",
@@ -158,13 +158,13 @@
             "columns": {
                 "name": "Nom",
                 "slug": "Slug",
-                "whitelist": ""
+                "unmute": ""
             },
             "empty": "Jusqu'à présent, vous n'avez bloqué personne.",
             "how-to": "Vous pouvez bloquer d'autres utilisateurs sur leur page de profil via le menu de contenu.",
-            "blacklist": "Bloquer l'utilisateur",
+            "mute": "Bloquer l'utilisateur",
-            "whitelist": "Débloquer l'utilisateur",
+            "unmute": "Débloquer l'utilisateur",
-            "unblocked": "{name} est à nouveau débloqué"
+            "unmuted": "{name} est à nouveau débloqué"
         },
         "privacy": {
             "name": "",

webapp/locales/it.json

@@ -145,7 +145,7 @@
             "successAdd": "Social media aggiunti. \nProfilo utente aggiornato ",
             "successDelete": "Social media cancellati. Profilo utente aggiornato!"
         },
-        "blacklisted-users": {
+        "muted-users": {
             "name": "",
             "explanation": {
                 "intro": "",
@@ -158,13 +158,13 @@
             "columns": {
                 "name": "",
                 "slug": "",
-                "whitelist": ""
+                "unmute": ""
             },
             "empty": "",
             "how-to": "",
-            "blacklist": "",
+            "mute": "",
-            "whitelist": "",
+            "unmute": "",
-            "unblocked": ""
+            "unmuted": ""
         },
         "privacy": {
             "name": "",

webapp/locales/pt.json

@@ -145,7 +145,7 @@
             "successAdd": "Mídias sociais adicionadas. Perfil de usuário atualizado!",
             "successDelete": "Mídias sociais removidas. Perfil de usuário atualizado!"
         },
-        "blacklisted-users": {
+        "muted-users": {
             "name": "Usuários bloqueados",
             "explanation": {
                 "intro": "Se outro usuário foi bloqueado por você, isto é o que acontece:",
@@ -158,13 +158,13 @@
             "columns": {
                 "name": "Nome",
                 "slug": "Slug",
-                "whitelist": "Desbloquear"
+                "unmute": "Desbloquear"
             },
             "empty": "Até agora, você não bloqueou ninguém.",
             "how-to": "Você pode bloquear outros usuários em suas páginas de perfil através do menu de conteúdo.",
-            "blacklist": "Bloquear usuário",
+            "mute": "Bloquear usuário",
-            "whitelist": "Desbloquear usuário",
+            "unmute": "Desbloquear usuário",
-            "unblocked": "{name} está desbloqueado novamente"
+            "unmuted": "{name} está desbloqueado novamente"
         },
         "privacy": {
             "name": "Privacidade",

webapp/locales/ru.json

@@ -596,12 +596,12 @@
     "placeholder": "Поиск"
   },
   "settings": {
-    "blacklisted-users": {
+    "muted-users": {
-      "blacklist": "Блокировать",
+      "mute": "Блокировать",
       "columns": {
         "name": "Имя",
         "slug": "Псевдоним",
-        "whitelist": "Разблокировать"
+        "unmute": "Разблокировать"
       },
       "empty": "Вы пока никого не блокировали.",
       "explanation": {
@@ -614,8 +614,8 @@
       },
       "how-to": "Вы можете блокировать других пользователей на странице их профиля с помощью меню профиля.",
       "name": "Заблокированные пользователи",
-      "whitelist": "Разблокировать пользователей",
+      "unmute": "Разблокировать пользователей",
-      "unblocked": "{name} - снова разблокирован"
+      "unmuted": "{name} - снова разблокирован"
     },
     "data": {
       "labelBio": "О себе",

webapp/pages/profile/_id/_slug.vue

@@ -22,8 +22,8 @@
               :resource="user"
               :is-owner="myProfile"
               class="user-content-menu"
-              @blacklist="blacklistUserContent"
+              @mute="muteUser"
-              @whitelist="whitelistUserContent"
+              @unmute="unmuteUser"
             />
           </client-only>
           <ds-space margin="small">
@@ -67,14 +67,14 @@
           <ds-space margin="small">
             <template v-if="!myProfile">
               <hc-follow-button
-                v-if="!user.isBlacklisted"
+                v-if="!user.isMuted"
                 :follow-id="user.id"
                 :is-followed="user.followedByCurrentUser"
                 @optimistic="optimisticFollow"
                 @update="updateFollow"
               />
-              <ds-button v-else fullwidth @click="whitelistUserContent(user)">
+              <ds-button v-else fullwidth @click="unmuteUser(user)">
-                {{ $t('settings.blacklisted-users.whitelist') }}
+                {{ $t('settings.muted-users.unmute') }}
               </ds-button>
             </template>
           </ds-space>
@@ -285,7 +285,7 @@ import MasonryGrid from '~/components/MasonryGrid/MasonryGrid.vue'
 import MasonryGridItem from '~/components/MasonryGrid/MasonryGridItem.vue'
 import { profilePagePosts } from '~/graphql/PostQuery'
 import UserQuery from '~/graphql/User'
-import { blacklistUserContent, whitelistUserContent } from '~/graphql/settings/BlacklistedUsers'
+import { muteUser, unmuteUser } from '~/graphql/settings/MutedUsers'
 import PostMutations from '~/graphql/PostMutations'
 import UpdateQuery from '~/components/utils/UpdateQuery'
 
@@ -398,9 +398,9 @@ export default {
       this.posts = []
       this.hasMore = true
     },
-    async blacklistUserContent(user) {
+    async muteUser(user) {
       try {
-        await this.$apollo.mutate({ mutation: blacklistUserContent(), variables: { id: user.id } })
+        await this.$apollo.mutate({ mutation: muteUser(), variables: { id: user.id } })
       } catch (error) {
         this.$toast.error(error.message)
       } finally {
@@ -409,9 +409,9 @@ export default {
         this.$apollo.queries.profilePagePosts.refetch()
       }
     },
-    async whitelistUserContent(user) {
+    async unmuteUser(user) {
       try {
-        this.$apollo.mutate({ mutation: whitelistUserContent(), variables: { id: user.id } })
+        this.$apollo.mutate({ mutation: unmuteUser(), variables: { id: user.id } })
       } catch (error) {
         this.$toast.error(error.message)
       } finally {

webapp/pages/settings.vue

@@ -40,8 +40,8 @@ export default {
           path: `/settings/my-social-media`,
         },
         {
-          name: this.$t('settings.blacklisted-users.name'),
+          name: this.$t('settings.muted-users.name'),
-          path: `/settings/blacklisted-users`,
+          path: `/settings/muted-users`,
         },
         {
           name: this.$t('settings.embeds.name'),

webapp/pages/settings/muted-users.spec.js

@@ -1,8 +1,8 @@
 import { config, mount, createLocalVue } from '@vue/test-utils'
-import BlacklistedUsers from './blacklisted-users.vue'
+import MutedUsers from './muted-users.vue'
 import Styleguide from '@human-connection/styleguide'
 import Filters from '~/plugins/vue-filters'
-import { whitelistUserContent } from '~/graphql/settings/BlacklistedUsers'
+import { unmuteUser } from '~/graphql/settings/MutedUsers'
 
 const localVue = createLocalVue()
 
@@ -11,7 +11,7 @@ localVue.use(Filters)
 
 config.stubs['nuxt-link'] = '<span><slot /></span>'
 
-describe('blacklisted-users.vue', () => {
+describe('muted-users.vue', () => {
   let wrapper
   let mocks
 
@@ -21,7 +21,7 @@ describe('blacklisted-users.vue', () => {
       $apollo: {
         mutate: jest.fn(),
         queries: {
-          blacklistedUsers: {
+          mutedUsers: {
             refetch: jest.fn(),
           },
         },
@@ -35,7 +35,7 @@ describe('blacklisted-users.vue', () => {
 
   describe('mount', () => {
     const Wrapper = () => {
-      return mount(BlacklistedUsers, { mocks, localVue })
+      return mount(MutedUsers, { mocks, localVue })
     }
 
     beforeEach(() => {
@@ -48,18 +48,18 @@ describe('blacklisted-users.vue', () => {
 
     describe('given a list of blocked users', () => {
       beforeEach(() => {
-        const blacklistedUsers = [{ id: 'u1', name: 'John Doe', slug: 'john-doe', avatar: '' }]
+        const mutedUsers = [{ id: 'u1', name: 'John Doe', slug: 'john-doe', avatar: '' }]
-        wrapper.setData({ blacklistedUsers })
+        wrapper.setData({ mutedUsers })
       })
 
-      describe('click unblock', () => {
+      describe('click unmute', () => {
         beforeEach(() => {
           wrapper.find('button').trigger('click')
         })
 
-        it('calls unblock mutation with given user', () => {
+        it('calls unmute mutation with given user', () => {
           expect(mocks.$apollo.mutate).toHaveBeenCalledWith({
-            mutation: whitelistUserContent(),
+            mutation: unmuteUser(),
             variables: { id: 'u1' },
           })
         })

webapp/pages/settings/muted-users.vue

@@ -1,31 +1,31 @@
 <template>
   <div>
     <ds-space>
-      <ds-card :header="$t('settings.blacklisted-users.name')">
+      <ds-card :header="$t('settings.muted-users.name')">
         <ds-text>
-          {{ $t('settings.blacklisted-users.explanation.intro') }}
+          {{ $t('settings.muted-users.explanation.intro') }}
         </ds-text>
         <ds-list>
           <ds-list-item>
-            {{ $t('settings.blacklisted-users.explanation.your-perspective') }}
+            {{ $t('settings.muted-users.explanation.your-perspective') }}
           </ds-list-item>
           <ds-list-item>
-            {{ $t('settings.blacklisted-users.explanation.their-perspective') }}
+            {{ $t('settings.muted-users.explanation.their-perspective') }}
           </ds-list-item>
           <ds-list-item>
-            {{ $t('settings.blacklisted-users.explanation.search') }}
+            {{ $t('settings.muted-users.explanation.search') }}
           </ds-list-item>
           <ds-list-item>
-            {{ $t('settings.blacklisted-users.explanation.notifications') }}
+            {{ $t('settings.muted-users.explanation.notifications') }}
           </ds-list-item>
         </ds-list>
         <ds-text>
-          {{ $t('settings.blacklisted-users.explanation.closing') }}
+          {{ $t('settings.muted-users.explanation.closing') }}
         </ds-text>
       </ds-card>
     </ds-space>
-    <ds-card v-if="blacklistedUsers && blacklistedUsers.length">
+    <ds-card v-if="mutedUsers && mutedUsers.length">
-      <ds-table :data="blacklistedUsers" :fields="fields" condensed>
+      <ds-table :data="mutedUsers" :fields="fields" condensed>
         <template slot="avatar" slot-scope="scope">
           <nuxt-link
             :to="{
@@ -57,8 +57,8 @@
           </nuxt-link>
         </template>
 
-        <template slot="whitelistUserContent" slot-scope="scope">
+        <template slot="unmuteUser" slot-scope="scope">
-          <ds-button size="small" @click="whitelistUserContent(scope)">
+          <ds-button size="small" @click="unmuteUser(scope)">
             <ds-icon name="user-plus" />
           </ds-button>
         </template>
@@ -67,12 +67,12 @@
     <ds-card v-else>
       <ds-space>
         <ds-placeholder>
-          {{ $t('settings.blacklisted-users.empty') }}
+          {{ $t('settings.muted-users.empty') }}
         </ds-placeholder>
       </ds-space>
       <ds-space>
         <ds-text align="center">
-          {{ $t('settings.blacklisted-users.how-to') }}
+          {{ $t('settings.muted-users.how-to') }}
         </ds-text>
       </ds-space>
     </ds-card>
@@ -80,7 +80,7 @@
 </template>
 
 <script>
-import { blacklistedUsers, whitelistUserContent } from '~/graphql/settings/BlacklistedUsers'
+import { mutedUsers, unmuteUser } from '~/graphql/settings/MutedUsers'
 import HcAvatar from '~/components/Avatar/Avatar.vue'
 
 export default {
@@ -89,31 +89,31 @@ export default {
   },
   data() {
     return {
-      blacklistedUsers: [],
+      mutedUsers: [],
     }
   },
   computed: {
     fields() {
       return {
         avatar: '',
-        name: this.$t('settings.blacklisted-users.columns.name'),
+        name: this.$t('settings.muted-users.columns.name'),
-        slug: this.$t('settings.blacklisted-users.columns.slug'),
+        slug: this.$t('settings.muted-users.columns.slug'),
-        whitelistUserContent: this.$t('settings.blacklisted-users.columns.whitelist'),
+        unmuteUser: this.$t('settings.muted-users.columns.unmute'),
       }
     },
   },
   apollo: {
-    blacklistedUsers: { query: blacklistedUsers, fetchPolicy: 'cache-and-network' },
+    mutedUsers: { query: mutedUsers, fetchPolicy: 'cache-and-network' },
   },
   methods: {
-    async whitelistUserContent(user) {
+    async unmuteUser(user) {
       await this.$apollo.mutate({
-        mutation: whitelistUserContent(),
+        mutation: unmuteUser(),
         variables: { id: user.row.id },
       })
-      this.$apollo.queries.blacklistedUsers.refetch()
+      this.$apollo.queries.mutedUsers.refetch()
       const { name } = user.row
-      this.$toast.success(this.$t('settings.blacklisted-users.unblocked', { name }))
+      this.$toast.success(this.$t('settings.muted-users.unblocked', { name }))
     },
   },
 }