Improve report layout (#7188)

* Use table for statuses in report

* Display reported account and reporter in the same table

* Split accounts and general report info into two tables again

* Redesign report statuses table, notes, merge notes and action log

* Remove unused translations

* Fix code style issue

* Fix code style issue

* Fix code style issue

diff --git a/app/controllers/admin/reported_statuses_controller.rb b/app/controllers/admin/reported_statuses_controller.rb
index 535bd11d487d23b2ad3a18590461db3a8d868a17..522f68c98ec0e3e1defbba743361788d79e22eab 100644 (file)
--- a/app/controllers/admin/reported_statuses_controller.rb
+++ b/app/controllers/admin/reported_statuses_controller.rb
@@ -8,7 +8,7 @@ module Admin
     def create
       authorize :status, :update?
 
     def create
       authorize :status, :update?
 

-      @form         = Form::StatusBatch.new(form_status_batch_params.merge(current_account: current_account))
+      @form         = Form::StatusBatch.new(form_status_batch_params.merge(current_account: current_account, action: action_from_button))

       flash[:alert] = I18n.t('admin.statuses.failed_to_execute') unless @form.save
 
       redirect_to admin_report_path(@report)
       flash[:alert] = I18n.t('admin.statuses.failed_to_execute') unless @form.save
 
       redirect_to admin_report_path(@report)


@@ -35,7 +35,17 @@ module Admin
     end
 
     def form_status_batch_params
     end
 
     def form_status_batch_params

-      params.require(:form_status_batch).permit(:action, status_ids: [])
+      params.require(:form_status_batch).permit(status_ids: [])
+    end
+
+    def action_from_button
+      if params[:nsfw_on]
+        'nsfw_on'
+      elsif params[:nsfw_off]
+        'nsfw_off'
+      elsif params[:delete]
+        'delete'
+      end

     end
 
     def set_report
     end
 
     def set_report

diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index a4ae9507d4b82a1d3b7566b6acc8096642d4d9d0..d00b3d2227357dec958d7d1e164d52de1b57f624 100644 (file)
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -11,10 +11,10 @@ module Admin
 
     def show
       authorize @report, :show?
 
     def show
       authorize @report, :show?

-      @report_note = @report.notes.new
-      @report_notes = @report.notes.latest
-      @report_history = @report.history
-      @form = Form::StatusBatch.new
+
+      @report_note  = @report.notes.new
+      @report_notes = (@report.notes.latest + @report.history).sort_by(&:created_at)
+      @form         = Form::StatusBatch.new

     end
 
     def update
     end
 
     def update

diff --git a/app/helpers/admin/account_moderation_notes_helper.rb b/app/helpers/admin/account_moderation_notes_helper.rb
index b17c522643d234314daf9ae230ebc449215fb978..fdfadef08011aab773dc454d3eb9b4099db4205d 100644 (file)
--- a/app/helpers/admin/account_moderation_notes_helper.rb
+++ b/app/helpers/admin/account_moderation_notes_helper.rb
@@ -1,4 +1,20 @@
 # frozen_string_literal: true
 
 module Admin::AccountModerationNotesHelper
 # frozen_string_literal: true
 
 module Admin::AccountModerationNotesHelper

+  def admin_account_link_to(account)
+    link_to admin_account_path(account.id), class: name_tag_classes(account) do
+      safe_join([
+                  image_tag(account.avatar.url, width: 15, height: 15, alt: display_name(account), class: 'avatar'),
+                  content_tag(:span, account.acct, class: 'username'),
+                ], ' ')
+    end
+  end
+
+  private
+
+  def name_tag_classes(account)
+    classes = ['name-tag']
+    classes << 'suspended' if account.suspended?
+    classes.join(' ')
+  end

 end
 end

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bab4615a18b51075ab131527811e26631f45ab2e..95863ab1f03e37cf055518eba09bc1874a66c915 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -63,4 +63,8 @@ module ApplicationHelper
   def opengraph(property, content)
     tag(:meta, content: content, property: property)
   end
   def opengraph(property, content)
     tag(:meta, content: content, property: property)
   end

+
+  def react_component(name, props = {})
+    content_tag(:div, nil, data: { component: name.to_s.camelcase, props: Oj.dump(props) })
+  end

 end
 end

diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb
index 3992432dbd0c2c85cc014dadfa60af87170f060d..8254ef4dc951aaed7235f8125e99cbefa7e443dd 100644 (file)
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@@ -113,6 +113,19 @@ module StreamEntriesHelper
     end
   end
 
     end
   end
 

+  def fa_visibility_icon(status)
+    case status.visibility
+    when 'public'
+      fa_icon 'globe fw'
+    when 'unlisted'
+      fa_icon 'unlock-alt fw'
+    when 'private'
+      fa_icon 'lock fw'
+    when 'direct'
+      fa_icon 'envelope fw'
+    end
+  end
+

   private
 
   def simplified_text(text)
   private
 
   def simplified_text(text)

diff --git a/app/javascript/packs/admin.js b/app/javascript/packs/admin.js
index 2bf1514a99d2c2a62330afeb0616da4e269d02e5..5dbcc03d3941d08dfe171f2f201753acd3fcf4d8 100644 (file)
--- a/app/javascript/packs/admin.js
+++ b/app/javascript/packs/admin.js
@@ -24,6 +24,7 @@ delegate(document, batchCheckboxClassName, 'change', () => {
   const checkAllElement = document.querySelector('#batch_checkbox_all');
   if (checkAllElement) {
     checkAllElement.checked = [].every.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
   const checkAllElement = document.querySelector('#batch_checkbox_all');
   if (checkAllElement) {
     checkAllElement.checked = [].every.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);

+    checkAllElement.indeterminate = !checkAllElement.checked && [].some.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);

   }
 });
 
   }
 });
 

diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 348f72078ec2f75d39d5f42c43b293a071eea6f9..a0f69449a782fc53d0d5fec9c63a81570c97b866 100644 (file)
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -141,14 +141,15 @@
     }
 
     hr {
     }
 
     hr {

-      margin: 20px 0;
+      width: 100%;
+      height: 0;

       border: 0;
       border: 0;

-      background: transparent;
-      border-bottom: 1px solid $ui-base-color;
+      border-bottom: 1px solid rgba($ui-base-lighter-color, .6);
+      margin: 20px 0;

 
 

-      &.section-break {
-        margin: 30px 0;
-        border-bottom: 2px solid $ui-base-lighter-color;
+      &.spacer {
+        height: 1px;
+        border: 0;

       }
     }
 
       }
     }
 


@@ -335,34 +336,8 @@
   }
 }
 
   }
 }
 

-.report-note__comment {
-  margin-bottom: 20px;
-}
-
-.report-note__form {
-  margin-bottom: 20px;
-
-  .report-note__textarea {
-    box-sizing: border-box;
-    border: 0;
-    padding: 7px 4px;
-    margin-bottom: 10px;
-    font-size: 16px;
-    color: $inverted-text-color;
-    display: block;
-    width: 100%;
-    outline: 0;
-    font-family: inherit;
-    resize: vertical;
-  }
-
-  .report-note__buttons {
-    text-align: right;
-  }
-
-  .report-note__button {
-    margin: 0 0 5px 5px;
-  }
+.simple_form.new_report_note {
+  max-width: 100%;

 }
 
 .batch-form-box {
 }
 
 .batch-form-box {


@@ -390,13 +365,6 @@
   }
 }
 
   }
 }
 

-.batch-checkbox,
-.batch-checkbox-all {
-  display: flex;
-  align-items: center;
-  margin-right: 5px;
-}
-

 .back-link {
   margin-bottom: 10px;
   font-size: 14px;
 .back-link {
   margin-bottom: 10px;
   font-size: 14px;


@@ -416,7 +384,7 @@
 }
 
 .log-entry {
 }
 
 .log-entry {

-  margin-bottom: 8px;
+  margin-bottom: 20px;

   line-height: 20px;
 
   &__header {
   line-height: 20px;
 
   &__header {


@@ -514,9 +482,12 @@
   }
 }
 
   }
 }
 

