Merge tag '2023.9.2' into merge-upstream

2023-09-29 22:16:04 +09:00
parent 8d35299f62 7adc8fcaf5
commit e2c9ed355b
144 changed files with 2519 additions and 1660 deletions
--- a/packages/backend/src/queue/processors/ImportUserListsProcessorService.ts
+++ b/packages/backend/src/queue/processors/ImportUserListsProcessorService.ts
@@ -101,7 +101,7 @@ export class ImportUserListsProcessorService {

 				if (await this.userListJoiningsRepository.findOneBy({ userListId: list!.id, userId: target.id }) != null) continue;

-				this.userListService.push(target, list!, user);
+				this.userListService.addMember(target, list!, user);
 			} catch (e) {
 				this.logger.warn(`Error in line:${linenum} ${e}`);
 			}