diff --git a/src/actions/compose.ts b/src/actions/compose.ts index 85b2d4c5d..fef615386 100644 --- a/src/actions/compose.ts +++ b/src/actions/compose.ts @@ -13,7 +13,7 @@ import toast from 'soapbox/toast'; import { isLoggedIn } from 'soapbox/utils/auth'; import { getFeatures, parseVersion } from 'soapbox/utils/features'; -import { useEmoji } from './emojis'; +import { chooseEmoji } from './emojis'; import { importFetchedAccounts } from './importer'; import { uploadFile, updateMedia } from './media'; import { openModal, closeModal } from './modals'; @@ -631,7 +631,7 @@ const selectComposeSuggestion = (composeId: string, position: number, token: str completion = isNativeEmoji(suggestion) ? suggestion.native : suggestion.colons; startPosition = position - 1; - dispatch(useEmoji(suggestion)); + dispatch(chooseEmoji(suggestion)); } else if (typeof suggestion === 'string' && suggestion[0] === '#') { completion = suggestion; startPosition = position - 1; diff --git a/src/actions/emojis.ts b/src/actions/emojis.ts index f3d33ac61..2a959fcc3 100644 --- a/src/actions/emojis.ts +++ b/src/actions/emojis.ts @@ -3,12 +3,12 @@ import { saveSettings } from './settings'; import type { Emoji } from 'soapbox/features/emoji'; import type { AppDispatch } from 'soapbox/store'; -const EMOJI_USE = 'EMOJI_USE'; +const EMOJI_CHOOSE = 'EMOJI_CHOOSE'; -const useEmoji = (emoji: Emoji) => +const chooseEmoji = (emoji: Emoji) => (dispatch: AppDispatch) => { dispatch({ - type: EMOJI_USE, + type: EMOJI_CHOOSE, emoji, }); @@ -16,6 +16,6 @@ const useEmoji = (emoji: Emoji) => }; export { - EMOJI_USE, - useEmoji, + EMOJI_CHOOSE, + chooseEmoji, }; diff --git a/src/features/compose/editor/plugins/autosuggest-plugin.tsx b/src/features/compose/editor/plugins/autosuggest-plugin.tsx index 24a9f2627..c4419eff0 100644 --- a/src/features/compose/editor/plugins/autosuggest-plugin.tsx +++ b/src/features/compose/editor/plugins/autosuggest-plugin.tsx @@ -33,7 +33,7 @@ import React, { import ReactDOM from 'react-dom'; import { clearComposeSuggestions, fetchComposeSuggestions } from 'soapbox/actions/compose'; -import { useEmoji as chooseEmoji } from 'soapbox/actions/emojis'; +import { chooseEmoji } from 'soapbox/actions/emojis'; import AutosuggestEmoji from 'soapbox/components/autosuggest-emoji'; import { useAppDispatch, useCompose } from 'soapbox/hooks'; import { selectAccount } from 'soapbox/selectors'; diff --git a/src/features/emoji/components/emoji-picker-dropdown.tsx b/src/features/emoji/components/emoji-picker-dropdown.tsx index 3ab977e57..f384c4e19 100644 --- a/src/features/emoji/components/emoji-picker-dropdown.tsx +++ b/src/features/emoji/components/emoji-picker-dropdown.tsx @@ -3,7 +3,7 @@ import React, { useEffect, useState, useLayoutEffect } from 'react'; import { defineMessages, useIntl } from 'react-intl'; import { createSelector } from 'reselect'; -import { useEmoji } from 'soapbox/actions/emojis'; +import { chooseEmoji } from 'soapbox/actions/emojis'; import { changeSetting } from 'soapbox/actions/settings'; import { useAppDispatch, useAppSelector, useTheme } from 'soapbox/hooks'; import { RootState } from 'soapbox/store'; @@ -160,7 +160,7 @@ const EmojiPickerDropdown: React.FC = ({ } as CustomEmoji; } - dispatch(useEmoji(pickedEmoji)); // eslint-disable-line react-hooks/rules-of-hooks + dispatch(chooseEmoji(pickedEmoji)); if (onPickEmoji) { onPickEmoji(pickedEmoji); diff --git a/src/reducers/settings.ts b/src/reducers/settings.ts index f124b38a5..e7946ca37 100644 --- a/src/reducers/settings.ts +++ b/src/reducers/settings.ts @@ -3,7 +3,7 @@ import { AnyAction } from 'redux'; import { ME_FETCH_SUCCESS } from 'soapbox/actions/me'; -import { EMOJI_USE } from '../actions/emojis'; +import { EMOJI_CHOOSE } from '../actions/emojis'; import { NOTIFICATIONS_FILTER_SET } from '../actions/notifications'; import { SEARCH_FILTER_SET } from '../actions/search'; import { @@ -40,7 +40,7 @@ export default function settings(state: State = ImmutableMap({ save return state .setIn(action.path, action.value) .set('saved', false); - case EMOJI_USE: + case EMOJI_CHOOSE: return updateFrequentEmojis(state, action.emoji); case SETTING_SAVE: return state.set('saved', true);