fix build, take 4, likely caused by borked merge

app/javascript/flavours/glitch/components/status_action_bar.jsx

@@ -18,8 +18,6 @@ import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 import { IconButton } from './icon_button';
 import { RelativeTimestamp } from './relative_timestamp';
 
-import EmojiPickerDropdown from '../features/compose/containers/emoji_picker_dropdown_container';
-
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
   redraft: { id: 'status.redraft', defaultMessage: 'Delete & re-draft' },

app/javascript/flavours/glitch/features/status/components/action_bar.jsx

@@ -14,7 +14,6 @@ import EmojiPickerDropdown from 'flavours/glitch/features/compose/containers/emo
 import { me, maxReactions } from 'flavours/glitch/initial_state';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'flavours/glitch/permissions';
 import { accountAdminLink, statusAdminLink } from 'flavours/glitch/utils/backend_links';
-import EmojiPickerDropdown from '../../compose/containers/emoji_picker_dropdown_container';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
 const messages = defineMessages({

app/javascript/flavours/glitch/reducers/settings.js

@@ -64,7 +64,6 @@ const initialState = ImmutableMap({
       favourite: true,
       reaction: true,
       reblog: true,
-      reaction: true,
       mention: true,
       poll: true,
       status: true,

app/javascript/flavours/glitch/reducers/statuses.js

@@ -108,43 +108,6 @@ const statusTranslateUndo = (state, id) => {
   });
 };
 
-const updateReaction = (state, id, name, updater) => state.update(
-  id,
-  status => status.update(
-    'reactions',
-    reactions => {
-      const index = reactions.findIndex(reaction => reaction.get('name') === name);
-      if (index > -1) {
-        return reactions.update(index, reaction => updater(reaction));
-      } else {
-        return reactions.push(updater(fromJS({ name, count: 0 })));
-      }
-    },
-  ),
-);
-
-const updateReactionCount = (state, reaction) => updateReaction(state, reaction.status_id, reaction.name, x => x.set('count', reaction.count));
-
-// The url parameter is only used when adding a new custom emoji reaction
-// (one that wasn't in the reactions list before) because we don't have its
-// URL yet.  In all other cases, it's undefined.
-const addReaction = (state, id, name, url) => updateReaction(
-  state,
-  id,
-  name,
-  x => x.set('me', true)
-    .update('count', n => n + 1)
-    .update('url', old => old ? old : url)
-    .update('static_url', old => old ? old : url),
-);
-
-const removeReaction = (state, id, name) => updateReaction(
-  state,
-  id,
-  name,
-  x => x.set('me', false).update('count', n => n - 1),
-);
-
 const initialState = ImmutableMap();
 
 export default function statuses(state = initialState, action) {

app/javascript/mastodon/components/status.jsx

@@ -30,7 +30,6 @@ import { DisplayName } from './display_name';
 import { getHashtagBarForStatus } from './hashtag_bar';
 import { RelativeTimestamp } from './relative_timestamp';
 import StatusActionBar from './status_action_bar';
-import StatusReactions from './status_reactions';
 import StatusContent from './status_content';
 import StatusReactions from './status_reactions';
 import { VisibilityIcon } from './visibility_icon';

app/javascript/mastodon/components/status_action_bar.jsx

@@ -21,7 +21,6 @@ import { ReactComponent as StarBorderIcon } from '@material-symbols/svg-600/outl
 import { ReactComponent as VisibilityIcon } from '@material-symbols/svg-600/outlined/visibility.svg';
 
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
-import EmojiPickerDropdown from '../features/compose/containers/emoji_picker_dropdown_container';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import DropdownMenuContainer from '../containers/dropdown_menu_container';

app/javascript/mastodon/features/status/components/action_bar.jsx

@@ -112,11 +112,7 @@ class ActionBar extends PureComponent {
 
   handleEmojiPick = data => {
     this.props.onReactionAdd(this.props.status.get('id'), data.native.replace(/:/g, ''));
-<<<<<<< HEAD
-  }
-=======
   };
->>>>>>> pr2462
 
   handleBookmarkClick = (e) => {
     this.props.onBookmark(this.props.status, e);

app/javascript/mastodon/reducers/settings.js

@@ -59,7 +59,6 @@ const initialState = ImmutableMap({
       favourite: true,
       reaction: true,
       reblog: true,
-      reaction: true,
       mention: true,
       poll: true,
       status: true,

app/javascript/mastodon/reducers/statuses.js

@@ -13,11 +13,6 @@ import {
   UNFAVOURITE_FAIL,
   BOOKMARK_REQUEST,
   BOOKMARK_FAIL,
-  REACTION_UPDATE,
-  REACTION_ADD_FAIL,
-  REACTION_REMOVE_FAIL,
-  REACTION_ADD_REQUEST,
-  REACTION_REMOVE_REQUEST,
   UNBOOKMARK_REQUEST,
   UNBOOKMARK_FAIL,
   REACTION_UPDATE,