+a.name-tag,

 .name-tag {
   display: flex;
   align-items: center;
 .name-tag {
   display: flex;
   align-items: center;

+  text-decoration: none;
+  color: $ui-secondary-color;

 
   .avatar {
     display: block;
 
   .avatar {
     display: block;


@@ -528,4 +499,52 @@
   .username {
     font-weight: 500;
   }
   .username {
     font-weight: 500;
   }

+
+  &.suspended {
+    .username {
+      text-decoration: line-through;
+      color: lighten($error-red, 12%);
+    }
+
+    .avatar {
+      filter: grayscale(100%);
+      opacity: 0.8;
+    }
+  }
+}
+
+.speech-bubble {
+  margin-bottom: 20px;
+  border-left: 4px solid $ui-highlight-color;
+
+  &.positive {
+    border-left-color: $success-green;
+  }
+
+  &.negative {
+    border-left-color: lighten($error-red, 12%);
+  }
+
+  &__bubble {
+    padding: 16px;
+    padding-left: 14px;
+    font-size: 15px;
+    line-height: 20px;
+    border-radius: 4px 4px 4px 0;
+    position: relative;
+    font-weight: 500;
+
+    a {
+      color: $ui-primary-color;
+    }
+  }
+
+  &__owner {
+    padding: 8px;
+    padding-left: 12px;
+  }
+
+  time {
+    color: $darker-text-color;
+  }

 }
 }

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 9b5ab6f01de85ae41198c037ee8e97d3d5b6d29a..908fa8a07234e8636b8254bce662cc59ff6c2032 100644 (file)
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1006,6 +1006,15 @@
   padding: 10px;
   border-bottom: 1px solid lighten($ui-base-color, 8%);
 
   padding: 10px;
   border-bottom: 1px solid lighten($ui-base-color, 8%);
 

+  &.compact {
+    padding: 0;
+    border-bottom: 0;
+
+    .account__avatar-wrapper {
+      margin-left: 0;
+    }
+  }
+

   .account__display-name {
     flex: 1 1 auto;
     display: block;
   .account__display-name {
     flex: 1 1 auto;
     display: block;


@@ -1029,7 +1038,6 @@
 .account__avatar {
   @include avatar-radius();
   position: relative;
 .account__avatar {
   @include avatar-radius();
   position: relative;

-  cursor: pointer;

 
   &-inline {
     display: inline-block;
 
   &-inline {
     display: inline-block;


@@ -1038,6 +1046,10 @@
   }
 }
 
   }
 }
 

+a .account__avatar {
+  cursor: pointer;
+}
+

 .account__avatar-overlay {
   @include avatar-size(48px);
 
 .account__avatar-overlay {
   @include avatar-size(48px);
 


@@ -1286,7 +1298,7 @@
 .status__display-name,
 .reply-indicator__display-name,
 .detailed-status__display-name,
 .status__display-name,
 .reply-indicator__display-name,
 .detailed-status__display-name,

-.account__display-name {
+a.account__display-name {

   &:hover strong {
     text-decoration: underline;
   }
   &:hover strong {
     text-decoration: underline;
   }

diff --git a/app/javascript/styles/mastodon/tables.scss b/app/javascript/styles/mastodon/tables.scss
index c12d84f1c0bac7353637ddb809fee2684c0234bb..fa876e6031a8e9ac2ade34f70b103a0ff12ab6dc 100644 (file)
--- a/app/javascript/styles/mastodon/tables.scss
+++ b/app/javascript/styles/mastodon/tables.scss
@@ -11,6 +11,7 @@
     vertical-align: top;
     border-top: 1px solid $ui-base-color;
     text-align: left;
     vertical-align: top;
     border-top: 1px solid $ui-base-color;
     text-align: left;

+    background: darken($ui-base-color, 4%);

   }
 
   & > thead > tr > th {
   }
 
   & > thead > tr > th {


@@ -48,9 +49,38 @@
     }
   }
 
     }
   }
 

-  &.inline-table > tbody > tr:nth-child(odd) > td,
-  &.inline-table > tbody > tr:nth-child(odd) > th {
-    background: transparent;
+  &.inline-table {
+    & > tbody > tr:nth-child(odd) {
+      & > td,
+      & > th {
+        background: transparent;
+      }
+    }
+
+    & > tbody > tr:first-child {
+      & > td,
+      & > th {
+        border-top: 0;
+      }
+    }
+  }
+
+  &.batch-table {
+    & > thead > tr > th {
+      background: $ui-base-color;
+      border-top: 1px solid darken($ui-base-color, 8%);
+      border-bottom: 1px solid darken($ui-base-color, 8%);
+
+      &:first-child {
+        border-radius: 4px 0 0;
+        border-left: 1px solid darken($ui-base-color, 8%);
+      }
+
+      &:last-child {
+        border-radius: 0 4px 0 0;
+        border-right: 1px solid darken($ui-base-color, 8%);
+      }
+    }

   }
 }
 
   }
 }
 


@@ -63,6 +93,13 @@ samp {
   font-family: 'mastodon-font-monospace', monospace;
 }
 
   font-family: 'mastodon-font-monospace', monospace;
 }
 

+button.table-action-link {
+  background: transparent;
+  border: 0;
+  font: inherit;
+}
+
+button.table-action-link,

 a.table-action-link {
   text-decoration: none;
   display: inline-block;
 a.table-action-link {
   text-decoration: none;
   display: inline-block;


@@ -79,4 +116,77 @@ a.table-action-link {
     font-weight: 400;
     margin-right: 5px;
   }
     font-weight: 400;
     margin-right: 5px;
   }

+
+  &:first-child {
+    padding-left: 0;
+  }
+}
+
+.batch-table {
+  &__toolbar,
+  &__row {
+    display: flex;
+
+    &__select {
+      box-sizing: border-box;
+      padding: 8px 16px;
+      cursor: pointer;
+      min-height: 100%;
+
+      input {
+        margin-top: 8px;
+      }
+    }
+
+    &__actions,
+    &__content {
+      padding: 8px 0;
+      padding-right: 16px;
+      flex: 1 1 auto;
+    }
+  }
+
+  &__toolbar {
+    border: 1px solid darken($ui-base-color, 8%);
+    background: $ui-base-color;
+    border-radius: 4px 0 0;
+    height: 47px;
+    align-items: center;
+
+    &__actions {
+      text-align: right;
+      padding-right: 16px - 5px;
+    }
+  }
+
+  &__row {
+    border: 1px solid darken($ui-base-color, 8%);
+    border-top: 0;
+    background: darken($ui-base-color, 4%);
+
+    &:hover {
+      background: darken($ui-base-color, 2%);
+    }
+
+    &:nth-child(even) {
+      background: $ui-base-color;
+
+      &:hover {
+        background: lighten($ui-base-color, 2%);
+      }
+    }
+
+    &__content {
+      padding-top: 12px;
+      padding-bottom: 16px;
+    }
+  }
+
+  .status__content {
+    padding-top: 0;
+
+    strong {
+      font-weight: 700;
+    }
+  }

 }
 }

diff --git a/app/views/admin/action_logs/_action_log.html.haml b/app/views/admin/action_logs/_action_log.html.haml
index ec90961cbd75b171057fab4b4ec6734dac4bb58a..f059814bd618fcd421ab68e4cde9b4fd24d9f00b 100644 (file)
--- a/app/views/admin/action_logs/_action_log.html.haml
+++ b/app/views/admin/action_logs/_action_log.html.haml
@@ -1,4 +1,4 @@
-%li.log-entry
+.log-entry

   .log-entry__header
     .log-entry__avatar
       = image_tag action_log.account.avatar.url(:original), alt: '', width: 40, height: 40, class: 'avatar'
   .log-entry__header
     .log-entry__avatar
       = image_tag action_log.account.avatar.url(:original), alt: '', width: 40, height: 40, class: 'avatar'

