summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarie <github@yuugi.dev>2025-05-31 16:27:47 +0000
committerMarie <github@yuugi.dev>2025-05-31 16:27:47 +0000
commitb9ada1eea7883f185df24c7e10a12a08aee56b9d (patch)
tree13a0f7092b1d49da25b9f5cd5fc75d8654092d43
parentmerge: Block remote interactions with local-only posts (resolves #972) (!1070) (diff)
parentAdd back in tossface (diff)
downloadsharkey-b9ada1eea7883f185df24c7e10a12a08aee56b9d.tar.gz
sharkey-b9ada1eea7883f185df24c7e10a12a08aee56b9d.tar.bz2
sharkey-b9ada1eea7883f185df24c7e10a12a08aee56b9d.zip
merge: Add back in missing tossface option (!1074)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1074 Approved-by: Hazelnoot <acomputerdog@gmail.com> Approved-by: Julia <julia@insertdomain.name>
-rw-r--r--packages/frontend/src/pages/settings/preferences.vue3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue
index 683fe3ee32..8b89325db7 100644
--- a/packages/frontend/src/pages/settings/preferences.vue
+++ b/packages/frontend/src/pages/settings/preferences.vue
@@ -99,7 +99,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</SearchMarker>
</div>
- <SearchMarker :keywords="['emoji', 'style', 'native', 'system', 'fluent', 'twemoji']">
+ <SearchMarker :keywords="['emoji', 'style', 'native', 'system', 'fluent', 'twemoji', 'tossface']">
<MkPreferenceContainer k="emojiStyle">
<div>
<MkRadios v-model="emojiStyle">
@@ -107,6 +107,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<option value="native">{{ i18n.ts.native }}</option>
<option value="fluentEmoji">Fluent Emoji</option>
<option value="twemoji">Twemoji</option>
+ <option value="tossface">Tossface</option>
</MkRadios>
<div style="margin: 8px 0 0 0; font-size: 1.5em;"><Mfm :key="emojiStyle" text="🍮🍦🍭🍩🍰🍫🍬🥞🍪"/></div>
</div>