summaryrefslogtreecommitdiff
path: root/src/queue
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-06-18 14:28:43 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-06-18 14:28:43 +0900
commite66d7babc5ae477d7a60628e5599f9c390426c81 (patch)
tree84733fc7b2a158e6d5786ccd72a58e40c301f140 /src/queue
parentwip (diff)
downloadsharkey-e66d7babc5ae477d7a60628e5599f9c390426c81.tar.gz
sharkey-e66d7babc5ae477d7a60628e5599f9c390426c81.tar.bz2
sharkey-e66d7babc5ae477d7a60628e5599f9c390426c81.zip
yatta
Diffstat (limited to 'src/queue')
-rw-r--r--src/queue/index.ts4
-rw-r--r--src/queue/processors/http/deliver.ts2
-rw-r--r--src/queue/processors/http/index.ts4
-rw-r--r--src/queue/processors/http/process-inbox.ts8
4 files changed, 9 insertions, 9 deletions
diff --git a/src/queue/index.ts b/src/queue/index.ts
index 3f82b30b35..1efd6e54ef 100644
--- a/src/queue/index.ts
+++ b/src/queue/index.ts
@@ -12,7 +12,7 @@ const queue = createQueue({
}
});
-export function createHttp(data) {
+export function createHttp(data: any) {
return queue
.create('http', data)
.removeOnComplete(true)
@@ -21,7 +21,7 @@ export function createHttp(data) {
.backoff({ delay: 16384, type: 'exponential' });
}
-export function deliver(user: ILocalUser, content, to) {
+export function deliver(user: ILocalUser, content: any, to: any) {
createHttp({
title: 'deliver',
type: 'deliver',
diff --git a/src/queue/processors/http/deliver.ts b/src/queue/processors/http/deliver.ts
index 2c4bbe9bf0..946d2f65bd 100644
--- a/src/queue/processors/http/deliver.ts
+++ b/src/queue/processors/http/deliver.ts
@@ -2,7 +2,7 @@ import * as kue from 'kue';
import request from '../../../remote/activitypub/request';
-export default async (job: kue.Job, done): Promise<void> => {
+export default async (job: kue.Job, done: any): Promise<void> => {
try {
await request(job.data.user, job.data.to, job.data.content);
done();
diff --git a/src/queue/processors/http/index.ts b/src/queue/processors/http/index.ts
index 6f8d1dbc2b..156be42250 100644
--- a/src/queue/processors/http/index.ts
+++ b/src/queue/processors/http/index.ts
@@ -1,12 +1,12 @@
import deliver from './deliver';
import processInbox from './process-inbox';
-const handlers = {
+const handlers: any = {
deliver,
processInbox,
};
-export default (job, done) => {
+export default (job: any, done: any) => {
const handler = handlers[job.data.type];
if (handler) {
diff --git a/src/queue/processors/http/process-inbox.ts b/src/queue/processors/http/process-inbox.ts
index dfafe64a78..0da442aefb 100644
--- a/src/queue/processors/http/process-inbox.ts
+++ b/src/queue/processors/http/process-inbox.ts
@@ -10,7 +10,7 @@ import { resolvePerson } from '../../../remote/activitypub/models/person';
const log = debug('misskey:queue:inbox');
// ユーザーのinboxにアクティビティが届いた時の処理
-export default async (job: kue.Job, done): Promise<void> => {
+export default async (job: kue.Job, done: any): Promise<void> => {
const signature = job.data.signature;
const activity = job.data.activity;
@@ -22,7 +22,7 @@ export default async (job: kue.Job, done): Promise<void> => {
//#endregion
const keyIdLower = signature.keyId.toLowerCase();
- let user;
+ let user: IRemoteUser;
if (keyIdLower.startsWith('acct:')) {
const { username, host } = parseAcct(keyIdLower.slice('acct:'.length));
@@ -36,7 +36,7 @@ export default async (job: kue.Job, done): Promise<void> => {
// アクティビティを送信してきたユーザーがまだMisskeyサーバーに登録されていなかったら登録する
if (user === null) {
- user = await resolvePerson(activity.actor);
+ user = await resolvePerson(activity.actor) as IRemoteUser;
}
} else {
user = await User.findOne({
@@ -46,7 +46,7 @@ export default async (job: kue.Job, done): Promise<void> => {
// アクティビティを送信してきたユーザーがまだMisskeyサーバーに登録されていなかったら登録する
if (user === null) {
- user = await resolvePerson(signature.keyId);
+ user = await resolvePerson(signature.keyId) as IRemoteUser;
}
}