Use base classes for message types

This avoids unnecessary duplication of code for "avatar", "sender" etc in the general layout of messages.

src/components/messages/MessageIncoming.vue

@@ -0,0 +1,37 @@
+<template>
+  <!-- BASE CLASS FOR INCOMING MESSAGE -->
+  <div :class="messageClasses">
+    <v-avatar class="avatar" size="32" color="#ededed">
+      <img v-if="messageEventAvatar(event)" :src="messageEventAvatar(event)" />
+      <span v-else class="white--text headline">{{
+        messageEventDisplayName(event).substring(0, 1).toUpperCase()
+      }}</span>
+    </v-avatar>
+    <QuickReactions :event="event" :reactions="reactions" />
+    <!-- SLOT FOR CONTENT -->
+    <slot></slot>
+    <div class="op-button" ref="opbutton">
+      <v-btn icon @click.stop="showContextMenu($refs.opbutton)"
+        ><v-icon>more_vert</v-icon></v-btn
+      >
+    </div>
+    <div v-if="showSenderAndTime" class="senderAndTime">
+      <div class="sender">{{ messageEventDisplayName(event) }}</div>
+      <div class="time">
+        {{ formatTime(event.event.origin_server_ts) }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import messageMixin from "./messageMixin";
+
+export default {
+  mixins: [messageMixin],
+};
+</script>
+
+<style lang="scss">
+@import "@/assets/css/chat.scss";
+</style>

src/components/messages/MessageIncomingAudio.vue

@@ -1,35 +1,19 @@
 <template>
-  <div :class="messageClasses">
+  <message-incoming v-bind="{...$props, ...$attrs}">
-    <v-avatar class="avatar" size="32" color="#ededed">
-      <img v-if="messageEventAvatar(event)" :src="messageEventAvatar(event)" />
-      <span v-else class="white--text headline">{{
-        messageEventDisplayName(event).substring(0, 1).toUpperCase()
-      }}</span>
-    </v-avatar>
-    <QuickReactions :event="event" :reactions="reactions" />
     <div class="audio-bubble">
       <audio controls :src="src">Audio file</audio>
     </div>
-    <div class="op-button" ref="opbutton">
+  </message-incoming>
-      <v-btn icon @click.stop="showContextMenu($refs.opbutton)"
-        ><v-icon>more_vert</v-icon></v-btn
-      >
-    </div>
-    <div v-if="showSenderAndTime" class="senderAndTime">
-      <div class="sender">{{ messageEventDisplayName(event) }}</div>
-      <div class="time">
-        {{ formatTime(event.event.origin_server_ts) }}
-      </div>
-    </div>
-  </div>
 </template>
 
 <script>
-import messageMixin from "./messageMixin";
 import attachmentMixin from "./attachmentMixin";
+import MessageIncoming from './MessageIncoming.vue';
 
 export default {
-  mixins: [messageMixin, attachmentMixin],
+  extends: MessageIncoming,
+  mixins: [attachmentMixin],
+  components: { MessageIncoming }
 };
 </script>
 

src/components/messages/MessageIncomingFile.vue

@@ -1,12 +1,5 @@
 <template>
-  <div :class="messageClasses">
+  <message-incoming v-bind="{...$props, ...$attrs}">
-    <v-avatar class="avatar" size="32" color="#ededed">
-      <img v-if="messageEventAvatar(event)" :src="messageEventAvatar(event)" />
-      <span v-else class="white--text headline">{{
-        messageEventDisplayName(event).substring(0, 1).toUpperCase()
-      }}</span>
-    </v-avatar>
-    <QuickReactions :event="event" :reactions="reactions" />
     <div class="bubble">
       <div class="original-message" v-if="inReplyToText">
         <div class="original-message-sender">
@@ -28,27 +21,16 @@
           >(edited)</span
         >
       </div>
-      <!-- <div>{{ JSON.stringify(event) }}</div> -->
     </div>
-    <div class="op-button" ref="opbutton">
+  </message-incoming>
-      <v-btn icon @click.stop="showContextMenu($refs.opbutton)"
-        ><v-icon>more_vert</v-icon></v-btn
-      >
-    </div>
-    <div v-if="showSenderAndTime" class="senderAndTime">
-      <div class="sender">{{ messageEventDisplayName(event) }}</div>
-      <div class="time">
-        {{ formatTime(event.event.origin_server_ts) }}
-      </div>
-    </div>
-  </div>
 </template>
 
 <script>
-import messageMixin from "./messageMixin";
+import MessageIncoming from "./MessageIncoming.vue";
 
 export default {
-  mixins: [messageMixin],
+  extends: MessageIncoming,
+  components: { MessageIncoming }
 };
 </script>
 

src/components/messages/MessageIncomingImage.vue

@@ -1,13 +1,6 @@
 <template>
-  <div :class="messageClasses">
+<message-incoming v-bind="{...$props, ...$attrs}">
-    <v-avatar class="avatar" size="32" color="#ededed">
+      <div class="bubble image-bubble">
-      <img v-if="messageEventAvatar(event)" :src="messageEventAvatar(event)" />
-      <span v-else class="white--text headline">{{
-        messageEventDisplayName(event).substring(0, 1).toUpperCase()
-      }}</span>
-    </v-avatar>
-    <QuickReactions :event="event" :reactions="reactions" />
-    <div class="bubble image-bubble">
       <v-img
         :aspect-ratio="16 / 9"
         ref="image"
@@ -16,26 +9,16 @@
         :contain="contain"
       />
     </div>
-    <div class="op-button" ref="opbutton">
+</message-incoming>  
-      <v-btn icon @click.stop="showContextMenu($refs.opbutton)"
-        ><v-icon>more_vert</v-icon></v-btn
-      >
-    </div>
-    <div v-if="showSenderAndTime" class="senderAndTime">
-      <div class="sender">{{ messageEventDisplayName(event) }}</div>
-      <div class="time">
-        {{ formatTime(event.event.origin_server_ts) }}
-      </div>
-    </div>
-  </div>
 </template>
 
 <script>
-import messageMixin from "./messageMixin";
 import util from "../../plugins/utils";
+import MessageIncoming from './MessageIncoming.vue';
 
 export default {
-  mixins: [messageMixin],
+  extends: MessageIncoming,
+  components: { MessageIncoming },
   data() {
     return {
       src: null,

src/components/messages/MessageIncomingSticker.vue

@@ -1,12 +1,5 @@
 <template>
-  <div :class="messageClasses">
+  <message-incoming v-bind="{ ...$props, ...$attrs }">
-    <v-avatar class="avatar" size="32" color="#ededed">
-      <img v-if="messageEventAvatar(event)" :src="messageEventAvatar(event)" />
-      <span v-else class="white--text headline">{{
-        messageEventDisplayName(event).substring(0, 1).toUpperCase()
-      }}</span>
-    </v-avatar>
-    <QuickReactions :event="event" :reactions="reactions" />
     <div class="bubble sticker-bubble">
       <v-img
         :aspect-ratio="16 / 9"
@@ -16,26 +9,16 @@
         :contain="contain"
       />
     </div>
-    <div class="op-button" ref="opbutton">
+  </message-incoming>
-      <v-btn icon @click.stop="showContextMenu($refs.opbutton)"
-        ><v-icon>more_vert</v-icon></v-btn
-      >
-    </div>
-    <div v-if="showSenderAndTime" class="senderAndTime">
-      <div class="sender">{{ messageEventDisplayName(event) }}</div>
-      <div class="time">
-        {{ formatTime(event.event.origin_server_ts) }}
-      </div>
-    </div>
-  </div>
 </template>
 
 <script>
-import messageMixin from "./messageMixin";
 import stickers from "../../plugins/stickers";
+import MessageIncoming from "./MessageIncoming.vue";
 
 export default {
-  mixins: [messageMixin],
+  extends: MessageIncoming,
+  components: { MessageIncoming },
   data() {
     return {
       src: null,

src/components/messages/MessageIncomingText.vue

@@ -1,12 +1,5 @@
 <template>
-  <div :class="messageClasses">
+  <message-incoming v-bind="{...$props, ...$attrs}">
-    <v-avatar class="avatar" size="32" color="#ededed">
-      <img v-if="messageEventAvatar(event)" :src="messageEventAvatar(event)" />
-      <span v-else class="white--text headline">{{
-        messageEventDisplayName(event).substring(0, 1).toUpperCase()
-      }}</span>
-    </v-avatar>
-    <QuickReactions :event="event" :reactions="reactions" />
     <div class="bubble">
       <div class="original-message" v-if="inReplyToText">
         <div class="original-message-sender">
@@ -25,24 +18,16 @@
       </div>
       <!-- <div>{{ JSON.stringify(event) }}</div> -->
     </div>
-    <div class="op-button" ref="opbutton">
+  </message-incoming>
-      <v-btn icon @click.stop="showContextMenu($refs.opbutton)"
-        ><v-icon>more_vert</v-icon></v-btn
-      >
-    </div>
-    <div v-if="showSenderAndTime" class="senderAndTime">
-      <div class="sender">{{ messageEventDisplayName(event) }}</div>
-      <div class="time">
-        {{ formatTime(event.event.origin_server_ts) }}
-      </div>
-    </div>
-  </div>
 </template>
 
 <script>
+import MessageIncoming from "./MessageIncoming.vue";
 import messageMixin from "./messageMixin";
 
 export default {
+  extends: MessageIncoming,
+  components: { MessageIncoming },
   mixins: [messageMixin],
 };
 </script>

src/components/messages/MessageIncomingVideo.vue

@@ -1,12 +1,5 @@
 <template>
-  <div :class="messageClasses">
+  <message-incoming v-bind="{ ...$props, ...$attrs }">
-    <v-avatar class="avatar" size="32" color="#ededed">
-      <img v-if="messageEventAvatar(event)" :src="messageEventAvatar(event)" />
-      <span v-else class="white--text headline">{{
-        messageEventDisplayName(event).substring(0, 1).toUpperCase()
-      }}</span>
-    </v-avatar>
-    <QuickReactions :event="event" :reactions="reactions" />
     <div class="bubble image-bubble">
       <v-responsive :aspect-ratio="16 / 9" :src="src">
         <video :src="src" controls style="width: 100%; height: 100%">
@@ -19,26 +12,17 @@
         </div>
       </v-responsive>
     </div>
-    <div class="op-button" ref="opbutton">
+  </message-incoming>
-      <v-btn icon @click.stop="showContextMenu($refs.opbutton)"
-        ><v-icon>more_vert</v-icon></v-btn
-      >
-    </div>
-    <div v-if="showSenderAndTime" class="senderAndTime">
-      <div class="sender">{{ messageEventDisplayName(event) }}</div>
-      <div class="time">
-        {{ formatTime(event.event.origin_server_ts) }}
-      </div>
-    </div>
-  </div>
 </template>
 
 <script>
-import messageMixin from "./messageMixin";
 import attachmentMixin from "./attachmentMixin";
+import MessageIncoming from "./MessageIncoming.vue";
 
 export default {
-  mixins: [messageMixin, attachmentMixin],
+  extends: MessageIncoming,
+  components: { MessageIncoming },
+  mixins: [attachmentMixin],
 };
 </script>
 

src/components/messages/MessageOutgoing.vue

@@ -0,0 +1,40 @@
+<template>
+  <!-- BASE CLASS FOR OUTGOING MESSAGE -->
+  <div class="messageOut">
+    <div class="op-button" ref="opbutton">
+      <v-btn icon @click.stop="showContextMenu($refs.opbutton)"
+        ><v-icon>more_vert</v-icon></v-btn
+      >
+    </div>
+    <QuickReactions :event="event" :reactions="reactions" />
+    <!-- SLOT FOR CONTENT -->
+    <slot></slot>
+    <v-avatar
+      class="avatar"
+      size="32"
+      color="#ededed"
+      @click.stop="ownAvatarClicked"
+    >
+      <img v-if="userAvatar" :src="userAvatar" />
+      <span v-else class="white--text headline">{{ userAvatarLetter }}</span>
+    </v-avatar>
+    <!-- <div class="sender">{{ "You" }}</div> -->
+    <div class="senderAndTime">
+      <div class="time">
+        {{ formatTime(event.event.origin_server_ts) }}
+      </div>
+      <div class="status">{{ event.status }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import messageMixin from "./messageMixin";
+
+export default {
+  mixins: [messageMixin],
+};
+</script>
+<style lang="scss">
+@import "@/assets/css/chat.scss";
+</style>

src/components/messages/MessageOutgoingAudio.vue

@@ -1,39 +1,19 @@
 <template>
-  <div class="messageOut">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }">
-    <div class="op-button" ref="opbutton">
-      <v-btn icon @click.stop="showContextMenu($refs.opbutton)"
-        ><v-icon>more_vert</v-icon></v-btn
-      >
-    </div>
-    <QuickReactions :event="event" :reactions="reactions" />
     <div class="audio-bubble">
       <audio controls :src="src">Audio file</audio>
     </div>
-    <v-avatar
+  </message-outgoing>
-      class="avatar"
-      size="32"
-      color="#ededed"
-      @click.stop="ownAvatarClicked"
-    >
-      <img v-if="userAvatar" :src="userAvatar" />
-      <span v-else class="white--text headline">{{ userAvatarLetter }}</span>
-    </v-avatar>
-    <div class="senderAndTime">
-      <!-- <div class="sender">{{ "You" }}</div> -->
-      <div class="time">
-        {{ formatTime(event.event.origin_server_ts) }}
-      </div>
-      <div class="status">{{ event.status }}</div>
-    </div>
-  </div>
 </template>
 
 <script>
-import messageMixin from "./messageMixin";
 import attachmentMixin from "./attachmentMixin";
+import MessageOutgoing from "./MessageOutgoing.vue";
 
 export default {
-  mixins: [messageMixin, attachmentMixin],
+  extends: MessageOutgoing,
+  components: { MessageOutgoing },
+  mixins: [attachmentMixin],
 };
 </script>
 

src/components/messages/MessageOutgoingFile.vue

@@ -1,11 +1,5 @@
 <template>
-  <div class="messageOut">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }">
-    <div class="op-button" ref="opbutton">
-      <v-btn icon @click.stop="showContextMenu($refs.opbutton)"
-        ><v-icon>more_vert</v-icon></v-btn
-      >
-    </div>
-    <QuickReactions :event="event" :reactions="reactions" />
     <div class="bubble">
       <div class="original-message" v-if="inReplyToText">
         <div class="original-message-sender">
@@ -29,30 +23,15 @@
         >
       </div>
     </div>
-    <v-avatar
+  </message-outgoing>
-      class="avatar"
-      size="32"
-      color="#ededed"
-      @click.stop="ownAvatarClicked"
-    >
-      <img v-if="userAvatar" :src="userAvatar" />
-      <span v-else class="white--text headline">{{ userAvatarLetter }}</span>
-    </v-avatar>
-    <!-- <div class="sender">{{ "You" }}</div> -->
-    <div class="senderAndTime">
-      <div class="time">
-        {{ formatTime(event.event.origin_server_ts) }}
-      </div>
-      <div class="status">{{ event.status }}</div>
-    </div>
-  </div>
 </template>
 
 <script>
-import messageMixin from "./messageMixin";
+import MessageOutgoing from "./MessageOutgoing.vue";
 
 export default {
-  mixins: [messageMixin],
+  extends: MessageOutgoing,
+  components: { MessageOutgoing },
 };
 </script>
 <style lang="scss">

src/components/messages/MessageOutgoingImage.vue

@@ -1,11 +1,5 @@
 <template>
-  <div class="messageOut">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }">
-    <div class="op-button" ref="opbutton">
-      <v-btn icon @click.stop="showContextMenu($refs.opbutton)"
-        ><v-icon>more_vert</v-icon></v-btn
-      >
-    </div>
-    <QuickReactions :event="event" :reactions="reactions" />
     <div class="bubble image-bubble">
       <v-img
         :aspect-ratio="16 / 9"
@@ -15,31 +9,16 @@
         :contain="contain"
       />
     </div>
-    <v-avatar
+  </message-outgoing>
-      class="avatar"
-      size="32"
-      color="#ededed"
-      @click.stop="ownAvatarClicked"
-    >
-      <img v-if="userAvatar" :src="userAvatar" />
-      <span v-else class="white--text headline">{{ userAvatarLetter }}</span>
-    </v-avatar>
-    <div class="senderAndTime">
-      <!-- <div class="sender">{{ "You" }}</div> -->
-      <div class="time">
-        {{ formatTime(event.event.origin_server_ts) }}
-        <div class="status">{{ event.status }}</div>
-      </div>
-    </div>
-  </div>
 </template>
 
 <script>
-import messageMixin from "./messageMixin";
 import util from "../../plugins/utils";
+import MessageOutgoing from "./MessageOutgoing.vue";
 
 export default {
-  mixins: [messageMixin],
+  extends: MessageOutgoing,
+  components: { MessageOutgoing },
   data() {
     return {
       src: null,

src/components/messages/MessageOutgoingSticker.vue

@@ -1,11 +1,5 @@
 <template>
-  <div class="messageOut">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }">
-    <div class="op-button" ref="opbutton">
-      <v-btn icon @click.stop="showContextMenu($refs.opbutton)"
-        ><v-icon>more_vert</v-icon></v-btn
-      >
-    </div>
-    <QuickReactions :event="event" :reactions="reactions" />
     <div class="bubble sticker-bubble">
       <v-img
         :aspect-ratio="16 / 9"
@@ -15,31 +9,16 @@
         :contain="contain"
       />
     </div>
-    <v-avatar
+  </message-outgoing>
-      class="avatar"
-      size="32"
-      color="#ededed"
-      @click.stop="ownAvatarClicked"
-    >
-      <img v-if="userAvatar" :src="userAvatar" />
-      <span v-else class="white--text headline">{{ userAvatarLetter }}</span>
-    </v-avatar>
-    <div class="senderAndTime">
-      <!-- <div class="sender">{{ "You" }}</div> -->
-      <div class="time">
-        {{ formatTime(event.event.origin_server_ts) }}
-        <div class="status">{{ event.status }}</div>
-      </div>
-    </div>
-  </div>
 </template>
 
 <script>
-import messageMixin from "./messageMixin";
 import stickers from "../../plugins/stickers";
+import MessageOutgoing from "./MessageOutgoing.vue";
 
 export default {
-  mixins: [messageMixin],
+  extends: MessageOutgoing,
+  components: { MessageOutgoing },
   data() {
     return {
       src: null,

src/components/messages/MessageOutgoingText.vue

@@ -1,11 +1,5 @@
 <template>
-  <div class="messageOut">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }">
-    <div class="op-button" ref="opbutton">
-      <v-btn icon @click.stop="showContextMenu($refs.opbutton)"
-        ><v-icon>more_vert</v-icon></v-btn
-      >
-    </div>
-    <QuickReactions :event="event" :reactions="reactions" />
     <div class="bubble">
       <div class="original-message" v-if="inReplyToText">
         <div class="original-message-sender">
@@ -24,30 +18,15 @@
         >
       </div>
     </div>
-    <v-avatar
+  </message-outgoing>
-      class="avatar"
-      size="32"
-      color="#ededed"
-      @click.stop="ownAvatarClicked"
-    >
-      <img v-if="userAvatar" :src="userAvatar" />
-      <span v-else class="white--text headline">{{ userAvatarLetter }}</span>
-    </v-avatar>
-    <!-- <div class="sender">{{ "You" }}</div> -->
-    <div class="senderAndTime">
-      <div class="time">
-        {{ formatTime(event.event.origin_server_ts) }}
-      </div>
-      <div class="status">{{ event.status }}</div>
-    </div>
-  </div>
 </template>
 
 <script>
-import messageMixin from "./messageMixin";
+import MessageOutgoing from "./MessageOutgoing.vue";
 
 export default {
-  mixins: [messageMixin],
+  extends: MessageOutgoing,
+  components: { MessageOutgoing },
 };
 </script>
 <style lang="scss">

src/components/messages/MessageOutgoingVideo.vue

@@ -1,11 +1,5 @@
 <template>
-  <div class="messageOut">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }">
-    <div class="op-button" ref="opbutton">
-      <v-btn icon @click.stop="showContextMenu($refs.opbutton)"
-        ><v-icon>more_vert</v-icon></v-btn
-      >
-    </div>
-    <QuickReactions :event="event" :reactions="reactions" />
     <div class="bubble image-bubble">
       <v-responsive :aspect-ratio="16 / 9" class="ma-0 pa-0">
         <video :src="src" controls style="width: 100%; height: 100%">
@@ -13,31 +7,17 @@
         </video>
       </v-responsive>
     </div>
-    <v-avatar
+  </message-outgoing>
-      class="avatar"
-      size="32"
-      color="#ededed"
-      @click.stop="ownAvatarClicked"
-    >
-      <img v-if="userAvatar" :src="userAvatar" />
-      <span v-else class="white--text headline">{{ userAvatarLetter }}</span>
-    </v-avatar>
-    <div class="senderAndTime">
-      <!-- <div class="sender">{{ "You" }}</div> -->
-      <div class="time">
-        {{ formatTime(event.event.origin_server_ts) }}
-      </div>
-      <div class="status">{{ event.status }}</div>
-    </div>
-  </div>
 </template>
 
 <script>
-import messageMixin from "./messageMixin";
 import attachmentMixin from "./attachmentMixin";
+import MessageOutgoing from "./MessageOutgoing.vue";
 
 export default {
-  mixins: [messageMixin, attachmentMixin],
+  extends: MessageOutgoing,
+  components: { MessageOutgoing },
+  mixins: [attachmentMixin],
 };
 </script>