10.38.1

New Crowdin translations

locales/ca-ES.yml

@@ -1015,6 +1015,10 @@ admin/views/emoji.vue:
     aliases-desc: "スペースで区切って複数設定できます。"
     url: "絵文字画像URL"
     add: "追加"
+  emojis:
+    title: "絵文字一覧"
+    update: "更新"
+    remove: "削除"
 admin/views/announcements.vue:
   announcements: "お知らせ"
   save: "保存"

locales/de-DE.yml

@@ -1015,6 +1015,10 @@ admin/views/emoji.vue:
     aliases-desc: "スペースで区切って複数設定できます。"
     url: "絵文字画像URL"
     add: "追加"
+  emojis:
+    title: "絵文字一覧"
+    update: "更新"
+    remove: "削除"
 admin/views/announcements.vue:
   announcements: "お知らせ"
   save: "保存"

locales/en-US.yml

@@ -1010,11 +1010,15 @@ admin/views/emoji.vue:
   add-emoji:
     title: "Add emoji"
     name: "Emoji name"
-    name-desc: "a~z 0~9 _ の文字が使えます。"
+    name-desc: "You can use the characters a~z 0~9 _"
     aliases: "Aliases"
-    aliases-desc: "スペースで区切って複数設定できます。"
+    aliases-desc: "You can add more than one, separated by spaces."
     url: "Image URL"
     add: "Add"
+  emojis:
+    title: "Emojis"
+    update: "Update"
+    remove: "Remove"
 admin/views/announcements.vue:
   announcements: "Announcements"
   save: "Save"

locales/es-ES.yml

@@ -1015,6 +1015,10 @@ admin/views/emoji.vue:
     aliases-desc: "スペースで区切って複数設定できます。"
     url: "絵文字画像URL"
     add: "追加"
+  emojis:
+    title: "絵文字一覧"
+    update: "更新"
+    remove: "削除"
 admin/views/announcements.vue:
   announcements: "お知らせ"
   save: "保存"

locales/fr-FR.yml

@@ -445,7 +445,7 @@ common/views/components/profile-editor.vue:
   is-cat: "Ce compte est un Chat"
   is-bot: "Ce compte est un Bot"
   is-locked: "Demandes d’abonnements requièrent l’approbation"
-  careful-bot: "Botからのフォローだけ承認制にする"
+  careful-bot: "Les demandes d’abonnements venant de Bots requièrent l’approbation"
   advanced: "Avancé"
   privacy: "Vie privée"
   save: "Mettre à jour le profil"
@@ -502,7 +502,7 @@ common/views/widgets/tips.vue:
   tips-line14: "ホームのカスタマイズ中、ウィジェットを右クリックしてデザインを変更できます"
   tips-line17: "Vous pouvez mettre un texte en surbrillance en le mettant entre ** **"
   tips-line19: "Plusieurs fenêtres peuvent être détachées en dehors du navigateur."
-  tips-line20: "カレンダーウィジェットのパーセンテージは、経過の割合を示しています"
+  tips-line20: "Pourcentage sur le widget calendrier qui indique le pourcentage de temps passé"
   tips-line21: "Vous pouvez aussi utiliser l'API pour développer des Bots."
   tips-line23: "Mayu est mignone avec ses sourcils."
   tips-line24: "Misskey a vu le jour en 2014"
@@ -549,7 +549,7 @@ desktop/views/components/charts.vue:
   drive: "Drive"
   network: "Réseau"
   charts:
-    federation-instances: "インスタンスの増減"
+    federation-instances: "Nombre d’instances : augmentation/diminution"
     federation-instances-total: "Nombre total d’instances"
     notes: "投稿の増減 (統合)"
     local-notes: "投稿の増減 (ローカル)"
@@ -782,7 +782,7 @@ desktop/views/components/settings.vue:
   timeline: "Chronologie"
   show-my-renotes: "Afficher mes republications dans le fil"
   show-renoted-my-notes: "Afficher mes republications dans les fils"
-  show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
+  show-local-renotes: "Afficher les partages locaux sur les fils"
   show-maps: "Afficher la carte"
   deck-column-align: "デッキのカラムの位置"
   deck-column-align-center: "Centrer"
