ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix block user (#8363)

Browse Source
This commit is contained in:
Ulf Gebhardt 2025-04-12 01:44:21 +02:00 committed by GitHub
parent caeff070b7
commit fa0280f9e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
backend/src/schema/resolvers/users.ts
View File

@ -113,32 +113,53 @@ export default {
blockUser: async (object, args, context, resolveInfo) => { blockUser: async (object, args, context, resolveInfo) => {
const { user: currentUser } = context const { user: currentUser } = context
if (currentUser.id === args.id) return null if (currentUser.id === args.id) return null
await neode.cypher(
const session = context.driver.session()
const writeTxResultPromise = session.writeTransaction(async (transaction) => {
const unBlockUserTransactionResponse = await transaction.run(
` `
MATCH(u:User {id: $currentUser.id})-[r:FOLLOWS]->(b:User {id: $args.id}) MATCH (blockedUser:User {id: $args.id})
MATCH (currentUser:User {id: $currentUser.id})
OPTIONAL MATCH (currentUser)-[r:FOLLOWS]->(blockedUser)
DELETE r DELETE r
CREATE (currentUser)-[:BLOCKED]->(blockedUser)
RETURN blockedUser {.*}
`, `,
{ currentUser, args }, { currentUser, args },
) )
const [user, blockedUser] = await Promise.all([ return unBlockUserTransactionResponse.records.map((record) => record.get('blockedUser'))[0]
neode.find('User', currentUser.id), })
neode.find('User', args.id), try {
]) return await writeTxResultPromise
await user.relateTo(blockedUser, 'blocked') } catch (error) {
return blockedUser.toJson() throw new UserInputError(error.message)
} finally {
session.close()
}
}, },
unblockUser: async (object, args, context, resolveInfo) => { unblockUser: async (object, args, context, resolveInfo) => {
const { user: currentUser } = context const { user: currentUser } = context
if (currentUser.id === args.id) return null if (currentUser.id === args.id) return null
await neode.cypher(
const session = context.driver.session()
const writeTxResultPromise = session.writeTransaction(async (transaction) => {
const unBlockUserTransactionResponse = await transaction.run(
` `
MATCH(u:User {id: $currentUser.id})-[r:BLOCKED]->(b:User {id: $args.id}) MATCH(u:User {id: $currentUser.id})-[r:BLOCKED]->(blockedUser:User {id: $args.id})
DELETE r DELETE r
RETURN blockedUser {.*}
`, `,
{ currentUser, args }, { currentUser, args },
) )
const blockedUser = await neode.find('User', args.id) return unBlockUserTransactionResponse.records.map((record) => record.get('blockedUser'))[0]
return blockedUser.toJson() })
try {
return await writeTxResultPromise
} catch (error) {
throw new UserInputError(error.message)
} finally {
session.close()
}
}, },
UpdateUser: async (_parent, params, context, _resolveInfo) => { UpdateUser: async (_parent, params, context, _resolveInfo) => {
const { avatar: avatarInput } = params const { avatar: avatarInput } = params