~cytrogen/masto-fe

0446394465c505660c4b29185980e58a040da037 — Claire 2 years ago f0862bc
Fix “legal” report category not showing up in moderation interface (#26509)

M app/javascript/mastodon/components/admin/ReportReasonSelector.jsx => app/javascript/mastodon/components/admin/ReportReasonSelector.jsx +2 -0
@@ 8,6 8,7 @@ import classNames from 'classnames';
import api from 'mastodon/api';

const messages = defineMessages({
  legal: { id: 'report.categories.legal', defaultMessage: 'Legal' },
  other: { id: 'report.categories.other', defaultMessage: 'Other' },
  spam: { id: 'report.categories.spam', defaultMessage: 'Spam' },
  violation: { id: 'report.categories.violation', defaultMessage: 'Content violates one or more server rules' },


@@ 150,6 151,7 @@ class ReportReasonSelector extends PureComponent {
    return (
      <div className='report-reason-selector'>
        <Category id='other' text={intl.formatMessage(messages.other)} selected={category === 'other'} onSelect={this.handleSelect} disabled={disabled} />
        <Category id='legal' text={intl.formatMessage(messages.legal)} selected={category === 'legal'} onSelect={this.handleSelect} disabled={disabled} />
        <Category id='spam' text={intl.formatMessage(messages.spam)} selected={category === 'spam'} onSelect={this.handleSelect} disabled={disabled} />
        <Category id='violation' text={intl.formatMessage(messages.violation)} selected={category === 'violation'} onSelect={this.handleSelect} disabled={disabled}>
          {rules.map(rule => <Rule key={rule.id} id={rule.id} text={rule.text} selected={rule_ids.includes(rule.id)} onToggle={this.handleToggle} disabled={disabled} />)}

M app/javascript/mastodon/locales/en.json => app/javascript/mastodon/locales/en.json +1 -0
@@ 533,6 533,7 @@
  "reply_indicator.cancel": "Cancel",
  "report.block": "Block",
  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
  "report.categories.legal": "Legal",
  "report.categories.other": "Other",
  "report.categories.spam": "Spam",
  "report.categories.violation": "Content violates one or more server rules",

M app/models/report.rb => app/models/report.rb +4 -1
@@ 48,7 48,10 @@ class Report < ApplicationRecord

  validate :validate_rule_ids

  # entries here needs to be kept in sync with app/javascript/mastodon/features/notifications/components/report.jsx
  # entries here need to be kept in sync with the front-end:
  # - app/javascript/mastodon/features/notifications/components/report.jsx
  # - app/javascript/mastodon/features/report/category.jsx
  # - app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
  enum category: {
    other: 0,
    spam: 1_000,