[pull] master from Ocelot-Social-Community:master

backend/src/constants/subscriptions.ts

@@ -3,3 +3,5 @@ export const CHAT_MESSAGE_ADDED = 'CHAT_MESSAGE_ADDED'
 export const CHAT_MESSAGE_STATUS_UPDATED = 'CHAT_MESSAGE_STATUS_UPDATED'
 export const ROOM_UPDATED = 'ROOM_UPDATED'
 export const VIDEO_CALL_PARTICIPANT_COUNT_CHANGED = 'VIDEO_CALL_PARTICIPANT_COUNT_CHANGED'
+export const GROUP_MEMBERSHIP_VISIBILITY_CHANGED = 'GROUP_MEMBERSHIP_VISIBILITY_CHANGED'
+export const GROUP_SHOW_MEMBERS_CHANGED = 'GROUP_SHOW_MEMBERS_CHANGED'

backend/src/db/migrations/20260629120000-add-show-on-profile-to-member-of.ts

@@ -0,0 +1,54 @@
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+import { getDriver } from '@db/neo4j'
+
+export const description =
+  'Add showOnProfile field to all existing MEMBER_OF relationships, defaulting to true. Controls whether a group membership is displayed on the user profile page.'
+
+export async function up(_next) {
+  const driver = getDriver()
+  const session = driver.session()
+  const transaction = session.beginTransaction()
+  try {
+    await transaction.run(
+      `
+        MATCH (user:User)-[membership:MEMBER_OF]->(group:Group)
+        WHERE membership.showOnProfile IS NULL
+        SET membership.showOnProfile = true
+      `,
+    )
+    await transaction.commit()
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error)
+    await transaction.rollback()
+    // eslint-disable-next-line no-console
+    console.log('rolled back')
+    throw new Error(error)
+  } finally {
+    await session.close()
+  }
+}
+
+export async function down(_next) {
+  const driver = getDriver()
+  const session = driver.session()
+  const transaction = session.beginTransaction()
+  try {
+    await transaction.run(
+      `
+        MATCH (user:User)-[membership:MEMBER_OF]->(group:Group)
+        REMOVE membership.showOnProfile
+      `,
+    )
+    await transaction.commit()
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error)
+    await transaction.rollback()
+    // eslint-disable-next-line no-console
+    console.log('rolled back')
+    throw new Error(error)
+  } finally {
+    await session.close()
+  }
+}

backend/src/db/migrations/20260701120000-add-show-members-to-group.ts

@@ -0,0 +1,54 @@
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+import { getDriver } from '@db/neo4j'
+
+export const description =
+  'Add showMembers field to existing closed Group nodes, defaulting to false. Public and hidden groups ignore this field (always true / always false).'
+
+export async function up(_next) {
+  const driver = getDriver()
+  const session = driver.session()
+  const transaction = session.beginTransaction()
+  try {
+    await transaction.run(
+      `
+        MATCH (group:Group)
+        WHERE group.groupType = 'closed' AND group.showMembers IS NULL
+        SET group.showMembers = false
+      `,
+    )
+    await transaction.commit()
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error)
+    await transaction.rollback()
+    // eslint-disable-next-line no-console
+    console.log('rolled back')
+    throw new Error(error)
+  } finally {
+    await session.close()
+  }
+}
+
+export async function down(_next) {
+  const driver = getDriver()
+  const session = driver.session()
+  const transaction = session.beginTransaction()
+  try {
+    await transaction.run(
+      `
+        MATCH (group:Group)
+        REMOVE group.showMembers
+      `,
+    )
+    await transaction.commit()
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error)
+    await transaction.rollback()
+    // eslint-disable-next-line no-console
+    console.log('rolled back')
+    throw new Error(error)
+  } finally {
+    await session.close()
+  }
+}

backend/src/graphql/queries/groups/Group.gql

@@ -27,6 +27,7 @@ query Group($isMember: Boolean, $id: ID, $slug: String) {
       name
     }
     myRole
+    showMembers
     membersCount
     currentlyPinnedPostsCount
     inviteCodes {

backend/src/graphql/queries/groups/SetGroupMembershipVisibility.gql

@@ -0,0 +1,6 @@
+mutation SetGroupMembershipVisibility($groupId: ID!, $showOnProfile: Boolean!) {
+  setGroupMembershipVisibility(groupId: $groupId, showOnProfile: $showOnProfile) {
+    role
+    showOnProfile
+  }
+}

backend/src/graphql/queries/groups/UpdateGroup.gql

@@ -9,6 +9,7 @@ mutation UpdateGroup(
   $categoryIds: [ID]
   $avatar: ImageInput
   $locationName: String # empty string '' sets it to null
+  $showMembers: Boolean
 ) {
   UpdateGroup(
     id: $id
@@ -21,6 +22,7 @@ mutation UpdateGroup(
     categoryIds: $categoryIds
     avatar: $avatar
     locationName: $locationName
+    showMembers: $showMembers
   ) {
     id
     name

backend/src/graphql/queries/groups/UserGroups.gql

@@ -0,0 +1,13 @@
+query UserGroups($id: ID!, $first: Int, $offset: Int) {
+  User(id: $id) {
+    id
+    groups(first: $first, offset: $offset) {
+      id
+      name
+      groupType
+      myRole
+      membersCount
+      postsCount
+    }
+  }
+}

backend/src/graphql/queries/users/UpdateUser.gql

@@ -5,6 +5,9 @@ mutation UpdateUser(
   $about: String
   $allowEmbedIframes: Boolean
   $showShoutsPublicly: Boolean
+  $showPublicGroupsOnProfile: Boolean
+  $showClosedGroupsOnProfile: Boolean
+  $showHiddenGroupsOnProfile: Boolean
   $emailNotificationSettings: [EmailNotificationSettingsInput]
   $termsAndConditionsAgreedVersion: String
   $avatar: ImageInput
@@ -18,6 +21,9 @@ mutation UpdateUser(
     about: $about
     allowEmbedIframes: $allowEmbedIframes
     showShoutsPublicly: $showShoutsPublicly
+    showPublicGroupsOnProfile: $showPublicGroupsOnProfile
+    showClosedGroupsOnProfile: $showClosedGroupsOnProfile
+    showHiddenGroupsOnProfile: $showHiddenGroupsOnProfile
     emailNotificationSettings: $emailNotificationSettings
     termsAndConditionsAgreedVersion: $termsAndConditionsAgreedVersion
     avatar: $avatar