parent
544f9066af
commit
3c19c0acdc
3 changed files with 109 additions and 0 deletions
|
|
@ -82,8 +82,10 @@
|
||||||
v-on:send-quick-reaction="sendQuickReaction"
|
v-on:send-quick-reaction="sendQuickReaction"
|
||||||
v-on:context-menu="showContextMenuForEvent($event)"
|
v-on:context-menu="showContextMenuForEvent($event)"
|
||||||
v-on:own-avatar-clicked="viewProfile"
|
v-on:own-avatar-clicked="viewProfile"
|
||||||
|
v-on:download="download(event)"
|
||||||
/>
|
/>
|
||||||
<!-- <div v-if="debugging" style="user-select:text">EventID: {{ event.getId() }}</div> -->
|
<!-- <div v-if="debugging" style="user-select:text">EventID: {{ event.getId() }}</div> -->
|
||||||
|
<!-- <div v-if="debugging" style="user-select:text">Event: {{ JSON.stringify(event) }}</div> -->
|
||||||
<div
|
<div
|
||||||
v-if="event.getId() == readMarker && index < events.length - 1"
|
v-if="event.getId() == readMarker && index < events.length - 1"
|
||||||
class="read-marker"
|
class="read-marker"
|
||||||
|
|
@ -314,10 +316,12 @@
|
||||||
<script>
|
<script>
|
||||||
import { TimelineWindow, EventTimeline } from "matrix-js-sdk";
|
import { TimelineWindow, EventTimeline } from "matrix-js-sdk";
|
||||||
import MessageIncomingText from "./messages/MessageIncomingText";
|
import MessageIncomingText from "./messages/MessageIncomingText";
|
||||||
|
import MessageIncomingFile from "./messages/MessageIncomingFile";
|
||||||
import MessageIncomingImage from "./messages/MessageIncomingImage.vue";
|
import MessageIncomingImage from "./messages/MessageIncomingImage.vue";
|
||||||
import MessageIncomingAudio from "./messages/MessageIncomingAudio.vue";
|
import MessageIncomingAudio from "./messages/MessageIncomingAudio.vue";
|
||||||
import MessageIncomingVideo from "./messages/MessageIncomingVideo.vue";
|
import MessageIncomingVideo from "./messages/MessageIncomingVideo.vue";
|
||||||
import MessageOutgoingText from "./messages/MessageOutgoingText";
|
import MessageOutgoingText from "./messages/MessageOutgoingText";
|
||||||
|
import MessageOutgoingFile from "./messages/MessageOutgoingFile";
|
||||||
import MessageOutgoingImage from "./messages/MessageOutgoingImage.vue";
|
import MessageOutgoingImage from "./messages/MessageOutgoingImage.vue";
|
||||||
import MessageOutgoingAudio from "./messages/MessageOutgoingAudio.vue";
|
import MessageOutgoingAudio from "./messages/MessageOutgoingAudio.vue";
|
||||||
import MessageOutgoingVideo from "./messages/MessageOutgoingVideo.vue";
|
import MessageOutgoingVideo from "./messages/MessageOutgoingVideo.vue";
|
||||||
|
|
@ -376,10 +380,12 @@ export default {
|
||||||
components: {
|
components: {
|
||||||
ChatHeader,
|
ChatHeader,
|
||||||
MessageIncomingText,
|
MessageIncomingText,
|
||||||
|
MessageIncomingFile,
|
||||||
MessageIncomingImage,
|
MessageIncomingImage,
|
||||||
MessageIncomingAudio,
|
MessageIncomingAudio,
|
||||||
MessageIncomingVideo,
|
MessageIncomingVideo,
|
||||||
MessageOutgoingText,
|
MessageOutgoingText,
|
||||||
|
MessageOutgoingFile,
|
||||||
MessageOutgoingImage,
|
MessageOutgoingImage,
|
||||||
MessageOutgoingAudio,
|
MessageOutgoingAudio,
|
||||||
MessageOutgoingVideo,
|
MessageOutgoingVideo,
|
||||||
|
|
@ -812,6 +818,8 @@ export default {
|
||||||
return MessageIncomingAudio;
|
return MessageIncomingAudio;
|
||||||
} else if (event.getContent().msgtype == "m.video") {
|
} else if (event.getContent().msgtype == "m.video") {
|
||||||
return MessageIncomingVideo;
|
return MessageIncomingVideo;
|
||||||
|
} else if (event.getContent().msgtype == "m.file") {
|
||||||
|
return MessageIncomingFile;
|
||||||
}
|
}
|
||||||
return MessageIncomingText;
|
return MessageIncomingText;
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -821,6 +829,8 @@ export default {
|
||||||
return MessageOutgoingAudio;
|
return MessageOutgoingAudio;
|
||||||
} else if (event.getContent().msgtype == "m.video") {
|
} else if (event.getContent().msgtype == "m.video") {
|
||||||
return MessageOutgoingVideo;
|
return MessageOutgoingVideo;
|
||||||
|
} else if (event.getContent().msgtype == "m.file") {
|
||||||
|
return MessageOutgoingFile;
|
||||||
}
|
}
|
||||||
return MessageOutgoingText;
|
return MessageOutgoingText;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
51
src/components/messages/MessageIncomingFile.vue
Normal file
51
src/components/messages/MessageIncomingFile.vue
Normal file
|
|
@ -0,0 +1,51 @@
|
||||||
|
<template>
|
||||||
|
<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>
|
||||||
|
|
||||||
|
<div class="bubble">
|
||||||
|
<QuickReactions :event="event" :reactions="reactions" />
|
||||||
|
<div class="original-message" v-if="inReplyToText">
|
||||||
|
<div class="original-message-sender">
|
||||||
|
{{ inReplyToSender || "Someone" }} said:
|
||||||
|
</div>
|
||||||
|
<div class="original-message-text" v-html="linkify($sanitize(inReplyToText))" />
|
||||||
|
</div>
|
||||||
|
<div class="message">
|
||||||
|
<span>File: </span>
|
||||||
|
<span style="cursor:pointer" @click.stop="$emit('download')" v-html="linkify($sanitize(messageText))" />
|
||||||
|
<span class="edit-marker" v-if="event.replacingEventId()"
|
||||||
|
>(edited)</span
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
<!-- <div>{{ JSON.stringify(event) }}</div> -->
|
||||||
|
</div>
|
||||||
|
<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>
|
||||||
48
src/components/messages/MessageOutgoingFile.vue
Normal file
48
src/components/messages/MessageOutgoingFile.vue
Normal file
|
|
@ -0,0 +1,48 @@
|
||||||
|
<template>
|
||||||
|
<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>
|
||||||
|
<div class="bubble">
|
||||||
|
<QuickReactions :event="event" :reactions="reactions" />
|
||||||
|
<div class="original-message" v-if="inReplyToText">
|
||||||
|
<div class="original-message-sender">
|
||||||
|
{{ inReplyToSender || "Someone" }} said:
|
||||||
|
</div>
|
||||||
|
<div class="original-message-text" v-html="linkify($sanitize(inReplyToText))" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="message">
|
||||||
|
<span>File: </span>
|
||||||
|
<span style="cursor:pointer" @click.stop="$emit('download')" v-html="linkify($sanitize(messageText))" />
|
||||||
|
<span class="edit-marker" v-if="event.replacingEventId()"
|
||||||
|
>(edited)</span
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<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>
|
||||||
Loading…
Add table
Add a link
Reference in a new issue