monkee.ch/monkeeShark
1
0
Fork 0
Code Pull requests Activity

Refactor

Browse source
This commit is contained in:
syuilo 2018-10-31 22:35:02 +09:00
parent f64100226d
commit 1a51b98700
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
7 changed files with 41 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/remote/activitypub/models/person.ts
View file

@ -15,6 +15,7 @@ import { URL } from 'url';
import { resolveNote } from './note';
import registerInstance from '../../../services/register-instance';
import Instance from '../../../models/instance';
import getDriveFileUrl from '../../../misc/get-drive-file-url';
const log = debug('misskey:activitypub');
@ -303,8 +304,8 @@ export async function updatePerson(uri: string, resolver?: Resolver, hint?: obje
featured: person.featured,
avatarId: avatar ? avatar._id : null,
bannerId: banner ? banner._id : null,
avatarUrl: (avatar && avatar.metadata.thumbnailUrl) ? avatar.metadata.thumbnailUrl : (avatar && avatar.metadata.url) ? avatar.metadata.url : null,
bannerUrl: banner && banner.metadata.url ? banner.metadata.url : null,
avatarUrl: getDriveFileUrl(avatar, true),
bannerUrl: getDriveFileUrl(banner, true),
description: htmlToMFM(person.summary),
followersCount,
followingCount,

4
src/remote/activitypub/renderer/document.ts
View file

@ -1,8 +1,8 @@
import config from '../../../config';
import { IDriveFile } from '../../../models/drive-file';
import getDriveFileUrl from '../../../misc/get-drive-file-url';
export default (file: IDriveFile) => ({
type: 'Document',
mediaType: file.contentType,
url: file.metadata.url || `${config.drive_url}/${file._id}`
url: getDriveFileUrl(file)
});

4
src/remote/activitypub/renderer/image.ts
View file

@ -1,8 +1,8 @@
import config from '../../../config';
import { IDriveFile } from '../../../models/drive-file';
import getDriveFileUrl from '../../../misc/get-drive-file-url';
export default (file: IDriveFile) => ({
type: 'Image',
url: file.metadata.url || `${config.drive_url}/${file._id}`,
url: getDriveFileUrl(file),
sensitive: file.metadata.isSensitive
});