diff --git a/app/views/admin/action_logs/index.html.haml b/app/views/admin/action_logs/index.html.haml
index bb6d7b5d73a1980e7f0446dd6ed7042745fecba4..a4d3871a90765684789224c25b6aa9eb6c9f23ed 100644 (file)
--- a/app/views/admin/action_logs/index.html.haml
+++ b/app/views/admin/action_logs/index.html.haml
@@ -1,7 +1,6 @@
 - content_for :page_title do
   = t('admin.action_logs.title')
 
 - content_for :page_title do
   = t('admin.action_logs.title')
 

-%ul
-  = render @action_logs
+= render @action_logs

 
 = paginate @action_logs
 
 = paginate @action_logs

diff --git a/app/views/admin/report_notes/_report_note.html.haml b/app/views/admin/report_notes/_report_note.html.haml
index 1f621e0d3bef070c53c409a93b8585d028e483fd..d34dc3d1575aa8a6213a43c19c260efa435ceb71 100644 (file)
--- a/app/views/admin/report_notes/_report_note.html.haml
+++ b/app/views/admin/report_notes/_report_note.html.haml
@@ -1,9 +1,7 @@
-%li
-  %h4
-    = report_note.account.acct
-    %div{ style: 'float: right' }
-      %time.formatted{ datetime: report_note.created_at.iso8601, title: l(report_note.created_at) }
-        = l report_note.created_at
-      = table_link_to 'trash', t('admin.reports.notes.delete'), admin_report_note_path(report_note), method: :delete if can?(:destroy, report_note)
-  %div{ class: 'report-note__comment' }
+.speech-bubble
+  .speech-bubble__bubble

     = simple_format(h(report_note.content))
     = simple_format(h(report_note.content))

+  .speech-bubble__owner
+    = admin_account_link_to report_note.account
+    %time.formatted{ datetime: report_note.created_at.iso8601 }= l report_note.created_at
+    = table_link_to 'trash', t('admin.reports.notes.delete'), admin_report_note_path(report_note), method: :delete if can?(:destroy, report_note)

diff --git a/app/views/admin/reports/_account.html.haml b/app/views/admin/reports/_account.html.haml
new file mode 100644 (file)
index 0000000..22b7a08
--- /dev/null
+++ b/app/views/admin/reports/_account.html.haml
@@ -0,0 +1,19 @@
+- size ||= 36
+
+.account.compact
+  .account__wrapper
+    - if account.nil?
+      .account__display-name
+        .account__avatar-wrapper
+          .account__avatar{ style: "background-image: url(#{full_asset_url('avatars/original/missing.png', skip_pipeline: true)}); width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px" }
+        %span.display-name
+          %strong= t 'about.contact_missing'
+          %span.display-name__account= t 'about.contact_unavailable'
+    - else
+      = link_to TagManager.instance.url_for(account), class: 'account__display-name' do
+        .account__avatar-wrapper
+          .account__avatar{ style: "background-image: url(#{account.avatar.url}); width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px" }
+        %span.display-name
+          %bdi
+            %strong.display-name__html.emojify= display_name(account)
+          %span.display-name__account @#{account.acct}

diff --git a/app/views/admin/reports/_account_details.html.haml b/app/views/admin/reports/_account_details.html.haml
deleted file mode 100644 (file)
index a8af39b..0000000
--- a/app/views/admin/reports/_account_details.html.haml
+++ /dev/null
@@ -1,20 +0,0 @@
-.table-wrapper
-  %table.table
-    %tbody
-      %tr
-        %td= t('admin.reports.account.created_reports')
-        %td= link_to pluralize(account.reports.count, t('admin.reports.account.report')), admin_reports_path(account_id: account.id)
-      %tr
-        %td= t('admin.reports.account.targeted_reports')
-        %td= link_to pluralize(account.targeted_reports.count, t('admin.reports.account.report')), admin_reports_path(target_account_id: account.id)
-      %tr
-        %td= t('admin.reports.account.moderation_notes')
-        %td= link_to pluralize(account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: account.id)
-      - if account.silenced? || account.suspended?
-        %tr
-          %td= t('admin.reports.account.moderation.title')
-          %td
-            - if account.silenced?
-              %p= t('admin.reports.account.moderation.silenced')
-            - if account.suspended?
-              %p= t('admin.reports.account.moderation.suspended')

diff --git a/app/views/admin/reports/_action_log.html.haml b/app/views/admin/reports/_action_log.html.haml
new file mode 100644 (file)
index 0000000..024078e
--- /dev/null
+++ b/app/views/admin/reports/_action_log.html.haml
@@ -0,0 +1,6 @@
+.speech-bubble.positive
+  .speech-bubble__bubble
+    = t("admin.action_logs.actions.#{action_log.action}_#{action_log.target_type.underscore}", name: content_tag(:span, action_log.account.username, class: 'username'), target: content_tag(:span, log_target(action_log), class: 'target')).html_safe
+  .speech-bubble__owner
+    = admin_account_link_to(action_log.account)
+    %time.formatted{ datetime: action_log.created_at.iso8601 }= l action_log.created_at

diff --git a/app/views/admin/reports/_report.html.haml b/app/views/admin/reports/_report.html.haml
index 84db00ad5088a87868323cc1e822f03a3b137d07..d6c881955c9596b48b36e09ea40e2be27d40d957 100644 (file)
--- a/app/views/admin/reports/_report.html.haml
+++ b/app/views/admin/reports/_report.html.haml
@@ -2,9 +2,9 @@
   %td.id
     = "##{report.id}"
   %td.target
   %td.id
     = "##{report.id}"
   %td.target

-    = link_to report.target_account.acct, admin_account_path(report.target_account.id)
+    = admin_account_link_to report.target_account

   %td.reporter
   %td.reporter

-    = link_to report.account.acct, admin_account_path(report.account.id)
+    = admin_account_link_to report.account

   %td
     %div{ title: report.comment }
       = truncate(report.comment, length: 30, separator: ' ')
   %td
     %div{ title: report.comment }
       = truncate(report.comment, length: 30, separator: ' ')


@@ -21,6 +21,6 @@
     - if report.assigned_account.nil?
       \-
     - else
     - if report.assigned_account.nil?
       \-
     - else

-      = link_to report.assigned_account.acct, admin_account_path(report.assigned_account.id)
+      = admin_account_link_to report.assigned_account

   %td
     = table_link_to 'circle', t('admin.reports.view'), admin_report_path(report)
   %td
     = table_link_to 'circle', t('admin.reports.view'), admin_report_path(report)

diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml
new file mode 100644 (file)
index 0000000..1376095
--- /dev/null
+++ b/app/views/admin/reports/_status.html.haml
@@ -0,0 +1,28 @@
+.batch-table__row
+  %label.batch-table__row__select.batch-checkbox
+    = f.check_box :status_ids, { multiple: true, include_hidden: false }, status.id
+  .batch-table__row__content
+    .status__content><
+      - unless status.spoiler_text.blank?
+        %p><
+          %strong= Formatter.instance.format_spoiler(status)
+
+      = Formatter.instance.format(status)
+
+    - unless status.media_attachments.empty?
+      - if status.media_attachments.first.video?
+        - video = status.media_attachments.first
+        = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 610, height: 343, inline: true
+      - else
+        = react_component :media_gallery, height: 343, sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }
+
+    .detailed-status__meta
+      = link_to TagManager.instance.url_for(status), class: 'detailed-status__datetime', target: stream_link_target, rel: 'noopener' do
+        %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
+      ·
+      = fa_visibility_icon(status)
+      = t("statuses.visibilities.#{status.visibility}")
+      - if status.sensitive?
+        ·
+        = fa_icon('eye-slash fw')
+        = t('stream_entries.sensitive_content')

diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml
index c3baaf6be7001548d6f81f67ce38d5beb4a7c017..44a531f2c66c2c17db1995195e560c02af1718ad 100644 (file)
--- a/app/views/admin/reports/index.html.haml
+++ b/app/views/admin/reports/index.html.haml
@@ -8,20 +8,17 @@
       %li= filter_link_to t('admin.reports.unresolved'), resolved: nil
       %li= filter_link_to t('admin.reports.resolved'), resolved: '1'
 
       %li= filter_link_to t('admin.reports.unresolved'), resolved: nil
       %li= filter_link_to t('admin.reports.resolved'), resolved: '1'
 

-= form_tag do
-
-  .table-wrapper
-    %table.table
-      %thead
-        %tr
-          -# %th
-          %th= t('admin.reports.id')
-          %th= t('admin.reports.target')
-          %th= t('admin.reports.reported_by')
-          %th= t('admin.reports.report_contents')
-          %th= t('admin.reports.assigned')
-          %th
-      %tbody
-        = render @reports
+.table-wrapper
+  %table.table
+    %thead
+      %tr
+        %th= t('admin.reports.id')
+        %th= t('admin.reports.target')
+        %th= t('admin.reports.reported_by')
+        %th= t('admin.reports.report_contents')
+        %th= t('admin.reports.assigned')
+        %th
+    %tbody
+      = render @reports

 
 = paginate @reports
 
 = paginate @reports

diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index 1306500011c614534296ead29a4b060505706a1d..2bba3079ed9a8dca5d70a21c1b67e35d227ab569 100644 (file)
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -14,16 +14,28 @@
   - else
     = link_to t('admin.reports.mark_as_unresolved'), admin_report_path(@report, outcome: 'reopen'), method: :put, class: 'button'
 
   - else
     = link_to t('admin.reports.mark_as_unresolved'), admin_report_path(@report, outcome: 'reopen'), method: :put, class: 'button'
 

+%hr.spacer
+

 .table-wrapper
   %table.table.inline-table
     %tbody
 .table-wrapper
   %table.table.inline-table
     %tbody

+      %tr
+        %th= t('admin.reports.reported_account')
+        %td= admin_account_link_to @report.target_account
+        %td= table_link_to 'flag', pluralize(@report.target_account.targeted_reports.count, t('admin.reports.account.report')), admin_reports_path(target_account_id: @report.target_account.id)
+        %td= table_link_to 'file', pluralize(@report.target_account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: @report.target_account.id)
+      %tr
+        %th= t('admin.reports.reported_by')
+        %td= admin_account_link_to @report.account
+        %td= table_link_to 'flag', pluralize(@report.account.targeted_reports.count, t('admin.reports.account.report')), admin_reports_path(target_account_id: @report.account.id)
+        %td= table_link_to 'file', pluralize(@report.account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: @report.account.id)

       %tr
         %th= t('admin.reports.created_at')
       %tr
         %th= t('admin.reports.created_at')

-        %td{colspan: 2}
+        %td{ colspan: 3 }

           %time.formatted{ datetime: @report.created_at.iso8601 }
       %tr
         %th= t('admin.reports.updated_at')
           %time.formatted{ datetime: @report.created_at.iso8601 }
       %tr
         %th= t('admin.reports.updated_at')

-        %td{colspan: 2}
+        %td{ colspan: 3 }

           %time.formatted{ datetime: @report.updated_at.iso8601 }
       %tr
         %th= t('admin.reports.status')
           %time.formatted{ datetime: @report.updated_at.iso8601 }
       %tr
         %th= t('admin.reports.status')


@@ -32,14 +44,14 @@
             = t('admin.reports.resolved')
           - else
             = t('admin.reports.unresolved')
             = t('admin.reports.resolved')
           - else
             = t('admin.reports.unresolved')

-        %td{style: "text-align: right; overflow: hidden;"}
+        %td{ colspan: 2 }

           - if @report.action_taken?
             = table_link_to 'envelope-open', t('admin.reports.reopen'), admin_report_path(@report, outcome: 'reopen'), method: :put
       - if !@report.action_taken_by_account.nil?
         %tr
           %th= t('admin.reports.action_taken_by')
           - if @report.action_taken?
             = table_link_to 'envelope-open', t('admin.reports.reopen'), admin_report_path(@report, outcome: 'reopen'), method: :put
       - if !@report.action_taken_by_account.nil?
         %tr
           %th= t('admin.reports.action_taken_by')

-          %td{colspan: 2}
-            = @report.action_taken_by_account.acct
+          %td{ colspan: 3 }
+            = admin_account_link_to @report.action_taken_by_account

       - else
         %tr
           %th= t('admin.reports.assigned')
       - else
         %tr
           %th= t('admin.reports.assigned')


@@ -47,78 +59,55 @@
             - if @report.assigned_account.nil?
               \-
             - else
             - if @report.assigned_account.nil?
               \-
             - else

-              = link_to @report.assigned_account.acct, admin_account_path(@report.assigned_account.id)
-          %td{style: "text-align: right"}
+              = admin_account_link_to @report.assigned_account
+          %td

             - if @report.assigned_account != current_user.account
               = table_link_to 'user', t('admin.reports.assign_to_self'), admin_report_path(@report, outcome: 'assign_to_self'), method: :put
             - if @report.assigned_account != current_user.account
               = table_link_to 'user', t('admin.reports.assign_to_self'), admin_report_path(@report, outcome: 'assign_to_self'), method: :put

+          %td

             - if !@report.assigned_account.nil?
               = table_link_to 'trash', t('admin.reports.unassign'), admin_report_path(@report, outcome: 'unassign'), method: :put
 
             - if !@report.assigned_account.nil?
               = table_link_to 'trash', t('admin.reports.unassign'), admin_report_path(@report, outcome: 'unassign'), method: :put
 

-%hr{ class: "section-break"}/
-
-.report-accounts
-  .report-accounts__item
-    %h3= t('admin.reports.reported_account')
-    = render 'authorize_follows/card', account: @report.target_account, admin: true
-    = render 'admin/reports/account_details', account: @report.target_account
-  .report-accounts__item
-    %h3= t('admin.reports.reported_by')
-    = render 'authorize_follows/card', account: @report.account, admin: true
-    = render 'admin/reports/account_details', account: @report.account
-
-%h3= t('admin.reports.comment.label')
+%hr.spacer

 
 

-= simple_format(@report.comment.presence || t('admin.reports.comment.none'))
+.speech-bubble
+  .speech-bubble__bubble= simple_format(@report.comment.presence || t('admin.reports.comment.none'))
+  .speech-bubble__owner
+    = admin_account_link_to @report.account
+    %time.formatted{ datetime: @report.created_at.iso8601 }

 
 - unless @report.statuses.empty?
 
 - unless @report.statuses.empty?

-  %hr/
-
-  %h3= t('admin.reports.statuses')
+  %hr.spacer/

 
   = form_for(@form, url: admin_report_reported_statuses_path(@report.id)) do |f|
 
   = form_for(@form, url: admin_report_reported_statuses_path(@report.id)) do |f|

