sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

yatta

Browse Source
This commit is contained in:
syuilo
2018-06-18 14:28:43 +09:00
parent 80e5645a84
commit e66d7babc5
56 changed files with 115 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/remote/activitypub/kernel/accept/index.ts
View File

@ -3,7 +3,7 @@ import * as debug from 'debug';
import Resolver from '../../resolver';
import { IRemoteUser } from '../../../../models/user';
import acceptFollow from './follow';
import { IAccept } from '../../type';
import { IAccept, IFollow } from '../../type';
const log = debug('misskey:activitypub');
@ -25,7 +25,7 @@ export default async (actor: IRemoteUser, activity: IAccept): Promise<void> => {
switch (object.type) {
case 'Follow':
acceptFollow(actor, object);
acceptFollow(actor, object as IFollow);
break;
default:

4
src/remote/activitypub/kernel/announce/index.ts
View File

@ -3,7 +3,7 @@ import * as debug from 'debug';
import Resolver from '../../resolver';
import { IRemoteUser } from '../../../../models/user';
import announceNote from './note';
import { IAnnounce } from '../../type';
import { IAnnounce, INote } from '../../type';
const log = debug('misskey:activitypub');
@ -25,7 +25,7 @@ export default async (actor: IRemoteUser, activity: IAnnounce): Promise<void> =>
switch (object.type) {
case 'Note':
announceNote(resolver, actor, activity, object);
announceNote(resolver, actor, activity, object as INote);
break;
default:

4
src/remote/activitypub/kernel/announce/note.ts
View File

@ -2,7 +2,7 @@ import * as debug from 'debug';
import Resolver from '../../resolver';
import post from '../../../../services/note/create';
import { IRemoteUser } from '../../../../models/user';
import { IRemoteUser, IUser } from '../../../../models/user';
import { IAnnounce, INote } from '../../type';
import { fetchNote, resolveNote } from '../../models/note';
import { resolvePerson } from '../../models/person';
@ -36,7 +36,7 @@ export default async function(resolver: Resolver, actor: IRemoteUser, activity:
//#region Visibility
let visibility = 'public';
let visibleUsers = [];
let visibleUsers: IUser[] = [];
if (!note.to.includes('https://www.w3.org/ns/activitystreams#Public')) {
if (note.cc.includes('https://www.w3.org/ns/activitystreams#Public')) {
visibility = 'home';

2
src/remote/activitypub/kernel/create/image.ts
View File

@ -1,6 +1,6 @@
import { IRemoteUser } from '../../../../models/user';
import { createImage } from '../../models/image';
export default async function(actor: IRemoteUser, image): Promise<void> {
export default async function(actor: IRemoteUser, image: any): Promise<void> {
await createImage(image.url, actor);
}

2
src/remote/activitypub/kernel/create/note.ts
View File

@ -5,7 +5,7 @@ import { createNote, fetchNote } from '../../models/note';
/**
* 投稿作成アクティビティを捌きます
*/
export default async function(resolver: Resolver, actor: IRemoteUser, note, silent = false): Promise<void> {
export default async function(resolver: Resolver, actor: IRemoteUser, note: any, silent = false): Promise<void> {
const exist = await fetchNote(note);
if (exist == null) {
await createNote(note);

3
src/remote/activitypub/kernel/delete/index.ts
View File

@ -2,11 +2,12 @@ import Resolver from '../../resolver';
import deleteNote from './note';
import Note from '../../../../models/note';
import { IRemoteUser } from '../../../../models/user';
import { IDelete } from '../../type';
/**
* 削除アクティビティを捌きます
*/
export default async (actor: IRemoteUser, activity): Promise<void> => {
export default async (actor: IRemoteUser, activity: IDelete): Promise<void> => {
if ('actor' in activity && actor.uri !== activity.actor) {
throw new Error('invalid actor');
}

4
src/remote/activitypub/kernel/reject/index.ts
View File

@ -3,7 +3,7 @@ import * as debug from 'debug';
import Resolver from '../../resolver';
import { IRemoteUser } from '../../../../models/user';
import rejectFollow from './follow';
import { IReject } from '../../type';
import { IReject, IFollow } from '../../type';
const log = debug('misskey:activitypub');
@ -25,7 +25,7 @@ export default async (actor: IRemoteUser, activity: IReject): Promise<void> => {
switch (object.type) {
case 'Follow':
rejectFollow(actor, object);
rejectFollow(actor, object as IFollow);
break;
default:

4
src/remote/activitypub/kernel/undo/index.ts
View File

@ -1,7 +1,7 @@
import * as debug from 'debug';
import { IRemoteUser } from '../../../../models/user';
import { IUndo } from '../../type';
import { IUndo, IFollow } from '../../type';
import unfollow from './follow';
import Resolver from '../../resolver';
@ -29,7 +29,7 @@ export default async (actor: IRemoteUser, activity: IUndo): Promise<void> => {
switch (object.type) {
case 'Follow':
unfollow(actor, object);
unfollow(actor, object as IFollow);
break;
}