@@ -866,22 +866,22 @@ common/views/components/api-settings.vue:
 desktop/views/components/settings.apps.vue:
   no-apps: "Aucune application autorisée"
 common/views/components/drive-settings.vue:
-  max: "容量"
+  max: "Maximale"
   in-use: "utilisé"
   stats: "Statistiques"
 common/views/components/mute-and-block.vue:
-  mute-and-block: "ミュートとブロック"
-  mute: "ミュート"
-  block: "ブロック"
-  no-muted-users: "ミュートしているユーザーはいません"
-  no-blocked-users: "ブロックしているユーザーはいません"
+  mute-and-block: "Silencer / Bloquer"
+  mute: "Mettre en sourdine"
+  block: "En cours blocage"
+  no-muted-users: "Aucun utilisateur·rice n’est mis·e en sourdine"
+  no-blocked-users: "Aucun utilisateur·rice n’est bloqué·e"
 common/views/components/password-settings.vue:
-  reset: "パスワードを変更する"
-  enter-current-password: "現在のパスワードを入力してください"
-  enter-new-password: "新しいパスワードを入力してください"
-  enter-new-password-again: "もう一度新しいパスワードを入力してください"
-  not-match: "新しいパスワードが一致しません"
-  changed: "パスワードを変更しました"
+  reset: "Modifier le mot de passe"
+  enter-current-password: "Entrez votre mot de passe actuel"
+  enter-new-password: "Saisissez le nouveau mot de passe"
+  enter-new-password-again: "Entrez à nouveau le nouveau mot de passe"
+  not-match: "Les nouveaux mots de passe ne sont pas identiques"
+  changed: "Mot de passe modifié avec succès"
 desktop/views/components/sub-note-content.vue:
   private: "cette publication est privée"
   deleted: "cette publication a été supprimée"
@@ -948,82 +948,86 @@ desktop/views/components/window.vue:
   popout: "ポップアウト"
   close: "Fermer"
 admin/views/index.vue:
-  dashboard: "ダッシュボード"
-  instance: "インスタンス"
-  emoji: "カスタム絵文字"
-  users: "ユーザー"
-  update: "更新"
-  announcements: "お知らせ"
-  hashtags: "ハッシュタグ"
-  back-to-misskey: "Misskeyに戻る"
+  dashboard: "Tableau de bord"
+  instance: "Instance"
+  emoji: "Emoji"
+  users: "Utilisateur·rice·s"
+  update: "Mise à jour"
+  announcements: "Annonces"
+  hashtags: "Hashtags"
+  back-to-misskey: "Retour vers Misskey"
 admin/views/dashboard.vue:
-  dashboard: "ダッシュボード"
-  accounts: "アカウント"
-  notes: "投稿"
-  drive: "ドライブ"
-  instances: "インスタンス"
-  this-instance: "このインスタンス"
-  federated: "連合"
-  invite: "招待"
-  banner-url: "Banner URL"
-  disableRegistration: "Disable new user registration"
-  disableLocalTimeline: "Disable the local timeline"
+  dashboard: "Tableau de bord"
+  accounts: "Comptes"
+  notes: "Notes"
+  drive: "Lecteur"
+  instances: "Instances"
+  this-instance: "Cette instance"
+  federated: "Fédérées"
+  invite: "Inviter"
+  banner-url: "URL de la bannière"
+  disableRegistration: "Désactiver l’enregistrement de nouveaux utilisateur·rice·s"
+  disableLocalTimeline: "Désactiver le fil local"
 admin/views/charts.vue:
-  title: "チャート"
-  per-day: "1日ごと"
-  per-hour: "1時間ごと"
-  federation: "フェデレーション"
-  notes: "投稿"
-  users: "ユーザー"
-  drive: "ドライブ"
-  network: "ネットワーク"
+  title: "Graph"
+  per-day: "par jour"
+  per-hour: "par heure"
+  federation: "Fédération"
+  notes: "Publications"
+  users: "Utilisateur·rice·s"
+  drive: "Lecteur"
+  network: "Réseau"
   charts:
