Revert "Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream"

This reverts commit fa3b5195fd, reversing
changes made to 1b1c4ff940.

.env.production.sample

@@ -270,9 +270,6 @@ MAX_POLL_OPTIONS=5
 # Maximum allowed poll option characters
 MAX_POLL_OPTION_CHARS=100
 
-# Maximum number of emoji reactions per toot and user (minimum 1)
-MAX_REACTIONS=1
-
 # Maximum image and video/audio upload sizes
 # Units are in bytes
 # 1048576 bytes equals 1 megabyte

app/controllers/api/v1/statuses/reactions_controller.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class Api::V1::Statuses::ReactionsController < Api::V1::Statuses::BaseController
-  before_action -> { doorkeeper_authorize! :write, :'write:favourites' }
-  before_action :require_user!
-
-  def create
-    ReactService.new.call(current_account, @status, params[:id])
-    render json: @status, serializer: REST::StatusSerializer
-  end
-
-  def destroy
-    UnreactWorker.perform_async(current_account.id, @status.id, params[:id])
-
-    render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_account.id, reactions_map: { @status.id => false })
-  rescue Mastodon::NotPermittedError
-    not_found
-  end
-end

app/javascript/flavours/glitch/actions/interactions.js

@@ -51,16 +51,6 @@ export const UNBOOKMARK_REQUEST = 'UNBOOKMARKED_REQUEST';
 export const UNBOOKMARK_SUCCESS = 'UNBOOKMARKED_SUCCESS';
 export const UNBOOKMARK_FAIL    = 'UNBOOKMARKED_FAIL';
 
