diff --git a/backend/src/models/User.js b/backend/src/models/User.js index 31c74bb2f..fd6e88c27 100644 --- a/backend/src/models/User.js +++ b/backend/src/models/User.js @@ -127,7 +127,7 @@ module.exports = { type: 'boolean', default: false, }, - allowShouts: { + showShoutsPublicly: { type: 'boolean', default: false, }, diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js index b66c7b110..1a4acf0fc 100644 --- a/backend/src/schema/resolvers/users.js +++ b/backend/src/schema/resolvers/users.js @@ -177,7 +177,7 @@ export default { 'termsAndConditionsAgreedVersion', 'termsAndConditionsAgreedAt', 'allowEmbedIframes', - 'allowShouts', + 'showShoutsPublicly', ], boolean: { followedByCurrentUser: diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql index 01ba3054a..bf37cb610 100644 --- a/backend/src/schema/types/type/User.gql +++ b/backend/src/schema/types/type/User.gql @@ -28,7 +28,7 @@ type User { termsAndConditionsAgreedAt: String allowEmbedIframes: Boolean - allowShouts: Boolean + showShoutsPublicly: Boolean locale: String friends: [User]! @relation(name: "FRIENDS", direction: "BOTH") friendsCount: Int! @cypher(statement: "MATCH (this)<-[: FRIENDS]->(r: User) RETURN COUNT(DISTINCT r)") @@ -171,7 +171,7 @@ type Mutation { termsAndConditionsAgreedVersion: String termsAndConditionsAgreedAt: String allowEmbedIframes: Boolean - allowShouts: Boolean + showShoutsPublicly: Boolean locale: String ): User diff --git a/backend/src/seed/factories/users.js b/backend/src/seed/factories/users.js index f56f759f1..d56c42d0a 100644 --- a/backend/src/seed/factories/users.js +++ b/backend/src/seed/factories/users.js @@ -17,7 +17,7 @@ export default function create() { termsAndConditionsAgreedVersion: '0.0.1', termsAndConditionsAgreedAt: '2019-08-01T10:47:19.212Z', allowEmbedIframes: false, - allowShouts: false, + showShoutsPublicly: false, locale: 'en', } defaults.slug = slugify(defaults.name, { lower: true }) diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js index 7fbd513aa..8ceaeb5b7 100644 --- a/webapp/graphql/User.js +++ b/webapp/graphql/User.js @@ -146,12 +146,12 @@ export const allowEmbedIframesMutation = () => { ` } -export const allowShoutsMutation = () => { +export const showShoutsPubliclyMutation = () => { return gql` - mutation($id: ID!, $allowShouts: Boolean) { - UpdateUser(id: $id, allowShouts: $allowShouts) { + mutation($id: ID!, $showShoutsPublicly: Boolean) { + UpdateUser(id: $id, showShoutsPublicly: $showShoutsPublicly) { id - allowShouts + showShoutsPublicly } } ` diff --git a/webapp/store/auth.js b/webapp/store/auth.js index 026c8be64..69af65f30 100644 --- a/webapp/store/auth.js +++ b/webapp/store/auth.js @@ -87,7 +87,7 @@ export const actions = { contributionsCount commentedCount allowEmbedIframes - allowShouts + showShoutsPublicly termsAndConditionsAgreedVersion socialMedia { id