-    federation-instances: "インスタンスの増減"
-    federation-instances-total: "インスタンスの積算"
+    federation-instances: "Nombre d’instances : augmentation/diminution"
+    federation-instances-total: "Nombre total d’instances"
     notes: "投稿の増減 (統合)"
     local-notes: "投稿の増減 (ローカル)"
     remote-notes: "投稿の増減 (リモート)"
-    notes-total: "投稿の積算"
-    users: "ユーザーの増減"
-    users-total: "ユーザーの積算"
+    notes-total: "Total des publications"
+    users: "Nombre d’utilisateur·rice·s : augmentation/diminution"
+    users-total: "Nombre total des utilisateur·rice·s"
     drive: "ドライブ使用量の増減"
-    drive-total: "ドライブ使用量の積算"
+    drive-total: "Utilisation totale du lecteur"
     drive-files: "ドライブのファイル数の増減"
-    drive-files-total: "ドライブのファイル数の積算"
-    network-requests: "リクエスト"
-    network-time: "応答時間"
-    network-usage: "通信量"
+    drive-files-total: "Nombre total de fichiers sur le lecteur"
+    network-requests: "Requêtes"
+    network-time: "Temps de réponse"
+    network-usage: "Traffic"
 admin/views/users.vue:
-  suspend-user: "ユーザーの凍結"
-  suspend: "凍結"
-  suspended: "凍結しました"
-  unsuspend-user: "ユーザーの凍結の解除"
-  unsuspend: "凍結の解除"
-  unsuspended: "凍結を解除しました"
-  verify-user: "ユーザーの公式アカウント設定"
+  suspend-user: "Suspendre un·e utilisateur·rice"
+  suspend: "Suspendre"
+  suspended: "Suspendu·e avec succès."
+  unsuspend-user: "Lever la suspension d’utilisateur·rice·s"
+  unsuspend: "Suspension levée"
+  unsuspended: "La suspension de l’utilisateur·rice a été levée avec succès"
+  verify-user: "Paramètres de vérification du compte utilisateur"
   verify: "公式アカウントにする"
   verified: "公式アカウントにしました"
   unverify-user: "ユーザーの公式アカウント解除"
-  unverify: "公式アカウントを解除する"
-  unverified: "公式アカウントを解除しました"
+  unverify: "Ôter la vérification du compte"
+  unverified: "Ce compte n'est plus vérifié"
 admin/views/emoji.vue:
   add-emoji:
-    title: "絵文字の登録"
-    name: "絵文字名"
+    title: "Ajouter un émoji"
+    name: "Nom de l’émoji"
     name-desc: "a~z 0~9 _ の文字が使えます。"
-    aliases: "エイリアス"
-    aliases-desc: "スペースで区切って複数設定できます。"
-    url: "絵文字画像URL"
-    add: "追加"
+    aliases: "Aliases"
+    aliases-desc: "Vous pouvez définir plus d’un, séparés par des espaces."
+    url: "URL de l’image"
+    add: "Ajouter"
+  emojis:
+    title: "絵文字一覧"
+    update: "更新"
+    remove: "削除"
 admin/views/announcements.vue:
-  announcements: "お知らせ"
-  save: "保存"
-  remove: "削除"
-  add: "追加"
-  title: "タイトル"
-  text: "内容"
+  announcements: "Annonces"
+  save: "Enregistrer"
+  remove: "Supprimer"
+  add: "Ajouter"
+  title: "Titre"
+  text: "Contenu"
 admin/views/hashtags.vue:
-  hided-tags: "Hidden Tags"
+  hided-tags: "Tags cachés"
 desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "Les publications médias uniquement"
   is-media-view: "Vue média"
@@ -1370,7 +1374,7 @@ mobile/views/pages/settings.vue:
   sound: "Sons"
   enable-sounds: "Activer les sons"
   mark-as-read-all-unread-notes: "Marquer toutes les publications comme lues"
-  password: "パスワード"
+  password: "Mot de Passe"
 mobile/views/pages/user.vue:
   follows-you: "Vous suit"
   following: "Abonnements"

locales/it-IT.yml

