summaryrefslogtreecommitdiff
path: root/packages/backend/src/core
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-01-25 11:23:57 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-01-25 11:23:57 +0900
commit2a2e8d0cf6a83c4a10e3a62331d6fbd3adb416a6 (patch)
tree46ddf8d082e3748d82da0db72c687e40e0958605 /packages/backend/src/core
parentrefactor(server): fix type errors (diff)
downloadsharkey-2a2e8d0cf6a83c4a10e3a62331d6fbd3adb416a6.tar.gz
sharkey-2a2e8d0cf6a83c4a10e3a62331d6fbd3adb416a6.tar.bz2
sharkey-2a2e8d0cf6a83c4a10e3a62331d6fbd3adb416a6.zip
refactor(server): fix type errors
Diffstat (limited to 'packages/backend/src/core')
-rw-r--r--packages/backend/src/core/activitypub/ApRendererService.ts2
-rw-r--r--packages/backend/src/core/activitypub/models/ApPersonService.ts8
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts
index 29f216aa1d..91a2767e69 100644
--- a/packages/backend/src/core/activitypub/ApRendererService.ts
+++ b/packages/backend/src/core/activitypub/ApRendererService.ts
@@ -21,11 +21,11 @@ import { UserEntityService } from '@/core/entities/UserEntityService.js';
import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
import type { UserKeypair } from '@/models/entities/UserKeypair.js';
import type { UsersRepository, UserProfilesRepository, NotesRepository, DriveFilesRepository, EmojisRepository, PollsRepository } from '@/models/index.js';
+import { bindThis } from '@/decorators.js';
import { LdSignatureService } from './LdSignatureService.js';
import { ApMfmService } from './ApMfmService.js';
import type { IActivity, IObject } from './type.js';
import type { IIdentifier } from './models/identifier.js';
-import { bindThis } from '@/decorators.js';
@Injectable()
export class ApRendererService {
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index e08f33c906..f86b5e6f96 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -566,22 +566,22 @@ export class ApPersonService implements OnModuleInit {
this.logger.info(`Updating the featured: ${user.uri}`);
- if (resolver == null) resolver = this.apResolverService.createResolver();
+ const _resolver = resolver ?? this.apResolverService.createResolver();
// Resolve to (Ordered)Collection Object
- const collection = await resolver.resolveCollection(user.featured);
+ const collection = await _resolver.resolveCollection(user.featured);
if (!isCollectionOrOrderedCollection(collection)) throw new Error('Object is not Collection or OrderedCollection');
// Resolve to Object(may be Note) arrays
const unresolvedItems = isCollection(collection) ? collection.items : collection.orderedItems;
- const items = await Promise.all(toArray(unresolvedItems).map(x => resolver.resolve(x)));
+ const items = await Promise.all(toArray(unresolvedItems).map(x => _resolver.resolve(x)));
// Resolve and regist Notes
const limit = promiseLimit<Note | null>(2);
const featuredNotes = await Promise.all(items
.filter(item => getApType(item) === 'Note') // TODO: Noteでなくてもいいかも
.slice(0, 5)
- .map(item => limit(() => this.apNoteService.resolveNote(item, resolver))));
+ .map(item => limit(() => this.apNoteService.resolveNote(item, _resolver))));
await this.db.transaction(async transactionalEntityManager => {
await transactionalEntityManager.delete(UserNotePining, { userId: user.id });