-    .batch-form-box
-      .batch-checkbox-all
-        = check_box_tag :batch_checkbox_all, nil, false
-      = f.select :action, Form::StatusBatch::ACTION_TYPE.map{|action| [t("admin.statuses.batch.#{action}"), action]}
-      = f.submit t('admin.statuses.execute'), data: { confirm: t('admin.reports.are_you_sure') }, class: 'button'
-      .media-spoiler-toggle-buttons
-        .media-spoiler-show-button.button= t('admin.statuses.media.show')
-        .media-spoiler-hide-button.button= t('admin.statuses.media.hide')
-    - @report.statuses.each do |status|
-      .report-status{ data: { id: status.id } }
-        .batch-checkbox
-          = f.check_box :status_ids, { multiple: true, include_hidden: false }, status.id
-        .activity-stream.activity-stream-headless
-          .entry= render 'stream_entries/simple_status', status: status
-        .report-status__actions
-          - unless status.media_attachments.empty?
-            = link_to admin_report_reported_status_path(@report, status, status: { sensitive: !status.sensitive }), method: :put, class: 'icon-button nsfw-button', title: t("admin.reports.nsfw.#{!status.sensitive}") do
-              = fa_icon status.sensitive? ? 'eye' : 'eye-slash'
-          = link_to admin_report_reported_status_path(@report, status), method: :delete, class: 'icon-button trash-button', title: t('admin.reports.delete'), data: { confirm: t('admin.reports.are_you_sure') }, remote: true do
-            = fa_icon 'trash'
-
-%hr{ class: "section-break"}/
-
-%h3= t('admin.reports.notes.label')
+    .batch-table
+      .batch-table__toolbar
+        %label.batch-table__toolbar__select.batch-checkbox-all
+          = check_box_tag :batch_checkbox_all, nil, false
+        .batch-table__toolbar__actions
+          = f.button safe_join([fa_icon('eye-slash'), t('admin.statuses.batch.nsfw_on')]), name: :nsfw_on, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([fa_icon('eye'), t('admin.statuses.batch.nsfw_off')]), name: :nsfw_off, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([fa_icon('trash'), t('admin.statuses.batch.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+      .batch-table__body
+        = render partial: 'admin/reports/status', collection: @report.statuses, locals: { f: f }
+
+%hr.spacer/
+
+- @report_notes.each do |item|
+  - if item.is_a?(Admin::ActionLog)
+    = render partial: 'action_log', locals: { action_log: item }
+  - elsif item.is_a?(ReportNote)
+    = render item
+
+= simple_form_for @report_note, url: admin_report_notes_path do |f|
+  = render 'shared/error_messages', object: @report_note
+  = f.input :report_id, as: :hidden

 
 

-- if @report_notes.length > 0
-  %ul
-    = render @report_notes
+  .field-group
+    = f.input :content, placeholder: t('admin.reports.notes.placeholder'), rows: 6

 
 

-%h4= t('admin.reports.notes.new_label')
-= form_for @report_note, url: admin_report_notes_path, html: { class: 'report-note__form' } do |f|
-  = render 'shared/error_messages', object: @report_note
-  = f.text_area :content, placeholder: t('admin.reports.notes.placeholder'), rows: 6, class: 'report-note__textarea'
-  = f.hidden_field :report_id
-  %div{ class: 'report-note__buttons' }
+  .actions

     - if @report.unresolved?
     - if @report.unresolved?

-      = f.submit t('admin.reports.notes.create_and_resolve'), name: :create_and_resolve, class: 'button report-note__button'
+      = f.button :button, t('admin.reports.notes.create_and_resolve'), name: :create_and_resolve, type: :submit

     - else
     - else

-      = f.submit t('admin.reports.notes.create_and_unresolve'), name: :create_and_unresolve, class: 'button report-note__button'
-    = f.submit t('admin.reports.notes.create'), class: 'button report-note__button'
-
-- if @report_history.length > 0
-  %h3= t('admin.reports.history')
-
-  %ul
-    = render @report_history
+      = f.button :button, t('admin.reports.notes.create_and_unresolve'), name: :create_and_unresolve, type: :submit
+    = f.button :button, t('admin.reports.notes.create'), type: :submit

diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml
index e1122d5a2eaccbecc94bab73078c6d2b8e516000..afc66d1487438a669cb77b023000490ea5b2fdc7 100644 (file)
--- a/app/views/stream_entries/_detailed_status.html.haml
+++ b/app/views/stream_entries/_detailed_status.html.haml
@@ -22,11 +22,11 @@
   - if !status.media_attachments.empty?
     - if status.media_attachments.first.video?
       - video = status.media_attachments.first
   - if !status.media_attachments.empty?
     - if status.media_attachments.first.video?
       - video = status.media_attachments.first

-      %div{ data: { component: 'Video', props: Oj.dump(src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 670, height: 380, detailed: true, inline: true) }}
+      = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 670, height: 380, detailed: true, inline: true

     - else
     - else

-      %div{ data: { component: 'MediaGallery', props: Oj.dump(height: 380, sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, standalone: true, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, 'reduceMotion': current_account&.user&.setting_reduce_motion, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }}
+      = react_component :media_gallery, height: 380, sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, standalone: true, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, 'reduceMotion': current_account&.user&.setting_reduce_motion, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }

   - elsif status.preview_cards.first
   - elsif status.preview_cards.first

-    %div{ data: { component: 'Card', props: Oj.dump('maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_cards.first, serializer: REST::PreviewCardSerializer).as_json) }}
+    = react_component :card, 'maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_cards.first, serializer: REST::PreviewCardSerializer).as_json

 
   .detailed-status__meta
     %data.dt-published{ value: status.created_at.to_time.iso8601 }
 
   .detailed-status__meta
     %data.dt-published{ value: status.created_at.to_time.iso8601 }

diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml
index 984691097b4fafa854ba5e52e9bd00a82e9a7c0f..a6f5120fb1d5a1141e137140074a5f4f16994602 100644 (file)
--- a/app/views/stream_entries/_simple_status.html.haml
+++ b/app/views/stream_entries/_simple_status.html.haml
@@ -23,6 +23,6 @@
   - unless status.media_attachments.empty?
     - if status.media_attachments.first.video?
       - video = status.media_attachments.first
   - unless status.media_attachments.empty?
     - if status.media_attachments.first.video?
       - video = status.media_attachments.first

-      %div{ data: { component: 'Video', props: Oj.dump(src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 610, height: 343, inline: true) }}
+      = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 610, height: 343, inline: true

     - else
     - else

-      %div{ data: { component: 'MediaGallery', props: Oj.dump(height: 343, sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }}
+      = react_component :media_gallery, height: 343, sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 8b9a6688ab1673eceb0a3e4bd0637ed71445a775..b3cb71d28b21da25ea25779eb2f25fb56758e318 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -240,7 +240,6 @@ ar:
       action_taken_by: تم اتخاذ الإجراء مِن طرف
       are_you_sure: هل أنت متأكد ؟
       comment:
       action_taken_by: تم اتخاذ الإجراء مِن طرف
       are_you_sure: هل أنت متأكد ؟
       comment:

-        label: تعليق

         none: لا شيء
       delete: حذف
       id: معرّف ID
         none: لا شيء
       delete: حذف
       id: معرّف ID

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index fc30b366118ffad0efc90f5ebec313a2956134a4..c9173cd5e72c72faab14287fad8a7d147ef172e5 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -243,7 +243,6 @@ ca:
       action_taken_by: Mesures adoptades per
       are_you_sure: N'estàs segur?
       comment:
       action_taken_by: Mesures adoptades per
       are_you_sure: N'estàs segur?
       comment:

-        label: Comentari

         none: Cap
       delete: Suprimeix
       id: ID
         none: Cap
       delete: Suprimeix
       id: ID

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 6233d299e2e513534b3627322dedafa9a872b046..51936aa36a5e5f64a6207045db0dfd796b1cabac 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -243,7 +243,6 @@ de:
       action_taken_by: Maßnahme ergriffen durch
       are_you_sure: Bist du dir sicher?
       comment:
       action_taken_by: Maßnahme ergriffen durch
       are_you_sure: Bist du dir sicher?
       comment:

-        label: Kommentar

         none: Kein
       delete: Löschen
       id: ID
         none: Kein
       delete: Löschen
       id: ID

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 20bfd0f8c3277b4173407fafa4d8c92a55b392b6..53b64a10035b0269642a339e4755b0ad5bf796cf 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -260,40 +260,29 @@ en:
       destroyed_msg: Report note successfully deleted!
     reports:
       account:
       destroyed_msg: Report note successfully deleted!
     reports:
       account:

-        created_reports: Reports created by this account
-        moderation:
-          silenced: Silenced
-          suspended: Suspended
-          title: Moderation
-        moderation_notes: Moderation Notes

         note: note
         report: report
         note: note
         report: report

-        targeted_reports: Reports made about this account

       action_taken_by: Action taken by
       are_you_sure: Are you sure?
       assign_to_self: Assign to me
       action_taken_by: Action taken by
       are_you_sure: Are you sure?
       assign_to_self: Assign to me

-      assigned: Assigned Moderator
+      assigned: Assigned moderator

       comment:
       comment:

-        label: Report Comment

         none: None
       created_at: Reported
       delete: Delete
         none: None
       created_at: Reported
       delete: Delete

-      history: Moderation History

       id: ID
       mark_as_resolved: Mark as resolved
       mark_as_unresolved: Mark as unresolved
       notes:
       id: ID
       mark_as_resolved: Mark as resolved
       mark_as_unresolved: Mark as unresolved
       notes:

-        create: Add Note
-        create_and_resolve: Resolve with Note
-        create_and_unresolve: Reopen with Note
+        create: Add note
+        create_and_resolve: Resolve with note
+        create_and_unresolve: Reopen with note

         delete: Delete
         delete: Delete

-        label: Moderator Notes
-        new_label: Add Moderator Note

         placeholder: Describe what actions have been taken, or any other updates to this report…
       nsfw:
         'false': Unhide media attachments
         'true': Hide media attachments
         placeholder: Describe what actions have been taken, or any other updates to this report…
       nsfw:
         'false': Unhide media attachments
         'true': Hide media attachments

-      reopen: Reopen Report
+      reopen: Reopen report

       report: 'Report #%{id}'
       report_contents: Contents
       reported_account: Reported account
       report: 'Report #%{id}'
       report_contents: Contents
       reported_account: Reported account


@@ -302,7 +291,6 @@ en:
       resolved_msg: Report successfully resolved!
       silence_account: Silence account
       status: Status
       resolved_msg: Report successfully resolved!
       silence_account: Silence account
       status: Status

-      statuses: Reported Toots

       suspend_account: Suspend account
       target: Target
       title: Reports
       suspend_account: Suspend account
       target: Target
       title: Reports


@@ -366,8 +354,8 @@ en:
       back_to_account: Back to account page
       batch:
         delete: Delete
       back_to_account: Back to account page
       batch:
         delete: Delete

-        nsfw_off: NSFW OFF
-        nsfw_on: NSFW ON
+        nsfw_off: Mark as not sensitive
+        nsfw_on: Mark as sensitive

       execute: Execute
       failed_to_execute: Failed to execute
       media:
       execute: Execute
       failed_to_execute: Failed to execute
       media:

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 27c62f899369d63df17969ad1b713eaf29982bca..c768d8a03df0ba9f1e324100dc453fdebfee1e4a 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -243,7 +243,6 @@ eo:
       action_taken_by: Ago farita de
       are_you_sure: Ĉu vi certas?
       comment:
       action_taken_by: Ago farita de
       are_you_sure: Ĉu vi certas?
       comment:

-        label: Komento

         none: Nenio
       delete: Forigi
       id: ID
         none: Nenio
       delete: Forigi
       id: ID

diff --git a/config/locales/es.yml b/config/locales/es.yml
index a5a20aa3c4c3b2656cf06f3d84a4abd7a317be4e..3143adda1c76932db19f8edd3a997feac893ffce 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -243,7 +243,6 @@ es:
       action_taken_by: Acción tomada por
       are_you_sure: "¿Estás seguro?"
       comment:
       action_taken_by: Acción tomada por
       are_you_sure: "¿Estás seguro?"
       comment:

-        label: Comentario

         none: Ninguno
       delete: Eliminar
       id: ID
         none: Ninguno
       delete: Eliminar
       id: ID

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index ed25ea8c96240a7092ebd63c5fb95e7de1c05b9d..a3005547a5be538b6bb2bc5d3df3d4ce7956a3a1 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -243,7 +243,6 @@ fa:
       action_taken_by: انجام‌دهنده
       are_you_sure: آیا مطمئن هستید؟
       comment:
       action_taken_by: انجام‌دهنده
       are_you_sure: آیا مطمئن هستید؟
       comment:

-        label: توضیح

         none: خالی
       delete: پاک‌کردن
       id: شناسه
         none: خالی
       delete: پاک‌کردن
       id: شناسه

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 62f6560bf17908a10ea75c7cc4a7c8ac57d93a5c..550ad1805e905bc23b273619d4f28d520195f173 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -243,7 +243,6 @@ fi:
       action_taken_by: Toimenpiteen tekijä
       are_you_sure: Oletko varma?
       comment:
       action_taken_by: Toimenpiteen tekijä
       are_you_sure: Oletko varma?
       comment:

-        label: Kommentti

         none: Ei mitään
       delete: Poista
       id: Tunniste
         none: Ei mitään
       delete: Poista
       id: Tunniste

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 4571cc37587ccc986876bfe3a3c0a041ab271b07..ebe579354896258acde1400419931a6dc35af589 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -243,7 +243,6 @@ fr:
       action_taken_by: Intervention de
       are_you_sure: Êtes vous certain⋅e ?
       comment:
       action_taken_by: Intervention de
       are_you_sure: Êtes vous certain⋅e ?
       comment:

-        label: Commentaire

         none: Aucun
       delete: Supprimer
       id: ID
         none: Aucun
       delete: Supprimer
       id: ID

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index f4ca7e8c5a6c9879cac5eab5c6aaa7ea192d352a..89de27a9a9e2f0d5690f571251713bc21fad511f 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -243,7 +243,6 @@ gl:
       action_taken_by: Acción tomada por
       are_you_sure: Está segura?
       comment:
       action_taken_by: Acción tomada por
       are_you_sure: Está segura?
       comment:

-        label: Comentario

         none: Nada
       delete: Eliminar
       id: ID
         none: Nada
       delete: Eliminar
       id: ID

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 1a7c84d7cb4489904f43fc9a03a654655d25c760..d641c6e1a50e48ae73eb00b919ae4d5eac40b941 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -180,7 +180,6 @@ he:
     reports:
       are_you_sure: 100% על בטוח?
       comment:
     reports:
       are_you_sure: 100% על בטוח?
       comment:

-        label: הערה

         none: ללא
       delete: מחיקה
       id: ID
         none: ללא
       delete: מחיקה
       id: ID

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 2560b3816079c02d50bdb277bbe3e5d1f8253ed1..7fe431d37713d3d78313c0393e7f038f66c4c7ba 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -243,7 +243,6 @@ hu:
       action_taken_by: 'Kezelte:'
       are_you_sure: Biztos vagy benne?
       comment:
       action_taken_by: 'Kezelte:'
       are_you_sure: Biztos vagy benne?
       comment:

-        label: Hozzászólás

         none: Egyik sem
       delete: Törlés
       id: ID
         none: Egyik sem
       delete: Törlés
       id: ID

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 0ef1d504041aaa7580bbd01647166de9588712fb..5a63b8038a1705d39feacb4c0bbefd7e75d0b026 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -106,7 +106,6 @@ id:
       title: Server yang diketahui
     reports:
       comment:
       title: Server yang diketahui
     reports:
       comment:

-        label: Komentar

         none: Tidak ada
       delete: Hapus
       id: ID
         none: Tidak ada
       delete: Hapus
       id: ID

diff --git a/config/locales/io.yml b/config/locales/io.yml
index 29ab4516b54ef6d28779583ab0d2b4ff85981f3a..7c25acc47ad19ccf19b018d1bf8023271a6bf11b 100644 (file)
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -105,7 +105,6 @@ io:
       title: Known Instances
     reports:
       comment:
       title: Known Instances
     reports:
       comment:

-        label: Comment

         none: None
       delete: Delete
       id: ID
         none: None
       delete: Delete
       id: ID

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index fecf996d5c0e5cb9920f44afeba44729ba25b485..b23c02754a3844cf8d09128c9d8a3fff0db91ef0 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -264,11 +264,9 @@ ja:
       assign_to_self: 担当になる
       assigned: 担当者
       comment:
       assign_to_self: 担当になる
       assigned: 担当者
       comment:

-        label: コメント

         none: なし
       created_at: レポート日時
       delete: 削除
         none: なし
       created_at: レポート日時
       delete: 削除

-      history: モデレーション履歴

       id: ID
       mark_as_resolved: 解決済みとしてマーク
       mark_as_unresolved: 未解決として再び開く
       id: ID
       mark_as_resolved: 解決済みとしてマーク
       mark_as_unresolved: 未解決として再び開く


@@ -277,8 +275,6 @@ ja:
         create_and_resolve: 書き込み、解決済みにする
         create_and_unresolve: 書き込み、未解決として開く
         delete: 削除
         create_and_resolve: 書き込み、解決済みにする
         create_and_unresolve: 書き込み、未解決として開く
         delete: 削除

-        label: モデレーターメモ
-        new_label: モデレーターメモの追加

         placeholder: このレポートに取られた措置やその他更新を記述してください
       nsfw:
         'false': NSFW オフ
         placeholder: このレポートに取られた措置やその他更新を記述してください
       nsfw:
         'false': NSFW オフ


@@ -292,7 +288,6 @@ ja:
       resolved_msg: レポートを解決済みにしました！
       silence_account: アカウントをサイレンス
       status: ステータス
       resolved_msg: レポートを解決済みにしました！
       silence_account: アカウントをサイレンス
       status: ステータス

-      statuses: 通報されたトゥート

       suspend_account: アカウントを停止
       target: ターゲット
       title: レポート
       suspend_account: アカウントを停止
       target: ターゲット
       title: レポート

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 72c98bc3054d73b16f07044e96b939b887feda25..3470085cf2b59514c3e419b1fa3dded2d5738fe9 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -245,7 +245,6 @@ ko:
       action_taken_by: 신고 처리자
       are_you_sure: 정말로 실행하시겠습니까?
       comment:
       action_taken_by: 신고 처리자
       are_you_sure: 정말로 실행하시겠습니까?
       comment:

-        label: 코멘트

         none: 없음
       delete: 삭제
       id: ID
         none: 없음
       delete: 삭제
       id: ID

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index a46bb72d75bda1413480bb4329aea024ac478f5a..2342ef6a291ff6631ca503123211bfa88b692749 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -243,7 +243,6 @@ nl:
       action_taken_by: Actie uitgevoerd door
       are_you_sure: Weet je het zeker?
       comment:
       action_taken_by: Actie uitgevoerd door
       are_you_sure: Weet je het zeker?
       comment:

-        label: Opmerking

         none: Geen
       delete: Verwijderen
       id: ID
         none: Geen
       delete: Verwijderen
       id: ID

diff --git a/config/locales/no.yml b/config/locales/no.yml
index d5edb3975dfceac11cbc8559ce9aa0a87054a331..8b84182af614d3c5e25af282c0d05ba3302fb2fb 100644 (file)
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -243,7 +243,6 @@
       action_taken_by: Handling utført av
       are_you_sure: Er du sikker?
       comment:
       action_taken_by: Handling utført av
       are_you_sure: Er du sikker?
       comment:

-        label: Kommentar

         none: Ingen
       delete: Slett
       id: ID
         none: Ingen
       delete: Slett
       id: ID

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index f8e819c532124b467d24fb196a06537626818d1c..195a1d9096a2f3574ce11ddaa941f8481a0f1790 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -243,7 +243,6 @@ oc:
       action_taken_by: Mesura menada per
       are_you_sure: Es segur ?
       comment:
       action_taken_by: Mesura menada per
       are_you_sure: Es segur ?
       comment:

-        label: Comentari

         none: Pas cap
       delete: Suprimir
       id: ID
         none: Pas cap
       delete: Suprimir
       id: ID

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index faa5494721a1d6c0b71c32cd2e206a794fbfdbc7..839767c8f420282875114c7eebc368bbc3121547 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -261,25 +261,16 @@ pl:
       destroyed_msg: Pomyślnie usunięto notatkę moderacyjną.
     reports:
       account:
       destroyed_msg: Pomyślnie usunięto notatkę moderacyjną.
     reports:
       account:

-        created_reports: Zgłoszenia utworzone z tego konta
-        moderation:
-          silenced: Wyciszone
-          suspended: Zawieszone
-          title: Moderacja
-        moderation_notes: Notatki moderacyjne

         note: notatka
         report: zgłoszenie
         note: notatka
         report: zgłoszenie

-        targeted_reports: Zgłoszenia dotycząće tego konta

       action_taken_by: Działanie podjęte przez
       are_you_sure: Czy na pewno?
       assign_to_self: Przypisz do siebie
       assigned: Przypisany moderator
       comment:
       action_taken_by: Działanie podjęte przez
       are_you_sure: Czy na pewno?
       assign_to_self: Przypisz do siebie
       assigned: Przypisany moderator
       comment:

-        label: Komentarz do zgłoszenia

         none: Brak
       created_at: Zgłoszono
       delete: Usuń
         none: Brak
       created_at: Zgłoszono
       delete: Usuń

-      history: Historia moderacji

       id: ID
       mark_as_resolved: Oznacz jako rozwiązane
       mark_as_unresolved: Oznacz jako nierozwiązane
       id: ID
       mark_as_resolved: Oznacz jako rozwiązane
       mark_as_unresolved: Oznacz jako nierozwiązane


@@ -288,8 +279,6 @@ pl:
         create_and_resolve: Rozwiąż i pozostaw notatkę
         create_and_unresolve: Cofnij rozwiązanie i pozostaw notatkę
         delete: Usuń
         create_and_resolve: Rozwiąż i pozostaw notatkę
         create_and_unresolve: Cofnij rozwiązanie i pozostaw notatkę
         delete: Usuń

-        label: Notatki
-        new_label: Dodaj notatkę moderacyjną

         placeholder: Opisz wykonane akcje i inne szczegóły dotyczące tego zgłoszenia…
       nsfw:
         'false': Nie oznaczaj jako NSFW
         placeholder: Opisz wykonane akcje i inne szczegóły dotyczące tego zgłoszenia…
       nsfw:
         'false': Nie oznaczaj jako NSFW


@@ -303,7 +292,6 @@ pl:
       resolved_msg: Pomyślnie rozwiązano zgłoszenie.
       silence_account: Wycisz konto
       status: Stan
       resolved_msg: Pomyślnie rozwiązano zgłoszenie.
       silence_account: Wycisz konto
       status: Stan

-      statuses: Zgłoszone wpisy

       suspend_account: Zawieś konto
       target: Cel
       title: Zgłoszenia
       suspend_account: Zawieś konto
       target: Cel
       title: Zgłoszenia

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index d6f463a198cc5200c684b4c2fb73edd338663cde..d3c1d532b1d2a6773733d9d60793f3ae75eda30c 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -243,7 +243,6 @@ pt-BR:
       action_taken_by: Ação realizada por
       are_you_sure: Você tem certeza?
       comment:
       action_taken_by: Ação realizada por
       are_you_sure: Você tem certeza?
       comment:

-        label: Comentário

         none: Nenhum
       delete: Excluir
       id: ID
         none: Nenhum
       delete: Excluir
       id: ID

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 27d4e88e3150b6d869ca97b3e0a6574b3dc4686b..fb2a6cad1cbf3686cfa4271824aa5be2c034fe2b 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -243,7 +243,6 @@ pt:
       action_taken_by: Ação tomada por
       are_you_sure: Tens a certeza?
       comment:
       action_taken_by: Ação tomada por
       are_you_sure: Tens a certeza?
       comment:

-        label: Comentário

         none: Nenhum
       delete: Eliminar
       id: ID
         none: Nenhum
       delete: Eliminar
       id: ID

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 176ace92ddc8fff1c17290a59e2b977785196a72..bf42257581a79b04bce18e22b34b295934f1c4a4 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -245,7 +245,6 @@ ru:
       action_taken_by: 'Действие предпринято:'
       are_you_sure: Вы уверены?
       comment:
       action_taken_by: 'Действие предпринято:'
       are_you_sure: Вы уверены?
       comment:

-        label: Комментарий

         none: Нет
       delete: Удалить
       id: ID
         none: Нет
       delete: Удалить
       id: ID

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 25e672604db943ff8aa974c22f82fad7613f47ee..37f711323a4d8aa685809d6bd246310c25139ef7 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -243,7 +243,6 @@ sk:
       action_taken_by: Zákrok vykonal
       are_you_sure: Ste si istý/á?
       comment:
       action_taken_by: Zákrok vykonal
       are_you_sure: Ste si istý/á?
       comment:

-        label: Vyjadriť sa

         none: Žiadne
       delete: Vymazať
       id: Identifikácia
         none: Žiadne
       delete: Vymazať
       id: Identifikácia

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 8d39d35b0b6394e6e710f44aa4a6eda69a25fa3f..742c976d193b28b2b92d20353c7e0fc1bfccbc7f 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -245,7 +245,6 @@ sr-Latn:
       action_taken_by: Akciju izveo
       are_you_sure: Da li ste sigurni?
       comment:
       action_taken_by: Akciju izveo
       are_you_sure: Da li ste sigurni?
       comment:

-        label: Komentar

         none: Ništa
       delete: Obriši
       id: ID
         none: Ništa
       delete: Obriši
       id: ID

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index af4c6a846f1d24c357dd78ffc900a017c91c5910..0d55910a6cacbeebfdfd430826a534c7fb39f199 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -245,7 +245,6 @@ sr:
       action_taken_by: Акцију извео
       are_you_sure: Да ли сте сигурни?
       comment:
       action_taken_by: Акцију извео
       are_you_sure: Да ли сте сигурни?
       comment:

-        label: Коментар

         none: Ништа
       delete: Обриши
       id: ID
         none: Ништа
       delete: Обриши
       id: ID

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index f85ed6efba43bb095501bd6156f61b8169b3d00b..7e763c2aad4595fe6e4827cd809ca095a46d3e30 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -243,7 +243,6 @@ sv:
       action_taken_by: Åtgärder vidtagna av
       are_you_sure: Är du säker?
       comment:
       action_taken_by: Åtgärder vidtagna av
       are_you_sure: Är du säker?
       comment:

-        label: Kommentar

         none: Ingen
       delete: Radera
       id: ID
         none: Ingen
       delete: Radera
       id: ID

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 45fe1e4752f5d9bf1834254a56b03a519813c8d0..350b93b521a55c572b0325e0d741884ad7a41d82 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -108,7 +108,6 @@ th:
       title: Known Instances
     reports:
       comment:
       title: Known Instances
     reports:
       comment:

-        label: คอมเม้นต์

         none: None
       delete: ลบ
       id: ไอดี
         none: None
       delete: ลบ
       id: ไอดี

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index ee0e330748a1b8bc4b215b82eca58ccac3527d19..6e7aeb77e946da7200f6f36f1c15530797eb1cca 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -107,7 +107,6 @@ tr:
       title: Bilinen Sunucular
     reports:
       comment:
       title: Bilinen Sunucular
     reports:
       comment:

-        label: Yorum

         none: Yok
       delete: Sil
       id: ID
         none: Yok
       delete: Sil
       id: ID

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 4c1c66b318e2b1b031ddd1209433e77d8897ee21..44f64b5c9e041c785cad103bc9d53d84189d972d 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -99,7 +99,6 @@ uk:
       undo: Відмінити
     reports:
       comment:
       undo: Відмінити
     reports:
       comment:

-        label: Коментар

         none: Немає
       delete: Видалити
       id: ID
         none: Немає
       delete: Видалити
       id: ID

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index be868e6e73c80e04f637735ddd243dce76cc8d53..78c72bd302cdc5a2ba24a1812b8ad2e26a23e808 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -241,7 +241,6 @@ zh-CN:
       action_taken_by: 操作执行者
       are_you_sure: 你确定吗？
       comment:
       action_taken_by: 操作执行者
       are_you_sure: 你确定吗？
       comment:

-        label: 备注

         none: 没有
       delete: 删除
       id: ID
         none: 没有
       delete: 删除
       id: ID

diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 964ff58112880a30802e3acebd374ec672ae9595..a27b0c04c8c556b77a5d401a81e51456b68c01b5 100644 (file)
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -259,25 +259,16 @@ zh-HK:
       destroyed_msg: 舉報筆記已刪除。
     reports:
       account:
       destroyed_msg: 舉報筆記已刪除。
     reports:
       account:

-        created_reports: 由此帳號發出的舉報
-        moderation:
-          silenced: 被靜音的
-          suspended: 被停權的
-          title: 管理操作
-        moderation_notes: 管理筆記

         note: 筆記
         report: 舉報
         note: 筆記
         report: 舉報

-        targeted_reports: 關於此帳號的舉報

       action_taken_by: 操作執行者
       are_you_sure: 你確認嗎？
       assign_to_self: 指派給自己
       assigned: 指派負責人
       comment:
       action_taken_by: 操作執行者
       are_you_sure: 你確認嗎？
       assign_to_self: 指派給自己
       assigned: 指派負責人
       comment:

-        label: 詳細解釋

         none: 沒有
       created_at: 日期
       delete: 刪除
         none: 沒有
       created_at: 日期
       delete: 刪除

-      history: 執行紀錄

       id: ID
       mark_as_resolved: 標示為「已處理」
       mark_as_unresolved: 標示為「未處理」
       id: ID
       mark_as_resolved: 標示為「已處理」
       mark_as_unresolved: 標示為「未處理」


@@ -286,8 +277,6 @@ zh-HK:
         create_and_resolve: 建立筆記並標示為「已處理」
         create_and_unresolve: 建立筆記並標示為「未處理」
         delete: 刪除
         create_and_resolve: 建立筆記並標示為「已處理」
         create_and_unresolve: 建立筆記並標示為「未處理」
         delete: 刪除

-        label: 管理筆記
-        new_label: 建立管理筆記

         placeholder: 記錄已執行的動作，或其他更新
       nsfw:
         'false': 取消 NSFW 標記
         placeholder: 記錄已執行的動作，或其他更新
       nsfw:
         'false': 取消 NSFW 標記


@@ -301,7 +290,6 @@ zh-HK:
       resolved_msg: 舉報已處理。
       silence_account: 將用戶靜音
       status: 狀態
       resolved_msg: 舉報已處理。
       silence_account: 將用戶靜音
       status: 狀態

-      statuses: 被舉報的文章

       suspend_account: 將用戶停權
       target: 對象
       title: 舉報
       suspend_account: 將用戶停權
       target: 對象
       title: 舉報

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 2fec09ed8e324990acc00cf75560a4aaeb34cd7b..f69d22d79a2924babb77f32660278cda931e0df8 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -79,7 +79,6 @@ zh-TW:
       title: 網域封鎖
     reports:
       comment:
       title: 網域封鎖
     reports:
       comment:

-        label: 留言

         none: 無
       delete: 刪除
       id: ID
         none: 無
       delete: 刪除
       id: ID

diff --git a/spec/controllers/admin/reported_statuses_controller_spec.rb b/spec/controllers/admin/reported_statuses_controller_spec.rb
index 297807d41118e2ecf9efac89a9faba27f5f3866d..41e032fc774426c885dd7b25210acbda366603bd 100644 (file)
--- a/spec/controllers/admin/reported_statuses_controller_spec.rb
+++ b/spec/controllers/admin/reported_statuses_controller_spec.rb
@@ -13,7 +13,7 @@ describe Admin::ReportedStatusesController do
 
   describe 'POST #create' do
     subject do
 
   describe 'POST #create' do
     subject do

-      -> { post :create, params: { report_id: report, form_status_batch: { action: action, status_ids: status_ids } } }
+      -> { post :create, params: { :report_id  => report, action => '', :form_status_batch => { status_ids: status_ids } } }

     end
 
     let(:action) { 'nsfw_on' }
     end
 
     let(:action) { 'nsfw_on' }