@@ -1015,6 +1015,10 @@ admin/views/emoji.vue:
     aliases-desc: "スペースで区切って複数設定できます。"
     url: "絵文字画像URL"
     add: "追加"
+  emojis:
+    title: "絵文字一覧"
+    update: "更新"
+    remove: "削除"
 admin/views/announcements.vue:
   announcements: "お知らせ"
   save: "保存"

locales/ja-JP.yml

@@ -1142,6 +1142,10 @@ admin/views/emoji.vue:
     aliases-desc: "スペースで区切って複数設定できます。"
     url: "絵文字画像URL"
     add: "追加"
+  emojis:
+    title: "絵文字一覧"
+    update: "更新"
+    remove: "削除"
 
 admin/views/announcements.vue:
   announcements: "お知らせ"

locales/ja-KS.yml

@@ -1015,6 +1015,10 @@ admin/views/emoji.vue:
     aliases-desc: "スペースで区切って複数設定できます。"
     url: "絵文字画像URL"
     add: "追加"
+  emojis:
+    title: "絵文字一覧"
+    update: "更新"
+    remove: "削除"
 admin/views/announcements.vue:
   announcements: "お知らせ"
   save: "保存"

locales/ko-KR.yml

@@ -1015,6 +1015,10 @@ admin/views/emoji.vue:
     aliases-desc: "スペースで区切って複数設定できます。"
     url: "絵文字画像URL"
     add: "追加"
+  emojis:
+    title: "絵文字一覧"
+    update: "更新"
+    remove: "削除"
 admin/views/announcements.vue:
   announcements: "お知らせ"
   save: "保存"

locales/nl-NL.yml

@@ -1015,6 +1015,10 @@ admin/views/emoji.vue:
     aliases-desc: "スペースで区切って複数設定できます。"
     url: "絵文字画像URL"
     add: "追加"
+  emojis:
+    title: "絵文字一覧"
+    update: "更新"
+    remove: "削除"
 admin/views/announcements.vue:
   announcements: "お知らせ"
   save: "保存"

locales/no-NO.yml

@@ -1015,6 +1015,10 @@ admin/views/emoji.vue:
     aliases-desc: "スペースで区切って複数設定できます。"
     url: "絵文字画像URL"
     add: "追加"
+  emojis:
+    title: "絵文字一覧"
+    update: "更新"
+    remove: "削除"
 admin/views/announcements.vue:
   announcements: "お知らせ"
   save: "保存"

locales/pl-PL.yml

@@ -1015,6 +1015,10 @@ admin/views/emoji.vue:
     aliases-desc: "スペースで区切って複数設定できます。"
     url: "絵文字画像URL"
     add: "追加"
+  emojis:
+    title: "絵文字一覧"
+    update: "更新"
+    remove: "削除"
 admin/views/announcements.vue:
   announcements: "お知らせ"
   save: "保存"

locales/pt-PT.yml

@@ -1015,6 +1015,10 @@ admin/views/emoji.vue:
     aliases-desc: "スペースで区切って複数設定できます。"
     url: "絵文字画像URL"
     add: "追加"
+  emojis:
+    title: "絵文字一覧"
+    update: "更新"
+    remove: "削除"
 admin/views/announcements.vue:
   announcements: "お知らせ"
   save: "保存"

locales/ru-RU.yml

@@ -1015,6 +1015,10 @@ admin/views/emoji.vue:
     aliases-desc: "スペースで区切って複数設定できます。"
     url: "絵文字画像URL"
     add: "追加"
+  emojis:
+    title: "絵文字一覧"
+    update: "更新"
+    remove: "削除"
 admin/views/announcements.vue:
   announcements: "お知らせ"
   save: "保存"

locales/zh-CN.yml

@@ -1015,6 +1015,10 @@ admin/views/emoji.vue:
     aliases-desc: "スペースで区切って複数設定できます。"
     url: "絵文字画像URL"
     add: "追加"
+  emojis:
+    title: "絵文字一覧"
+    update: "更新"
+    remove: "削除"
 admin/views/announcements.vue:
   announcements: "お知らせ"
   save: "保存"

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.38.0",
-	"clientVersion": "1.0.11454",
+	"version": "10.38.1",
+	"clientVersion": "1.0.11482",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,

