usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix

This commit is contained in:
mattyatea 2024-02-13 13:00:48 +09:00
parent e9fda7dd1a
commit 588d6acfb7
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/backend/src/core/NoteUpdateService.ts
View File

@ -4,8 +4,10 @@
*/ */
import { setImmediate } from 'node:timers/promises'; import { setImmediate } from 'node:timers/promises';
import util from 'util';
import { In, DataSource } from 'typeorm'; import { In, DataSource } from 'typeorm';
import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common'; import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
import * as mfm from 'mfm-js';
import type { IMentionedRemoteUsers } from '@/models/Note.js'; import type { IMentionedRemoteUsers } from '@/models/Note.js';
import { MiNote } from '@/models/Note.js'; import { MiNote } from '@/models/Note.js';
import type { NotesRepository, UsersRepository } from '@/models/_.js'; import type { NotesRepository, UsersRepository } from '@/models/_.js';
@ -20,14 +22,12 @@ import { ApDeliverManagerService } from '@/core/activitypub/ApDeliverManagerServ
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import { DB_MAX_NOTE_TEXT_LENGTH } from '@/const.js'; import { DB_MAX_NOTE_TEXT_LENGTH } from '@/const.js';
import { SearchService } from '@/core/SearchService.js'; import { SearchService } from '@/core/SearchService.js';
import { normalizeForSearch } from "@/misc/normalize-for-search.js"; import { normalizeForSearch } from '@/misc/normalize-for-search.js';
import { MiDriveFile } from '@/models/_.js'; import { MiDriveFile } from '@/models/_.js';
import { MiPoll, IPoll } from '@/models/Poll.js'; import { MiPoll, IPoll } from '@/models/Poll.js';
import * as mfm from "cherrypick-mfm-js"; import { concat } from '@/misc/prelude/array.js';
import { concat } from "@/misc/prelude/array.js"; import { extractHashtags } from '@/misc/extract-hashtags.js';
import { extractHashtags } from "@/misc/extract-hashtags.js"; import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mfm.js';
import { extractCustomEmojisFromMfm } from "@/misc/extract-custom-emojis-from-mfm.js";
import util from 'util';
type MinimumUser = { type MinimumUser = {
id: MiUser['id']; id: MiUser['id'];
@ -187,10 +187,10 @@ export class NoteUpdateService implements OnApplicationShutdown {
} else if (note.hasPoll && !values.hasPoll) { } else if (note.hasPoll && !values.hasPoll) {
// Start transaction // Start transaction
await this.db.transaction(async transactionalEntityManager => { await this.db.transaction(async transactionalEntityManager => {
await transactionalEntityManager.update(MiNote, {id: note.id}, values); await transactionalEntityManager.update(MiNote, { id: note.id }, values);
if (!values.hasPoll) { if (!values.hasPoll) {
await transactionalEntityManager.delete(MiPoll, {noteId: note.id}); await transactionalEntityManager.delete(MiPoll, { noteId: note.id });
} }
}); });
} else { } else {

11
packages/backend/src/core/activitypub/models/ApNoteService.ts
View File

@ -24,12 +24,11 @@ import { StatusError } from '@/misc/status-error.js';
import { UtilityService } from '@/core/UtilityService.js'; import { UtilityService } from '@/core/UtilityService.js';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import { checkHttps } from '@/misc/check-https.js'; import { checkHttps } from '@/misc/check-https.js';
import type { IObject, IPost } from '../type.js'; import { NoteUpdateService } from '@/core/NoteUpdateService.js';
import { getApId, getApType, getOneApHrefNullable, getOneApId, isEmoji, validPost } from '../type.js'; import { getApId, getApType, getOneApHrefNullable, getOneApId, isEmoji, validPost } from '../type.js';
import { ApLoggerService } from '../ApLoggerService.js'; import { ApLoggerService } from '../ApLoggerService.js';
import { ApMfmService } from '../ApMfmService.js'; import { ApMfmService } from '../ApMfmService.js';
import { ApDbResolverService } from '../ApDbResolverService.js'; import { ApDbResolverService } from '../ApDbResolverService.js';
import type { Resolver } from '../ApResolverService.js';
import { ApResolverService } from '../ApResolverService.js'; import { ApResolverService } from '../ApResolverService.js';
import { ApAudienceService } from '../ApAudienceService.js'; import { ApAudienceService } from '../ApAudienceService.js';
import { ApPersonService } from './ApPersonService.js'; import { ApPersonService } from './ApPersonService.js';
@ -37,7 +36,8 @@ import { extractApHashtags } from './tag.js';
import { ApMentionService } from './ApMentionService.js'; import { ApMentionService } from './ApMentionService.js';
import { ApQuestionService } from './ApQuestionService.js'; import { ApQuestionService } from './ApQuestionService.js';
import { ApImageService } from './ApImageService.js'; import { ApImageService } from './ApImageService.js';
import { NoteUpdateService } from '@/core/NoteUpdateService.js'; import type { Resolver } from '../ApResolverService.js';
import type { IObject, IPost } from '../type.js';
@Injectable() @Injectable()
export class ApNoteService { export class ApNoteService {
@ -53,9 +53,6 @@ export class ApNoteService {
@Inject(DI.emojisRepository) @Inject(DI.emojisRepository)
private emojisRepository: EmojisRepository, private emojisRepository: EmojisRepository,
@Inject(DI.messagingMessagesRepository)
private messagingMessagesRepository: MessagingMessagesRepository,
@Inject(DI.notesRepository) @Inject(DI.notesRepository)
private notesRepository: NotesRepository, private notesRepository: NotesRepository,
@ -348,7 +345,7 @@ export class ApNoteService {
} }
const b_note = await this.notesRepository.findOneBy({ const b_note = await this.notesRepository.findOneBy({
uri: entryUri uri: entryUri,
}).then(x => { }).then(x => {
if (x == null) throw new Error('note not found'); if (x == null) throw new Error('note not found');
return x; return x;

5
packages/backend/src/server/api/endpoints/notes/update.ts
View File

@ -13,7 +13,6 @@ import { DI } from '@/di-symbols.js';
import { GetterService } from '@/server/api/GetterService.js'; import { GetterService } from '@/server/api/GetterService.js';
import { MAX_NOTE_TEXT_LENGTH } from '@/const.js'; import { MAX_NOTE_TEXT_LENGTH } from '@/const.js';
import { ApiError } from '../../error.js'; import { ApiError } from '../../error.js';
import type { DriveFilesRepository, MiDriveFile } from "@/models/_.js";
export const meta = { export const meta = {
tags: ['notes'], tags: ['notes'],
@ -116,9 +115,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
@Inject(DI.driveFilesRepository) @Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository, private driveFilesRepository: DriveFilesRepository,
@Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository,
private getterService: GetterService, private getterService: GetterService,
private noteEntityService: NoteEntityService, private noteEntityService: NoteEntityService,
private noteUpdateService: NoteUpdateService, private noteUpdateService: NoteUpdateService,
@ -133,7 +129,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
throw new ApiError(meta.errors.noSuchNote); throw new ApiError(meta.errors.noSuchNote);
} }
let files: MiDriveFile[] = []; let files: MiDriveFile[] = [];
const fileIds = ps.fileIds ?? ps.mediaIds ?? null; const fileIds = ps.fileIds ?? ps.mediaIds ?? null;
if (fileIds != null) { if (fileIds != null) {