廃止 OS標準の絵文字を使用

locales/cs-CZ.yml

@@ -152,7 +152,6 @@ common:
     show-via: "zobrazit přes"
     reduce-motion: "Snížit pohyb v rozhraní"
     this-setting-is-this-device-only: "Pouze pro toto zařízení"
-    use-os-default-emojis: "Použít výchozí emoji systému"
     line-width: "Hrubka línie"
     line-width-thin: "Úzka"
     line-width-normal: "Běžná"

locales/en-US.yml

@@ -197,7 +197,6 @@ common:
     show-via: "Show via"
     reduce-motion: "Reduce motion in UI"
     this-setting-is-this-device-only: "Only for this device"
-    use-os-default-emojis: "Use the OS default Emojis"
     line-width: "Line thickness"
     line-width-thin: "Thin"
     line-width-normal: "Regular"

locales/es-ES.yml

@@ -103,7 +103,6 @@ common:
     tags: "Etiquetas"
     blocking: "Bloquear"
     password: "Contraseña"
-    use-os-default-emojis: "Usar los emoticonos estándar del sistema operativo"
     line-width: "Grosor de línea"
     line-width-thick: "Grosor"
     font-size: "Tamaño del texto"

locales/fr-FR.yml

@@ -137,7 +137,6 @@ common:
     show-via: "Afficher via"
     reduce-motion: "Réduire les animations dans l’interface utilisateur"
     this-setting-is-this-device-only: "Uniquement sur cet appareil"
-    use-os-default-emojis: "Utiliser les émojis standards du système"
     line-width: "Epaisseur du trait"
     line-width-thin: "Fine"
     line-width-normal: "Normale"

locales/ja-JP.yml

@@ -208,7 +208,6 @@ common:
     show-via: "viaを表示する"
     reduce-motion: "UIの動きを減らす"
     this-setting-is-this-device-only: "このデバイスのみ"
-    use-os-default-emojis: "OS標準の絵文字を使用"
     line-width: "線の太さ"
     line-width-thin: "細い"
     line-width-normal: "普通"

locales/ko-KR.yml

@@ -152,7 +152,6 @@ common:
     show-via: "via 표시하기"
     reduce-motion: "UI의 애니메이션 줄이기"
     this-setting-is-this-device-only: "이 장치만"
-    use-os-default-emojis: "운영체제의 기본 이모지 사용"
     line-width: "선 두께"
     line-width-thin: "얇음"
     line-width-normal: "보통"

locales/zh-CN.yml

@@ -152,7 +152,6 @@ common:
     show-via: "显示 via"
     reduce-motion: "减弱UI中的动画效果"
     this-setting-is-this-device-only: "设置仅在本设备中生效"
-    use-os-default-emojis: "使用设备系统默认的表情符号"
     line-width: "线条宽度"
     line-width-thin: "细"
     line-width-normal: "正常"

src/client/app/common/views/components/autocomplete.vue

@@ -17,8 +17,7 @@
 	<ol class="emojis" ref="suggests" v-if="emojis.length > 0">
 		<li v-for="emoji in emojis" @click="complete(type, emoji.emoji)" @keydown="onKeydown" tabindex="-1">
 			<span class="emoji" v-if="emoji.isCustomEmoji"><img :src="$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url" :alt="emoji.emoji"/></span>
-			<span class="emoji" v-else-if="!useOsDefaultEmojis"><img :src="emoji.url" :alt="emoji.emoji"/></span>
-			<span class="emoji" v-else>{{ emoji.emoji }}</span>
+			<span class="emoji" v-else><img :src="emoji.url" :alt="emoji.emoji"/></span>
 			<span class="name" v-html="emoji.name.replace(q, `<b>${q}</b>`)"></span>
 			<span class="alias" v-if="emoji.aliasOf">({{ emoji.aliasOf }})</span>
 		</li>
@@ -92,10 +91,6 @@ export default Vue.extend({
 		items(): HTMLCollection {
 			return (this.$refs.suggests as Element).children;
 		},
-
-		useOsDefaultEmojis(): boolean {
-			return this.$store.state.device.useOsDefaultEmojis;
-		}
 	},
 
 	updated() {

src/client/app/common/views/components/emoji.vue

@@ -1,7 +1,6 @@
 <template>
 <img v-if="customEmoji" class="fvgwvorwhxigeolkkrcderjzcawqrscl custom" :class="{ normal: normal }" :src="url" :alt="alt" :title="title"/>
-<img v-else-if="char && !useOsDefaultEmojis" class="fvgwvorwhxigeolkkrcderjzcawqrscl" :src="url" :alt="alt" :title="alt"/>
-<span v-else-if="char && useOsDefaultEmojis">{{ char }}</span>
+<img v-else-if="char" class="fvgwvorwhxigeolkkrcderjzcawqrscl" :src="url" :alt="alt" :title="alt"/>
 <span v-else>:{{ name }}:</span>
 </template>
 
@@ -51,10 +50,6 @@ export default Vue.extend({
 		title(): string {
 			return this.customEmoji ? `:${this.customEmoji.name}:` : this.char;
 		},
-
-		useOsDefaultEmojis(): boolean {
-			return this.$store.state.device.useOsDefaultEmojis && !this.isReaction;
-		}
 	},
 
 	watch: {

src/client/app/common/views/components/settings/settings.vue

@@ -39,7 +39,6 @@
 				<ui-switch v-model="contrastedAcct" v-if="isAdvanced">{{ $t('@._settings.contrasted-acct') }}</ui-switch>
 				<ui-switch v-model="showFullAcct" v-if="isAdvanced">{{ $t('@._settings.show-full-acct') }}</ui-switch>
 				<ui-switch v-model="showVia">{{ $t('@._settings.show-via') }}</ui-switch>
-				<ui-switch v-model="useOsDefaultEmojis" v-if="isAdvanced">{{ $t('@._settings.use-os-default-emojis') }}</ui-switch>
 				<ui-switch v-model="iLikeSushi">{{ $t('@._settings.i-like-sushi') }}</ui-switch>
 			</section>
 			<section>
@@ -396,11 +395,6 @@ export default Vue.extend({
 			return emojis;
 		},
 
-		useOsDefaultEmojis: {
-			get() { return this.$store.state.device.useOsDefaultEmojis; },
-			set(value) { this.$store.commit('device/set', { key: 'useOsDefaultEmojis', value }); }
-		},
-
 		reduceMotion: {
 			get() { return this.$store.state.device.reduceMotion; },
 			set(value) { this.$store.commit('device/set', { key: 'reduceMotion', value }); }

src/client/app/store.ts

@@ -75,7 +75,6 @@ const defaultDeviceSettings = Object.assign({
 	postStyle: 'standard',
 	navbar: 'top',
 	mobileNotificationPosition: 'bottom',
-	useOsDefaultEmojis: false,
 	disableShowingAnimatedImages: true,
 	expandUsersPhotos: true,
 	expandUsersActivity: true,