Skip to content

Commit

Permalink
cleanup(ApNoteService.ts)
Browse files Browse the repository at this point in the history
  • Loading branch information
okayurisotto committed Jul 2, 2023
1 parent fb459de commit 9dc2e98
Showing 1 changed file with 51 additions and 51 deletions.
102 changes: 51 additions & 51 deletions packages/backend/src/core/activitypub/models/ApNoteService.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class ApNoteService {
// 循環参照のため / for circular dependency
@Inject(forwardRef(() => ApPersonService))
private apPersonService: ApPersonService,

private utilityService: UtilityService,
private apAudienceService: ApAudienceService,
private apMentionService: ApMentionService,
Expand All @@ -73,15 +73,15 @@ export class ApNoteService {
@bindThis
public validateNote(object: IObject, uri: string) {
const expectHost = this.utilityService.extractDbHost(uri);

if (object == null) {
return new Error('invalid Note: object is null');
}

if (!validPost.includes(getApType(object))) {
return new Error(`invalid Note: invalid object type ${getApType(object)}`);
}

if (object.id && this.utilityService.extractDbHost(object.id) !== expectHost) {
return new Error(`invalid Note: id has different host. expected: ${expectHost}, actual: ${this.utilityService.extractDbHost(object.id)}`);
}
Expand All @@ -90,10 +90,10 @@ export class ApNoteService {
if (object.attributedTo && actualHost !== expectHost) {
return new Error(`invalid Note: attributedTo has different host. expected: ${expectHost}, actual: ${actualHost}`);
}

return null;
}

/**
* Noteをフェッチします。
*
Expand All @@ -103,16 +103,16 @@ export class ApNoteService {
public async fetchNote(object: string | IObject): Promise<Note | null> {
return await this.apDbResolverService.getNoteFromApId(object);
}

/**
* Noteを作成します。
*/
@bindThis
public async createNote(value: string | IObject, resolver?: Resolver, silent = false): Promise<Note | null> {
if (resolver == null) resolver = this.apResolverService.createResolver();

const object = await resolver.resolve(value);

const entryUri = getApId(value);
const err = this.validateNote(object, entryUri);
if (err) {
Expand All @@ -125,9 +125,9 @@ export class ApNoteService {
});
throw new Error('invalid note');
}

const note = object as IPost;

this.logger.debug(`Note fetched: ${JSON.stringify(note, null, 2)}`);

if (note.id && !checkHttps(note.id)) {
Expand All @@ -139,45 +139,45 @@ export class ApNoteService {
if (url && !checkHttps(url)) {
throw new Error('unexpected shcema of note url: ' + url);
}

this.logger.info(`Creating the Note: ${note.id}`);

// 投稿者をフェッチ
const actor = await this.apPersonService.resolvePerson(getOneApId(note.attributedTo!), resolver) as RemoteUser;

// 投稿者が凍結されていたらスキップ
if (actor.isSuspended) {
throw new Error('actor has been suspended');
}

const noteAudience = await this.apAudienceService.parseAudience(actor, note.to, note.cc, resolver);
let visibility = noteAudience.visibility;
const visibleUsers = noteAudience.visibleUsers;

// Audience (to, cc) が指定されてなかった場合
if (visibility === 'specified' && visibleUsers.length === 0) {
if (typeof value === 'string') { // 入力がstringならばresolverでGETが発生している
// こちらから匿名GET出来たものならばpublic
visibility = 'public';
}
}

const apMentions = await this.apMentionService.extractApMentions(note.tag, resolver);
const apHashtags = await extractApHashtags(note.tag);

// 添付ファイル
// TODO: attachmentは必ずしもImageではない
// TODO: attachmentは必ずしも配列ではない
// Noteがsensitiveなら添付もsensitiveにする
const limit = promiseLimit(2);

note.attachment = Array.isArray(note.attachment) ? note.attachment : note.attachment ? [note.attachment] : [];
const files = note.attachment
.map(attach => attach.sensitive = note.sensitive)
? (await Promise.all(note.attachment.map(x => limit(() => this.apImageService.resolveImage(actor, x)) as Promise<DriveFile>)))
.filter(image => image != null)
: [];

// リプライ
const reply: Note | null = note.inReplyTo
? await this.resolveNote(note.inReplyTo, resolver).then(x => {
Expand All @@ -192,10 +192,10 @@ export class ApNoteService {
throw err;
})
: null;

// 引用
let quote: Note | undefined | null;

if (note._misskey_quote || note.quoteUrl) {
const tryResolveNote = async (uri: string): Promise<{
status: 'ok';
Expand All @@ -222,20 +222,20 @@ export class ApNoteService {
};
}
};

const uris = unique([note._misskey_quote, note.quoteUrl].filter((x): x is string => typeof x === 'string'));
const results = await Promise.all(uris.map(uri => tryResolveNote(uri)));

quote = results.filter((x): x is { status: 'ok', res: Note | null } => x.status === 'ok').map(x => x.res).find(x => x);
if (!quote) {
if (results.some(x => x.status === 'temperror')) {
throw new Error('quote resolve failed');
}
}
}

const cw = note.summary === '' ? null : note.summary;

// テキストのパース
let text: string | null = null;
if (note.source?.mediaType === 'text/x.misskeymarkdown' && typeof note.source.content === 'string') {
Expand All @@ -245,38 +245,38 @@ export class ApNoteService {
} else if (typeof note.content === 'string') {
text = this.apMfmService.htmlToMfm(note.content, note.tag);
}

// vote
if (reply && reply.hasPoll) {
const poll = await this.pollsRepository.findOneByOrFail({ noteId: reply.id });

const tryCreateVote = async (name: string, index: number): Promise<null> => {
if (poll.expiresAt && Date.now() > new Date(poll.expiresAt).getTime()) {
this.logger.warn(`vote to expired poll from AP: actor=${actor.username}@${actor.host}, note=${note.id}, choice=${name}`);
} else if (index >= 0) {
this.logger.info(`vote from AP: actor=${actor.username}@${actor.host}, note=${note.id}, choice=${name}`);
await this.pollService.vote(actor, reply, index);

// リモートフォロワーにUpdate配信
this.pollService.deliverQuestionUpdate(reply.id);
}
return null;
};

if (note.name) {
return await tryCreateVote(note.name, poll.choices.findIndex(x => x === note.name));
}
}

const emojis = await this.extractEmojis(note.tag ?? [], actor.host).catch(e => {
this.logger.info(`extractEmojis: ${e}`);
return [] as Emoji[];
});

const apEmojis = emojis.map(emoji => emoji.name);

const poll = await this.apQuestionService.extractPollFromQuestion(note, resolver).catch(() => undefined);

return await this.noteCreateService.create(actor, {
createdAt: note.published ? new Date(note.published) : null,
files,
Expand All @@ -296,7 +296,7 @@ export class ApNoteService {
url: url,
}, silent);
}

/**
* Noteを解決します。
*
Expand All @@ -307,26 +307,26 @@ export class ApNoteService {
public async resolveNote(value: string | IObject, resolver?: Resolver): Promise<Note | null> {
const uri = typeof value === 'string' ? value : value.id;
if (uri == null) throw new Error('missing uri');

// ブロックしてたら中断
const meta = await this.metaService.fetch();
if (this.utilityService.isBlockedHost(meta.blockedHosts, this.utilityService.extractDbHost(uri))) throw new StatusError('blocked host', 451);

const unlock = await this.appLockService.getApLock(uri);

try {
//#region このサーバーに既に登録されていたらそれを返す
const exist = await this.fetchNote(uri);

if (exist) {
return exist;
}
//#endregion

if (uri.startsWith(this.config.url)) {
throw new StatusError('cannot resolve local note', 400, 'cannot resolve local note');
}

// リモートサーバーからフェッチしてきて登録
// ここでuriの代わりに添付されてきたNote Objectが指定されていると、サーバーフェッチを経ずにノートが生成されるが
// 添付されてきたNote Objectは偽装されている可能性があるため、常にuriを指定してサーバーフェッチを行う。
Expand All @@ -335,26 +335,26 @@ export class ApNoteService {
unlock();
}
}

@bindThis
public async extractEmojis(tags: IObject | IObject[], host: string): Promise<Emoji[]> {
host = this.utilityService.toPuny(host);

if (!tags) return [];

const eomjiTags = toArray(tags).filter(isEmoji);

const existingEmojis = await this.emojisRepository.findBy({
host,
name: In(eomjiTags.map(tag => tag.name!.replaceAll(':', ''))),
});

return await Promise.all(eomjiTags.map(async tag => {
const name = tag.name!.replaceAll(':', '');
tag.icon = toSingle(tag.icon);

const exists = existingEmojis.find(x => x.name === name);

if (exists) {
if ((tag.updated != null && exists.updatedAt == null)
|| (tag.id != null && exists.uri == null)
Expand All @@ -370,18 +370,18 @@ export class ApNoteService {
publicUrl: tag.icon!.url,
updatedAt: new Date(),
});

return await this.emojisRepository.findOneBy({
host,
name,
}) as Emoji;
}

return exists;
}

this.logger.info(`register emoji host=${host}, name=${name}`);

return await this.emojisRepository.insert({
id: this.idService.genId(),
host,
Expand Down

0 comments on commit 9dc2e98

Please sign in to comment.