-
diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue
index 0a971b51f9..9b1d4fb954 100644
--- a/src/client/app/desktop/views/components/post-form.vue
+++ b/src/client/app/desktop/views/components/post-form.vue
@@ -7,7 +7,9 @@
>
diff --git a/src/client/app/desktop/views/components/received-follow-requests-window.vue b/src/client/app/desktop/views/components/received-follow-requests-window.vue
index cadf195d3f..61bddf530a 100644
--- a/src/client/app/desktop/views/components/received-follow-requests-window.vue
+++ b/src/client/app/desktop/views/components/received-follow-requests-window.vue
@@ -4,7 +4,9 @@
{{ notification.user | userName }}
+
+
@@ -20,7 +22,9 @@
{{ notification.user | userName }}
+
+
@@ -34,7 +38,9 @@
{{ notification.user | userName }}
+
+
@@ -45,7 +51,9 @@
{{ notification.user | userName }}
+
+
@@ -56,7 +64,9 @@
{{ notification.user | userName }}
+
+
diff --git a/src/client/app/desktop/views/pages/deck/deck.user-column.vue b/src/client/app/desktop/views/pages/deck/deck.user-column.vue
index 404e934424..f1bcc48afe 100644
--- a/src/client/app/desktop/views/pages/deck/deck.user-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.user-column.vue
@@ -16,13 +16,15 @@
- {{ req.follower | userName }}
+
+
{{ $t('accept') }}|{{ $t('reject') }}
diff --git a/src/client/app/desktop/views/components/user-card.vue b/src/client/app/desktop/views/components/user-card.vue
index c5d925fe6d..ffea85d411 100644
--- a/src/client/app/desktop/views/components/user-card.vue
+++ b/src/client/app/desktop/views/components/user-card.vue
@@ -4,10 +4,12 @@
diff --git a/src/client/app/desktop/views/components/user-preview.vue b/src/client/app/desktop/views/components/user-preview.vue
index a4e7eb735a..e1146c25b9 100644
--- a/src/client/app/desktop/views/components/user-preview.vue
+++ b/src/client/app/desktop/views/components/user-preview.vue
@@ -4,10 +4,14 @@
- {{ user | userName }}
+
+
@{{ user | acct }}
-
- {{ u | userName }}
+
+
- {{ u.description }}
+
+
{{ $t('notes') }}
{{ u.notesCount }} diff --git a/src/client/app/desktop/views/pages/deck/deck.notification.vue b/src/client/app/desktop/views/pages/deck/deck.notification.vue index fce9853b6f..4347d8c12d 100644 --- a/src/client/app/desktop/views/pages/deck/deck.notification.vue +++ b/src/client/app/desktop/views/pages/deck/deck.notification.vue @@ -5,7 +5,9 @@
-
diff --git a/src/client/app/desktop/views/pages/user-following-or-followers.vue b/src/client/app/desktop/views/pages/user-following-or-followers.vue
index 6cb6340089..0b0114cc22 100644
--- a/src/client/app/desktop/views/pages/user-following-or-followers.vue
+++ b/src/client/app/desktop/views/pages/user-following-or-followers.vue
@@ -4,7 +4,9 @@
- {{ user | userName }}
+
+
diff --git a/src/client/app/desktop/views/pages/user/user.header.vue b/src/client/app/desktop/views/pages/user/user.header.vue
index 9eacbe3914..1904acd96a 100644
--- a/src/client/app/desktop/views/pages/user/user.header.vue
+++ b/src/client/app/desktop/views/pages/user/user.header.vue
@@ -4,7 +4,9 @@
-
{{ $store.state.i | userName }}
+
+
diff --git a/src/client/app/desktop/views/widgets/users.vue b/src/client/app/desktop/views/widgets/users.vue
index 7890b6df04..cfc1afe14d 100644
--- a/src/client/app/desktop/views/widgets/users.vue
+++ b/src/client/app/desktop/views/widgets/users.vue
@@ -13,7 +13,9 @@
- ![avatar]()
![avatar]()
+
{{ user | userName }}
+
+
-
@{{ $store.state.i | acct }}
- {{ _user | userName }}
+
+
@{{ _user | acct }}
{{ note.user | userName }}
+
+
{{ text }}
diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue
index bcf11696c7..e91d66440d 100644
--- a/src/client/app/mobile/views/components/note-detail.vue
+++ b/src/client/app/mobile/views/components/note-detail.vue
@@ -20,7 +20,9 @@
diff --git a/src/client/app/mobile/views/components/notification-preview.vue b/src/client/app/mobile/views/components/notification-preview.vue
index 45a2d3b064..7deee66e79 100644
--- a/src/client/app/mobile/views/components/notification-preview.vue
+++ b/src/client/app/mobile/views/components/notification-preview.vue
@@ -3,7 +3,7 @@
{{ notification.user | userName }}
+
@@ -20,7 +20,7 @@
{{ notification.user | userName }}
+
@@ -34,7 +34,7 @@
{{ notification.user | userName }}
+
@@ -45,7 +45,7 @@
{{ notification.user | userName }}
+
@@ -56,7 +56,7 @@
{{ notification.user | userName }}
+
diff --git a/src/client/app/mobile/views/components/post-form.vue b/src/client/app/mobile/views/components/post-form.vue
index 7757875eb6..604e756ad8 100644
--- a/src/client/app/mobile/views/components/post-form.vue
+++ b/src/client/app/mobile/views/components/post-form.vue
@@ -13,7 +13,10 @@
![avatar]()
-
diff --git a/src/client/app/mobile/views/components/user-preview.vue b/src/client/app/mobile/views/components/user-preview.vue
index a165e66a9d..47960f9819 100644
--- a/src/client/app/mobile/views/components/user-preview.vue
+++ b/src/client/app/mobile/views/components/user-preview.vue
@@ -3,11 +3,15 @@
- {{ user | userName }}
+
+
diff --git a/src/client/app/mobile/views/pages/received-follow-requests.vue b/src/client/app/mobile/views/pages/received-follow-requests.vue
index 48c46f64cd..838ed8adba 100644
--- a/src/client/app/mobile/views/pages/received-follow-requests.vue
+++ b/src/client/app/mobile/views/pages/received-follow-requests.vue
@@ -4,7 +4,9 @@
diff --git a/src/mfm/parse.ts b/src/mfm/parse.ts
index 01c8cc7d7a..0dc749a5f8 100644
--- a/src/mfm/parse.ts
+++ b/src/mfm/parse.ts
@@ -1,13 +1,13 @@
-import parser, { Node } from './parser';
+import parser, { Node, plainParser } from './parser';
import * as A from '../prelude/array';
import * as S from '../prelude/string';
-export default (source: string): Node[] => {
+export default (source: string, plainText = false): Node[] => {
if (source == null || source == '') {
return null;
}
- let nodes: Node[] = parser.root.tryParse(source);
+ let nodes: Node[] = plainText ? plainParser.root.tryParse(source) : parser.root.tryParse(source);
const combineText = (es: Node[]): Node =>
({ name: 'text', props: { text: S.concat(es.map(e => e.props.text)) } });
diff --git a/src/mfm/parser.ts b/src/mfm/parser.ts
index 9a1264220b..de1bc89d2b 100644
--- a/src/mfm/parser.ts
+++ b/src/mfm/parser.ts
@@ -64,6 +64,29 @@ const newline = P((input, i) => {
}
});
+export const plainParser = P.createLanguage({
+ root: r => P.alt(
+ r.emoji,
+ r.text
+ ).atLeast(1),
+
+ text: () => P.any.map(x => makeNode('text', { text: x })),
+
+ //#region Emoji
+ emoji: r =>
+ P.alt(
+ P.regexp(/:([a-z0-9_+-]+):/i, 1)
+ .map(x => makeNode('emoji', {
+ name: x
+ })),
+ P.regexp(emojiRegex)
+ .map(x => makeNode('emoji', {
+ emoji: x
+ })),
+ ),
+ //#endregion
+});
+
const mfm = P.createLanguage({
root: r => P.alt(
r.big,
diff --git a/src/models/user.ts b/src/models/user.ts
index 18e45dbae9..90c74fe279 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -11,6 +11,7 @@ import { getFriendIds } from '../server/api/common/get-friends';
import config from '../config';
import FollowRequest from './follow-request';
import fetchMeta from '../misc/fetch-meta';
+import Emoji from './emoji';
const User = db.get('users');
@@ -46,6 +47,7 @@ type IUserBase = {
description: string;
lang?: string;
pinnedNoteIds: mongo.ObjectID[];
+ emojis?: string[];
/**
* 凍結されているか否か
@@ -247,6 +249,7 @@ export const pack = (
host: true,
avatarColor: true,
avatarUrl: true,
+ emojis: true,
isCat: true,
isBot: true,
isAdmin: true,
@@ -377,6 +380,16 @@ export const pack = (
delete _user.hasUnreadMentions;
}
+ // カスタム絵文字添付
+ if (_user.emojis) {
+ _user.emojis = Emoji.find({
+ name: { $in: _user.emojis },
+ host: _user.host
+ }, {
+ fields: { _id: false }
+ });
+ }
+
// resolve promises in _user object
_user = await rap(_user);
diff --git a/src/remote/activitypub/models/note.ts b/src/remote/activitypub/models/note.ts
index a45946a050..10aa83342e 100644
--- a/src/remote/activitypub/models/note.ts
+++ b/src/remote/activitypub/models/note.ts
@@ -164,7 +164,7 @@ export async function resolveNote(value: string | IObject, resolver?: Resolver):
return await createNote(uri, resolver);
}
-async function extractEmojis(tags: ITag[], host_: string) {
+export async function extractEmojis(tags: ITag[], host_: string) {
const host = toUnicode(host_.toLowerCase());
if (!tags) return [];
diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
index 90d58a1244..9bbc41e628 100644
--- a/src/remote/activitypub/models/person.ts
+++ b/src/remote/activitypub/models/person.ts
@@ -12,10 +12,11 @@ import Meta from '../../../models/meta';
import htmlToMFM from '../../../mfm/html-to-mfm';
import usersChart from '../../../chart/users';
import { URL } from 'url';
-import { resolveNote } from './note';
+import { resolveNote, extractEmojis } from './note';
import registerInstance from '../../../services/register-instance';
import Instance from '../../../models/instance';
import getDriveFileUrl from '../../../misc/get-drive-file-url';
+import { IEmoji } from '../../../models/emoji';
const log = debug('misskey:activitypub');
@@ -234,6 +235,21 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise {
+ console.log(`extractEmojis: ${e}`);
+ return [] as IEmoji[];
+ });
+
+ const emojiNames = emojis.map(emoji => emoji.name);
+
+ await User.update({ _id: user._id }, {
+ $set: {
+ emojis: emojiNames
+ }
+ });
+ //#endregion
+
await updateFeatured(user._id).catch(err => console.log(err));
return user;
@@ -301,6 +317,14 @@ export async function updatePerson(uri: string, resolver?: Resolver, hint?: obje
: resolveImage(exist, img).catch(() => null)
)));
+ // カスタム絵文字取得
+ const emojis = await extractEmojis(person.tag, exist.host).catch(e => {
+ console.log(`extractEmojis: ${e}`);
+ return [] as IEmoji[];
+ });
+
+ const emojiNames = emojis.map(emoji => emoji.name);
+
// Update user
await User.update({ _id: exist._id }, {
$set: {
@@ -314,6 +338,7 @@ export async function updatePerson(uri: string, resolver?: Resolver, hint?: obje
bannerUrl: getDriveFileUrl(banner, false),
avatarColor: avatar && avatar.metadata.properties.avgColor ? avatar.metadata.properties.avgColor : null,
bannerColor: banner && banner.metadata.properties.avgColor ? banner.metadata.properties.avgColor : null,
+ emojis: emojiNames,
description: htmlToMFM(person.summary),
followersCount,
followingCount,
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
};
}
-async function getEmojis(names: string[]): Promise {
+export async function getEmojis(names: string[]): Promise {
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: `@${user.discord.username}#${user.discord.discriminator}`
});
+ 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,
diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts
index b87c3c47e7..0319550109 100644
--- a/src/server/api/endpoints/i/update.ts
+++ b/src/server/api/endpoints/i/update.ts
@@ -6,6 +6,8 @@ import acceptAllFollowRequests from '../../../../services/following/requests/acc
import { publishToFollowers } from '../../../../services/i/update';
import define from '../../define';
import getDriveFileUrl from '../../../../misc/get-drive-file-url';
+import parse from '../../../../mfm/parse';
+import { extractEmojis } from '../../../../services/note/create';
const langmap = require('langmap');
export const meta = {
@@ -191,6 +193,24 @@ export default define(meta, (ps, user, app) => new Promise(async (res, rej) => {
}
}
+ //#region emojis
+ if (updates.name != null || updates.description != null) {
+ let emojis = [] as string[];
+
+ if (updates.name != null) {
+ const match = updates.name.match(/:\w{1,100}:/g) as string[];
+ if (match) emojis = emojis.concat(match.map(m => m.replace(/:(\w+):/, '$1')));
+ }
+
+ if (updates.description != null) {
+ const tokens = parse(updates.description);
+ emojis = emojis.concat(extractEmojis(tokens));
+ }
+
+ updates.emojis = emojis;
+ }
+ //#endregion
+
await User.update(user._id, {
$set: updates
});
diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index 49b465b948..6fe64d3ee5 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -482,7 +482,7 @@ function extractHashtags(tokens: ReturnType): string[] {
return unique(hashtags);
}
-function extractEmojis(tokens: ReturnType): string[] {
+export function extractEmojis(tokens: ReturnType): string[] {
const emojis: string[] = [];
const extract = (tokens: Node[]) => {
- {{ appearNote.user | userName }}
+
+
-
@@ -11,7 +11,7 @@
-
@@ -19,7 +19,7 @@
-
@@ -27,21 +27,21 @@
{{ getNoteSummary(notification.note) }}
-
-
-
@@ -49,7 +49,7 @@
{{ getNoteSummary(notification.note) }}
-
@@ -57,7 +57,7 @@
{{ getNoteSummary(notification.note) }}
-
diff --git a/src/client/app/mobile/views/components/notification.vue b/src/client/app/mobile/views/components/notification.vue
index 1228047c94..72cda1b11a 100644
--- a/src/client/app/mobile/views/components/notification.vue
+++ b/src/client/app/mobile/views/components/notification.vue
@@ -5,7 +5,7 @@
{{ $store.state.i | userName }}
+
+
-
diff --git a/src/client/app/mobile/views/components/user-card.vue b/src/client/app/mobile/views/components/user-card.vue
index 6d79e7a872..7275cbfed0 100644
--- a/src/client/app/mobile/views/components/user-card.vue
+++ b/src/client/app/mobile/views/components/user-card.vue
@@ -3,7 +3,9 @@
-
{{ user.description }}
+
+
- {{ req.follower | userName }}
+
+
{{ $t('accept') }}|{{ $t('reject') }}
diff --git a/src/client/app/mobile/views/pages/user-list.vue b/src/client/app/mobile/views/pages/user-list.vue
index fdc621ef7d..95f100d613 100644
--- a/src/client/app/mobile/views/pages/user-list.vue
+++ b/src/client/app/mobile/views/pages/user-list.vue
@@ -4,7 +4,9 @@
diff --git a/src/client/app/mobile/views/pages/user.vue b/src/client/app/mobile/views/pages/user.vue
index 15c5fbb9ad..183e105a22 100644
--- a/src/client/app/mobile/views/pages/user.vue
+++ b/src/client/app/mobile/views/pages/user.vue
@@ -1,6 +1,8 @@
- ![]()
{{ user | userName }}
+ ![]()
+
@@ -15,12 +17,12 @@
-
-
{{ user | userName }}
+ + +
-
{{ user | userName }}
+
-
diff --git a/src/client/app/mobile/views/widgets/profile.vue b/src/client/app/mobile/views/widgets/profile.vue
index 6ce3468c49..f6ca793dce 100644
--- a/src/client/app/mobile/views/widgets/profile.vue
+++ b/src/client/app/mobile/views/widgets/profile.vue
@@ -8,7 +8,9 @@
:src="$store.state.i.avatarUrl"
alt="avatar"
/>
-