tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2023-07-13 14:22:20 +02:00
parent 447ab7ab24 5a3f174d56
commit 25571b18ed
25 changed files with 151 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/javascript/mastodon/features/emoji/emoji_compressed.d.ts vendored
View File

@ -28,9 +28,10 @@ export type SearchData = [
Emoji['unified'],
];
export interface ShortCodesToEmojiData {
[key: ShortCodesToEmojiDataKey]: [FilenameData, SearchData];
}
export type ShortCodesToEmojiData = Record<
ShortCodesToEmojiDataKey,
[FilenameData, SearchData]
>;
export type EmojisWithoutShortCodes = FilenameData[];
export type EmojiCompressed = [

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

@ -9,7 +9,7 @@ import emojiCompressed from './emoji_compressed';
import { unicodeToUnifiedName } from './unicode_to_unified_name';
type Emojis = {
[key in keyof ShortCodesToEmojiData]: {
[key in NonNullable<keyof ShortCodesToEmojiData>]: {
native: BaseEmoji['native'];
search: Search;
short_names: Emoji['short_names'];

2
app/javascript/mastodon/features/home_timeline/components/column_settings.tsx
View File

@ -18,7 +18,7 @@ export const ColumnSettings: React.FC = () => {
const dispatch = useAppDispatch();
const onChange = useCallback(
(key: string, checked: boolean) => {
void dispatch(changeSetting(['home', ...key], checked));
dispatch(changeSetting(['home', ...key], checked));
},
[dispatch],
);