diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2018-12-06 10:02:04 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2018-12-06 10:02:04 +0900 |
| commit | 452256874930093d07ad6734f72293b4334a3b9e (patch) | |
| tree | 6bf45b67be29d279201ea122b922f8dd6bde7361 /src/remote/activitypub/renderer | |
| parent | 外部サービス連携情報をPersonのfieldsに乗せて配信する (#3499) (diff) | |
| download | misskey-452256874930093d07ad6734f72293b4334a3b9e.tar.gz misskey-452256874930093d07ad6734f72293b4334a3b9e.tar.bz2 misskey-452256874930093d07ad6734f72293b4334a3b9e.zip | |
Emoji support in profile (#3514)
* Emoji in profile
* Add emojis to fields
Diffstat (limited to 'src/remote/activitypub/renderer')
| -rw-r--r-- | src/remote/activitypub/renderer/note.ts | 2 | ||||
| -rw-r--r-- | src/remote/activitypub/renderer/person.ts | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/remote/activitypub/renderer/note.ts b/src/remote/activitypub/renderer/note.ts index 76a527e9aa..1445429ee9 100644 --- a/src/remote/activitypub/renderer/note.ts +++ b/src/remote/activitypub/renderer/note.ts @@ -137,7 +137,7 @@ export default async function renderNote(note: INote, dive = true): Promise<any> }; } -async function getEmojis(names: string[]): Promise<IEmoji[]> { +export async function getEmojis(names: string[]): Promise<IEmoji[]> { if (names == null || names.length < 1) return []; const emojis = await Promise.all( diff --git a/src/remote/activitypub/renderer/person.ts b/src/remote/activitypub/renderer/person.ts index f02710aad0..4a6a54881f 100644 --- a/src/remote/activitypub/renderer/person.ts +++ b/src/remote/activitypub/renderer/person.ts @@ -5,6 +5,8 @@ import { ILocalUser } from '../../../models/user'; import toHtml from '../../../mfm/html'; import parse from '../../../mfm/parse'; import DriveFile from '../../../models/drive-file'; +import { getEmojis } from './note'; +import renderEmoji from './emoji'; export default async (user: ILocalUser) => { const id = `${config.url}/users/${user._id}`; @@ -36,6 +38,13 @@ export default async (user: ILocalUser) => { value: `<a href="https://discordapp.com/users/${user.discord.id}" rel="me nofollow noopener" target="_blank"><span>@${user.discord.username}#${user.discord.discriminator}</span></a>` }); + const emojis = await getEmojis(user.emojis); + const apemojis = emojis.map(emoji => renderEmoji(emoji)); + + const tag = [ + ...apemojis, + ]; + return { type: user.isBot ? 'Service' : 'Person', id, @@ -51,6 +60,7 @@ export default async (user: ILocalUser) => { summary: toHtml(parse(user.description)), icon: user.avatarId && renderImage(avatar), image: user.bannerId && renderImage(banner), + tag, manuallyApprovesFollowers: user.isLocked, publicKey: renderKey(user), isCat: user.isCat, |