src/client/app/admin/views/ap-log.vue

@@ -34,8 +34,8 @@ export default Vue.extend({
 
 	mounted() {
 		this.connection = (this as any).os.stream.useSharedConnection('apLog');
-		this.connection.on('stats', this.onLog);
-		this.connection.on('statsLog', this.onLogs);
+		this.connection.on('log', this.onLog);
+		this.connection.on('logs', this.onLogs);
 		this.connection.send('requestLog', {
 			id: Math.random().toString().substr(2, 8),
 			length: 50

src/client/app/admin/views/emoji.vue

@@ -17,6 +17,28 @@
 			<ui-button @click="add">%i18n:@add-emoji.add%</ui-button>
 		</section>
 	</ui-card>
+
+	<ui-card>
+		<div slot="title">%fa:grin R% %i18n:@emojis.title%</div>
+		<section v-for="emoji in emojis">
+			<img :src="emoji.url" :alt="emoji.name" style="width: 64px;"/>
+			<ui-input v-model="emoji.name">
+				<span>%i18n:@add-emoji.name%</span>
+				<span slot="text">%i18n:@add-emoji.name-desc%</span>
+			</ui-input>
+			<ui-input v-model="emoji.aliases">
+				<span>%i18n:@add-emoji.aliases%</span>
+				<span slot="text">%i18n:@add-emoji.aliases-desc%</span>
+			</ui-input>
+			<ui-input v-model="emoji.url">
+				<span>%i18n:@add-emoji.url%</span>
+			</ui-input>
+			<ui-button-group>
+				<ui-button inline @click="updateEmoji(emoji)">%fa:save R% %i18n:@emojis.update%</ui-button>
+				<ui-button inline @click="removeEmoji(emoji)">%fa:trash-alt R% %i18n:@emojis.remove%</ui-button>
+			</ui-button-group>
+		</section>
+	</ui-card>
 </div>
 </template>
 
@@ -29,16 +51,54 @@ export default Vue.extend({
 			name: '',
 			url: '',
 			aliases: '',
+			emojis: []
 		};
 	},
+
+	mounted() {
+		this.fetchEmojis();
+	},
+
 	methods: {
 		add() {
-			(this as any).api('admin/add-emoji', {
+			(this as any).api('admin/emoji/add', {
 				name: this.name,
 				url: this.url,
 				aliases: this.aliases.split(' ')
 			}).then(() => {
 				(this as any).os.apis.dialog({ text: `Added` });
+				this.fetchEmojis();
+			}).catch(e => {
+				(this as any).os.apis.dialog({ text: `Failed ${e}` });
+			});
+		},
+
+		fetchEmojis() {
+			(this as any).api('admin/emoji/list').then(emojis => {
+				emojis.forEach(e => e.aliases = (e.aliases || []).join(' '));
+				this.emojis = emojis;
+			});
+		},
+
+		updateEmoji(emoji) {
+			(this as any).api('admin/emoji/update', {
+				id: emoji.id,
+				name: emoji.name,
+				url: emoji.url,
+				aliases: emoji.aliases.split(' ')
+			}).then(() => {
+				(this as any).os.apis.dialog({ text: `Updated` });
+			}).catch(e => {
+				(this as any).os.apis.dialog({ text: `Failed ${e}` });
+			});
+		},
+
+		removeEmoji(emoji) {
+			(this as any).api('admin/emoji/remove', {
+				id: emoji.id
+			}).then(() => {
+				(this as any).os.apis.dialog({ text: `Removed` });
+				this.fetchEmojis();
 			}).catch(e => {
 				(this as any).os.apis.dialog({ text: `Failed ${e}` });
 			});

src/client/app/common/views/components/welcome-timeline.vue

@@ -14,7 +14,7 @@
 					</div>
 				</header>
 				<div class="text">
-					<misskey-flavored-markdown v-if="note.text" :text="note.text" :customEmojis="p.emojis"/>
+					<misskey-flavored-markdown v-if="note.text" :text="note.text" :customEmojis="note.emojis"/>
 				</div>
 			</div>
 		</div>

src/models/emoji.ts

@@ -1,3 +1,4 @@
+import * as mongo from 'mongodb';
 import db from '../db/mongodb';
 
 const Emoji = db.get<IEmoji>('emoji');
@@ -8,20 +9,10 @@ Emoji.createIndex(['name', 'host'], { unique: true });
 export default Emoji;
 
 export type IEmoji = {
+	_id: mongo.ObjectID;
 	name: string;
 	host: string;
 	url: string;
 	aliases?: string[];
 	updatedAt?: Date;
 };
-
-export const packEmojis = async (
-	host: string,
-	// MeiTODO: filter
-) => {
-	return await Emoji.find({ host }, {
-		fields: {
-			_id: false
-		}
-	});
-};

src/models/note.ts

@@ -12,7 +12,7 @@ import { packMany as packFileMany, IDriveFile } from './drive-file';
 import Favorite from './favorite';
 import Following from './following';
 import config from '../config';
-import { packEmojis } from './emoji';
+import Emoji from './emoji';
 
 const Note = db.get<INote>('notes');
 Note.createIndex('uri', { sparse: true, unique: true });
@@ -50,6 +50,7 @@ export type INote = {
 	text: string;
 	tags: string[];
 	tagsLower: string[];
+	emojis: string[];
 	cw: string;
 	userId: mongo.ObjectID;
 	appId: mongo.ObjectID;
@@ -231,7 +232,22 @@ export const pack = async (
 
 	// _note._userを消す前か、_note.userを解決した後でないとホストがわからない
 	if (_note._user) {
-		_note.emojis = packEmojis(_note._user.host);
+		const host = _note._user.host;
+		// 互換性のため。(古いMisskeyではNoteにemojisが無い)
+		if (_note.emojis == null) {
+			_note.emojis = Emoji.find({
+				host: host
+			}, {
+				fields: { _id: false }
+			});
+		} else {
+			_note.emojis = Emoji.find({
+				name: { $in: _note.emojis },
+				host: host
+			}, {
+				fields: { _id: false }
+			});
+		}
 	}
 
 	// Rename _id to id

src/server/api/endpoints/admin/emoji/add.ts

@@ -1,6 +1,6 @@
 import $ from 'cafy';
-import Emoji from '../../../../models/emoji';
-import define from '../../define';
+import Emoji from '../../../../../models/emoji';
+import define from '../../../define';
 
 export const meta = {
 	desc: {

src/server/api/endpoints/admin/emoji/list.ts

@@ -0,0 +1,33 @@
+import $ from 'cafy';
+import Emoji from '../../../../../models/emoji';
+import define from '../../../define';
+
+export const meta = {
+	desc: {
+		'ja-JP': 'カスタム絵文字を取得します。'
+	},
+
+	requireCredential: true,
+	requireAdmin: true,
+
+	params: {
+		host: {
+			validator: $.str.optional.nullable,
+			default: null as any
+		}
+	}
+};
+
+export default define(meta, (ps) => new Promise(async (res, rej) => {
+	const emojis = await Emoji.find({
+		host: ps.host
+	});
+
+	res(emojis.map(e => ({
+		id: e._id,
+		name: e.name,
+		aliases: e.aliases,
+		host: e.host,
+		url: e.url
+	})));
+}));

src/server/api/endpoints/admin/emoji/remove.ts

@@ -0,0 +1,31 @@
+import $ from 'cafy';
+import Emoji from '../../../../../models/emoji';
+import define from '../../../define';
+import ID from '../../../../../misc/cafy-id';
+
+export const meta = {
+	desc: {
+		'ja-JP': 'カスタム絵文字を削除します。'
+	},
+
+	requireCredential: true,
+	requireAdmin: true,
+
+	params: {
+		id: {
+			validator: $.type(ID)
+		}
+	}
+};
+
+export default define(meta, (ps) => new Promise(async (res, rej) => {
+	const emoji = await Emoji.findOne({
+		_id: ps.id
+	});
+
+	if (emoji == null) return rej('emoji not found');
+
+	await Emoji.remove({ _id: emoji._id });
+
+	res();
+}));

src/server/api/endpoints/admin/emoji/update.ts

@@ -0,0 +1,49 @@
+import $ from 'cafy';
+import Emoji from '../../../../../models/emoji';
+import define from '../../../define';
+import ID from '../../../../../misc/cafy-id';
+
+export const meta = {
+	desc: {
+		'ja-JP': 'カスタム絵文字を更新します。'
+	},
+
+	requireCredential: true,
+	requireAdmin: true,
+
+	params: {
+		id: {
+			validator: $.type(ID)
+		},
+
+		name: {
+			validator: $.str
+		},
+
+		url: {
+			validator: $.str
+		},
+
+		aliases: {
+			validator: $.arr($.str)
+		}
+	}
+};
+
+export default define(meta, (ps) => new Promise(async (res, rej) => {
+	const emoji = await Emoji.findOne({
+		_id: ps.id
+	});
+
+	if (emoji == null) return rej('emoji not found');
+
+	await Emoji.update({ _id: emoji._id }, {
+		$set: {
+			name: ps.name,
+			aliases: ps.aliases,
+			url: ps.url
+		}
+	});
+
+	res();
+}));

src/server/api/endpoints/i/update_client_setting.ts

@@ -21,7 +21,7 @@ export const meta = {
 
 export default define(meta, (ps, user) => new Promise(async (res, rej) => {
 	const x: any = {};
-	x[`clientSettings.${name}`] = ps.value;
+	x[`clientSettings.${ps.name}`] = ps.value;
 
 	await User.update(user._id, {
 		$set: x
@@ -31,7 +31,7 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
 
 	// Publish event
 	publishMainStream(user._id, 'clientSettingUpdated', {
-		key: name,
+		key: ps.name,
 		value: ps.value
 	});
 }));

src/services/note/create.ts

@@ -30,6 +30,7 @@ import { erase, unique } from '../../prelude/array';
 import insertNoteUnread from './unread';
 import registerInstance from '../register-instance';
 import Instance from '../../models/instance';
+import { TextElementEmoji } from '../../mfm/parse/elements/emoji';
 
 type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
 
@@ -146,6 +147,8 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
 
 	const tags = extractHashtags(tokens);
 
+	const emojis = extractEmojis(tokens);
+
 	const mentionedUsers = await extractMentionedUsers(tokens);
 
 	if (data.reply && !user._id.equals(data.reply.userId) && !mentionedUsers.some(u => u._id.equals(data.reply.userId))) {
@@ -160,7 +163,7 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
 		});
 	}
 
-	const note = await insertNote(user, data, tags, mentionedUsers);
+	const note = await insertNote(user, data, tags, emojis, mentionedUsers);
 
 	res(note);
 
@@ -371,7 +374,7 @@ async function publish(user: IUser, note: INote, noteObj: any, reply: INote, ren
 	publishToUserLists(note, noteObj);
 }
 
-async function insertNote(user: IUser, data: Option, tags: string[], mentionedUsers: IUser[]) {
+async function insertNote(user: IUser, data: Option, tags: string[], emojis: string[], mentionedUsers: IUser[]) {
 	const insert: any = {
 		createdAt: data.createdAt,
 		fileIds: data.files ? data.files.map(file => file._id) : [],
@@ -382,6 +385,7 @@ async function insertNote(user: IUser, data: Option, tags: string[], mentionedUs
 		cw: data.cw == null ? null : data.cw,
 		tags,
 		tagsLower: tags.map(tag => tag.toLowerCase()),
+		emojis,
 		userId: user._id,
 		viaMobile: data.viaMobile,
 		geo: data.geo || null,
@@ -449,6 +453,16 @@ function extractHashtags(tokens: ReturnType<typeof parse>): string[] {
 	return unique(hashtags);
 }
 
+function extractEmojis(tokens: ReturnType<typeof parse>): string[] {
+	// Extract emojis
+	const emojis = tokens
+		.filter(t => t.type == 'emoji')
+		.map(t => (t as TextElementEmoji).emoji)
+		.filter(emoji => emoji.length <= 100);
+
+	return unique(emojis);
+}
+
 function index(note: INote) {
 	if (note.text == null || config.elasticsearch == null) return;