diff options
| author | Acid Chicken <root@acid-chicken.com> | 2024-06-01 11:16:44 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-01 11:16:44 +0900 |
| commit | 2b8056a8525e1b38536aa0406ba9446a88b365b9 (patch) | |
| tree | d22952ee3f8e30057977a99a33823f4d52990fbc /packages/backend/src/server/api/endpoints/users | |
| parent | [skip ci] Update CHANGELOG.md (prepend template) (diff) | |
| download | sharkey-2b8056a8525e1b38536aa0406ba9446a88b365b9.tar.gz sharkey-2b8056a8525e1b38536aa0406ba9446a88b365b9.tar.bz2 sharkey-2b8056a8525e1b38536aa0406ba9446a88b365b9.zip | |
fix(backend): use insertOne insteadof insert/findOneOrFail combination (#13908)
* fix(backend): use insertOne insteadof insert/findOneOrFail combination
* fix: typo
* fix(backend): inherit mainAlias?
* refactor(backend): use extend
* fix(backend): invalid entityTarget
* fix(backend): fake where
* chore: debug
* chore: debug
* test: log
* fix(backend): column names
* fix(backend): remove dummy from
* revert: log
* fix(backend): position
* fix(backend): automatic aliasing
* chore(backend): alias
* chore(backend): remove from
* fix(backend): type
* fix(backend): avoid pure name
* test(backend): fix type
* chore(backend): use cte
* fix(backend): avoid useless alias
* fix(backend): fix typo
* fix(backend): __disambiguation__
* fix(backend): quote
* chore(backend): t
* chore(backend): accessible
* chore(backend): concrete returning
* fix(backend): quote
* chore: log more
* chore: log metadata
* chore(backend): use raw
* fix(backend): returning column name
* fix(backend): transform
* build(backend): wanna logging
* build(backend): transform empty
* build(backend): build alias
* build(backend): restore name
* chore: return entity
* fix: test case
* test(backend): 204
* chore(backend): log sql
* chore(backend): assert user joined
* fix(backend): typo
* chore(backend): log long sql
* chore(backend): log join
* chore(backend): log join depth null
* chore(backend): joinAttributes
* chore(backend): override createJoinExpression
* chore: join log
* fix(backend): escape
* test(backend): log log
* chore(backend): join gonna success?
* chore(backend): relations
* chore(backend): undefined
* chore(backend): target
* chore(backend): remove log
* chore(backend): log chart update
* chore(backend): log columns
* chore(backend): check hasMetadata
* chore(backend): unshift id when not included
* chore(backend): missing select
* chore(backend): remove debug code
Diffstat (limited to 'packages/backend/src/server/api/endpoints/users')
3 files changed, 6 insertions, 6 deletions
diff --git a/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts b/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts index e2db71c5c7..8504da0209 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts @@ -104,11 +104,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- throw new ApiError(meta.errors.tooManyUserLists); } - const userList = await this.userListsRepository.insert({ + const userList = await this.userListsRepository.insertOne({ id: this.idService.gen(), userId: me.id, name: ps.name, - } as MiUserList).then(x => this.userListsRepository.findOneByOrFail(x.identifiers[0])); + } as MiUserList); const users = (await this.userListMembershipsRepository.findBy({ userListId: ps.listId, diff --git a/packages/backend/src/server/api/endpoints/users/lists/create.ts b/packages/backend/src/server/api/endpoints/users/lists/create.ts index 952580e639..9378bde5cb 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/create.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/create.ts @@ -65,11 +65,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- throw new ApiError(meta.errors.tooManyUserLists); } - const userList = await this.userListsRepository.insert({ + const userList = await this.userListsRepository.insertOne({ id: this.idService.gen(), userId: me.id, name: ps.name, - } as MiUserList).then(x => this.userListsRepository.findOneByOrFail(x.identifiers[0])); + } as MiUserList); return await this.userListEntityService.pack(userList); }); diff --git a/packages/backend/src/server/api/endpoints/users/report-abuse.ts b/packages/backend/src/server/api/endpoints/users/report-abuse.ts index 1750dd6206..48e14b68cc 100644 --- a/packages/backend/src/server/api/endpoints/users/report-abuse.ts +++ b/packages/backend/src/server/api/endpoints/users/report-abuse.ts @@ -82,14 +82,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- throw new ApiError(meta.errors.cannotReportAdmin); } - const report = await this.abuseUserReportsRepository.insert({ + const report = await this.abuseUserReportsRepository.insertOne({ id: this.idService.gen(), targetUserId: user.id, targetUserHost: user.host, reporterId: me.id, reporterHost: null, comment: ps.comment, - }).then(x => this.abuseUserReportsRepository.findOneByOrFail(x.identifiers[0])); + }); // Publish event to moderators setImmediate(async () => { |