gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-10-06 09:02:43 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

cleanup removing unused types and constants
Some checks failed
Chromatic / Run Chromatic (push) Has been cancelled
Details

Browse Source
This commit is contained in:
ChaosExAnima 2025-09-26 12:27:52 +02:00
parent fd8bdd8fb6
commit ab7d17ebba
No known key found for this signature in database
GPG Key ID: 8F2B333100FB6117
4 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/emoji/constants.ts
View File

@ -23,8 +23,6 @@ export const EMOJI_MODE_TWEMOJI = 'twemoji';
export const EMOJI_TYPE_UNICODE = 'unicode'; export const EMOJI_TYPE_UNICODE = 'unicode';
export const EMOJI_TYPE_CUSTOM = 'custom'; export const EMOJI_TYPE_CUSTOM = 'custom';
export const EMOJI_STATE_MISSING = 'missing';
export const EMOJIS_WITH_DARK_BORDER = [ export const EMOJIS_WITH_DARK_BORDER = [
'🎱', // 1F3B1 '🎱', // 1F3B1
'🐜', // 1F41C '🐜', // 1F41C

6
app/javascript/mastodon/features/emoji/loader.ts
View File

@ -1,8 +1,6 @@
import { flattenEmojiData } from 'emojibase'; import { flattenEmojiData } from 'emojibase';
import type { CompactEmoji, FlatCompactEmoji } from 'emojibase'; import type { CompactEmoji, FlatCompactEmoji } from 'emojibase';
import type { ApiCustomEmojiJSON } from '@/mastodon/api_types/custom_emoji';
import { import {
putEmojiData, putEmojiData,
putCustomEmojiData, putCustomEmojiData,
@ -10,7 +8,7 @@ import {
putLatestEtag, putLatestEtag,
} from './database'; } from './database';
import { toSupportedLocale, toSupportedLocaleOrCustom } from './locale'; import { toSupportedLocale, toSupportedLocaleOrCustom } from './locale';
import type { LocaleOrCustom } from './types'; import type { CustomEmojiData, LocaleOrCustom } from './types';
import { emojiLogger } from './utils'; import { emojiLogger } from './utils';
const log = emojiLogger('loader'); const log = emojiLogger('loader');
@ -27,7 +25,7 @@ export async function importEmojiData(localeString: string) {
} }
export async function importCustomEmojiData() { export async function importCustomEmojiData() {
const emojis = await fetchAndCheckEtag<ApiCustomEmojiJSON[]>('custom'); const emojis = await fetchAndCheckEtag<CustomEmojiData[]>('custom');
if (!emojis) { if (!emojis) {
return; return;
} }

13
app/javascript/mastodon/features/emoji/render.ts
View File

@ -18,16 +18,15 @@ import {
import { importEmojiData } from './loader'; import { importEmojiData } from './loader';
import { emojiToUnicodeHex, unicodeHexToUrl } from './normalize'; import { emojiToUnicodeHex, unicodeHexToUrl } from './normalize';
import type { import type {
CustomEmojiToken,
EmojiAppState, EmojiAppState,
EmojiLoadedState, EmojiLoadedState,
EmojiMode, EmojiMode,
EmojiState, EmojiState,
EmojiStateCustom,
EmojiStateMap, EmojiStateMap,
EmojiToken, EmojiStateUnicode,
ExtraCustomEmojiMap, ExtraCustomEmojiMap,
LocaleOrCustom, LocaleOrCustom,
UnicodeEmojiToken,
} from './types'; } from './types';
import { import {
anyEmojiRegex, anyEmojiRegex,
@ -298,11 +297,11 @@ async function textToElementArray(
return renderedFragments; return renderedFragments;
} }
type TokenizedText = (string | EmojiToken)[]; type TokenizedText = (string | EmojiState)[];
export function tokenizeText(text: string): TokenizedText { export function tokenizeText(text: string): TokenizedText {
if (!text.trim()) { if (!text.trim()) {
return []; return [text];
} }
const tokens = []; const tokens = [];
@ -319,13 +318,13 @@ export function tokenizeText(text: string): TokenizedText {
tokens.push({ tokens.push({
type: EMOJI_TYPE_CUSTOM, type: EMOJI_TYPE_CUSTOM,
code, code,
} satisfies CustomEmojiToken); } satisfies EmojiStateCustom);
} else { } else {
// Unicode emoji // Unicode emoji
tokens.push({ tokens.push({
type: EMOJI_TYPE_UNICODE, type: EMOJI_TYPE_UNICODE,
code: code, code: code,
} satisfies UnicodeEmojiToken); } satisfies EmojiStateUnicode);
} }
lastIndex = match.index + code.length; lastIndex = match.index + code.length;
} }

25
app/javascript/mastodon/features/emoji/types.ts
View File

@ -10,7 +10,6 @@ import type {
EMOJI_MODE_NATIVE, EMOJI_MODE_NATIVE,
EMOJI_MODE_NATIVE_WITH_FLAGS, EMOJI_MODE_NATIVE_WITH_FLAGS,
EMOJI_MODE_TWEMOJI, EMOJI_MODE_TWEMOJI,
EMOJI_STATE_MISSING,
EMOJI_TYPE_CUSTOM, EMOJI_TYPE_CUSTOM,
EMOJI_TYPE_UNICODE, EMOJI_TYPE_UNICODE,
} from './constants'; } from './constants';
@ -29,21 +28,15 @@ export interface EmojiAppState {
darkTheme: boolean; darkTheme: boolean;
} }
export interface UnicodeEmojiToken {
type: typeof EMOJI_TYPE_UNICODE;
code: string;
}
export interface CustomEmojiToken {
type: typeof EMOJI_TYPE_CUSTOM;
code: string;
}
export type EmojiToken = UnicodeEmojiToken | CustomEmojiToken;
export type CustomEmojiData = ApiCustomEmojiJSON; export type CustomEmojiData = ApiCustomEmojiJSON;
export type UnicodeEmojiData = FlatCompactEmoji; export type UnicodeEmojiData = FlatCompactEmoji;
export type AnyEmojiData = CustomEmojiData | UnicodeEmojiData; export type AnyEmojiData = CustomEmojiData | UnicodeEmojiData;
export type EmojiStateMissing = typeof EMOJI_STATE_MISSING; type CustomEmojiRenderFields = Pick<
CustomEmojiData,
'shortcode' | 'static_url' | 'url'
>;
export interface EmojiStateUnicode { export interface EmojiStateUnicode {
type: typeof EMOJI_TYPE_UNICODE; type: typeof EMOJI_TYPE_UNICODE;
code: string; code: string;
@ -64,11 +57,11 @@ export type EmojiStateMap = LimitedCache<string, EmojiState>;
export type CustomEmojiMapArg = export type CustomEmojiMapArg =
| ExtraCustomEmojiMap | ExtraCustomEmojiMap
| ImmutableList<CustomEmoji>; | ImmutableList<CustomEmoji>;
export type CustomEmojiRenderFields = Pick<
CustomEmojiData, export type ExtraCustomEmojiMap = Record<
'shortcode' | 'static_url' | 'url' string,
Pick<CustomEmojiData, 'shortcode' | 'static_url' | 'url'>
>; >;
export type ExtraCustomEmojiMap = Record<string, CustomEmojiRenderFields>;
export interface TwemojiBorderInfo { export interface TwemojiBorderInfo {
hexCode: string; hexCode: string;