Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: ApDeliverManagerService.tsの型とJSDocを適切に置き換え #11096

Merged
merged 5 commits into from
Jul 5, 2023
Merged

refactor: ApDeliverManagerService.tsの型とJSDocを適切に置き換え #11096

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
624dbab
refactor: ApDeliverManagerService.ts のanyを適切な型に置き換え
Umisyo Jul 4, 2023
49f777c
fix: quote to single quote
Umisyo Jul 4, 2023
af58a23
refactor: JSDocを実態に合わせて修正
Umisyo Jul 4, 2023
fbc4da3
fix: activityのnullを許容するよう変更
Umisyo Jul 4, 2023
384112e
Merge branch 'develop' into fix/DeliverManager_types
tamaina Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions packages/backend/src/core/activitypub/ApDeliverManagerService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import type { LocalUser, RemoteUser, User } from '@/models/entities/User.js';
import { QueueService } from '@/core/QueueService.js';
import { UserEntityService } from '@/core/entities/UserEntityService.js';
import { bindThis } from '@/decorators.js';
import type { IActivity } from '@/core/activitypub/type.js';
import { ThinUser } from '@/queue/types.js';

interface IRecipe {
Expand All @@ -22,10 +23,10 @@ interface IDirectRecipe extends IRecipe {
to: RemoteUser;
}

const isFollowers = (recipe: any): recipe is IFollowersRecipe =>
const isFollowers = (recipe: IRecipe): recipe is IFollowersRecipe =>
recipe.type === 'Followers';

const isDirect = (recipe: any): recipe is IDirectRecipe =>
const isDirect = (recipe: IRecipe): recipe is IDirectRecipe =>
recipe.type === 'Direct';

@Injectable()
Expand All @@ -47,11 +48,11 @@ export class ApDeliverManagerService {

/**
* Deliver activity to followers
* @param actor
* @param activity Activity
* @param from Followee
*/
@bindThis
public async deliverToFollowers(actor: { id: LocalUser['id']; host: null; }, activity: any) {
public async deliverToFollowers(actor: { id: LocalUser['id']; host: null; }, activity: IActivity) {
const manager = new DeliverManager(
this.userEntityService,
this.followingsRepository,
Expand All @@ -65,11 +66,12 @@ export class ApDeliverManagerService {

/**
* Deliver activity to user
* @param actor
* @param activity Activity
* @param to Target user
*/
@bindThis
public async deliverToUser(actor: { id: LocalUser['id']; host: null; }, activity: any, to: RemoteUser) {
public async deliverToUser(actor: { id: LocalUser['id']; host: null; }, activity: IActivity, to: RemoteUser) {
const manager = new DeliverManager(
this.userEntityService,
this.followingsRepository,
Expand All @@ -82,7 +84,7 @@ export class ApDeliverManagerService {
}

@bindThis
public createDeliverManager(actor: { id: User['id']; host: null; }, activity: any) {
public createDeliverManager(actor: { id: User['id']; host: null; }, activity: IActivity | null) {
return new DeliverManager(
this.userEntityService,
this.followingsRepository,
Expand All @@ -96,11 +98,14 @@ export class ApDeliverManagerService {

class DeliverManager {
private actor: ThinUser;
private activity: any;
private activity: IActivity | null;
private recipes: IRecipe[] = [];

/**
* Constructor
* @param userEntityService
* @param followingsRepository
* @param queueService
* @param actor Actor
* @param activity Activity to deliver
*/
Expand All @@ -110,7 +115,7 @@ class DeliverManager {
private queueService: QueueService,

actor: { id: User['id']; host: null; },
activity: any,
activity: IActivity | null,
) {
// 型で弾いてはいるが一応ローカルユーザーかチェック
if (actor.host != null) throw new Error('actor.host must be null');
Expand Down
Loading