{{ inReplyToSender }}
@@ -10,7 +10,7 @@
-
+
@@ -19,7 +19,7 @@
block
- {{ $t('message.incoming_message_deleted_text') }}
+ {{ redactedBySomeoneElse(event) ? $t('message.incoming_message_deleted_text') : $t('message.outgoing_message_deleted_text')}}
@@ -53,7 +53,7 @@ export default {
}
},
mounted() {
- this.thread = this.timelineSet.relations.getChildEventsForEvent(this.event.getId(), "m.thread", "m.room.message");
+ this.thread = this.timelineSet.relations.getChildEventsForEvent(this.event.getId(), util.threadMessageType(), "m.room.message");
if (!this.thread) {
this.event.on("Event.relationsCreated", this.onRelationsCreated);
}
@@ -63,7 +63,7 @@ export default {
},
methods: {
onRelationsCreated() {
- this.thread = this.timelineSet.relations.getChildEventsForEvent(this.event.getId(), "m.thread", "m.room.message");
+ this.thread = this.timelineSet.relations.getChildEventsForEvent(this.event.getId(), util.threadMessageType(), "m.room.message");
this.event.off("Event.relationsCreated", this.onRelationsCreated);
},
onItemClick(event) {
@@ -72,7 +72,7 @@ export default {
processThread() {
this.$emit('layout-change', () => {
this.items = this.timelineSet.relations.getAllChildEventsForEvent(this.event.getId())
- .filter(e => util.downloadableTypes().includes(e.getContent().msgtype))
+ .filter(e => !e.isRedacted() && util.downloadableTypes().includes(e.getContent().msgtype))
.map(e => {
let ret = {
event: e,
diff --git a/src/components/messages/MessageOutgoing.vue b/src/components/messages/MessageOutgoing.vue
index 34d87b6..d147db4 100644
--- a/src/components/messages/MessageOutgoing.vue
+++ b/src/components/messages/MessageOutgoing.vue
@@ -14,7 +14,9 @@
-
+
+
+
import SeenBy from "./SeenBy.vue";
import messageMixin from "./messageMixin";
+import util from "../../plugins/utils";
export default {
mixins: [messageMixin],
- components: { SeenBy }
+ components: { SeenBy },
+ mounted() {
+ if(util.isMobileOrTabletBrowser() && this.$refs.messageInOutRef) {
+ this.initMsgHammerJs(this.$refs.messageInOutRef);
+ }
+ }
};
\ No newline at end of file
diff --git a/src/plugins/notificationAndServiceWorker.js b/src/plugins/notificationAndServiceWorker.js
index 0fdba82..13567c1 100644
--- a/src/plugins/notificationAndServiceWorker.js
+++ b/src/plugins/notificationAndServiceWorker.js
@@ -33,11 +33,12 @@ const registerPeriodicBackgroundSync = async (registration) => {
}
}
-export function registerServiceWorker() {
+export function registerServiceWorker(periodicSyncNewMsgReminderTxt) {
if("serviceWorker" in navigator) {
navigator.serviceWorker.register("./sw.js")
.then(async registration => {
console.log('Service Worker registered with scope:', registration.scope);
+ registration.active.postMessage(periodicSyncNewMsgReminderTxt);
await registerPeriodicBackgroundSync(registration);
})
.catch(error => {
diff --git a/src/plugins/utils.js b/src/plugins/utils.js
index e3244d8..7a4b64a 100644
--- a/src/plugins/utils.js
+++ b/src/plugins/utils.js
@@ -5,6 +5,8 @@ import ImageResize from "image-resize";
import { AutoDiscovery } from 'matrix-js-sdk';
import User from '../models/user';
const prettyBytes = require("pretty-bytes");
+import Hammer from "hammerjs";
+import { Thread } from 'matrix-js-sdk/lib/models/thread';
export const STATE_EVENT_ROOM_DELETION_NOTICE = "im.keanu.room_deletion_notice";
export const STATE_EVENT_ROOM_DELETED = "im.keanu.room_deleted";
@@ -66,6 +68,11 @@ class UploadPromise {
}
class Util {
+
+ threadMessageType() {
+ return Thread.hasServerSideSupport ? "m.thread" : "io.element.thread"
+ }
+
getAttachmentUrlAndDuration(event) {
return new Promise((resolve, reject) => {
const content = event.getContent();
@@ -398,7 +405,7 @@ class Util {
// If thread root (an eventId) is set, add that here
if (threadRoot) {
messageContent["m.relates_to"] = {
- "rel_type": "m.thread",
+ "rel_type": this.threadMessageType(),
"event_id": threadRoot
};
}
@@ -669,7 +676,8 @@ class Util {
name = name.slice(0, name.indexOf("."));
name = name.charAt(0).toUpperCase() + name.slice(1);
const image = r(res);
- images.push({ id: res, image: image, name: "Guest " + name });
+ const randomNumber = parseInt(this.randomString(4, "0123456789")).toFixed();
+ images.push({ id: res, image: image, name: "Guest " + name + " " + randomNumber});
});
return images;
}
@@ -1014,6 +1022,25 @@ class Util {
}
return false;
}
+
+ isMobileOrTabletBrowser() {
+ // Regular expression to match common mobile and tablet browser user agent strings
+ const mobileTabletPattern = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini|Tablet|Mobile|CriOS/i;
+ const userAgent = navigator.userAgent;
+ return mobileTabletPattern.test(userAgent);
+ }
+
+ singleOrDoubleTabRecognizer(element) {
+ // reference: https://codepen.io/jtangelder/pen/xxYyJQ
+ const hm = new Hammer.Manager(element);
+
+ hm.add(new Hammer.Tap({ event: 'doubletap', taps: 2 }));
+ hm.add(new Hammer.Tap({ event: 'singletap' }) );
+
+ hm.get('doubletap').recognizeWith('singletap');
+ hm.get('singletap').requireFailure('doubletap');
+ return hm
+ }
}
export default new Util();
diff --git a/src/store/index.js b/src/store/index.js
index 4da7ecc..a544b2e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -68,7 +68,7 @@ const vuexPersistSessionStorage = new VuexPersist({
const defaultUseSessionStorage = (sessionStorage.getItem(USER) != null);
export default new Vuex.Store({
- state: { language: null, currentRoomId: null, auth: null, tempuser: null, useLocalStorage: !defaultUseSessionStorage },
+ state: { language: null, currentRoomId: null, auth: null, tempuser: null, useLocalStorage: !defaultUseSessionStorage, globalNotification: false },
mutations: {
loginSuccess(state, user) {
state.auth.status.loggedIn = true;