Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into add/edit-status

2 files changed, 9 insertions, 0 deletions

diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 882b68f9..f60a1a6a 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -4,6 +4,7 @@ import Status from '../status/status.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserCard from '../user_card/user_card.vue'
 import Timeago from '../timeago/timeago.vue'
+import Report from '../report/report.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
 import UserPopover from '../user_popover/user_popover.vue'
 import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'
@@ -47,6 +48,7 @@ const Notification = {
     UserCard,
     Timeago,
     Status,
+    Report,
     RichContent,
     UserPopover
   },
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index d2b903f6..6a5417b3 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -121,6 +121,9 @@
                 </i18n-t>
               </small>
             </span>
+            <span v-if="notification.type === 'pleroma:report'">
+              <small>{{ $t('notifications.submitted_report') }}</small>
+            </span>
             <span v-if="notification.type === 'poll'">
               <FAIcon
                 class="type-icon"
@@ -211,6 +214,10 @@
             @{{ notification.target.screen_name_ui }}
           </router-link>
         </div>
+        <Report
+          v-else-if="notification.type === 'pleroma:report'"
+          :report-id="notification.report.id"
+        />
         <template v-else>
           <StatusContent
             class="faint"