matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

pl-fe: simplify emoji sort code

Browse Source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak
2024-09-04 11:49:42 +02:00
parent 8a1410afb9
commit b7faf7040c
4 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/pl-fe/src/components/status-action-bar.tsx
View File

@@ -21,7 +21,7 @@ import StatusActionButton from 'pl-fe/components/status-action-button';
import StatusReactionWrapper from 'pl-fe/components/status-reaction-wrapper';
import { HStack } from 'pl-fe/components/ui';
import { languages } from 'pl-fe/features/preferences';
import { useAppDispatch, useAppSelector, useFeatures, useInstance, useOwnAccount, useSettings, usePlFeConfig } from 'pl-fe/hooks';
import { useAppDispatch, useAppSelector, useFeatures, useInstance, useOwnAccount, useSettings } from 'pl-fe/hooks';
import { useChats } from 'pl-fe/queries/chats';
import toast from 'pl-fe/toast';
import copy from 'pl-fe/utils/copy';
@@ -138,7 +138,6 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
const features = useFeatures();
const instance = useInstance();
const { autoTranslate, boostModal, deleteModal, knownLanguages } = useSettings();
const plFeConfig = usePlFeConfig();
const { translationLanguages } = useTranslationLanguages();
@@ -154,8 +153,6 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
return autoTranslate && features.translations && renderTranslate && supportsLanguages;
}, [me, status, autoTranslate]);
const { allowedEmoji } = plFeConfig;
const { account } = useOwnAccount();
const isStaff = account ? account.is_admin || account.is_moderator : false;
const isAdmin = account ? account.is_admin : false;
@@ -632,10 +629,9 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
status.emoji_reactions,
favouriteCount,
status.favourited,
allowedEmoji,
).reduce((acc, cur) => acc + (cur.count || 0), 0) : undefined;
const meEmojiReact = getReactForStatus(status, allowedEmoji);
const meEmojiReact = getReactForStatus(status);
const meEmojiName = meEmojiReact?.name as keyof typeof reactMessages | undefined;
const reactMessages = {

5
packages/pl-fe/src/components/status-reaction-wrapper.tsx
View File

@@ -3,7 +3,7 @@ import React, { useState, useEffect, useRef } from 'react';
import { simpleEmojiReact } from 'pl-fe/actions/emoji-reacts';
import { openModal } from 'pl-fe/actions/modals';
import { EmojiSelector, Portal } from 'pl-fe/components/ui';
import { useAppDispatch, useAppSelector, useOwnAccount, usePlFeConfig } from 'pl-fe/hooks';
import { useAppDispatch, useAppSelector, useOwnAccount } from 'pl-fe/hooks';
import { userTouching } from 'pl-fe/is-mobile';
import { getReactForStatus } from 'pl-fe/utils/emoji-reacts';
@@ -17,7 +17,6 @@ const StatusReactionWrapper: React.FC<IStatusReactionWrapper> = ({ statusId, chi
const dispatch = useAppDispatch();
const { account: ownAccount } = useOwnAccount();
const status = useAppSelector(state => state.statuses.get(statusId));
const plFeConfig = usePlFeConfig();
const timeout = useRef<NodeJS.Timeout>();
const [visible, setVisible] = useState(false);
@@ -69,7 +68,7 @@ const StatusReactionWrapper: React.FC<IStatusReactionWrapper> = ({ statusId, chi
};
const handleClick: React.EventHandler<React.MouseEvent> = e => {
const meEmojiReact = getReactForStatus(status, plFeConfig.allowedEmoji)?.name || '👍';
const meEmojiReact = getReactForStatus(status)?.name || '👍';
if (userTouching.matches) {
if (ownAccount) {