-export const REACTION_UPDATE = 'REACTION_UPDATE';
-
-export const REACTION_ADD_REQUEST = 'REACTION_ADD_REQUEST';
-export const REACTION_ADD_SUCCESS = 'REACTION_ADD_SUCCESS';
-export const REACTION_ADD_FAIL    = 'REACTION_ADD_FAIL';
-
-export const REACTION_REMOVE_REQUEST = 'REACTION_REMOVE_REQUEST';
-export const REACTION_REMOVE_SUCCESS = 'REACTION_REMOVE_SUCCESS';
-export const REACTION_REMOVE_FAIL    = 'REACTION_REMOVE_FAIL';
-
 export function reblog(status, visibility) {
   return function (dispatch, getState) {
     dispatch(reblogRequest(status));
@@ -526,75 +516,3 @@ export function unpinFail(status, error) {
     skipLoading: true,
   };
 }
-
-export const addReaction = (statusId, name, url) => (dispatch, getState) => {
-  const status = getState().get('statuses').get(statusId);
-  let alreadyAdded = false;
-  if (status) {
-    const reaction = status.get('reactions').find(x => x.get('name') === name);
-    if (reaction && reaction.get('me')) {
-      alreadyAdded = true;
-    }
-  }
-  if (!alreadyAdded) {
-    dispatch(addReactionRequest(statusId, name, url));
-  }
-
-  // encodeURIComponent is required for the Keycap Number Sign emoji, see:
-  // <https://github.com/glitch-soc/mastodon/pull/1980#issuecomment-1345538932>
-  api(getState).post(`/api/v1/statuses/${statusId}/react/${encodeURIComponent(name)}`).then(() => {
-    dispatch(addReactionSuccess(statusId, name));
-  }).catch(err => {
-    if (!alreadyAdded) {
-      dispatch(addReactionFail(statusId, name, err));
-    }
-  });
-};
-
-export const addReactionRequest = (statusId, name, url) => ({
-  type: REACTION_ADD_REQUEST,
-  id: statusId,
-  name,
-  url,
-});
-
-export const addReactionSuccess = (statusId, name) => ({
-  type: REACTION_ADD_SUCCESS,
-  id: statusId,
-  name,
-});
-
-export const addReactionFail = (statusId, name, error) => ({
-  type: REACTION_ADD_FAIL,
-  id: statusId,
-  name,
-  error,
-});
-
-export const removeReaction = (statusId, name) => (dispatch, getState) => {
-  dispatch(removeReactionRequest(statusId, name));
-
-  api(getState).post(`/api/v1/statuses/${statusId}/unreact/${encodeURIComponent(name)}`).then(() => {
-    dispatch(removeReactionSuccess(statusId, name));
-  }).catch(err => {
-    dispatch(removeReactionFail(statusId, name, err));
-  });
-};
-
-export const removeReactionRequest = (statusId, name) => ({
-  type: REACTION_REMOVE_REQUEST,
-  id: statusId,
-  name,
-});
-
-export const removeReactionSuccess = (statusId, name) => ({
-  type: REACTION_REMOVE_SUCCESS,
-  id: statusId,
-  name,
-});
-
-export const removeReactionFail = (statusId, name) => ({
-  type: REACTION_REMOVE_FAIL,
-  id: statusId,
-  name,
-});

app/javascript/flavours/glitch/actions/notifications.js

@@ -142,7 +142,6 @@ const excludeTypesFromFilter = filter => {
     'follow',
     'follow_request',
     'favourite',
-    'reaction',
     'reblog',
     'mention',
     'poll',

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

@@ -20,7 +20,7 @@ import Card from '../features/status/components/card';
 // to use the progress bar to show download progress
 import Bundle from '../features/ui/components/bundle';
 import { MediaGallery, Video, Audio } from '../features/ui/util/async-components';
-import { displayMedia, visibleReactions } from '../initial_state';
+import { displayMedia } from '../initial_state';
 
 import AttachmentList from './attachment_list';
 import { getHashtagBarForStatus } from './hashtag_bar';
@@ -29,7 +29,6 @@ import StatusContent from './status_content';
 import StatusHeader from './status_header';
 import StatusIcons from './status_icons';
 import StatusPrepend from './status_prepend';
-import StatusReactions from './status_reactions';
 
 const domParser = new DOMParser();
 
@@ -72,10 +71,6 @@ export const defaultMediaVisibility = (status, settings) => {
 
 class Status extends ImmutablePureComponent {
 
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
     containerId: PropTypes.string,
     id: PropTypes.string,
@@ -93,8 +88,6 @@ class Status extends ImmutablePureComponent {
     onDelete: PropTypes.func,
     onDirect: PropTypes.func,
     onMention: PropTypes.func,
-    onReactionAdd: PropTypes.func,
-    onReactionRemove: PropTypes.func,
     onPin: PropTypes.func,
     onOpenMedia: PropTypes.func,
     onOpenVideo: PropTypes.func,
@@ -759,7 +752,6 @@ class Status extends ImmutablePureComponent {
     if (this.props.prepend && account) {
       const notifKind = {
         favourite: 'favourited',
-        reaction: 'reacted',
         reblog: 'boosted',
         reblogged_by: 'boosted',
         status: 'posted',
@@ -846,15 +838,6 @@ class Status extends ImmutablePureComponent {
             {...statusContentProps}
           />
 
-          <StatusReactions
-            statusId={status.get('id')}
-            reactions={status.get('reactions')}
-            numVisible={visibleReactions}
-            addReaction={this.props.onReactionAdd}
-            removeReaction={this.props.onReactionRemove}
-            canReact={this.context.identity.signedIn}
-          />
-
           {!isCollapsed || !(muted || !settings.getIn(['collapsed', 'show_action_bar'])) ? (
             <StatusActionBar
               status={status}

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

@@ -8,7 +8,6 @@ import { withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import AddReactionIcon from '@/material-icons/400-24px/add_reaction.svg?react';
 import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg?react';
 import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react';
 import FormatQuoteIcon from '@/material-icons/400-24px/format_quote-fill.svg?react';
@@ -28,8 +27,7 @@ import { accountAdminLink, statusAdminLink } from 'flavours/glitch/utils/backend
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
 import DropdownMenuContainer from '../containers/dropdown_menu_container';
-import EmojiPickerDropdown from '../features/compose/containers/emoji_picker_dropdown_container';
+import { me } from '../initial_state';
-import { me, maxReactions } from '../initial_state';
 
 import { IconButton } from './icon_button';
 import { RelativeTimestamp } from './relative_timestamp';
@@ -52,7 +50,6 @@ const messages = defineMessages({
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favorite' },
-  react: { id: 'status.react', defaultMessage: 'React' },
   bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
   open: { id: 'status.open', defaultMessage: 'Expand this status' },
   report: { id: 'status.report', defaultMessage: 'Report @{name}' },
@@ -81,7 +78,6 @@ class StatusActionBar extends ImmutablePureComponent {
     status: ImmutablePropTypes.map.isRequired,
     onReply: PropTypes.func,
     onFavourite: PropTypes.func,
-    onReactionAdd: PropTypes.func,
     onReblog: PropTypes.func,
     onQuote: PropTypes.func,
     onDelete: PropTypes.func,
@@ -151,10 +147,6 @@ class StatusActionBar extends ImmutablePureComponent {
     }
   };
 
-  handleEmojiPick = data => {
-    this.props.onReactionAdd(this.props.status.get('id'), data.native.replace(/:/g, ''), data.imageUrl);
-  };
-
   handleReblogClick = e => {
     const { signedIn } = this.context.identity;
 
@@ -230,8 +222,6 @@ class StatusActionBar extends ImmutablePureComponent {
     this.props.onAddFilter(this.props.status);
   };
 
-  handleNoOp = () => {}; // hack for reaction add button
-
   render () {
     const { status, intl, withDismiss, withCounters, showReplyCount, scrollKey } = this.props;
     const { permissions, signedIn } = this.context.identity;
@@ -360,18 +350,6 @@ class StatusActionBar extends ImmutablePureComponent {
       <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.hide)} icon='eye' iconComponent={VisibilityIcon} onClick={this.handleHideClick} />
     );
 
-    const canReact = permissions && status.get('reactions').filter(r => r.get('count') > 0 && r.get('me')).size < maxReactions;
-    const reactButton = (
-      <IconButton
-        className='status__action-bar-button'
-        onClick={this.handleNoOp} // EmojiPickerDropdown handles that
-        title={intl.formatMessage(messages.react)}
-        disabled={!canReact}
-        icon='add_reaction'
-        iconComponent={AddReactionIcon}
-      />
-    );
-
     return (
       <div className='status__action-bar'>
         <IconButton
@@ -388,11 +366,6 @@ class StatusActionBar extends ImmutablePureComponent {
         <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} /* active={status.get('reblogged')} */ title={quoteTitle} icon={quoteIcon} iconComponent={quoteIconComponent} onClick={this.handleQuoteClick} />
 
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' iconComponent={status.get('favourited') ? StarIcon : StarBorderIcon} onClick={this.handleFavouriteClick} counter={withCounters ? status.get('favourites_count') : undefined} />
-        {
-          permissions
-            ? <EmojiPickerDropdown className='status__action-bar-button' onPickEmoji={this.handleEmojiPick} button={reactButton} disabled={!canReact} />
-            : reactButton
-        }
         <IconButton className='status__action-bar-button bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' iconComponent={status.get('bookmarked') ? BookmarkIcon : BookmarkBorderIcon} onClick={this.handleBookmarkClick} />
 
         {filterButton}

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

@@ -6,7 +6,6 @@ import { FormattedMessage } from 'react-intl';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import AddReactionIcon from '@/material-icons/400-24px/add_reaction.svg?react';
 import EditIcon from '@/material-icons/400-24px/edit.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
@@ -67,14 +66,6 @@ export default class StatusPrepend extends PureComponent {
           values={{ name : link }}
         />
       );
-    case 'reaction':
-      return (
-        <FormattedMessage
-          id='notification.reaction'
-          defaultMessage='{name} reacted to your status'
-          values={{ name: link }}
-        />
-      );
     case 'reblog':
       return (
         <FormattedMessage
@@ -130,10 +121,6 @@ export default class StatusPrepend extends PureComponent {
       iconId = 'star';
       iconComponent = StarIcon;
       break;
-    case 'reaction':
-      iconId = 'add_reaction';
-      iconComponent = AddReactionIcon;
-      break;
     case 'featured':
       iconId = 'thumb-tack';
       iconComponent = PushPinIcon;

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

@@ -1,175 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-
-import classNames from 'classnames';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import TransitionMotion from 'react-motion/lib/TransitionMotion';
-import spring from 'react-motion/lib/spring';
-
-import { unicodeMapping } from '../features/emoji/emoji_unicode_mapping_light';
-import { autoPlayGif, reduceMotion } from '../initial_state';
-import { assetHost } from '../utils/config';
-
-import { AnimatedNumber } from './animated_number';
-
-export default class StatusReactions extends ImmutablePureComponent {
-
-  static propTypes = {
-    statusId: PropTypes.string.isRequired,
-    reactions: ImmutablePropTypes.list.isRequired,
-    numVisible: PropTypes.number,
-    addReaction: PropTypes.func.isRequired,
-    canReact: PropTypes.bool.isRequired,
-    removeReaction: PropTypes.func.isRequired,
-  };
-
-  willEnter() {
-    return { scale: reduceMotion ? 1 : 0 };
-  }
-
-  willLeave() {
-    return { scale: reduceMotion ? 0 : spring(0, { stiffness: 170, damping: 26 }) };
-  }
-
-  render() {
-    const { reactions, numVisible } = this.props;
-    let visibleReactions = reactions
-      .filter(x => x.get('count') > 0)
-      .sort((a, b) => b.get('count') - a.get('count'));
-
-    if (numVisible >= 0) {
-      visibleReactions = visibleReactions.filter((_, i) => i < numVisible);
-    }
-
-    const styles = visibleReactions.map(reaction => ({
-      key: reaction.get('name'),
-      data: reaction,
-      style: { scale: reduceMotion ? 1 : spring(1, { stiffness: 150, damping: 13 }) },
-    })).toArray();
-
-    return (
-      <TransitionMotion styles={styles} willEnter={this.willEnter} willLeave={this.willLeave}>
-        {items => (
-          <div className={classNames('reactions-bar', { 'reactions-bar--empty': visibleReactions.isEmpty() })}>
-            {items.map(({ key, data, style }) => (
-              <Reaction
-                key={key}
-                statusId={this.props.statusId}
-                reaction={data}
-                style={{ transform: `scale(${style.scale})`, position: style.scale < 0.5 ? 'absolute' : 'static' }}
-                addReaction={this.props.addReaction}
-                removeReaction={this.props.removeReaction}
-                canReact={this.props.canReact}
-              />
-            ))}
-          </div>
-        )}
-      </TransitionMotion>
-    );
-  }
-
-}
-
-class Reaction extends ImmutablePureComponent {
-
-  static propTypes = {
-    statusId: PropTypes.string,
-    reaction: ImmutablePropTypes.map.isRequired,
-    addReaction: PropTypes.func.isRequired,
-    removeReaction: PropTypes.func.isRequired,
-    canReact: PropTypes.bool.isRequired,
-    style: PropTypes.object,
-  };
-
-  state = {
-    hovered: false,
-  };
-
-  handleClick = () => {
-    const { reaction, statusId, addReaction, removeReaction } = this.props;
-
-    if (reaction.get('me')) {
-      removeReaction(statusId, reaction.get('name'));
-    } else {
-      addReaction(statusId, reaction.get('name'));
-    }
-  };
-
-  handleMouseEnter = () => this.setState({ hovered: true });
-
-  handleMouseLeave = () => this.setState({ hovered: false });
-
-  render() {
-    const { reaction } = this.props;
-
-    return (
-      <button
-        className={classNames('reactions-bar__item', { active: reaction.get('me') })}
-        onClick={this.handleClick}
-        onMouseEnter={this.handleMouseEnter}
-        onMouseLeave={this.handleMouseLeave}
-        disabled={!this.props.canReact}
-        style={this.props.style}
-      >
-        <span className='reactions-bar__item__emoji'>
-          <Emoji
-            hovered={this.state.hovered}
-            emoji={reaction.get('name')}
-            url={reaction.get('url')}
-            staticUrl={reaction.get('static_url')}
-          />
-        </span>
-        <span className='reactions-bar__item__count'>
-          <AnimatedNumber value={reaction.get('count')} />
-        </span>
-      </button>
-    );
-  }
-
-}
-
-class Emoji extends React.PureComponent {
-
-  static propTypes = {
-    emoji: PropTypes.string.isRequired,
-    hovered: PropTypes.bool.isRequired,
-    url: PropTypes.string,
-    staticUrl: PropTypes.string,
-  };
-
-  render() {
-    const { emoji, hovered, url, staticUrl } = this.props;
-
-    if (unicodeMapping[emoji]) {
-      const { filename, shortCode } = unicodeMapping[this.props.emoji];
-      const title = shortCode ? `:${shortCode}:` : '';
-
-      return (
-        <img
-          draggable='false'
-          className='emojione'
-          alt={emoji}
-          title={title}
-          src={`${assetHost}/emoji/${filename}.svg`}
-        />
-      );
-    } else {
-      const filename = (autoPlayGif || hovered) ? url : staticUrl;
-      const shortCode = `:${emoji}:`;
-
-      return (
-        <img
-          draggable='false'
-          className='emojione custom-emoji'
-          alt={shortCode}
-          title={shortCode}
-          src={filename}
-        />
-      );
-    }
-  }
-
-}

app/javascript/flavours/glitch/containers/status_container.js

@@ -22,8 +22,6 @@ import {
   unbookmark,
   pin,
   unpin,
-  addReaction,
-  removeReaction,
 } from 'flavours/glitch/actions/interactions';
 import { changeLocalSetting } from 'flavours/glitch/actions/local_settings';
 import { openModal } from 'flavours/glitch/actions/modal';
@@ -198,14 +196,6 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }
   },
 
-  onReactionAdd (statusId, name, url) {
-    dispatch(addReaction(statusId, name, url));
-  },
-
-  onReactionRemove (statusId, name) {
-    dispatch(removeReaction(statusId, name));
-  },
-
   onEmbed (status) {
     dispatch(openModal({
       modalType: 'EMBED',

app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx

@@ -324,7 +324,6 @@ class EmojiPickerDropdown extends PureComponent {
     onSkinTone: PropTypes.func.isRequired,
     skinTone: PropTypes.number.isRequired,
     button: PropTypes.node,
-    disabled: PropTypes.bool,
   };
 
   state = {
@@ -358,7 +357,7 @@ class EmojiPickerDropdown extends PureComponent {
   };
 
   onToggle = (e) => {
-    if (!this.state.disabled && !this.state.loading && (!e.key || e.key === 'Enter')) {
+    if (!this.state.loading && (!e.key || e.key === 'Enter')) {
       if (this.state.active) {
         this.onHideDropdown();
       } else {
@@ -396,7 +395,7 @@ class EmojiPickerDropdown extends PureComponent {
           />}
         </div>
 
-        <Overlay show={active} placement={'bottom'} flip target={this.findTarget} popperConfig={{ strategy: 'fixed' }}>
+        <Overlay show={active} placement={'bottom'} target={this.findTarget} popperConfig={{ strategy: 'fixed' }}>
           {({ props, placement })=> (
             <div {...props} style={{ ...props.style, width: 299 }}>
               <div className={`dropdown-animation ${placement}`}>

app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx

@@ -120,17 +120,6 @@ export default class ColumnSettings extends PureComponent {
           </div>
         </div>
 
-        <div role='group' aria-labelledby='notifications-reaction'>
-          <span id='notifications-reaction' className='column-settings__section'><FormattedMessage id='notifications.column_settings.reaction' defaultMessage='Reactions:' /></span>
-
-          <div className='column-settings__pillbar'>
-            <PillBarButton disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'reaction']} onChange={onChange} label={alertStr} />
-            {showPushSettings && <PillBarButton prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'reaction']} onChange={this.onPushChange} label={pushStr} />}
-            <PillBarButton prefix='notifications' settings={settings} settingPath={['shows', 'reaction']} onChange={onChange} label={showStr} />
-            <PillBarButton prefix='notifications' settings={settings} settingPath={['sounds', 'reaction']} onChange={onChange} label={soundStr} />
-          </div>
-        </div>
-
         <div role='group' aria-labelledby='notifications-mention'>
           <span id='notifications-mention' className='column-settings__section'><FormattedMessage id='notifications.column_settings.mention' defaultMessage='Mentions:' /></span>
 

app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx

@@ -3,7 +3,6 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
-import AddReactionIcon from '@/material-icons/400-24px/add_reaction.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
 import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
@@ -16,7 +15,6 @@ import { Icon }  from 'flavours/glitch/components/icon';
 const tooltips = defineMessages({
   mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' },
   favourites: { id: 'notifications.filter.favourites', defaultMessage: 'Favorites' },
-  reactions: { id: 'notifications.filter.reactions', defaultMessage: 'Reactions' },
   boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Boosts' },
   polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' },
   follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' },
@@ -84,13 +82,6 @@ class FilterBar extends PureComponent {
         >
           <Icon id='star' icon={StarIcon} />
         </button>
-        <button
-          className={selectedFilter === 'reaction' ? 'active' : ''}
-          onClick={this.onClick('reaction')}
-          title={intl.formatMessage(tooltips.reactions)}
-        >
-          <Icon id='add_reaction' icon={AddReactionIcon} />
-        </button>
         <button
           className={selectedFilter === 'reblog' ? 'active' : ''}
           onClick={this.onClick('reblog')}

app/javascript/flavours/glitch/features/notifications/components/notification.jsx

@@ -159,28 +159,6 @@ export default class Notification extends ImmutablePureComponent {
           unread={this.props.unread}
         />
       );
-    case 'reaction':
-      return (
-        <StatusContainer
-          containerId={notification.get('id')}
-          hidden={hidden}
-          id={notification.get('status')}
-          account={notification.get('account')}
-          prepend='reaction'
-          muted
-          notification={notification}
-          onMoveDown={onMoveDown}
-          onMoveUp={onMoveUp}
-          onMention={onMention}
-          getScrollPosition={getScrollPosition}
-          updateScrollBottom={updateScrollBottom}
-          cachedMediaWidth={this.props.cachedMediaWidth}
-          cacheMediaWidth={this.props.cacheMediaWidth}
-          onUnmount={this.props.onUnmount}
-          withDismiss
-          unread={this.props.unread}
-        />
-      );
     case 'reblog':
       return (
         <StatusContainer

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

@@ -8,7 +8,6 @@ import { withRouter } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import AddReactionIcon from '@/material-icons/400-24px/add_reaction.svg?react';
 import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg?react';
 import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
@@ -28,8 +27,7 @@ import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
 import { IconButton } from '../../../components/icon_button';
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
-import { me, maxReactions } from '../../../initial_state';
+import { me } from '../../../initial_state';
-import EmojiPickerDropdown from '../../compose/containers/emoji_picker_dropdown_container';
 
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
@@ -44,7 +42,6 @@ const messages = defineMessages({
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favorite' },
-  react: { id: 'status.react', defaultMessage: 'React' },
   bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
   more: { id: 'status.more', defaultMessage: 'More' },
   mute: { id: 'status.mute', defaultMessage: 'Mute @{name}' },
@@ -74,7 +71,6 @@ class ActionBar extends PureComponent {
     onReply: PropTypes.func.isRequired,
     onReblog: PropTypes.func.isRequired,
     onFavourite: PropTypes.func.isRequired,
-    onReactionAdd: PropTypes.func.isRequired,
     onBookmark: PropTypes.func.isRequired,
     onDelete: PropTypes.func.isRequired,
     onEdit: PropTypes.func.isRequired,
@@ -103,10 +99,6 @@ class ActionBar extends PureComponent {
     this.props.onFavourite(this.props.status, e);
   };
 
-  handleEmojiPick = data => {
-    this.props.onReactionAdd(this.props.status.get('id'), data.native.replace(/:/g, ''), data.imageUrl);
-  };
-
   handleBookmarkClick = (e) => {
     this.props.onBookmark(this.props.status, e);
   };
@@ -170,8 +162,6 @@ class ActionBar extends PureComponent {
     navigator.clipboard.writeText(url);
   };
 
-  handleNoOp = () => {}; // hack for reaction add button
-
   render () {
     const { status, intl } = this.props;
     const { signedIn, permissions } = this.context.identity;
@@ -248,18 +238,6 @@ class ActionBar extends PureComponent {
       replyIconComponent = ReplyAllIcon;
     }
 
-    const canReact = signedIn && status.get('reactions').filter(r => r.get('count') > 0 && r.get('me')).size < maxReactions;
-    const reactButton = (
-      <IconButton
-        className='add-reaction-icon'
-        onClick={this.handleNoOp} // EmojiPickerDropdown handles that
-        title={intl.formatMessage(messages.react)}
-        disabled={!canReact}
-        icon='add_reaction'
-        iconComponent={AddReactionIcon}
-      />
-    );
-
     const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility') === 'private';
 
     let reblogTitle, reblogIconComponent;
@@ -284,13 +262,6 @@ class ActionBar extends PureComponent {
         <div className='detailed-status__button'><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' iconComponent={reblogIconComponent} onClick={this.handleReblogClick} /></div>
         <div className='detailed-status__button'><IconButton className='quote-right-icon' disabled={!publicStatus} title={intl.formatMessage(messages.quote)} icon='quote-right' iconComponent={QuoteIcon} onClick={this.handleQuoteClick} /></div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' iconComponent={status.get('favourited') ? StarIcon : StarBorderIcon} onClick={this.handleFavouriteClick} /></div>
-        <div className='detailed-status__button'>
-          {
-            signedIn
-              ? <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={reactButton} disabled={!canReact} />
-              : reactButton
-          }
-        </div>
         <div className='detailed-status__button'><IconButton className='bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' iconComponent={status.get('bookmarked') ? BookmarkIcon : BookmarkBorderIcon} onClick={this.handleBookmarkClick} /></div>
 
         <div className='detailed-status__action-bar-dropdown'>

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

@@ -25,7 +25,6 @@ import { Avatar } from '../../../components/avatar';
 import { DisplayName } from '../../../components/display_name';
 import MediaGallery from '../../../components/media_gallery';
 import StatusContent from '../../../components/status_content';
-import StatusReactions from '../../../components/status_reactions';
 import Audio from '../../audio';
 import scheduleIdleTask from '../../ui/util/schedule_idle_task';
 import Video from '../../video';
@@ -34,10 +33,6 @@ import Card from './card';
 
 class DetailedStatus extends ImmutablePureComponent {
 
-  static contextTypes = {
-    identity: PropTypes.object,
-  };
-
   static propTypes = {
     status: ImmutablePropTypes.map,
     settings: ImmutablePropTypes.map.isRequired,
@@ -56,8 +51,6 @@ class DetailedStatus extends ImmutablePureComponent {
       available: PropTypes.bool,
     }),
     onToggleMediaVisibility: PropTypes.func,
-    onReactionAdd: PropTypes.func.isRequired,
-    onReactionRemove: PropTypes.func.isRequired,
     ...WithRouterPropTypes,
   };
 
@@ -336,14 +329,6 @@ class DetailedStatus extends ImmutablePureComponent {
             {...statusContentProps}
           />
 
-          <StatusReactions
-            statusId={status.get('id')}
-            reactions={status.get('reactions')}
-            addReaction={this.props.onReactionAdd}
-            removeReaction={this.props.onReactionRemove}
-            canReact={this.context.identity.signedIn}
-          />
-
           <div className='detailed-status__meta'>
             <a className='detailed-status__datetime' href={status.get('url')} target='_blank' rel='noopener noreferrer'>
               <FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />

app/javascript/flavours/glitch/features/status/index.jsx

@@ -41,8 +41,6 @@ import {
   unreblog,
   pin,
   unpin,
-  addReaction,
-  removeReaction,
 } from '../../actions/interactions';
 import { changeLocalSetting } from '../../actions/local_settings';
 import { openModal } from '../../actions/modal';
@@ -311,19 +309,6 @@ class Status extends ImmutablePureComponent {
     }
   };
 
-  handleReactionAdd = (statusId, name, url) => {
-    const { dispatch } = this.props;
-    const { signedIn } = this.context.identity;
-
-    if (signedIn) {
-      dispatch(addReaction(statusId, name, url));
-    }
-  };
-
-  handleReactionRemove = (statusId, name) => {
-    this.props.dispatch(removeReaction(statusId, name));
-  };
-
   handlePin = (status) => {
     if (status.get('pinned')) {
       this.props.dispatch(unpin(status));
@@ -779,8 +764,6 @@ class Status extends ImmutablePureComponent {
                   settings={settings}
                   onOpenVideo={this.handleOpenVideo}
                   onOpenMedia={this.handleOpenMedia}
-                  onReactionAdd={this.handleReactionAdd}
-                  onReactionRemove={this.handleReactionRemove}
                   expanded={isExpanded}
                   onToggleHidden={this.handleToggleHidden}
                   onTranslate={this.handleTranslate}
@@ -795,7 +778,6 @@ class Status extends ImmutablePureComponent {
                   status={status}
                   onReply={this.handleReplyClick}
                   onFavourite={this.handleFavouriteClick}
-                  onReactionAdd={this.handleReactionAdd}
                   onReblog={this.handleReblogClick}
                   onBookmark={this.handleBookmarkClick}
                   onQuote={this.handleQuoteClick}

app/javascript/flavours/glitch/initial_state.js

@@ -24,7 +24,6 @@
  * @property {boolean} limited_federation_mode
  * @property {string} locale
  * @property {string | null} mascot
- * @property {number} max_reactions
  * @property {string=} me
  * @property {string=} moved_to_account_id
  * @property {string=} owner
@@ -45,7 +44,6 @@
  * @property {boolean} use_blurhash
  * @property {boolean=} use_pending_items
  * @property {string} version
- * @property {number} visible_reactions
  * @property {string} sso_redirect
  * @property {boolean} translation_enabled
  * @property {string} status_page_url
@@ -70,7 +68,6 @@ export const hasMultiColumnPath = initialPath === '/'
  * @property {object} local_settings
  * @property {number} max_toot_chars
  * @property {number} poll_limits
- * @property {number} max_reactions
  */
 
 const element = document.getElementById('initial-state');
@@ -107,7 +104,6 @@ export const expandSpoilers = getMeta('expand_spoilers');
 export const forceSingleColumn = !getMeta('advanced_layout');
 export const limitedFederationMode = getMeta('limited_federation_mode');
 export const mascot = getMeta('mascot');
-export const maxReactions = (initialState && initialState.max_reactions) || 1;
 export const me = getMeta('me');
 export const movedToAccountId = getMeta('moved_to_account_id');
 export const owner = getMeta('owner');
@@ -127,7 +123,6 @@ export const unfollowModal = getMeta('unfollow_modal');
 export const useBlurhash = getMeta('use_blurhash');
 export const usePendingItems = getMeta('use_pending_items');
 export const version = getMeta('version');
-export const visibleReactions = getMeta('visible_reactions');
 export const languages = initialState?.languages;
 export const criticalUpdatesPending = initialState?.critical_updates_pending;
 export const statusPageUrl = getMeta('status_page_url');

app/javascript/flavours/glitch/locales/en.json

@@ -60,14 +60,11 @@
   "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
   "navigation_bar.misc": "Misc",
   "notification.markForDeletion": "Mark for deletion",
-  "notification.reaction": "{name} reacted to your post",
   "notification_purge.btn_all": "Select\nall",
   "notification_purge.btn_apply": "Clear\nselected",
   "notification_purge.btn_invert": "Invert\nselection",
   "notification_purge.btn_none": "Select\nnone",
   "notification_purge.start": "Enter notification cleaning mode",
-  "notifications.column_settings.reaction": "Reactions:",
-  "notifications.filter.reactions": "Reactions",
   "notifications.marked_clear": "Clear selected notifications",
   "notifications.marked_clear_confirmation": "Are you sure you want to permanently clear all selected notifications?",
   "settings.always_show_spoilers_field": "Always enable the Content Warning field",
@@ -157,7 +154,6 @@
   "status.in_reply_to": "This toot is a reply",
   "status.is_poll": "This toot is a poll",
   "status.local_only": "Only visible from your instance",
-  "status.react": "React",
   "status.sensitive_toggle": "Click to view",
   "status.uncollapse": "Uncollapse",
   "suggestions.dismiss": "Dismiss suggestion"

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

@@ -38,7 +38,6 @@ const initialState = ImmutableMap({
       follow: false,
       follow_request: false,
       favourite: false,
-      reaction: false,
       reblog: false,
       mention: false,
       poll: false,
@@ -61,7 +60,6 @@ const initialState = ImmutableMap({
       follow: true,
       follow_request: false,
       favourite: true,
-      reaction: true,
       reblog: true,
       mention: true,
       poll: true,
@@ -75,7 +73,6 @@ const initialState = ImmutableMap({
       follow: true,
       follow_request: false,
       favourite: true,
-      reaction: true,
       reblog: true,
       mention: true,
       poll: true,

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

@@ -15,11 +15,6 @@ import {
   BOOKMARK_FAIL,
   UNBOOKMARK_REQUEST,
   UNBOOKMARK_FAIL,
-  REACTION_UPDATE,
-  REACTION_ADD_FAIL,
-  REACTION_REMOVE_FAIL,
-  REACTION_ADD_REQUEST,
-  REACTION_REMOVE_REQUEST,
 } from '../actions/interactions';
 import {
   STATUS_MUTE_SUCCESS,
@@ -47,43 +42,6 @@ const deleteStatus = (state, id, references) => {
   return state.delete(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 statusTranslateSuccess = (state, id, translation) => {
   return state.withMutations(map => {
     map.setIn([id, 'translation'], fromJS(normalizeStatusTranslation(translation, map.get(id))));
@@ -137,14 +95,6 @@ export default function statuses(state = initialState, action) {
     return state.setIn([action.status.get('id'), 'reblogged'], true);
   case REBLOG_FAIL:
     return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'reblogged'], false);
-  case REACTION_UPDATE:
-    return updateReactionCount(state, action.reaction);
-  case REACTION_ADD_REQUEST:
-  case REACTION_REMOVE_FAIL:
-    return addReaction(state, action.id, action.name, action.url);
-  case REACTION_REMOVE_REQUEST:
-  case REACTION_ADD_FAIL:
-    return removeReaction(state, action.id, action.name);
   case UNREBLOG_REQUEST:
     return state.setIn([action.status.get('id'), 'reblogged'], false);
   case UNREBLOG_FAIL:

app/javascript/flavours/glitch/styles/components/accounts.scss

@@ -327,10 +327,6 @@
   text-align: center;
 }
 
-.detailed-status__button .emoji-button {
-  padding: 0;
-}
-
 .relationship-tag {
   color: $white;
   margin-bottom: 4px;

app/javascript/flavours/glitch/styles/components/status.scss

@@ -471,10 +471,6 @@
   .notification__message {
     margin: -10px 0 10px;
   }
-
-  .reactions-bar--empty {
-    display: none;
-  }
 }
 
 .notification-favourite {
@@ -624,10 +620,6 @@
   align-items: center;
   display: flex;
   margin-top: 8px;
-
-  & > .emoji-picker-dropdown > .emoji-button {
-    padding: 0;
-  }
 }
 
 .status__action-bar-button {
@@ -636,10 +628,6 @@
   &.icon-button--with-counter {
     margin-inline-end: 14px;
   }
-
-  .fa-plus {
-    padding-top: 1px;
-  }
 }
 
 .status__action-bar-dropdown {
@@ -713,10 +701,6 @@
   display: flex;
   flex-direction: row;
   padding: 10px 0;
-
-  .fa-plus {
-    padding-top: 2px;
-  }
 }
 
 .detailed-status__link {
@@ -1157,8 +1141,7 @@ a.status-card.compact:hover {
     border-bottom: 0;
 
     .status__content,
-    .status__action-bar,
+    .status__action-bar {
-    .reactions-bar {
       margin-inline-start: 46px + 10px;
       width: calc(100% - (46px + 10px));
     }

app/javascript/material-icons/400-24px/add_reaction-fill.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M800-680v-80h-80v-80h80v-80h80v80h80v80h-80v80h-80ZM620-520q25 0 42.5-17.5T680-580q0-25-17.5-42.5T620-640q-25 0-42.5 17.5T560-580q0 25 17.5 42.5T620-520Zm-280 0q25 0 42.5-17.5T400-580q0-25-17.5-42.5T340-640q-25 0-42.5 17.5T280-580q0 25 17.5 42.5T340-520Zm140 260q68 0 123.5-38.5T684-400H276q25 63 80.5 101.5T480-260Zm0 180q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q43 0 83 8.5t77 24.5v167h80v80h142q9 29 13.5 58.5T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Z"/></svg>

app/javascript/material-icons/400-24px/add_reaction.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-480Zm0 400q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q43 0 83 8.5t77 24.5v90q-35-20-75.5-31.5T480-800q-133 0-226.5 93.5T160-480q0 133 93.5 226.5T480-160q133 0 226.5-93.5T800-480q0-32-6.5-62T776-600h86q9 29 13.5 58.5T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm320-600v-80h-80v-80h80v-80h80v80h80v80h-80v80h-80ZM620-520q25 0 42.5-17.5T680-580q0-25-17.5-42.5T620-640q-25 0-42.5 17.5T560-580q0 25 17.5 42.5T620-520Zm-280 0q25 0 42.5-17.5T400-580q0-25-17.5-42.5T340-640q-25 0-42.5 17.5T280-580q0 25 17.5 42.5T340-520Zm140 260q68 0 123.5-38.5T684-400H276q25 63 80.5 101.5T480-260Z"/></svg>

app/lib/activitypub/activity.rb

@@ -39,8 +39,6 @@ class ActivityPub::Activity
         ActivityPub::Activity::Follow
       when 'Like'
         ActivityPub::Activity::Like
-      when 'EmojiReact'
-        ActivityPub::Activity::EmojiReact
       when 'Block'
         ActivityPub::Activity::Block
       when 'Update'
@@ -178,32 +176,4 @@ class ActivityPub::Activity
     Rails.logger.info("Rejected #{@json['type']} activity #{@json['id']} from #{@account.uri}#{@options[:relayed_through_actor] && "via #{@options[:relayed_through_actor].uri}"}")
     nil
   end
-
-  # Ensure emoji declared in the activity's tags are
-  # present in the database and downloaded to the local cache.
-  # Required by EmojiReact and Like for emoji reactions.
-  def process_emoji_tags(name, tags)
-    tag = as_array(tags).find { |item| item['type'] == 'Emoji' }
-    return if tag.nil?
-
-    custom_emoji_parser = ActivityPub::Parser::CustomEmojiParser.new(tag)
-    return if custom_emoji_parser.shortcode.blank? || custom_emoji_parser.image_remote_url.blank? || !name.eql?(custom_emoji_parser.shortcode)
-
-    emoji = CustomEmoji.find_by(shortcode: custom_emoji_parser.shortcode, domain: @account.domain)
-    return emoji unless emoji.nil? ||
-                        custom_emoji_parser.image_remote_url != emoji.image_remote_url ||
-                        (custom_emoji_parser.updated_at && custom_emoji_parser.updated_at >= emoji.updated_at)
-
-    begin
-      emoji ||= CustomEmoji.new(domain: @account.domain,
-                                shortcode: custom_emoji_parser.shortcode,
-                                uri: custom_emoji_parser.uri)
-      emoji.image_remote_url = custom_emoji_parser.image_remote_url
-      emoji.save
-    rescue Seahorse::Client::NetworkingError => e
-      Rails.logger.warn "Error fetching emoji: #{e}"
-      return
-    end
-    emoji
-  end
 end

app/lib/activitypub/activity/emoji_react.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-class ActivityPub::Activity::EmojiReact < ActivityPub::Activity
-  def perform
-    original_status = status_from_uri(object_uri)
-    name = @json['content']
-    return if original_status.nil? ||
-              !original_status.account.local? ||
-              delete_arrived_first?(@json['id'])
-
-    if /^:.*:$/.match?(name)
-      name.delete! ':'
-      custom_emoji = process_emoji_tags(name, @json['tag'])
-
-      return if custom_emoji.nil?
-    end
-
-    return if @account.reacted?(original_status, name, custom_emoji)
-
-    reaction = original_status.status_reactions.create!(account: @account, name: name, custom_emoji: custom_emoji)
-
-    LocalNotificationWorker.perform_async(original_status.account_id, reaction.id, 'StatusReaction', 'reaction')
-  rescue ActiveRecord::RecordInvalid
-    nil
-  end
-end

app/lib/activitypub/activity/like.rb

@@ -3,39 +3,12 @@
 class ActivityPub::Activity::Like < ActivityPub::Activity
   def perform
     original_status = status_from_uri(object_uri)
-    return if original_status.nil? || !original_status.account.local? || delete_arrived_first?(@json['id'])
 
-    return if maybe_process_embedded_reaction
+    return if original_status.nil? || !original_status.account.local? || delete_arrived_first?(@json['id']) || @account.favourited?(original_status)
-
-    return if @account.favourited?(original_status)
 
     favourite = original_status.favourites.create!(account: @account)
 
     LocalNotificationWorker.perform_async(original_status.account_id, favourite.id, 'Favourite', 'favourite')
     Trends.statuses.register(original_status)
   end
-
-  # Some servers deliver reactions as likes with the emoji in content
-  # Versions of Misskey before 12.1.0 specify emojis in _misskey_reaction instead, so we check both
-  # See https://misskey-hub.net/ns.html#misskey-reaction for details
-  def maybe_process_embedded_reaction
-    original_status = status_from_uri(object_uri)
-    name = @json['content'] || @json['_misskey_reaction']
-    return false if name.nil?
-
-    if /^:.*:$/.match?(name)
-      name.delete! ':'
-      custom_emoji = process_emoji_tags(name, @json['tag'])
-
-      return false if custom_emoji.nil? # invalid custom emoji, treat it as a regular like
-    end
-    return true if @account.reacted?(original_status, name, custom_emoji)
-
-    reaction = original_status.status_reactions.create!(account: @account, name: name, custom_emoji: custom_emoji)
-    LocalNotificationWorker.perform_async(original_status.account_id, reaction.id, 'StatusReaction', 'reaction')
-    true
-  # account tried to react with disabled custom emoji. Returning true to discard activity.
-  rescue ActiveRecord::RecordInvalid
-    true
-  end
 end

app/lib/activitypub/activity/undo.rb

@@ -11,8 +11,6 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
       undo_follow
     when 'Like'
       undo_like
-    when 'EmojiReact'
-      undo_emoji_react
     when 'Block'
       undo_block
     when nil
@@ -110,31 +108,6 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
     if @account.favourited?(status)
       favourite = status.favourites.where(account: @account).first
       favourite&.destroy
-    elsif @object['content'].present? || @object['_misskey_reaction'].present?
-      undo_emoji_react
-    else
-      delete_later!(object_uri)
-    end
-  end
-
-  def undo_emoji_react
-    name = @object['content'] || @object['_misskey_reaction']
-    return if name.nil?
-
-    status = status_from_uri(target_uri)
-
-    return if status.nil? || !status.account.local?
-
-    if /^:.*:$/.match?(name)
-      name.delete! ':'
-      custom_emoji = process_emoji_tags(name, @object['tag'])
-
-      return if custom_emoji.nil?
-    end
-
-    if @account.reacted?(status, name, custom_emoji)
-      reaction = status.status_reactions.where(account: @account, name: name).first
-      reaction&.destroy
     else
       delete_later!(object_uri)
     end

app/mailers/notification_mailer.rb

@@ -6,8 +6,8 @@ class NotificationMailer < ApplicationMailer
          :routing
 
   before_action :process_params
-  before_action :set_status, only: [:mention, :favourite, :reaction, :reblog]
+  before_action :set_status, only: [:mention, :favourite, :reblog]
-  before_action :set_account, only: [:follow, :favourite, :reaction, :reblog, :follow_request]
+  before_action :set_account, only: [:follow, :favourite, :reblog, :follow_request]
   after_action :set_list_headers!
 
   default to: -> { email_address_with_name(@user.email, @me.username) }
@@ -40,15 +40,6 @@ class NotificationMailer < ApplicationMailer
     end
   end
 
-  def reaction
-    return unless @user.functional? && @status.present?
-
-    locale_for_account(@me) do
-      thread_by_conversation(@status.conversation)
-      mail subject: default_i18n_subject(name: @account.acct)
-    end
-  end
-
   def reblog
     return unless @user.functional? && @status.present?
 

app/models/concerns/account/associations.rb

@@ -13,7 +13,6 @@ module Account::Associations
     # Timelines
     has_many :statuses, inverse_of: :account, dependent: :destroy
     has_many :favourites, inverse_of: :account, dependent: :destroy
-    has_many :status_reactions, inverse_of: :account, dependent: :destroy
     has_many :bookmarks, inverse_of: :account, dependent: :destroy
     has_many :mentions, inverse_of: :account, dependent: :destroy
     has_many :notifications, inverse_of: :account, dependent: :destroy

app/models/concerns/account/interactions.rb

@@ -230,10 +230,6 @@ module Account::Interactions
     status.proper.favourites.exists?(account: self)
   end
 
-  def reacted?(status, name, custom_emoji = nil)
-    status.proper.status_reactions.exists?(account: self, name: name, custom_emoji: custom_emoji)
-  end
-
   def bookmarked?(status)
     status.proper.bookmarks.exists?(account: self)
   end

app/models/concerns/user/has_settings.rb

@@ -123,10 +123,6 @@ module User::HasSettings
     settings['hide_followers_count']
   end
 
-  def setting_visible_reactions
-    integer_cast_setting('visible_reactions', 0)
-  end
-
   def allows_report_emails?
     settings['notification_emails.report']
   end
@@ -170,14 +166,4 @@ module User::HasSettings
   def hide_all_media?
     settings['web.display_media'] == 'hide_all'
   end
-
-  def integer_cast_setting(key, min = nil, max = nil)
-    i = ActiveModel::Type::Integer.new.cast(settings[key])
-    # the cast above doesn't return a number if passed the string "e"
-    i = 0 unless i.is_a? Numeric
-    return min if !min.nil? && i < min
-    return max if !max.nil? && i > max
-
-    i
-  end
 end

app/models/notification.rb

@@ -25,7 +25,6 @@ class Notification < ApplicationRecord
     'Follow' => :follow,
     'FollowRequest' => :follow_request,
     'Favourite' => :favourite,
-    'StatusReaction' => :reaction,
     'Poll' => :poll,
   }.freeze
 
@@ -36,7 +35,6 @@ class Notification < ApplicationRecord
     follow
     follow_request
     favourite
-    reaction
     poll
     update
     admin.sign_up
@@ -48,7 +46,6 @@ class Notification < ApplicationRecord
     reblog: [status: :reblog],
     mention: [mention: :status],
     favourite: [favourite: :status],
-    reaction: [status_reaction: :status],
     poll: [poll: :status],
     update: :status,
     'admin.report': [report: :target_account],
@@ -64,7 +61,6 @@ class Notification < ApplicationRecord
     belongs_to :follow, inverse_of: :notification
     belongs_to :follow_request, inverse_of: :notification
     belongs_to :favourite, inverse_of: :notification
-    belongs_to :status_reaction, inverse_of: :notification
     belongs_to :poll, inverse_of: false
     belongs_to :report, inverse_of: false
   end
@@ -85,8 +81,6 @@ class Notification < ApplicationRecord
       status&.reblog
     when :favourite
       favourite&.status
-    when :reaction
-      status_reaction&.status
     when :mention
       mention&.status
     when :poll
@@ -147,8 +141,6 @@ class Notification < ApplicationRecord
     end
   end
 
-  alias reaction status_reaction
-
   after_initialize :set_from_account
   before_validation :set_from_account
 
@@ -158,7 +150,7 @@ class Notification < ApplicationRecord
     return unless new_record?
 
     case activity_type
-    when 'Status', 'Follow', 'Favourite', 'StatusReaction', 'FollowRequest', 'Poll', 'Report'
+    when 'Status', 'Follow', 'Favourite', 'FollowRequest', 'Poll', 'Report'
       self.from_account_id = activity&.account_id
     when 'Mention'
       self.from_account_id = activity&.status&.account_id

app/models/status.rb

@@ -77,7 +77,6 @@ class Status < ApplicationRecord
   has_many :mentioned_accounts, through: :mentions, source: :account, class_name: 'Account'
   has_many :media_attachments, dependent: :nullify
   has_many :quoted, foreign_key: 'quote_id', class_name: 'Status', inverse_of: :quote, dependent: :nullify
-  has_many :status_reactions, inverse_of: :status, dependent: :destroy
 
   # The `dependent` option is enabled by the initial `mentions` association declaration
   has_many :active_mentions, -> { active }, class_name: 'Mention', inverse_of: :status # rubocop:disable Rails/HasManyOrHasOneDependent
@@ -306,16 +305,6 @@ class Status < ApplicationRecord
     @emojis = CustomEmoji.from_text(fields.join(' '), account.domain) + (quote? ? CustomEmoji.from_text([quote.spoiler_text, quote.text].join(' '), quote.account.domain) : [])
   end
 
-  def reactions(account = nil)
-    grouped_ordered_status_reactions.select(
-      [:name, :custom_emoji_id, 'COUNT(*) as count'].tap do |values|
-        values << value_for_reaction_me_column(account)
-      end
-    ).to_a.tap do |records|
-      ActiveRecord::Associations::Preloader.new(records: records, associations: :custom_emoji).call
-    end
-  end
-
   def ordered_media_attachments
     if ordered_media_attachment_ids.nil?
       # NOTE: sort Ruby-side to avoid hitting the database when the status is
@@ -503,35 +492,6 @@ class Status < ApplicationRecord
 
   private
 
-  def grouped_ordered_status_reactions
-    status_reactions
-      .group(:status_id, :name, :custom_emoji_id)
-      .order(
-        Arel.sql('MIN(created_at)').asc
-      )
-  end
-
-  def value_for_reaction_me_column(account)
-    if account.nil?
-      'FALSE AS me'
-    else
-      <<~SQL.squish
-        EXISTS(
-          SELECT 1
-          FROM status_reactions inner_reactions
-          WHERE inner_reactions.account_id = #{account.id}
-            AND inner_reactions.status_id = status_reactions.status_id
-            AND inner_reactions.name = status_reactions.name
-            AND (
-              inner_reactions.custom_emoji_id = status_reactions.custom_emoji_id
-              OR inner_reactions.custom_emoji_id IS NULL
-                AND status_reactions.custom_emoji_id IS NULL
-            )
-        ) AS me
-      SQL
-    end
-  end
-
   def update_status_stat!(attrs)
     return if marked_for_destruction? || destroyed?
 

app/models/status_reaction.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-# == Schema Information
-#
-# Table name: status_reactions
-#
-#  id              :bigint(8)        not null, primary key
-#  account_id      :bigint(8)        not null
-#  status_id       :bigint(8)        not null
-#  name            :string           default(""), not null
-#  custom_emoji_id :bigint(8)
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#
-class StatusReaction < ApplicationRecord
-  belongs_to :account
-  belongs_to :status, inverse_of: :status_reactions
-  belongs_to :custom_emoji, optional: true
-
-  has_one :notification, as: :activity, dependent: :destroy
-
-  validates :name, presence: true
-  validates_with StatusReactionValidator
-
-  before_validation do
-    self.status = status.reblog if status&.reblog?
-  end
-
-  before_validation :set_custom_emoji
-
-  private
-
-  # Sets custom_emoji to nil when disabled
-  def set_custom_emoji
-    self.custom_emoji = CustomEmoji.find_by(disabled: false, shortcode: name, domain: custom_emoji.domain) if name.present? && custom_emoji.present?
-  end
-end

app/models/user_settings.rb

@@ -18,7 +18,6 @@ class UserSettings
   setting :default_privacy, default: nil, in: %w(public unlisted private)
   setting :default_content_type, default: 'text/plain'
   setting :hide_followers_count, default: false
-  setting :visible_reactions, default: 6
 
   setting_inverse_alias :indexable, :noindex
   setting_inverse_alias :show_followers_count, :hide_followers_count
@@ -45,7 +44,6 @@ class UserSettings
     setting :follow, default: true
     setting :reblog, default: false
     setting :favourite, default: false
-    setting :reaction, default: false
     setting :mention, default: true
     setting :follow_request, default: true
     setting :report, default: true

app/policies/status_policy.rb

@@ -28,10 +28,6 @@ class StatusPolicy < ApplicationPolicy
     show? && !blocking_author?
   end
 
-  def react?
-    show? && !blocking_author?
-  end
-
   def destroy?
     owned?
   end

app/serializers/activitypub/emoji_reaction_serializer.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-class ActivityPub::EmojiReactionSerializer < ActivityPub::Serializer
-  attributes :id, :type, :actor, :content
-  attribute :virtual_object, key: :object
-  attribute :custom_emoji, key: :tag, unless: -> { object.custom_emoji.nil? }
-
-  def id
-    [ActivityPub::TagManager.instance.uri_for(object.account), '#emoji_reactions/', object.id].join
-  end
-
-  def type
-    'EmojiReact'
-  end
-
-  def actor
-    ActivityPub::TagManager.instance.uri_for(object.account)
-  end
-
-  def virtual_object
-    ActivityPub::TagManager.instance.uri_for(object.status)
-  end
-
-  def content
-    if object.custom_emoji.nil?
-      object.name
-    else
-      ":#{object.name}:"
-    end
-  end
-
-  alias reaction content
-
-  # Akkoma (and possibly others) expect `tag` to be an array, so we can't just
-  # use the has_one shorthand because we need to wrap it into an array manually
-  def custom_emoji
-    [ActivityPub::EmojiSerializer.new(object.custom_emoji).serializable_hash]
-  end
-end

app/serializers/activitypub/undo_emoji_reaction_serializer.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class ActivityPub::UndoEmojiReactionSerializer < ActivityPub::Serializer
-  attributes :id, :type, :actor
-
-  has_one :object, serializer: ActivityPub::EmojiReactionSerializer
-
-  def id
-    [ActivityPub::TagManager.instance.uri_for(object.account), '#emoji_reactions/', object.id, '/undo'].join
-  end
-
-  def type
-    'Undo'
-  end
-
-  def actor
-    ActivityPub::TagManager.instance.uri_for(object.account)
-  end
-end

app/serializers/initial_state_serializer.rb

@@ -6,7 +6,7 @@ class InitialStateSerializer < ActiveModel::Serializer
   attributes :meta, :compose, :accounts,
              :media_attachments, :settings,
              :max_toot_chars, :poll_limits,
-             :languages, :max_reactions
+             :languages
 
   attribute :critical_updates_pending, if: -> { object&.role&.can?(:view_devops) && SoftwareUpdate.check_enabled? }
 
@@ -17,10 +17,6 @@ class InitialStateSerializer < ActiveModel::Serializer
     StatusLengthValidator::MAX_CHARS
   end
 
-  def max_reactions
-    StatusReactionValidator::LIMIT
-  end
-
   def poll_limits
     {
       max_options: PollValidator::MAX_OPTIONS,
@@ -50,7 +46,6 @@ class InitialStateSerializer < ActiveModel::Serializer
       store[:default_content_type] = object_account_user.setting_default_content_type
       store[:system_emoji_font] = object_account_user.setting_system_emoji_font
       store[:show_trends]       = Setting.trends && object_account_user.setting_trends
-      store[:visible_reactions] = object_account_user.setting_visible_reactions
     else
       store[:auto_play_gif] = Setting.auto_play_gif
       store[:display_media] = Setting.display_media

app/serializers/rest/instance_serializer.rb

@@ -82,10 +82,6 @@ class REST::InstanceSerializer < ActiveModel::Serializer
       translation: {
         enabled: TranslationService.configured?,
       },
-
-      reactions: {
-        max_reactions: StatusReactionValidator::LIMIT,
-      },
     }
   end
 

app/serializers/rest/notification_serializer.rb

@@ -12,7 +12,7 @@ class REST::NotificationSerializer < ActiveModel::Serializer
   end
 
   def status_type?
-    [:favourite, :reaction, :reblog, :status, :mention, :poll, :update].include?(object.type)
+    [:favourite, :reblog, :status, :mention, :poll, :update].include?(object.type)
   end
 
   def report_type?

app/serializers/rest/reaction_serializer.rb

@@ -21,14 +21,6 @@ class REST::ReactionSerializer < ActiveModel::Serializer
     object.custom_emoji.present?
   end
 
-  def name
-    if extern?
-      [object.name, '@', object.custom_emoji.domain].join
-    else
-      object.name
-    end
-  end
-
   def url
     full_asset_url(object.custom_emoji.image.url)
   end
@@ -36,10 +28,4 @@ class REST::ReactionSerializer < ActiveModel::Serializer
   def static_url
     full_asset_url(object.custom_emoji.image.url(:static))
   end
-
-  private
-
-  def extern?
-    custom_emoji? && object.custom_emoji.domain.present?
-  end
 end

app/serializers/rest/status_serializer.rb

@@ -28,7 +28,6 @@ class REST::StatusSerializer < ActiveModel::Serializer
   has_many :ordered_mentions, key: :mentions
   has_many :tags
   has_many :emojis, serializer: REST::CustomEmojiSerializer
-  has_many :reactions, serializer: REST::ReactionSerializer
 
   has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer
   has_one :preloadable_poll, key: :poll, serializer: REST::PollSerializer
@@ -157,10 +156,6 @@ class REST::StatusSerializer < ActiveModel::Serializer
     object.active_mentions.to_a.sort_by(&:id)
   end
 
-  def reactions
-    object.reactions(current_user&.account)
-  end
-
   private
 
   def relationships

app/serializers/rest/v1/instance_serializer.rb

@@ -97,10 +97,6 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
         min_expiration: PollValidator::MIN_EXPIRATION,
         max_expiration: PollValidator::MAX_EXPIRATION,
       },
-
-      reactions: {
-        max_reactions: StatusReactionValidator::LIMIT,
-      },
     }
   end
 

app/services/react_service.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-class ReactService < BaseService
-  include Authorization
-  include Payloadable
-
-  def call(account, status, emoji)
-    authorize_with account, status, :react?
-
-    name, domain = emoji.split('@')
-    return unless domain.nil? || status.local?
-
-    custom_emoji = CustomEmoji.find_by(shortcode: name, domain: domain)
-    reaction = StatusReaction.find_by(account: account, status: status, name: name, custom_emoji: custom_emoji)
-    return reaction unless reaction.nil?
-
-    reaction = StatusReaction.create!(account: account, status: status, name: name, custom_emoji: custom_emoji)
-
-    Trends.statuses.register(status)
-
-    create_notification(reaction)
-    increment_statistics
-
-    reaction
-  end
-
-  private
-
-  def create_notification(reaction)
-    status = reaction.status
-
-    if status.account.local?
-      LocalNotificationWorker.perform_async(status.account_id, reaction.id, 'StatusReaction', 'reaction')
-    elsif status.account.activitypub?
-      ActivityPub::DeliveryWorker.perform_async(build_json(reaction), reaction.account_id, status.account.inbox_url)
-    end
-  end
-
-  def increment_statistics
-    ActivityTracker.increment('activity:interactions')
-  end
-
-  def build_json(reaction)
-    Oj.dump(serialize_payload(reaction, ActivityPub::EmojiReactionSerializer))
-  end
-end

app/services/unreact_service.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-class UnreactService < BaseService
-  include Payloadable
-
-  def call(account, status, emoji)
-    name, domain = emoji.split('@')
-    custom_emoji = CustomEmoji.find_by(shortcode: name, domain: domain)
-    reaction = StatusReaction.find_by(account: account, status: status, name: name, custom_emoji: custom_emoji)
-    return if reaction.nil?
-
-    reaction.destroy!
-    create_notification(reaction) if !status.account.local? && status.account.activitypub?
-    reaction
-  end
-
-  private
-
-  def create_notification(reaction)
-    status = reaction.status
-    ActivityPub::DeliveryWorker.perform_async(build_json(reaction), reaction.account_id, status.account.inbox_url)
-  end
-
-  def build_json(reaction)
-    Oj.dump(serialize_payload(reaction, ActivityPub::UndoEmojiReactionSerializer))
-  end
-end

app/validators/status_reaction_validator.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-class StatusReactionValidator < ActiveModel::Validator
-  SUPPORTED_EMOJIS = Oj.load_file(Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json').to_s).keys.freeze
-
-  LIMIT = [1, (ENV['MAX_REACTIONS'] || 1).to_i].max
-
-  def validate(reaction)
-    return if reaction.name.blank?
-
-    reaction.errors.add(:name, I18n.t('reactions.errors.unrecognized_emoji')) if reaction.custom_emoji_id.blank? && !unicode_emoji?(reaction.name)
-    reaction.errors.add(:base, I18n.t('reactions.errors.limit_reached')) if reaction.account.local? && new_reaction?(reaction) && limit_reached?(reaction)
-  end
-
-  private
-
-  def unicode_emoji?(name)
-    SUPPORTED_EMOJIS.include?(name)
-  end
-
-  def new_reaction?(reaction)
-    !reaction.status.status_reactions.exists?(status: reaction.status, account: reaction.account, name: reaction.name, custom_emoji: reaction.custom_emoji)
-  end
-
-  def limit_reached?(reaction)
-    reaction.status.status_reactions.where(status: reaction.status, account: reaction.account).count >= LIMIT
-  end
-end

app/views/notification_mailer/reaction.html.haml

@@ -1,13 +0,0 @@
-= content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('notification_mailer.reaction.title'), heading_subtitle: t('notification_mailer.reaction.body', name: @account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/reaction.png')
-%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
-  %tr
-    %td.email-body-padding-td
-      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
-        %tr
-          %td.email-inner-card-td
-            = render 'status', status: @status, time_zone: @me.user_time_zone
-            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
-              %tr
-                %td.email-padding-top-24
-                  = render 'application/mailer/button', text: t('application_mailer.view_status'), url: web_url("@#{@status.account.pretty_acct}/#{@status.id}")

app/views/notification_mailer/reaction.text.erb

@@ -1,5 +0,0 @@
-<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
-
-<%= raw t('notification_mailer.reaction.body', name: @account.pretty_acct) %>
-
-<%= render 'status', status: @status %>

app/views/settings/preferences/appearance/show.html.haml

@@ -51,9 +51,6 @@
       = ff.input :'web.use_system_font', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_system_font_ui')
       = ff.input :'web.use_system_emoji_font', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_system_emoji_font'), glitch_only: true
 
-    .fields-group.fields-row__column.fields-row__column-6
-      = ff.input :visible_reactions, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_visible_reactions'), input_html: { type: 'number', min: '0', data: { default: '6' } }, hint: false
-
     %h4= t 'appearance.discovery'
 
     .fields-group

app/views/settings/preferences/notifications/show.html.haml

@@ -17,7 +17,6 @@
       = ff.input :'notification_emails.follow_request', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.follow_request')
       = ff.input :'notification_emails.reblog', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.reblog')
       = ff.input :'notification_emails.favourite', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.favourite')
-      = ff.input :'notification_emails.reaction', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.reaction')
       = ff.input :'notification_emails.mention', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.mention')
 
     .fields-group

app/workers/unreact_worker.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class UnreactWorker
-  include Sidekiq::Worker
-
-  def perform(account_id, status_id, emoji)
-    UnreactService.new.call(Account.find(account_id), Status.find(status_id), emoji)
-  rescue ActiveRecord::RecordNotFound
-    true
-  end
-end

config/locales-glitch/en.yml

@@ -38,10 +38,5 @@ en:
       title: User verification
   generic:
     use_this: Use this
-  notification_mailer:
-    reaction:
-      body: "%{name} reacted to your post:"
-      subject: "%{name} reacted to your post"
-      title: New reaction
   settings:
     flavours: Flavours

config/locales-glitch/simple_form.en.yml

@@ -20,9 +20,7 @@ en:
         setting_show_followers_count: Show your followers count
         setting_skin: Skin
         setting_system_emoji_font: Use system's default font for emojis (applies to Glitch flavour only)
-        setting_visible_reactions: Number of visible emoji reactions
       notification_emails:
-        reaction: Someone reacted to your post
         trending_link: New trending link requires review
         trending_status: New trending post requires review
         trending_tag: New trending tag requires review

config/routes/api.rb

@@ -16,11 +16,6 @@ namespace :api, format: false do
         resource :favourite, only: :create
         post :unfavourite, to: 'favourites#destroy'
 
-        # foreign custom emojis are encoded as shortcode@domain.tld
-        # the constraint prevents rails from interpreting the ".tld" as a filename extension
-        post '/react/:id', to: 'reactions#create', constraints: { id: %r{[^/]+} }
-        post '/unreact/:id', to: 'reactions#destroy', constraints: { id: %r{[^/]+} }
-
         resource :bookmark, only: :create
         post :unbookmark, to: 'bookmarks#destroy'
 

config/settings.yml

@@ -22,7 +22,6 @@ defaults: &defaults
   trends_as_landing_page: true
   trendable_by_default: false
   trending_status_cw: true
-  visible_reactions: 6
   hide_followers_count: false
   reserved_usernames:
     - admin

db/migrate/20221124114030_create_status_reactions.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-class CreateStatusReactions < ActiveRecord::Migration[6.1]
-  def change
-    create_table :status_reactions do |t|
-      t.references :account, null: false, foreign_key: { on_delete: :cascade }
-      t.references :status, null: false, foreign_key: { on_delete: :cascade }
-      t.string :name, null: false, default: ''
-      t.references :custom_emoji, null: true, foreign_key: { on_delete: :cascade }
-
-      t.timestamps
-    end
-
-    add_index :status_reactions, [:account_id, :status_id, :name], unique: true, name: :index_status_reactions_on_account_id_and_status_id
-  end
-end

db/migrate/20230215074425_move_emoji_reaction_settings.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-class MoveEmojiReactionSettings < ActiveRecord::Migration[6.1]
-  class User < ApplicationRecord; end
-
-  MAPPING = {
-    setting_visible_reactions: 'visible_reactions',
-  }.freeze
-
-  class LegacySetting < ApplicationRecord
-    self.table_name = 'settings'
-
-    def var
-      self[:var]&.to_sym
-    end
-
-    def value
-      YAML.safe_load(self[:value], permitted_classes: [ActiveSupport::HashWithIndifferentAccess]) if self[:value].present?
-    end
-  end
-
-  def up
-    User.find_in_batches do |users|
-      previous_settings_for_batch = LegacySetting.where(thing_type: 'User', thing_id: users.map(&:id)).group_by(&:thing_id)
-
-      users.each do |user|
-        previous_settings = previous_settings_for_batch[user.id]&.index_by(&:var) || {}
-        user_settings = Oj.load(user.settings || '{}')
-        user_settings.delete('theme')
-
-        MAPPING.each do |legacy_key, new_key|
-          value = previous_settings[legacy_key]&.value
-
-          next if value.blank?
-
-          if value.is_a?(Hash)
-            value.each do |nested_key, nested_value|
-              user_settings[MAPPING[legacy_key][nested_key.to_sym]] = nested_value
-            end
-          else
-            user_settings[new_key] = value
-          end
-        end
-
-        user.update_column('settings', Oj.dump(user_settings))
-      end
-    end
-  end
-end

db/schema.rb

@@ -961,18 +961,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_11_033014) do
     t.index ["status_id"], name: "index_status_pins_on_status_id"
   end
 
-  create_table "status_reactions", force: :cascade do |t|
-    t.bigint "account_id", null: false
-    t.bigint "status_id", null: false
-    t.string "name", default: "", null: false
-    t.bigint "custom_emoji_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-    t.index ["account_id", "status_id", "name"], name: "index_status_reactions_on_account_id_and_status_id", unique: true
-    t.index ["custom_emoji_id"], name: "index_status_reactions_on_custom_emoji_id"
-    t.index ["status_id"], name: "index_status_reactions_on_status_id"
-  end
-
   create_table "status_stats", force: :cascade do |t|
     t.bigint "status_id", null: false
     t.bigint "replies_count", default: 0, null: false
@@ -1298,9 +1286,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_11_033014) do
   add_foreign_key "status_edits", "statuses", on_delete: :cascade
   add_foreign_key "status_pins", "accounts", name: "fk_d4cb435b62", on_delete: :cascade
   add_foreign_key "status_pins", "statuses", on_delete: :cascade
-  add_foreign_key "status_reactions", "accounts", on_delete: :cascade
-  add_foreign_key "status_reactions", "custom_emojis", on_delete: :cascade
-  add_foreign_key "status_reactions", "statuses", on_delete: :cascade
   add_foreign_key "status_stats", "statuses", on_delete: :cascade
   add_foreign_key "status_trends", "accounts", on_delete: :cascade
   add_foreign_key "status_trends", "statuses", on_delete: :cascade

spec/fabricators/status_reaction_fabricator.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-Fabricator(:status_reaction) do
-  account
-  status
-  name '👍'
-  custom_emoji
-end

spec/models/status_reaction_spec.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'