EmojiReacts: remove thumbs-up, map like to heart

emoji-improvements
Alex Gleason 2022-09-05 20:05:01 -05:00
rodzic 4ee9419402
commit 63080d4f7c
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7211D1F99744FBB7
5 zmienionych plików z 6 dodań i 8 usunięć

Wyświetl plik

@ -29,7 +29,7 @@ const simpleEmojiReact = (status: Status, emoji: string) =>
(dispatch: AppDispatch) => {
const emojiReacts: ImmutableList<ImmutableMap<string, any>> = status.pleroma.get('emoji_reactions') || ImmutableList();
if (emoji === '👍' && status.favourited) return dispatch(unfavourite(status));
if (emoji === '❤️' && status.favourited) return dispatch(unfavourite(status));
const undo = emojiReacts.filter(e => e.get('me') === true && e.get('name') === emoji).count() > 0;
if (undo) return dispatch(unEmojiReact(status, emoji));
@ -40,7 +40,7 @@ const simpleEmojiReact = (status: Status, emoji: string) =>
.map(emojiReact => dispatch(unEmojiReact(status, emojiReact.get('name')))).toArray(),
status.favourited && dispatch(unfavourite(status)),
]).then(() => {
if (emoji === '👍') {
if (emoji === '❤️') {
dispatch(favourite(status));
} else {
dispatch(emojiReact(status, emoji));

Wyświetl plik

@ -93,7 +93,7 @@ const EmojiButtonWrapper: React.FC<IEmojiButtonWrapper> = ({ statusId, children
};
const handleClick: React.EventHandler<React.MouseEvent> = e => {
const meEmojiReact = getReactForStatus(status, soapboxConfig.allowedEmoji) || '👍';
const meEmojiReact = getReactForStatus(status, soapboxConfig.allowedEmoji) || '❤️';
if (isUserTouching()) {
if (visible) {

Wyświetl plik

@ -29,7 +29,7 @@ const ReactionsModal: React.FC<IReactionsModal> = ({ onClose, statusId, reaction
const reactions = useAppSelector<ImmutableList<ReturnType<typeof ReactionRecord>> | undefined>((state) => {
const favourites = state.user_lists.favourited_by.get(statusId)?.items;
const reactions = state.user_lists.reactions.get(statusId)?.items;
return favourites && reactions && ImmutableList(favourites?.size ? [ReactionRecord({ accounts: favourites, count: favourites.size, name: '👍' })] : []).concat(reactions || []);
return favourites && reactions && ImmutableList(favourites?.size ? [ReactionRecord({ accounts: favourites, count: favourites.size, name: '❤️' })] : []).concat(reactions || []);
});
const fetchData = () => {

Wyświetl plik

@ -90,7 +90,6 @@ export const SoapboxConfigRecord = ImmutableRecord({
homeFooter: ImmutableList<FooterItem>(),
}),
allowedEmoji: ImmutableList<string>([
'👍',
'❤️',
'😆',
'😮',

Wyświetl plik

@ -8,7 +8,6 @@ import type { Me } from 'soapbox/types/soapbox';
// https://emojipedia.org/facebook
// I've customized them.
export const ALLOWED_EMOJI = ImmutableList([
'👍',
'❤️',
'😆',
'😮',
@ -29,7 +28,7 @@ export const mergeEmoji = (emojiReacts: ImmutableList<EmojiReact>): ImmutableLis
export const mergeEmojiFavourites = (emojiReacts = ImmutableList<EmojiReact>(), favouritesCount: number, favourited: boolean) => {
if (!favouritesCount) return emojiReacts;
const likeIndex = emojiReacts.findIndex(emojiReact => emojiReact.get('name') === '👍');
const likeIndex = emojiReacts.findIndex(emojiReact => emojiReact.get('name') === '❤️');
if (likeIndex > -1) {
const likeCount = Number(emojiReacts.getIn([likeIndex, 'count']));
favourited = favourited || Boolean(emojiReacts.getIn([likeIndex, 'me'], false));
@ -37,7 +36,7 @@ export const mergeEmojiFavourites = (emojiReacts = ImmutableList<EmojiReact>(),
.setIn([likeIndex, 'count'], likeCount + favouritesCount)
.setIn([likeIndex, 'me'], favourited);
} else {
return emojiReacts.push(ImmutableMap({ count: favouritesCount, me: favourited, name: '👍' }));
return emojiReacts.push(ImmutableMap({ count: favouritesCount, me: favourited, name: '❤️' }));
}
};