Merge branch 'small-fixes-and-improvements' into shigusegubu-themes3

src/components/notification/notification.js

@@ -144,7 +144,6 @@ const Notification = {
       }
     },
     doApprove() {
-      this.$emit('interacted')
       this.$store.state.api.backendInteractor.approveUser({ id: this.user.id })
       this.$store.dispatch('removeFollowRequest', this.user)
       this.$store.dispatch('markSingleNotificationAsSeen', {
@@ -166,7 +165,6 @@ const Notification = {
       }
     },
     doDeny() {
-      this.$emit('interacted')
       this.$store.state.api.backendInteractor
         .denyUser({ id: this.user.id })
         .then(() => {

src/components/notification/notification.vue

@@ -7,7 +7,7 @@
       class="Notification"
       :compact="true"
       :statusoid="notification.status"
-      @interacted="interacted"
+      @click="interacted"
     />
   </article>
   <article

src/components/status/status.js

@@ -167,7 +167,7 @@ const Status = {
     'controlledMediaPlaying',
     'controlledSetMediaPlaying',
   ],
-  emits: ['interacted', 'goto', 'toggleExpanded'],
+  emits: ['goto', 'toggleExpanded'],
   data() {
     return {
       uncontrolledReplying: false,
@@ -560,11 +560,9 @@ const Status = {
       this.error = error
     },
     clearError() {
-      this.$emit('interacted')
       this.error = undefined
     },
     toggleReplying() {
-      this.$emit('interacted')
       if (this.replying) {
         this.$refs.postStatusForm.requestClose()
       } else {

src/components/status/status.vue

@@ -520,7 +520,6 @@
             :status="status"
             :replying="replying"
             @toggle-replying="toggleReplying"
-            @interacted="e => $emit('interacted')"
           />
         </div>
       </div>

src/components/status_action_buttons/action_button.js

@@ -67,7 +67,6 @@ export default {
     'doAction',
     'outerClose',
   ],
-  emits: ['interacted'],
   components: {
     StatusBookmarkFolderMenu,
     EmojiPicker,
@@ -138,7 +137,6 @@ export default {
         this.button.interactive ? !this.button.interactive(this.funcArg) : false
       )
         return
-      this.$emit('interacted')
       if (button.name === 'emoji') {
         this.$refs.picker.showPicker()
       } else {

src/components/status_action_buttons/action_button_container.js

@@ -20,7 +20,6 @@ export default {
     UserTimedFilterModal,
   },
   props: ['button', 'status'],
-  emits: ['interacted'],
   mounted() {
     if (this.button.name === 'mute') {
       this.$store.dispatch('fetchDomainMutes')

src/components/status_action_buttons/action_button_container.vue

@@ -79,7 +79,6 @@
       :button="button"
       :status="status"
       v-bind="$attrs"
-      @interacted="e => $emit('interacted')"
     />
     <teleport to="#modal">
       <MuteConfirm

src/components/status_action_buttons/status_action_buttons.js

@@ -16,7 +16,7 @@ library.add(faEllipsisH)
 
 const StatusActionButtons = {
   props: ['status', 'replying'],
-  emits: ['toggleReplying', 'interacted'],
+  emits: ['toggleReplying'],
   data() {
     return {
       showPin: false,

src/components/status_action_buttons/status_action_buttons.vue

@@ -20,7 +20,6 @@
           :get-component="getComponent"
           :close="() => { /* no-op */ }"
           :do-action="doAction"
-          @interacted="e => $emit('interacted')"
         />
         <button
           v-if="showPin && currentUser"
@@ -75,7 +74,6 @@
                 :get-component="getComponent"
                 :outer-close="close"
                 :do-action="doAction"
-                @interacted="e => $emit('interacted')"
               />
               <button
                 v-if="showPin && currentUser"