{{ reaction.emoji }}
@@ -69,10 +69,9 @@
- 👏
- 👏
+
- mic
@@ -116,7 +114,7 @@ export default {
}
});
},
- beforeDestroy() {
+ beforeUnmount() {
this.mc.destroy();
window.onresize = null;
},
@@ -163,8 +161,10 @@ export default {
\ No newline at end of file
diff --git a/src/components/CreateFileDrop.vue b/src/components/CreateFileDrop.vue
index 4185dbf..aac86f1 100644
--- a/src/components/CreateFileDrop.vue
+++ b/src/components/CreateFileDrop.vue
@@ -1,7 +1,7 @@
-
arrow_back
@@ -16,13 +16,13 @@
+
close
@@ -52,7 +51,7 @@
:class="{ deletable: pollAnswers.length > 1 }"
ref="answerInput"
>
- delete
@@ -68,7 +67,7 @@
-
+
diff --git a/src/components/CreateRoom.vue b/src/components/CreateRoom.vue
index d5031f9..54276a8 100644
--- a/src/components/CreateRoom.vue
+++ b/src/components/CreateRoom.vue
@@ -1,7 +1,7 @@
{{ this.errorMessage }}
+ {{ this.errorMessage }}
{{ $t("poll_create.title") }}
-
- 
+ $vuetify.icons.ic_add
+
-
arrow_back
@@ -18,7 +18,7 @@
v-on="{ ...roomTopicInputListeners }">
-
+
-
+
-
+
-
-
+
{{ displayName(device) }}
{{
verificationStatus(device)
}}
-
-
+
+
+
verified_user
@@ -29,11 +28,12 @@
-
\ No newline at end of file
diff --git a/src/components/Home.vue b/src/components/Home.vue
index 1fcceb4..d152d87 100644
--- a/src/components/Home.vue
+++ b/src/components/Home.vue
@@ -12,7 +12,7 @@
-
+
{{ $t("room.room_list_rooms") }}
@@ -43,7 +42,7 @@
diff --git a/src/components/Invite.vue b/src/components/Invite.vue
index 4c66bb6..57e0bbe 100644
--- a/src/components/Invite.vue
+++ b/src/components/Invite.vue
@@ -5,7 +5,7 @@
@@ -16,7 +16,7 @@
+
@@ -64,9 +62,11 @@
diff --git a/src/components/LeaveRoomDialog.vue b/src/components/LeaveRoomDialog.vue
index f75052d..3f5e1cf 100644
--- a/src/components/LeaveRoomDialog.vue
+++ b/src/components/LeaveRoomDialog.vue
@@ -1,9 +1,8 @@
@@ -44,8 +43,7 @@
\ No newline at end of file
diff --git a/src/components/Login.vue b/src/components/Login.vue
index a5696ab..c143d16 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -16,7 +16,7 @@
-
+
close
@@ -32,7 +32,7 @@
:label="$t('login.username')"
color="black"
background-color="white"
- solo
+ variant="solo"
:rules="[(v) => !!v || $t('login.username_required')]"
:error="userErrorMessage != null"
:error-messages="userErrorMessage"
@@ -42,7 +42,7 @@
v-on:blur="onUsernameBlur"
>
-
\ No newline at end of file
diff --git a/src/components/LogoutRoomDialog.vue b/src/components/LogoutRoomDialog.vue
index e869e1b..174773f 100644
--- a/src/components/LogoutRoomDialog.vue
+++ b/src/components/LogoutRoomDialog.vue
@@ -1,37 +1,17 @@
-
+
{{ $t('room_info.message_history') }}
@@ -33,7 +33,7 @@
-
{{ $t('room_info.message_retention') }}
@@ -48,10 +48,10 @@
- {{ this.errorMessage }}
+ {{ this.errorMessage }}
-
{{ creatingRoomStatus }}
@@ -70,24 +70,45 @@
-
+
+
-
-
-
+
+
+
+
+
@@ -99,24 +120,24 @@
-
-
-
+
+
{{ $t("join.ua") }}
-
+
-
{{ $t("join.enter_room") }}
@@ -124,8 +145,10 @@
-
@@ -149,7 +172,8 @@ export default {
selectedProfile: {
id: "",
image: "",
- name: ""
+ name: "",
+ title: "",
},
enterRoomDialog: false,
selectRetentionDialog: false,
@@ -333,6 +357,7 @@ export default {
},
selectAvatar(value) {
+ console.log("SELECT AVATAR", value);
this.selectedProfile = Object.assign({}, value); // Make a copy, so editing does not destroy data
},
@@ -369,5 +394,9 @@ export default {
\ No newline at end of file
diff --git a/src/components/DeviceList.vue b/src/components/DeviceList.vue
index 63e51ea..884a3a2 100644
--- a/src/components/DeviceList.vue
+++ b/src/components/DeviceList.vue
@@ -1,27 +1,26 @@
- {{ $t("join.choose_name") }}
- {{ data.item.name }}
+
+ {{$t('invite.send_invites_to')}}
{{ status }}
-
-
-
+
-
-
- ![]()
- {{
+
+
+
-
+
+
+
{{ memberName(member) }}
- {{ member.userId }}
+
+
-
- check
+
+ check
-
@@ -17,7 +16,7 @@
v-if="$matrix.currentUser.is_guest && lastRoom"
class="dialog-text"
>
-
+
{{ $matrix.currentUserDisplayName }}
@@ -26,7 +25,7 @@
$t("leave.create_account")
}}
-
+
{{ $t("leave.text_public") }}
{{ $t("login.title") }}
Loading login flows...
+ Loading login flows...
{{ this.message }}
+ {{ this.message }}
-
-
- {{ $t("menu.cancel") }}
+ {{
+ $t("menu.cancel") }}
- {{ $t("menu.logout") }}
+ {{ $t("menu.logout")
+ }}
@@ -47,8 +27,8 @@ export default {
props: {
showLogoutPopup: {
type: Boolean,
- default: false
- }
- }
+ default: false,
+ },
+ },
};
diff --git a/src/components/MessageErrorHandler.vue b/src/components/MessageErrorHandler.vue
index 7c02bb3..3ebcc60 100644
--- a/src/components/MessageErrorHandler.vue
+++ b/src/components/MessageErrorHandler.vue
@@ -20,6 +20,7 @@ export default {
},
errorCaptured(err, ignoredvm, ignoredinfo) {
this.err = err;
+ console.error("IGNORE", err, ignoredvm, ignoredinfo);
return false;
}
};
diff --git a/src/components/MessageOperationsBottomSheet.vue b/src/components/MessageOperationsBottomSheet.vue
index 7d36683..92b0bf5 100644
--- a/src/components/MessageOperationsBottomSheet.vue
+++ b/src/components/MessageOperationsBottomSheet.vue
@@ -16,14 +16,12 @@
>
- cancel
@@ -72,7 +70,10 @@ export default {
diff --git a/src/components/MoreMenuPopup.vue b/src/components/MoreMenuPopup.vue
index 01fa3dd..02a5eaf 100644
--- a/src/components/MoreMenuPopup.vue
+++ b/src/components/MoreMenuPopup.vue
@@ -1,7 +1,7 @@
- {{ $t("logout.confirm_text")}} -
- +{{ $t("logout.confirm_text") }}
-
+
@@ -10,8 +10,8 @@
- ![]()
- {{ userAvatarLetter }}
+
@@ -28,11 +28,12 @@
\ No newline at end of file
diff --git a/src/components/ProfileInfoPopup.vue b/src/components/ProfileInfoPopup.vue
index 4fe50e2..bc1d78b 100644
--- a/src/components/ProfileInfoPopup.vue
+++ b/src/components/ProfileInfoPopup.vue
@@ -1,13 +1,13 @@
-
+
- ![]()
- {{ userAvatarLetter }}
+
@@ -44,12 +44,12 @@
+
{{ product }}
{{ productLink }}
-
+
{{ $t("profile_info_popup.new_room") }}
@@ -64,10 +64,12 @@
diff --git a/src/components/QRCodePopup.vue b/src/components/QRCodePopup.vue
index bce7a80..65593de 100644
--- a/src/components/QRCodePopup.vue
+++ b/src/components/QRCodePopup.vue
@@ -2,7 +2,7 @@
{{ $t("profile_info_popup.you_are") }}
-
+
-
+
-
+
-
+
🙌 {{ $t("profile_info_popup.want_more") }}
-
@@ -106,5 +106,5 @@ export default {
diff --git a/src/components/QuoteView.vue b/src/components/QuoteView.vue
index 302531f..cff3380 100644
--- a/src/components/QuoteView.vue
+++ b/src/components/QuoteView.vue
@@ -6,19 +6,19 @@
class="text-center d-flex flex-column goodbye-wrapper"
>
+
- $vuetify.icons.trash
-
+
{{ $t("goodbye.room_deleted") }}
- {{ quote }}
-
+ {{ quote }}
+
{{ $t("goodbye.view_other_rooms") }} {{ $t("goodbye.close_tab") }}
-
+
{{ $t("profile_info_popup.you_are") }}
-
+
{{ displayName }}
-
+
-
-
+
+
{{ displayName }}
-
+
- ![]()
- {{ userAvatarLetter }}
+
@@ -77,10 +77,12 @@
\ No newline at end of file
diff --git a/src/components/RoomAvatarPicker.vue b/src/components/RoomAvatarPicker.vue
index 84f5f57..1c2b3e8 100644
--- a/src/components/RoomAvatarPicker.vue
+++ b/src/components/RoomAvatarPicker.vue
@@ -1,7 +1,7 @@
- {{ exportDate }}
@@ -38,12 +38,12 @@
-
+
{{
+ {{
$t("menu.cancel")
}}
@@ -53,7 +53,6 @@
\ No newline at end of file
diff --git a/src/components/RoomInfoBottomSheet.vue b/src/components/RoomInfoBottomSheet.vue
index a317a9c..ded6f9e 100644
--- a/src/components/RoomInfoBottomSheet.vue
+++ b/src/components/RoomInfoBottomSheet.vue
@@ -46,5 +46,5 @@ export default {
diff --git a/src/components/RoomList.vue b/src/components/RoomList.vue
index 95602c2..0bdaee6 100644
--- a/src/components/RoomList.vue
+++ b/src/components/RoomList.vue
@@ -1,70 +1,75 @@
-
-
-
-
-
+
+
+
+
$vuetify.icons.ic_new_room
-
-
- {{
- $t("menu.new_room")
- }}
-
-
+
+
-
-
-
- {{
+ $t("menu.new_room")
+ }}
+
+
+
+
+
+
+
- {{ room.name }}
- {{ room.topic }}
-
+
+
+
+ {{ room.name }}
+ {{ room.topic }}
+
- {{
+ {{
$t("menu.join") }}
- {{
- $t("menu.ignore") }}
+ {{
+ $t("menu.ignore") }}
-
+
+
-
-
-
+
+
+
-
- {{ room.name }}
-
-
-
-
+
+
+ {{ room.name }}
+
+
+
+
$vuetify.icons.ic_circle_filled
$vuetify.icons.ic_circle
-
-
+
+
diff --git a/src/components/RoundedDialog.vue b/src/components/RoundedDialog.vue
new file mode 100644
index 0000000..753e370
--- /dev/null
+++ b/src/components/RoundedDialog.vue
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/SelectLanguageDialog.vue b/src/components/SelectLanguageDialog.vue
index a527f6f..d015906 100644
--- a/src/components/SelectLanguageDialog.vue
+++ b/src/components/SelectLanguageDialog.vue
@@ -1,9 +1,8 @@
-
@@ -16,11 +15,11 @@
{{ $t("menu.done") }}
-
+
diff --git a/src/components/StickerPickerBottomSheet.vue b/src/components/StickerPickerBottomSheet.vue
index 1ab00b7..55e2e1a 100644
--- a/src/components/StickerPickerBottomSheet.vue
+++ b/src/components/StickerPickerBottomSheet.vue
@@ -5,18 +5,15 @@
centered
class="tabs"
show-arrows
+ slider-color="primary"
>
-
+
{{ pack }}
- mdi-phone
-
-
-
-
+
+
+
@@ -25,8 +22,8 @@
-
-
+
+
@@ -40,17 +37,14 @@ export default {
},
data() {
return {
- currentStickerPack: 'tab-0',
+ currentStickerPack: 'pack-0',
+ packs: [],
};
},
- computed: {
- packs() {
- return stickers.getPacks();
- }
- },
mounted() {},
methods: {
open() {
+ this.packs = stickers.getPacks();
this.$refs.sheet.open();
},
stickersInPack(pack) {
@@ -65,10 +59,14 @@ export default {
\ No newline at end of file
diff --git a/src/components/UnsupportedBrowserAlert.vue b/src/components/UnsupportedBrowserAlert.vue
index e8b3b71..fc009b0 100644
--- a/src/components/UnsupportedBrowserAlert.vue
+++ b/src/components/UnsupportedBrowserAlert.vue
@@ -3,7 +3,7 @@
class="ma-0 pa-0"
v-model="isUnSupportedBrowser"
persistent
- :width="$vuetify.breakpoint.smAndUp ? '50%' : '90%'"
+ :width="$vuetify.display.smAndUp ? '50%' : '90%'"
>
{{ $t("global.different_browser_title") }}
@@ -12,7 +12,7 @@
{{ $t(`room_info.${locationUrlCopied ? 'link_copied' : 'copy_link'}`) }}
- ![]()
- {{ firstLetterUserName }}
+
@@ -39,22 +37,22 @@
- $vuetify.icons.direct_chat {{ $t("menu.direct_chat") }}
+
+ $vuetify.icons.direct_chat {{ $t("menu.direct_chat") }}
-
- $vuetify.icons.kickout {{ $t("menu.user_kick_and_ban") }}
+
+ $vuetify.icons.kickout {{ $t("menu.user_kick_and_ban") }}
-
- $vuetify.icons.make_admin {{ $t("menu.user_make_admin") }}
+
+ $vuetify.icons.make_admin {{ $t("menu.user_make_admin") }}
-
- $vuetify.icons.make_moderator {{ $t("menu.user_make_moderator") }}
+
+ $vuetify.icons.make_moderator {{ $t("menu.user_make_moderator") }}
-
- $vuetify.icons.revoke {{ $t("menu.user_revoke_moderator") }}
+
+ $vuetify.icons.revoke {{ $t("menu.user_revoke_moderator") }}
@@ -63,21 +61,18 @@
\ No newline at end of file
diff --git a/src/components/VoiceRecorder.vue b/src/components/VoiceRecorder.vue
index 3c10378..0a6e11b 100644
--- a/src/components/VoiceRecorder.vue
+++ b/src/components/VoiceRecorder.vue
@@ -5,14 +5,14 @@
:class="{ 'voice-recorder': true, ptt: usePTT, row: !usePTT }"
ref="vrroot"
>
-
+
- undo
+ undo
- $vuetify.icons.audio_import
+ $vuetify.icons.audio_import
- $vuetify.icons.audio_import_play
+ $vuetify.icons.audio_import_play
- pause
+ pause
@@ -36,6 +36,7 @@
icon
class="voice-recorder-btn recording"
@click.stop="pauseRecording"
+ size="60"
>
stop
@@ -46,6 +47,7 @@
icon
:disabled="!recordedFile"
@click.stop="send"
+ size="60"
>
arrow_upward
@@ -55,19 +57,20 @@
class="voice-recorder-btn"
icon
@click.stop="startRecording"
+ size="60"
>
- fiber_manual_record
+ fiber_manual_record
- close
+ close
-
+
@@ -86,7 +89,7 @@
v-if="willCancel"
class="will-cancel"
>
-
+
delete_outline
@@ -106,7 +109,7 @@
v-if="recordingLocked"
class="locked"
>
-
+
@@ -114,7 +117,7 @@
- {{
+ {{
$t("menu.cancel")
}}
@@ -132,7 +135,7 @@
v-if="state == states.ERROR"
class="error"
>
-
+
@@ -167,10 +170,9 @@ const State = {
};
import util from "../plugins/utils";
import VoiceRecorderLock from "./VoiceRecorderLock";
-require("md-gum-polyfill");
-import MicRecorder from "mic-recorder-to-mp3";
-import ysFixWebmDuration from "fix-webm-duration";
-//import { duration } from "dayjs";
+import "md-gum-polyfill";
+import { RecordRTCPromisesHandler } from "recordrtc";
+import recordStop from "@/assets/sounds/record_stop.mp3";
export default {
name: "VoiceRecorder",
@@ -371,13 +373,14 @@ export default {
event.stopPropagation();
},
- startRecording() {
+ async startRecording() {
// Start recording. Browser will request permission to use your microphone.
- this.recorder = new MicRecorder({
- bitRate: 128,
+ let stream = await navigator.mediaDevices.getUserMedia({video: false, audio: true});
+ this.recorder = new RecordRTCPromisesHandler(stream, {
+ type: 'audio'
});
this.recorder
- .start()
+ .startRecording()
.then(() => {
this.state = State.RECORDING;
this.recordStartedAt = Date.now();
@@ -400,7 +403,7 @@ export default {
}
},
playRecordedSound() {
- const audio = new Audio(require("@/assets/sounds/record_stop.mp3"));
+ const audio = new Audio(recordStop);
audio.play();
},
aquireWakeLock() {
@@ -422,7 +425,7 @@ export default {
},
cancelRecording() {
if(this.recorder) {
- this.recorder.stop();
+ this.recorder.stopRecording();
this.recorder = null;
}
this.releaseWakeLock();
@@ -471,14 +474,13 @@ export default {
getFile(send) {
const duration = Date.now() - this.recordStartedAt;
this.recorder
- .stop()
- .getMp3()
- .then(([buffer, blob]) => {
- // do what ever you want with buffer and blob
- // Example: Create a mp3 file and play
+ .stopRecording()
+ .then(() => this.recorder.getBlob())
+ .then((blob) => {
+ console.log("BLOB IS", blob);
this.recordedFile = new File(
- buffer,
- util.formatRecordStartTime(this.recordStartedAt) + ".mp3",
+ [blob],
+ util.formatRecordStartTime(this.recordStartedAt) + ".webm",
{
type: blob.type,
lastModified: Date.now(),
@@ -511,25 +513,6 @@ export default {
}
},
- /*
- * There is an issue with browsers not setting correct metadata in the generated webm file.
- * See here: https://bugs.chromium.org/p/chromium/issues/detail?id=642012
- * Use fix-webm-duration package to try to update the cues section.
- */
- async correctMetadata(blob, duration) {
- return new Promise((resolve, reject) => {
- try {
- ysFixWebmDuration(blob, duration, function(fixedBlob) {
- const b = new Blob([fixedBlob], { type: blob.type });
- resolve(b);
- });
- } catch (err) {
- console.error(err);
- reject(err);
- }
- });
- },
-
/**
* Show import picker to select file
*/
@@ -570,6 +553,6 @@ export default {
diff --git a/src/components/VoiceRecorderLock.vue b/src/components/VoiceRecorderLock.vue
index c1b1785..aad8fda 100644
--- a/src/components/VoiceRecorderLock.vue
+++ b/src/components/VoiceRecorderLock.vue
@@ -24,5 +24,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/YouAre.vue b/src/components/YouAre.vue
index a4d11ac..c4e94a1 100644
--- a/src/components/YouAre.vue
+++ b/src/components/YouAre.vue
@@ -3,45 +3,45 @@
{{ $t("profile_info_popup.you_are") }}
+ color="#ededed"
+ variant="outlined"
+ >
+
+
+ {{ $t("profile_info_popup.you_are") }}
-
+
{{ displayName }}
-
+
-
+
{{ displayName }}
-
+
-
- ![]()
- {{ userAvatarLetter }}
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/chatMixin.js b/src/components/chatMixin.js
index 533649b..45aa163 100644
--- a/src/components/chatMixin.js
+++ b/src/components/chatMixin.js
@@ -1,3 +1,4 @@
+import { markRaw } from "vue";
import util, { ROOM_TYPE_CHANNEL, STATE_EVENT_ROOM_DELETION_NOTICE } from "../plugins/utils";
import MessageIncomingText from "./messages/MessageIncomingText";
import MessageIncomingFile from "./messages/MessageIncomingFile";
@@ -57,7 +58,7 @@ import ReadMarker from "./messages/ReadMarker.vue";
import roomDisplayOptionsMixin from "./roomDisplayOptionsMixin";
import roomTypeMixin from "./roomTypeMixin";
-export const ROOM_READ_MARKER_EVENT_PLACEHOLDER = { getId: () => "ROOM_READ_MARKER" };
+export const ROOM_READ_MARKER_EVENT_PLACEHOLDER = { getId: () => "ROOM_READ_MARKER", getTs: () => Date.now() };
export default {
mixins: [ roomDisplayOptionsMixin, roomTypeMixin ],
@@ -106,6 +107,11 @@ export default {
CreatePollDialog,
ReadMarker
},
+ computed: {
+ debugging() {
+ return false; //(window.location.host || "").startsWith("localhost");
+ },
+ },
methods: {
showDayMarkerBeforeEvent(event) {
const idx = this.events.indexOf(event);
@@ -119,7 +125,7 @@ export default {
dayForEvent(event) {
let dayDiff = util.dayDiffToday(event.getTs());
if (dayDiff < 7) {
- return this.$tc("message.time_ago", dayDiff);
+ return this.$t("message.time_ago", dayDiff);
} else {
return util.formatDay(event.getTs());
}
@@ -130,6 +136,14 @@ export default {
},
componentForEvent(event, isForExport = false) {
+ let component = this.componentForEventInternal(event, isForExport);
+ if (component) {
+ return markRaw(component);
+ }
+ return component;
+ },
+
+ componentForEventInternal(event, isForExport = false) {
const isChannel = this.roomDisplayType === ROOM_TYPE_CHANNEL;
if (event === ROOM_READ_MARKER_EVENT_PLACEHOLDER) {
return ReadMarker;
diff --git a/src/components/create/CreateRoomAvatar.vue b/src/components/create/CreateRoomAvatar.vue
index 3ec348e..ec66588 100644
--- a/src/components/create/CreateRoomAvatar.vue
+++ b/src/components/create/CreateRoomAvatar.vue
@@ -1,6 +1,6 @@
- $vuetify.icons.room_avatar_placeholder
$vuetify.icons.ic_camera
\ No newline at end of file
diff --git a/src/components/file_mode/GalleryItemsView.vue b/src/components/file_mode/GalleryItemsView.vue
index 2a5d94a..fec79a2 100644
--- a/src/components/file_mode/GalleryItemsView.vue
+++ b/src/components/file_mode/GalleryItemsView.vue
@@ -65,7 +65,7 @@ export default {
}
}
},
- beforeDestroy() {
+ beforeUnmount() {
document.body.classList.remove("dark");
},
computed: {
@@ -95,18 +95,18 @@ export default {
methods: {
downloadOne() {
if (this.currentItemIndex >= 0 && this.currentItemIndex < this.items.length) {
- util.download(this.$matrix.matrixClient, this.items[this.currentItemIndex].event);
+ util.download(this.$matrix.matrixClient, this.$matrix.useAuthedMedia, this.items[this.currentItemIndex].event);
}
},
downloadAll() {
- this.items.forEach(item => util.download(this.$matrix.matrixClient, item.event));
+ this.items.forEach(item => util.download(this.$matrix.matrixClient, this.$matrix.useAuthedMedia, item.event));
}
}
};
diff --git a/src/components/messages/AudioWaveformView.vue b/src/components/messages/AudioWaveformView.vue
index 905fbbc..d8bb406 100644
--- a/src/components/messages/AudioWaveformView.vue
+++ b/src/components/messages/AudioWaveformView.vue
@@ -32,7 +32,7 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/ContactChanged.vue b/src/components/messages/ContactChanged.vue
index e03d24a..8708f82 100644
--- a/src/components/messages/ContactChanged.vue
+++ b/src/components/messages/ContactChanged.vue
@@ -40,5 +40,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/ContactInvited.vue b/src/components/messages/ContactInvited.vue
index 110c43e..8e9337e 100644
--- a/src/components/messages/ContactInvited.vue
+++ b/src/components/messages/ContactInvited.vue
@@ -14,5 +14,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/ContactJoin.vue b/src/components/messages/ContactJoin.vue
index d8aa6d8..eb8defd 100644
--- a/src/components/messages/ContactJoin.vue
+++ b/src/components/messages/ContactJoin.vue
@@ -14,5 +14,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/ContactKicked.vue b/src/components/messages/ContactKicked.vue
index b34da00..4f2375c 100644
--- a/src/components/messages/ContactKicked.vue
+++ b/src/components/messages/ContactKicked.vue
@@ -21,5 +21,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/ContactLeave.vue b/src/components/messages/ContactLeave.vue
index 1e40799..eb21a48 100644
--- a/src/components/messages/ContactLeave.vue
+++ b/src/components/messages/ContactLeave.vue
@@ -19,5 +19,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/DebugEvent.vue b/src/components/messages/DebugEvent.vue
index e678340..24705db 100644
--- a/src/components/messages/DebugEvent.vue
+++ b/src/components/messages/DebugEvent.vue
@@ -11,5 +11,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageIncoming.vue b/src/components/messages/MessageIncoming.vue
index d468d5c..3ec7e44 100644
--- a/src/components/messages/MessageIncoming.vue
+++ b/src/components/messages/MessageIncoming.vue
@@ -8,8 +8,8 @@
- ![]()
- {{
+
@@ -23,8 +23,8 @@
more_vert
-
@@ -35,10 +35,11 @@ import messageMixin from "./messageMixin";
import util, { ROOM_TYPE_CHANNEL } from "../../plugins/utils";
import QuickReactions from "./QuickReactions.vue";
import QuickReactionsChannel from "./channel/QuickReactionsChannel.vue";
+import AuthedImage from "../AuthedImage.vue";
export default {
mixins: [messageMixin],
- components: { QuickReactions, QuickReactionsChannel, SeenBy },
+ components: { AuthedImage, QuickReactions, QuickReactionsChannel, SeenBy },
data() {
return { ROOM_TYPE_CHANNEL: ROOM_TYPE_CHANNEL }
},
@@ -51,5 +52,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageIncomingAudio.vue b/src/components/messages/MessageIncomingAudio.vue
index f1ed2c6..3ce0882 100644
--- a/src/components/messages/MessageIncomingAudio.vue
+++ b/src/components/messages/MessageIncomingAudio.vue
@@ -1,5 +1,5 @@
-
+
{{ $t('fallbacks.audio_file')}}
@@ -17,5 +17,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageIncomingFile.vue b/src/components/messages/MessageIncomingFile.vue
index ef34564..368e1dd 100644
--- a/src/components/messages/MessageIncomingFile.vue
+++ b/src/components/messages/MessageIncomingFile.vue
@@ -1,5 +1,5 @@
-
+
@@ -30,5 +30,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageIncomingImage.vue b/src/components/messages/MessageIncomingImage.vue
index d89d9fc..d554dce 100644
--- a/src/components/messages/MessageIncomingImage.vue
+++ b/src/components/messages/MessageIncomingImage.vue
@@ -1,5 +1,5 @@
-
+
@@ -50,7 +50,7 @@ export default {
const width = this.$refs.image.$el.clientWidth;
const height = (width * 9) / 16;
util
- .getThumbnail(this.$matrix.matrixClient, this.event, this.$config, width, height)
+ .getThumbnail(this.$matrix.matrixClient, this.$matrix.useAuthedMedia, this.event, this.$config, width, height)
.then((url) => {
const info = this.event.getContent().info;
// JPEGs use cover, PNG and GIF ect contain. This is because PNG and GIF are expected to
@@ -71,7 +71,7 @@ export default {
console.log("Failed to fetch thumbnail: ", err);
});
},
- beforeDestroy() {
+ beforeUnmount() {
if (this.src) {
const objectUrl = this.src;
this.src = null;
@@ -82,5 +82,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageIncomingPoll.vue b/src/components/messages/MessageIncomingPoll.vue
index 3008f22..e2f4ca8 100644
--- a/src/components/messages/MessageIncomingPoll.vue
+++ b/src/components/messages/MessageIncomingPoll.vue
@@ -1,8 +1,8 @@
-
+
{{ pollQuestion }}
@@ -22,8 +22,8 @@
>
{{ answer.text }} {{ answer.max }}
$vuetify.icons.ic_check
+
- 
+ $vuetify.icons.ic_check_small
{{ $t("poll_create.poll_status_closed") }}
@@ -93,6 +93,6 @@ export default {
diff --git a/src/components/messages/MessageIncomingSticker.vue b/src/components/messages/MessageIncomingSticker.vue
index afa5800..96d2d0b 100644
--- a/src/components/messages/MessageIncomingSticker.vue
+++ b/src/components/messages/MessageIncomingSticker.vue
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/components/messages/MessageIncomingText.vue b/src/components/messages/MessageIncomingText.vue
index f98648d..94a4848 100644
--- a/src/components/messages/MessageIncomingText.vue
+++ b/src/components/messages/MessageIncomingText.vue
@@ -1,5 +1,5 @@
-
+
@@ -39,5 +39,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageIncomingThread.vue b/src/components/messages/MessageIncomingThread.vue
index bacf1e6..f30734c 100644
--- a/src/components/messages/MessageIncomingThread.vue
+++ b/src/components/messages/MessageIncomingThread.vue
@@ -1,5 +1,5 @@
-
+
-
@@ -31,8 +31,8 @@
- {{ item.data }}
+
+
+ {{ item.i }}
- $vuetify.icons.addReaction
+ $vuetify.icons.addReaction
reply
- edit
+ edit
- delete
+ delete
- get_app
+ get_app
@@ -72,5 +72,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageOperationsPicker.vue b/src/components/messages/MessageOperationsPicker.vue
index d1b80fb..145975a 100644
--- a/src/components/messages/MessageOperationsPicker.vue
+++ b/src/components/messages/MessageOperationsPicker.vue
@@ -47,5 +47,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageOutgoing.vue b/src/components/messages/MessageOutgoing.vue
index da41b18..137356f 100644
--- a/src/components/messages/MessageOutgoing.vue
+++ b/src/components/messages/MessageOutgoing.vue
@@ -26,11 +26,11 @@
color="#ededed"
@click.stop="ownAvatarClicked"
>
- ![]()
- {{ userAvatarLetter }}
+
@@ -41,10 +41,11 @@ import messageMixin from "./messageMixin";
import util, { ROOM_TYPE_CHANNEL } from "../../plugins/utils";
import QuickReactions from "./QuickReactions.vue";
import QuickReactionsChannel from "./channel/QuickReactionsChannel.vue";
+import AuthedImage from "../AuthedImage.vue";
export default {
mixins: [messageMixin],
- components: { QuickReactions, QuickReactionsChannel, SeenBy },
+ components: { QuickReactions, QuickReactionsChannel, SeenBy, AuthedImage },
data() {
return { ROOM_TYPE_CHANNEL: ROOM_TYPE_CHANNEL }
},
@@ -56,5 +57,5 @@ export default {
};
\ No newline at end of file
diff --git a/src/components/messages/MessageOutgoingAudio.vue b/src/components/messages/MessageOutgoingAudio.vue
index 70db51d..e353179 100644
--- a/src/components/messages/MessageOutgoingAudio.vue
+++ b/src/components/messages/MessageOutgoingAudio.vue
@@ -1,5 +1,5 @@
-
+
{{ $t('fallbacks.audio_file')}}
@@ -17,5 +17,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageOutgoingFile.vue b/src/components/messages/MessageOutgoingFile.vue
index 87e8e6d..fe454fa 100644
--- a/src/components/messages/MessageOutgoingFile.vue
+++ b/src/components/messages/MessageOutgoingFile.vue
@@ -1,5 +1,5 @@
-
+
@@ -30,5 +30,5 @@ export default {
};
\ No newline at end of file
diff --git a/src/components/messages/MessageOutgoingImage.vue b/src/components/messages/MessageOutgoingImage.vue
index 73bcb3e..5225196 100644
--- a/src/components/messages/MessageOutgoingImage.vue
+++ b/src/components/messages/MessageOutgoingImage.vue
@@ -1,5 +1,5 @@
-
+
@@ -49,7 +49,7 @@ export default {
const width = this.$refs.image.$el.clientWidth;
const height = (width * 9) / 16;
util
- .getThumbnail(this.$matrix.matrixClient, this.event, this.$config, width, height)
+ .getThumbnail(this.$matrix.matrixClient, this.$matrix.useAuthedMedia, this.event, this.$config, width, height)
.then((url) => {
const info = this.event.getContent().info;
// JPEGs use cover, PNG and GIF ect contain. This is because PNG and GIF are expected to
@@ -70,7 +70,7 @@ export default {
console.log("Failed to fetch thumbnail: ", err);
});
},
- beforeDestroy() {
+ beforeUnmount() {
if (this.src) {
const objectUrl = this.src;
this.src = null;
@@ -81,5 +81,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageOutgoingPoll.vue b/src/components/messages/MessageOutgoingPoll.vue
index 779c63e..c3a7a60 100644
--- a/src/components/messages/MessageOutgoingPoll.vue
+++ b/src/components/messages/MessageOutgoingPoll.vue
@@ -1,8 +1,8 @@
-
+
{{ pollQuestion }}
@@ -22,8 +22,8 @@
>
{{ answer.text }} {{ answer.max }}
$vuetify.icons.ic_check
+
-
+ $vuetify.icons.ic_check_small
{{ $t("poll_create.poll_status_closed") }}
@@ -93,6 +93,6 @@ export default {
diff --git a/src/components/messages/MessageOutgoingSticker.vue b/src/components/messages/MessageOutgoingSticker.vue
index 2fa7655..757e59e 100644
--- a/src/components/messages/MessageOutgoingSticker.vue
+++ b/src/components/messages/MessageOutgoingSticker.vue
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/components/messages/MessageOutgoingText.vue b/src/components/messages/MessageOutgoingText.vue
index fd55d75..948ce13 100644
--- a/src/components/messages/MessageOutgoingText.vue
+++ b/src/components/messages/MessageOutgoingText.vue
@@ -1,5 +1,5 @@
-
+
@@ -35,5 +35,5 @@ export default {
};
\ No newline at end of file
diff --git a/src/components/messages/MessageOutgoingThread.vue b/src/components/messages/MessageOutgoingThread.vue
index 0785d94..d00f514 100644
--- a/src/components/messages/MessageOutgoingThread.vue
+++ b/src/components/messages/MessageOutgoingThread.vue
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,7 @@
-
@@ -32,8 +32,8 @@
-
+
{{ name }} {{ value.length }}
@@ -24,8 +23,8 @@
{{ name }} {{ value.length }}
@@ -34,22 +33,21 @@
v-if="totalReaction > REACTION_LIMIT"
@click="showAllReaction = !showAllReaction"
class="pa-2 ma-1 ml-0"
- outlined
- small
+ variant="outlined"
+ size="small"
>
{{ otherReactionText }}
-
+
- $vuetify.icons.addReaction
+ $vuetify.icons.addReaction
{{ $t("global.add_reaction") }}
@@ -88,7 +86,7 @@ export default {
this.reactions = this.timelineSet.relations.getChildEventsForEvent(this.event.getId(), 'm.annotation', 'm.reaction');
this.event.on("Event.relationsCreated", this.onRelationsCreated);
},
- beforeDestroy() {
+ beforeUnmount() {
this.event.off("Event.relationsCreated", this.onRelationsCreated);
if (this.reactions) {
this.reactions.off('Relations.add', this.onAddRelation);
@@ -163,5 +161,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/ReadMarker.vue b/src/components/messages/ReadMarker.vue
index f8b3969..ba5360a 100644
--- a/src/components/messages/ReadMarker.vue
+++ b/src/components/messages/ReadMarker.vue
@@ -13,5 +13,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomAliased.vue b/src/components/messages/RoomAliased.vue
index 9c87f29..1f4dac4 100644
--- a/src/components/messages/RoomAliased.vue
+++ b/src/components/messages/RoomAliased.vue
@@ -13,5 +13,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomAvatarChanged.vue b/src/components/messages/RoomAvatarChanged.vue
index cc68bca..590d71b 100644
--- a/src/components/messages/RoomAvatarChanged.vue
+++ b/src/components/messages/RoomAvatarChanged.vue
@@ -14,5 +14,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomCreated.vue b/src/components/messages/RoomCreated.vue
index c83ad15..9d4fc08 100644
--- a/src/components/messages/RoomCreated.vue
+++ b/src/components/messages/RoomCreated.vue
@@ -13,5 +13,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomDeletionNotice.vue b/src/components/messages/RoomDeletionNotice.vue
index f8b7524..9bd43f7 100644
--- a/src/components/messages/RoomDeletionNotice.vue
+++ b/src/components/messages/RoomDeletionNotice.vue
@@ -19,5 +19,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomEncrypted.vue b/src/components/messages/RoomEncrypted.vue
index 874d989..8154ea8 100644
--- a/src/components/messages/RoomEncrypted.vue
+++ b/src/components/messages/RoomEncrypted.vue
@@ -13,5 +13,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomGuestAccessChanged.vue b/src/components/messages/RoomGuestAccessChanged.vue
index b89501c..84fe7e6 100644
--- a/src/components/messages/RoomGuestAccessChanged.vue
+++ b/src/components/messages/RoomGuestAccessChanged.vue
@@ -30,5 +30,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomHistoryVisibility.vue b/src/components/messages/RoomHistoryVisibility.vue
index a6e1592..70272cc 100644
--- a/src/components/messages/RoomHistoryVisibility.vue
+++ b/src/components/messages/RoomHistoryVisibility.vue
@@ -30,5 +30,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomJoinRules.vue b/src/components/messages/RoomJoinRules.vue
index 0ee433b..9a57b78 100644
--- a/src/components/messages/RoomJoinRules.vue
+++ b/src/components/messages/RoomJoinRules.vue
@@ -26,5 +26,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomNameChanged.vue b/src/components/messages/RoomNameChanged.vue
index 1e844c5..381a920 100644
--- a/src/components/messages/RoomNameChanged.vue
+++ b/src/components/messages/RoomNameChanged.vue
@@ -14,5 +14,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomPowerLevelsChanged.vue b/src/components/messages/RoomPowerLevelsChanged.vue
index 14df1ff..97cc259 100644
--- a/src/components/messages/RoomPowerLevelsChanged.vue
+++ b/src/components/messages/RoomPowerLevelsChanged.vue
@@ -82,5 +82,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomTopicChanged.vue b/src/components/messages/RoomTopicChanged.vue
index 9268756..e66d7bc 100644
--- a/src/components/messages/RoomTopicChanged.vue
+++ b/src/components/messages/RoomTopicChanged.vue
@@ -14,5 +14,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/SeenBy.vue b/src/components/messages/SeenBy.vue
index 70480a1..f72c8a7 100644
--- a/src/components/messages/SeenBy.vue
+++ b/src/components/messages/SeenBy.vue
@@ -2,21 +2,21 @@
-
-
+
+
{{ moreItems }}
- ![]()
- {{
+
- {{ $tc("message.seen_by_count", seenBy.length) }}
+ {{ $t("message.seen_by_count", seenBy.length) }}
- {{ $tc("message.seen_by") }}
-
-
+ {{ $t("message.seen_by") }}
+
+
- ![]()
- {{
+
-
-
- {{member.roomMember.name}}
- {{ seenByTimeStamp(member.readTimestamp) }}
-
+
+ {{member.roomMember.name}}
+ {{ seenByTimeStamp(member.readTimestamp) }}
@@ -45,12 +43,14 @@
\ No newline at end of file
diff --git a/src/components/messages/attachmentMixin.js b/src/components/messages/attachmentMixin.js
index 0fed50b..5379834 100644
--- a/src/components/messages/attachmentMixin.js
+++ b/src/components/messages/attachmentMixin.js
@@ -19,7 +19,7 @@ export default {
mounted() {
this.loadAttachmentSource(this.event);
},
- beforeDestroy() {
+ beforeUnmount() {
this.loadAttachmentSource(null); // Release
},
computed: {
@@ -44,7 +44,7 @@ export default {
return;
}
util
- .getAttachment(this.$matrix.matrixClient, event, (progress) => {
+ .getAttachment(this.$matrix.matrixClient, this.$matrix.useAuthedMedia, event, (progress) => {
this.downloadProgress = progress;
console.log("Progress: " + progress);
})
diff --git a/src/components/messages/channel/MessageOperationsChannel.vue b/src/components/messages/channel/MessageOperationsChannel.vue
index 7a726ab..7541e4e 100644
--- a/src/components/messages/channel/MessageOperationsChannel.vue
+++ b/src/components/messages/channel/MessageOperationsChannel.vue
@@ -1,29 +1,21 @@
-
+
- $vuetify.icons.ic_edit
- {{ $t("menu.edit") }}
-
+ $vuetify.icons.ic_edit
+ {{ $t("menu.edit") }}
- $vuetify.icons.ic_pin
- {{ $t("menu.pin") }}
-
+ $vuetify.icons.ic_pin
+ {{ $t("menu.pin") }}
- $vuetify.icons.ic_pin
- {{ $t("menu.unpin") }}
-
+ $vuetify.icons.ic_pin
+ {{ $t("menu.unpin") }}
- delete_outline
- {{ $t("menu.delete") }}
-
+ delete_outline
+ {{ $t("menu.delete") }}
@@ -50,5 +42,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/channel/QuickReactionsChannel.vue b/src/components/messages/channel/QuickReactionsChannel.vue
index 8e2e422..c05998e 100644
--- a/src/components/messages/channel/QuickReactionsChannel.vue
+++ b/src/components/messages/channel/QuickReactionsChannel.vue
@@ -7,18 +7,19 @@
v-show="name == '❤️'"
>
-
- $vuetify.icons.ic_like_filled
+
+ $vuetify.icons.ic_like_filled
{{ $t("global.click_to_remove") }}
- $vuetify.icons.ic_like {{ $i18n.toLocalNumbers(value.length.toFixed()) }}
+ $vuetify.icons.ic_like {{ utils.toLocalNumbers(value.length.toFixed()) }}
\ No newline at end of file
diff --git a/src/components/messages/channel/SwipeableThumbnailsView.vue b/src/components/messages/channel/SwipeableThumbnailsView.vue
index fe1dcc6..4c4df19 100644
--- a/src/components/messages/channel/SwipeableThumbnailsView.vue
+++ b/src/components/messages/channel/SwipeableThumbnailsView.vue
@@ -53,5 +53,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/export/MessageIncomingAudioExport.vue b/src/components/messages/export/MessageIncomingAudioExport.vue
index b7d3032..967b801 100644
--- a/src/components/messages/export/MessageIncomingAudioExport.vue
+++ b/src/components/messages/export/MessageIncomingAudioExport.vue
@@ -1,5 +1,5 @@
-
+
@@ -17,5 +17,5 @@ export default {
diff --git a/src/components/messages/export/MessageIncomingFileExport.vue b/src/components/messages/export/MessageIncomingFileExport.vue
index 3696760..02f53a4 100644
--- a/src/components/messages/export/MessageIncomingFileExport.vue
+++ b/src/components/messages/export/MessageIncomingFileExport.vue
@@ -1,5 +1,5 @@
-
+
{{ $sanitize(fileName) }}
@@ -27,7 +27,7 @@ export default {
diff --git a/src/components/messages/export/MessageIncomingThreadExport.vue b/src/components/messages/export/MessageIncomingThreadExport.vue
index a527dd2..70c15c2 100644
--- a/src/components/messages/export/MessageIncomingThreadExport.vue
+++ b/src/components/messages/export/MessageIncomingThreadExport.vue
@@ -1,7 +1,7 @@
-
@@ -25,7 +25,7 @@ export default {
this.event.on("Event.relationsCreated", this.onRelationsCreated);
}
},
- beforeDestroy() {
+ beforeUnmount() {
this.event.off("Event.relationsCreated", this.onRelationsCreated);
},
methods: {
@@ -49,7 +49,7 @@ export default {
diff --git a/src/components/messages/export/MessageOutgoingAudioExport.vue b/src/components/messages/export/MessageOutgoingAudioExport.vue
index f32c19a..85ccadb 100644
--- a/src/components/messages/export/MessageOutgoingAudioExport.vue
+++ b/src/components/messages/export/MessageOutgoingAudioExport.vue
@@ -1,5 +1,5 @@
-
+
@@ -17,5 +17,5 @@ export default {
diff --git a/src/components/messages/export/MessageOutgoingFileExport.vue b/src/components/messages/export/MessageOutgoingFileExport.vue
index 0bcaa6f..1599a99 100644
--- a/src/components/messages/export/MessageOutgoingFileExport.vue
+++ b/src/components/messages/export/MessageOutgoingFileExport.vue
@@ -1,5 +1,5 @@
-
+
{{ $sanitize(fileName) }}
@@ -27,7 +27,7 @@ export default {
diff --git a/src/components/messages/export/MessageOutgoingThreadExport.vue b/src/components/messages/export/MessageOutgoingThreadExport.vue
index 108e5cf..4feee8d 100644
--- a/src/components/messages/export/MessageOutgoingThreadExport.vue
+++ b/src/components/messages/export/MessageOutgoingThreadExport.vue
@@ -1,7 +1,6 @@
-
@@ -25,7 +24,7 @@ export default {
this.event.on("Event.relationsCreated", this.onRelationsCreated);
}
},
- beforeDestroy() {
+ beforeUnmount() {
this.event.off("Event.relationsCreated", this.onRelationsCreated);
},
methods: {
@@ -49,7 +48,7 @@ export default {
diff --git a/src/components/messages/messageMixin.js b/src/components/messages/messageMixin.js
index 3340863..bcce0e7 100644
--- a/src/components/messages/messageMixin.js
+++ b/src/components/messages/messageMixin.js
@@ -1,8 +1,7 @@
import QuickReactions from "./QuickReactions.vue";
import * as linkify from 'linkifyjs';
import linkifyHtml from 'linkify-html';
-import utils from "../../plugins/utils"
-import util from "../../plugins/utils";
+import utils from "../../plugins/utils";
import Hammer from "hammerjs";
linkify.options.defaults.className = "link";
@@ -53,7 +52,7 @@ export default {
mcCustom: null
};
},
- beforeDestroy() {
+ beforeUnmount() {
this.thread = null;
},
watch: {
@@ -140,7 +139,7 @@ export default {
if (this.inReplyToEvent && (this.inReplyToEvent.isThreadRoot || this.inReplyToEvent.isMxThread)) {
const children = this.timelineSet.relations
.getAllChildEventsForEvent(this.inReplyToEvent.getId())
- .filter((e) => util.downloadableTypes().includes(e.getContent().msgtype));
+ .filter((e) => utils.downloadableTypes().includes(e.getContent().msgtype));
return this.$t("message.sent_media", { count: children.length });
}
const content = this.event.getContent();
@@ -200,7 +199,7 @@ export default {
if (!this.$matrix.userAvatar) {
return null;
}
- return this.$matrix.matrixClient.mxcUrlToHttp(this.$matrix.userAvatar, 80, 80, "scale", true);
+ return this.$matrix.matrixClient.mxcUrlToHttp(this.$matrix.userAvatar, 80, 80, "scale", true, undefined, this.$matrix.useAuthedMedia);
},
userAvatarLetter() {
@@ -268,7 +267,7 @@ export default {
if (this.room) {
const member = this.room.getMember(event.getSender());
if (member) {
- return member.getAvatarUrl(this.$matrix.matrixClient.getHomeserverUrl(), 40, 40, "scale", true);
+ return member.getAvatarUrl(this.$matrix.matrixClient.getHomeserverUrl(), 40, 40, "scale", true, false, this.$matrix.useAuthedMedia);
}
}
return null;
@@ -305,35 +304,13 @@ export default {
if (ti < 60) {
s = this.$t("global.time.recently");
} else if (ti < 3600 && Math.round(ti / 60) < 60) {
- s = this.$tc("global.time.minutes", Math.round(ti / 60));
+ s = this.$t("global.time.minutes", Math.round(ti / 60));
} else if (ti < 86400 && Math.round(ti / 60 / 60) < 24) {
- s = this.$tc("global.time.hours", Math.round(ti / 60 / 60));
+ s = this.$t("global.time.hours", Math.round(ti / 60 / 60));
} else {
- s = this.$tc("global.time.days", Math.round(ti / 60 / 60 / 24));
+ s = this.$t("global.time.days", Math.round(ti / 60 / 60 / 24));
}
- return this.toLocalNumbers(s);
- },
-
- /**
- * Possibly convert numerals to local representation (currently only for "bo" locale)
- * @param str String in which to convert numerals [0-9]
- * @returns converted string
- */
- toLocalNumbers(str) {
- if (this.$i18n.locale == "bo") {
- // Translate to tibetan numerals
- let result = "";
- for (let i = 0; i < str.length; i++) {
- let c = str.charCodeAt(i);
- if (c >= 48 && c <= 57) {
- result += String.fromCharCode(c + 0x0f20 - 48);
- } else {
- result += String.fromCharCode(c);
- }
- }
- return result;
- }
- return str;
+ return utils.toLocalNumbers(s);
},
linkify(text) {
diff --git a/src/components/messages/pollMixin.js b/src/components/messages/pollMixin.js
index b1da22f..5761fa3 100644
--- a/src/components/messages/pollMixin.js
+++ b/src/components/messages/pollMixin.js
@@ -26,10 +26,10 @@ export default {
"";
this.updateAnswers();
},
- destroyed() {
+ unmounted() {
this.$matrix.off("Room.timeline", this.pollMixinOnEvent);
},
- beforeDestroy() {
+ beforeUnmount() {
if (this.pollResponseRelations) {
this.pollResponseRelations.off("Relations.add", this.onAddRelation);
this.pollResponseRelations = null;
diff --git a/src/components/profileInfoMixin.js b/src/components/profileInfoMixin.js
index d0627dc..45c1e12 100644
--- a/src/components/profileInfoMixin.js
+++ b/src/components/profileInfoMixin.js
@@ -23,7 +23,7 @@ export default {
if (!this.$matrix.userAvatar) {
return null;
}
- return this.$matrix.matrixClient.mxcUrlToHttp(this.$matrix.userAvatar, 80, 80, 'scale', true);
+ return this.$matrix.matrixClient.mxcUrlToHttp(this.$matrix.userAvatar, 80, 80, 'scale', true, undefined, this.$matrix.useAuthedMedia);
},
userAvatarLetter() {
diff --git a/src/components/rememberMeMixin.js b/src/components/rememberMeMixin.js
index ffade3a..a093c2f 100644
--- a/src/components/rememberMeMixin.js
+++ b/src/components/rememberMeMixin.js
@@ -4,9 +4,18 @@ export default {
rememberMe: this.$store.state.useLocalStorage
}
},
- methods: {
- onRememberMe(val) {
- this.$store.commit("setUseLocalStorage", val);
+ watch: {
+ rememberMe(val) {
+ if (val != this.$store.state.useLocalStorage) {
+ this.$store.commit("setUseLocalStorage", val);
+ }
+ },
+ "$store.state.useLocalStorage": {
+ handler(val) {
+ if (val != this.rememberMe) {
+ this.rememberMe = val;
+ }
+ }
}
}
}
\ No newline at end of file
diff --git a/src/components/roomInfoMixin.js b/src/components/roomInfoMixin.js
index b3b8e55..04dc632 100644
--- a/src/components/roomInfoMixin.js
+++ b/src/components/roomInfoMixin.js
@@ -24,7 +24,7 @@ export default {
this.updateMessageRetention();
},
- destroyed() {
+ unmounted() {
this.$matrix.off("Room.timeline", this.roomInfoMixinOnEvent);
},
@@ -140,7 +140,9 @@ export default {
40,
40,
"scale",
- true
+ true,
+ false,
+ this.$matrix.useAuthedMedia
);
}
return null;
@@ -243,7 +245,7 @@ export default {
privatePartyAvatar(size) {
const other = this.privateParty;
if (other) {
- return other.getAvatarUrl(this.$matrix.matrixClient.getHomeserverUrl(), size, size, "scale", true);
+ return other.getAvatarUrl(this.$matrix.matrixClient.getHomeserverUrl(), size, size, "scale", true, false, this.$matrix.useAuthedMedia);
}
return undefined;
},
diff --git a/src/components/roomMembersMixin.js b/src/components/roomMembersMixin.js
index ac5ec09..71e79a9 100644
--- a/src/components/roomMembersMixin.js
+++ b/src/components/roomMembersMixin.js
@@ -9,7 +9,7 @@ export default {
this.updateMembers();
},
- destroyed() {
+ unmounted() {
this.$matrix.off("Room.timeline", this.roomMembersMixinOnEvent);
},
diff --git a/src/components/roomTypeMixin.js b/src/components/roomTypeMixin.js
index 5b6ce3e..1f94a38 100644
--- a/src/components/roomTypeMixin.js
+++ b/src/components/roomTypeMixin.js
@@ -9,7 +9,7 @@ export default {
mounted() {
this.$matrix.on("Room.timeline", this.onRoomTypeMixinEvent);
},
- destroyed() {
+ unmounted() {
this.$matrix.off("Room.timeline", this.onRoomTypeMixinEvent);
},
watch: {
diff --git a/src/components/welcome_headers/WelcomeHeaderChannel.vue b/src/components/welcome_headers/WelcomeHeaderChannel.vue
index 6d6c163..4477d94 100644
--- a/src/components/welcome_headers/WelcomeHeaderChannel.vue
+++ b/src/components/welcome_headers/WelcomeHeaderChannel.vue
@@ -1,35 +1,37 @@
-
+
- {{ publicRoomLink }}
- {{ publicRoomLink }}
+ {{
$t("room_info.link_copied") }}
-
+
{{ $t("room_welcome.join_invite") }}
-
+
{{ messageRetentionDisplay }}
-
+
{{ $t("room_welcome.change") }}
-
+
{{ $t("room_welcome.got_it") }}
-
+
{{ messageRetentionDisplay }}
-
+
@@ -42,5 +42,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/welcome_headers/WelcomeHeaderDirectChat.vue b/src/components/welcome_headers/WelcomeHeaderDirectChat.vue
index 6ae80c9..1ac85a4 100644
--- a/src/components/welcome_headers/WelcomeHeaderDirectChat.vue
+++ b/src/components/welcome_headers/WelcomeHeaderDirectChat.vue
@@ -61,5 +61,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/welcome_headers/WelcomeHeaderRoom.vue b/src/components/welcome_headers/WelcomeHeaderRoom.vue
index bd66de1..6f86f7e 100644
--- a/src/components/welcome_headers/WelcomeHeaderRoom.vue
+++ b/src/components/welcome_headers/WelcomeHeaderRoom.vue
@@ -2,22 +2,22 @@
{{ $t("room_welcome.info") }}
-
+
-
+
{{ $t("room_welcome.join_invite") }}
@@ -30,7 +30,7 @@
{{ roomHistoryDescription }}
-
+
{{ $t("room_welcome.got_it") }}
@@ -92,5 +92,5 @@ export default {
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 4d0cef6..35a0775 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,4 +1,3 @@
-import Vue from 'vue'
import App from './App.vue'
import store from './store'
import i18n from './plugins/lang';
@@ -10,40 +9,42 @@ import analytics from './services/analytics.service'
import audioPlayer from './services/audio.service';
import 'roboto-fontface/css/roboto/roboto-fontface.css'
import 'material-design-icons-iconfont/dist/material-design-icons.css'
-import VEmojiPicker from 'v-emoji-picker';
-import VueResize from 'vue-resize';
-import 'vue-resize/dist/vue-resize.css';
+import VueResize from 'vue3-resize';
+import 'vue3-resize/dist/vue3-resize.css';
import VueClipboard from 'vue-clipboard2'
-import VueSanitize from "vue-sanitize";
-import createVuetify from './plugins/vuetify';
+import Vue3Sanitize from "vue-3-sanitize";
+import vuetify from './plugins/vuetify';
+import { Buffer } from 'buffer/'
+import { createApp, h } from 'vue';
+globalThis.Buffer = Buffer;
-var defaultOptions = VueSanitize.defaults;
+var defaultOptions = Vue3Sanitize.defaults;
defaultOptions.disallowedTagsMode = "recursiveEscape";
defaultOptions.allowedTags = [];
-Vue.use(VueSanitize, defaultOptions);
-Vue.config.productionTip = false
+const app = createApp({
+ render: () => h(App)
+});
+app.use(Vue3Sanitize, defaultOptions);
-Vue.use(VueResize);
-Vue.use(VEmojiPicker);
-Vue.use(matrix, { store: store, i18n: i18n });
+app.config.productionTip = false
+
+app.use(VueResize);
const configLoadedPromise = new Promise((resolve, ignoredreject) => {
// eslint-disable-next-line
- Vue.use(config, globalThis.window.location.origin, (config) => {
+ app.use(config, globalThis.window.location.origin, (config) => {
resolve(config);
}); // Use this before cleaninsights below, it depends on config!
});
-Vue.use(analytics);
-Vue.use(VueClipboard);
-Vue.use(audioPlayer);
-
-const vuetify = createVuetify(config);
+app.use(analytics);
+app.use(VueClipboard);
+app.use(audioPlayer);
// Add bubble functionality to custom events.
// From here: https://stackoverflow.com/questions/41993508/vuejs-bubbling-custom-events
-Vue.use((Vue) => {
- Vue.prototype.$bubble = function $bubble(eventName, ...args) {
+app.use((instance) => {
+ instance.$bubble = function $bubble(eventName, ...args) {
// Emit the event on all parent components
let component = this;
let arg = args.at(0);
@@ -62,8 +63,8 @@ Vue.use((Vue) => {
});
// Register a global custom directive called `v-blur` that prevents focus
-Vue.directive('blur', {
- inserted: function (el) {
+app.directive('blur', {
+ mounted: function (el) {
el.onfocus = (ev) => ev.target.blur()
}
});
@@ -75,8 +76,8 @@ Vue.directive('blur', {
*
* Like this: v-linkTap:500="[tapped,longTapped]"
*/
-Vue.directive('longTap', {
- bind: function (el, binding, ignoredvnode) {
+app.directive('longTap', {
+ beforeMount: function (el, binding, ignoredvnode) {
el.longTapTimeout = parseInt(binding.arg || "500");
el.longTapCallbacks = binding.value;
for (var i = el.longTapCallbacks.length; i < 2; i++) {
@@ -156,7 +157,7 @@ Vue.directive('longTap', {
el.addEventListener("mouseup", touchEnd);
el.addEventListener("mousemove", touchMove);
},
- unbind: function (el) {
+ unmounted: function (el) {
el.longTapTimer && clearTimeout(el.longTapTimer);
el.removeEventListener("touchstart", el.longTapTouchStart);
el.removeEventListener("touchend", el.longTapTouchEnd);
@@ -168,27 +169,32 @@ Vue.directive('longTap', {
},
});
-Vue.use(navigation, router);
+app.use(store);
+app.$store = store;
+app.config.globalProperties.$store = store;
-const vueInstance = new Vue({
- vuetify,
- store,
- i18n,
- router,
- matrix,
- config,
- analytics,
- audioPlayer,
- render: h => h(App),
-});
-if (vueInstance.$config.accentColor) {
- vueInstance.$vuetify.theme.themes.light.primary = vueInstance.$config.accentColor;
+app.use(router);
+router.app = app;
+
+app.use(navigation, router);
+app.use(vuetify);
+app.use(i18n);
+app.$i18n = i18n;
+app.config.globalProperties.$i18n = i18n;
+
+app.use(matrix, { store: store, i18n: i18n });
+
+// Set $matrix inside data store
+store.$matrix = app.$matrix;
+
+if (app.$config.accentColor) {
+ app.$vuetify.theme.themes.light.primary = app.$config.accentColor;
}
-vueInstance.$audioPlayer.$root = vueInstance; // Make sure a $root is available here
+app.$audioPlayer.$root = app; // Make sure a $root is available here
configLoadedPromise.then((config) => {
if (config.accentColor) {
- vueInstance.$vuetify.theme.themes.light.primary = config.accentColor;
+ app.$vuetify.theme.themes.light.primary = config.accentColor;
}
- vueInstance.$mount('#app');
+ app.mount('#app');
});
diff --git a/src/plugins/lang.js b/src/plugins/lang.js
index 456ecc0..d305bf2 100644
--- a/src/plugins/lang.js
+++ b/src/plugins/lang.js
@@ -1,23 +1,19 @@
-import Vue from 'vue'
-import VueI18n from 'vue-i18n'
-
-Vue.use(VueI18n)
+import { createI18n } from 'vue-i18n'
var messages = {}
-function importAll(r) {
- return r.keys().map(res => {
- // Remove"./"
- const parts = res.split("/");
- const locale = parts[1].split(".")[0];
- messages[locale] = r(res);
- });
-}
-importAll(require.context('@/assets/translations/', true, /\.json$/));
+const modules = import.meta.glob('@/assets/translations/*.json', {eager: true});
+Object.keys(modules).map(path => {
+ // Remove"./"
+ const parts = path.split("/");
+ const locale = parts[parts.length - 1].split(".")[0];
+ messages[locale] = modules[path];
+});
-const vue18n = new VueI18n({
+const vue18n = new createI18n({
locale: 'en',
fallbackLocale: 'en',
+ globalInjection: true,
silentFallbackWarn: true,
messages: messages,
pluralizationRules: {
@@ -52,35 +48,4 @@ const vue18n = new VueI18n({
}
})
-vue18n.toLocalNumbers = (str) => {
- if (vue18n.locale == "my") {
- // Translate to burmese numerals
- var result = "";
- for (var i = 0; i < str.length; i++) {
- var c = str.charCodeAt(i);
- if (c >= 48 && c <= 57) {
- result += String.fromCharCode(c + 0x1040 - 48);
- } else {
- result += String.fromCharCode(c);
- }
- }
- return result;
- } else if (vue18n.locale == "bo") {
- // Translate to tibetan numerals
- result = "";
- for (i = 0; i < str.length; i++) {
- c = str.charCodeAt(i);
- if (c >= 48 && c <= 57) {
- result += String.fromCharCode(c + 0x0f20 - 48);
- } else {
- result += String.fromCharCode(c);
- }
- }
- return result;
- }
-
- return str;
-};
-
-
export default vue18n;
\ No newline at end of file
diff --git a/src/plugins/utils.js b/src/plugins/utils.js
index bdc8646..9a0784b 100644
--- a/src/plugins/utils.js
+++ b/src/plugins/utils.js
@@ -1,12 +1,23 @@
-import axios from 'axios';
+import axios from "axios";
import * as ContentHelpers from "matrix-js-sdk/lib/content-helpers";
-import dataUriToBuffer from "data-uri-to-buffer";
-import ImageResize from "image-resize";
-import { AutoDiscovery } from 'matrix-js-sdk';
-import User from '../models/user';
-const prettyBytes = require("pretty-bytes");
+import imageResize from "image-resize";
+import { AutoDiscovery } from "matrix-js-sdk";
+import User from "../models/user";
+import prettyBytes from "pretty-bytes";
import Hammer from "hammerjs";
-import { Thread } from 'matrix-js-sdk/lib/models/thread';
+import { Thread } from "matrix-js-sdk/lib/models/thread";
+import { imageSize } from "image-size";
+import dayjs from "dayjs";
+import aesjs from "aes-js";
+import localizedFormat from "dayjs/plugin/localizedFormat";
+import duration from "dayjs/plugin/duration";
+import i18n from "./lang";
+import {
+ toRaw,
+ isRef,
+ isReactive,
+ isProxy,
+} from 'vue';
export const STATE_EVENT_ROOM_DELETION_NOTICE = "im.keanu.room_deletion_notice";
export const STATE_EVENT_ROOM_DELETED = "im.keanu.room_deleted";
@@ -18,1085 +29,1224 @@ export const ROOM_TYPE_CHANNEL = "im.keanu.room_type_channel";
export const STATE_EVENT_ROOM_TYPE = "im.keanu.room_type";
-const sizeOf = require("image-size");
-
-var dayjs = require('dayjs');
-var sha256 = require('js-sha256').sha256;
-var aesjs = require('aes-js');
-var base64Url = require('json-web-key/lib/base64url');
-
// Install extended localized format
-var localizedFormat = require('dayjs/plugin/localizedFormat')
-dayjs.extend(localizedFormat)
-var duration = require('dayjs/plugin/duration')
+dayjs.extend(localizedFormat);
dayjs.extend(duration);
// Store info about getUserMedia BEFORE we aply polyfill(s)!
var _browserCanRecordAudioF = function () {
- var legacyGetUserMedia = (navigator.getUserMedia ||
- navigator.webkitGetUserMedia ||
- navigator.mozGetUserMedia ||
- navigator.msGetUserMedia);
- return legacyGetUserMedia !== undefined || (navigator.mediaDevices && navigator.mediaDevices.getUserMedia !== undefined);
-}
+ var legacyGetUserMedia =
+ navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
+ return (
+ legacyGetUserMedia !== undefined || (navigator.mediaDevices && navigator.mediaDevices.getUserMedia !== undefined)
+ );
+};
var _browserCanRecordAudio = _browserCanRecordAudioF();
class UploadPromise {
- aborted = false;
- onAbort = undefined;
+ aborted = false;
+ onAbort = undefined;
- constructor(wrappedPromise) {
- this.wrappedPromise = wrappedPromise;
- }
+ constructor(wrappedPromise) {
+ this.wrappedPromise = wrappedPromise;
+ }
- abort() {
- this.aborted = true;
- if (this.onAbort) {
- this.onAbort();
- }
+ abort() {
+ this.aborted = true;
+ if (this.onAbort) {
+ this.onAbort();
}
+ }
- then(resolve, reject) {
- this.wrappedPromise = this.wrappedPromise.then(resolve, reject);
- return this;
- }
+ then(resolve, reject) {
+ this.wrappedPromise = this.wrappedPromise.then(resolve, reject);
+ return this;
+ }
- catch(handler) {
- this.wrappedPromise = this.wrappedPromise.catch(handler);
- return this;
- }
+ catch(handler) {
+ this.wrappedPromise = this.wrappedPromise.catch(handler);
+ return this;
+ }
}
class Util {
+ threadMessageType() {
+ return Thread.hasServerSideSupport ? "m.thread" : "io.element.thread";
+ }
- threadMessageType() {
- return Thread.hasServerSideSupport ? "m.thread" : "io.element.thread"
- }
+ getAttachmentUrlAndDuration(event) {
+ return new Promise((resolve, reject) => {
+ const content = event.getContent();
+ if (content.url != null) {
+ resolve([content.url, content.info.duration]);
+ return;
+ }
+ if (content.file && content.file.url) {
+ resolve([content.file.url, content.info.duration]);
+ } else {
+ reject("No url found!");
+ }
+ });
+ }
- getAttachmentUrlAndDuration(event) {
- return new Promise((resolve, reject) => {
- const content = event.getContent();
- if (content.url != null) {
- resolve([content.url, content.info.duration]);
- return;
- }
- if (content.file && content.file.url) {
- resolve([content.file.url, content.info.duration]);
- } else {
- reject("No url found!");
- }
- });
+ getAttachment(matrixClient, useAuthedMedia, event, progressCallback, asBlob = false, abortController = undefined) {
+ return new Promise((resolve, reject) => {
+ const content = event.getContent();
+ var url = null;
+ var mime = "image/png";
+ var file = null;
+ let decrypt = true;
+ if (content.url != null) {
+ url = matrixClient.mxcUrlToHttp(
+ content.url,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ useAuthedMedia
+ );
+ decrypt = false;
+ if (content.info) {
+ mime = content.info.mimetype;
+ }
+ } else if (content.file && content.file.url) {
+ file = content.file;
+ url = matrixClient.mxcUrlToHttp(
+ file.url,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ useAuthedMedia
+ );
+ mime = file.mimetype;
}
- getAttachment(matrixClient, event, progressCallback, asBlob = false, abortController = undefined) {
- return new Promise((resolve, reject) => {
- const content = event.getContent();
- if (content.url != null) {
- // Unencrypted, just return!
- resolve(matrixClient.mxcUrlToHttp(content.url));
- return;
+ if (url == null) {
+ reject("No url found!");
+ }
+
+ axios
+ .get(url, {
+ headers: {
+ Authorization: `Bearer ${matrixClient.getAccessToken()}`,
+ },
+ signal: abortController ? abortController.signal : undefined,
+ responseType: "arraybuffer",
+ onDownloadProgress: (progressEvent) => {
+ let percentCompleted = Math.floor((progressEvent.loaded * 100) / progressEvent.total);
+ if (progressCallback) {
+ progressCallback(percentCompleted);
}
- var url = null;
- var file = null;
- if (content.file && content.file.url) {
- file = content.file;
- url = matrixClient.mxcUrlToHttp(file.url);
- }
-
- if (url == null) {
- reject("No url found!");
- }
-
- axios.get(url, {
- signal: abortController ? abortController.signal : undefined,
- responseType: 'arraybuffer', onDownloadProgress: progressEvent => {
- let percentCompleted = Math.floor((progressEvent.loaded * 100) / progressEvent.total);
- if (progressCallback) {
- progressCallback(percentCompleted);
- }
- }
- })
- .then(response => {
- return this.decryptIfNeeded(file, response);
- })
- .then(bytes => {
- if (asBlob) {
- resolve(new Blob([bytes.buffer], { type: file.mimetype }));
- } else {
- resolve(URL.createObjectURL(new Blob([bytes.buffer], { type: file.mimetype })));
- }
- })
- .catch(err => {
- console.log("Download error: ", err);
- reject(err);
- })
- .finally(() => {
- if (progressCallback) {
- progressCallback(null);
- }
- });
- });
- }
-
- getThumbnail(matrixClient, event, config, ignoredw, ignoredh) {
- return new Promise((resolve, reject) => {
- const content = event.getContent();
- if (content.url != null) {
- // Unencrypted, just return!
- resolve(matrixClient.mxcUrlToHttp(content.url));
- return;
- }
- var url = null;
- var file = null;
- if (
- content &&
- content.info &&
- content.info.thumbnail_file &&
- content.info.thumbnail_file.url
- ) {
- file = content.info.thumbnail_file;
- // var width = w;
- // var height = h;
- // if (content.info.w < w || content.info.h < h) {
- // width = content.info.w;
- // height = content.info.h;
- // }
- // url = matrixClient.mxcUrlToHttp(
- // file.url,
- // width, height,
- // "scale",
- // true
- // );
- url = matrixClient.mxcUrlToHttp(file.url);
- } else if (content.file && content.file.url && this.getFileSize(event) > 0 && this.getFileSize(event) < config.maxSizeAutoDownloads) {
- // No thumb, use real url
- file = content.file;
- url = matrixClient.mxcUrlToHttp(file.url);
- }
-
- if (url == null) {
- reject("No url found!");
- return;
- }
- axios.get(url, { responseType: 'arraybuffer' })
- .then(response => {
- return this.decryptIfNeeded(file, response);
- })
- .then(bytes => {
- resolve(URL.createObjectURL(new Blob([bytes.buffer], { type: file.mimetype })));
- })
- .catch(err => {
- console.log("Download error: ", err);
- reject(err);
- });
- });
- }
-
- decryptIfNeeded(file, response) {
- return new Promise((resolve, reject) => {
- var key = base64Url.decode(file.key.k);
- var iv = base64Url.decode(file.iv);
- var aesCtr = new aesjs.ModeOfOperation.ctr(key, new aesjs.Counter(iv));
-
- const data = new Uint8Array(response.data);
-
- // Calculate sha256 and compare hashes
- var hash = new Uint8Array(sha256.create().update(data).arrayBuffer());
- const originalHash = base64Url.decode(file.hashes.sha256);
- if (Buffer.compare(Buffer.from(hash), Buffer.from(originalHash.buffer)) != 0) {
- reject("Hashes don't match!");
- return;
- }
-
- var decryptedBytes = aesCtr.decrypt(data);
- resolve(decryptedBytes);
- });
- }
-
- sendTextMessage(matrixClient, roomId, text, editedEvent, replyToEvent) {
- var content = ContentHelpers.makeTextMessage(text);
- if (editedEvent) {
- content['m.relates_to'] = {
- rel_type: 'm.replace',
- event_id: editedEvent.getId()
- }
- content['m.new_content'] = {
- body: content.body,
- msgtype: content.msgtype
- }
- } else if (replyToEvent) {
- content['m.relates_to'] = {
- 'm.in_reply_to': {
- event_id: replyToEvent.getId()
- }
- }
- let senderContent = replyToEvent.getContent()
-
- const senderContentBody = Object.getOwnPropertyDescriptor(senderContent, 'body') ? senderContent.body : Object.values(senderContent)[0].question.body
- // Prefix the content with reply info (seems to be a legacy thing)
- const prefix = senderContentBody.split('\n').map((item, index) => {
- return "> " + (index == 0 ? ("<" + replyToEvent.getSender() + "> ") : "") + item;
- }).join('\n');
- content.body = prefix + "\n\n" + content.body;
- }
- return this.sendMessage(matrixClient, roomId, "m.room.message", content);
- }
-
- sendQuickReaction(matrixClient, roomId, emoji, event, extraData = {}) {
- const content = {
- 'm.relates_to': Object.assign(extraData, {
- key: emoji,
- rel_type: 'm.annotation',
- event_id: event.getId()
- })
- };
- return this.sendMessage(matrixClient, roomId, "m.reaction", content);
- }
-
- createPoll(matrixClient, roomId, question, answers, isDisclosed) {
- var idx = 0;
- let answerData = answers.map(a => {
- idx++;
- return { id: "" + idx, 'org.matrix.msc1767.text': a.text }
- });
- const content = {
- 'org.matrix.msc3381.poll.start': {
- question: {
- 'org.matrix.msc1767.text': question,
- body: question
- },
- kind: isDisclosed ? "org.matrix.msc3381.poll.disclosed" : "org.matrix.msc3381.poll.undisclosed",
- max_selections: 1,
- answers: answerData
- },
- };
- return this.sendMessage(matrixClient, roomId, "org.matrix.msc3381.poll.start", content);
- }
-
- closePoll(matrixClient, roomId, event) {
- const content = {
- 'm.relates_to': {
- rel_type: 'm.reference',
- event_id: event.getId()
- },
- 'org.matrix.msc3381.poll.end': {
- },
- };
- return this.sendMessage(matrixClient, roomId, "org.matrix.msc3381.poll.end", content);
- }
-
- sendPollAnswer(matrixClient, roomId, answers, event) {
- const content = {
- 'm.relates_to': {
- rel_type: 'm.reference',
- event_id: event.getId()
- },
- 'org.matrix.msc3381.poll.response': {
- answers: answers
- },
- };
- return this.sendMessage(matrixClient, roomId, "org.matrix.msc3381.poll.response", content);
- }
-
- sendMessage(matrixClient, roomId, eventType, content) {
- return new Promise((resolve, reject) => {
- matrixClient.sendEvent(roomId, eventType, content, undefined, undefined)
- .then((result) => {
- console.log("Message sent: ", result);
- resolve(result.event_id);
- })
- .catch(err => {
- console.log("Send error: ", err);
- if (err && err.name == "UnknownDeviceError") {
- console.log("Unknown devices. Mark as known before retrying.");
- var setAsKnownPromises = [];
- for (var user of Object.keys(err.devices)) {
- const userDevices = err.devices[user];
- for (var deviceId of Object.keys(userDevices)) {
- const deviceInfo = userDevices[deviceId];
- if (!deviceInfo.known) {
- setAsKnownPromises.push(
- matrixClient.setDeviceKnown(
- user,
- deviceId,
- true
- )
- );
- }
- }
- }
- Promise.all(setAsKnownPromises)
- .then(() => {
- // All devices now marked as "known", try to resend
- let event = err.event;
- if (!event) {
- // Seems event is no longer send in the UnknownDevices error...
- const room = matrixClient.getRoom(roomId);
- if (room) {
- event = room.getLiveTimeline().getEvents().find(e => {
- // Find the exact match (= object equality)
- return e.error === err
- });
- }
- }
- matrixClient.resendEvent(event, matrixClient.getRoom(event.getRoomId()))
- .then((result) => {
- console.log("Message sent: ", result);
- resolve(result.event_id);
- })
- .catch((err) => {
- // Still error, abort
- reject(err.toLocaleString());
- });
- });
- }
- else {
- reject(err.toLocaleString());
- }
- });
- });
- }
-
- sendFile(matrixClient, roomId, file, onUploadProgress, threadRoot) {
- const uploadPromise = new UploadPromise(undefined);
- uploadPromise.wrappedPromise = new Promise((resolve, reject) => {
- var reader = new FileReader();
- reader.onload = (e) => {
- if (uploadPromise.aborted) {
- reject("Aborted");
- return;
- }
- const fileContents = e.target.result;
- var data = new Uint8Array(fileContents);
-
- const info = {
- mimetype: file.type,
- size: file.size
- };
-
- // If audio, send duration in ms as well
- if (file.duration) {
- info.duration = file.duration;
- }
-
- var description = file.name;
- var msgtype = 'm.file';
- if (file.type.startsWith("image/")) {
- msgtype = 'm.image';
- } else if (file.type.startsWith("audio/")) {
- msgtype = 'm.audio';
- } else if (file.type.startsWith("video/")) {
- msgtype = 'm.video';
- }
-
- const opts = {
- type: file.type,
- name: description,
- progressHandler: onUploadProgress,
- onlyContentUri: false
- };
-
- var messageContent = {
- body: description,
- info: info,
- msgtype: msgtype
- }
-
- // If thread root (an eventId) is set, add that here
- if (threadRoot) {
- messageContent["m.relates_to"] = {
- "rel_type": this.threadMessageType(),
- "event_id": threadRoot
- };
- }
-
- // Set filename for files
- if (msgtype == 'm.file') {
- messageContent.filename = file.name;
- }
-
- if (!matrixClient.isRoomEncrypted(roomId)) {
- // Not encrypted.
- const promise = matrixClient.uploadContent(data, opts);
- uploadPromise.onAbort = () => {
- matrixClient.cancelUpload(promise);
- };
- promise
- .then((response) => {
- messageContent.url = response.content_uri;
- return (msgtype == 'm.audio' ? this.generateWaveform(fileContents, messageContent) : true);
- })
- .then(() => {
- return this.sendMessage(matrixClient, roomId, "m.room.message", messageContent)
- })
- .then(result => {
- resolve(result);
- })
- .catch(err => {
- reject(err);
- });
- return; // Don't fall through
- }
-
- const crypto = require('crypto');
- let key = crypto.randomBytes(256 / 8);
- let iv = Buffer.concat([crypto.randomBytes(8), Buffer.alloc(8)]); // Initialization vector.
-
- // Encrypt
- var aesCtr = new aesjs.ModeOfOperation.ctr(key, new aesjs.Counter(iv));
- var encryptedBytes = aesCtr.encrypt(data);
- data = encryptedBytes;
-
- // Calculate sha256
- var hash = new Uint8Array(sha256.create().update(data).arrayBuffer());
-
- const jwk = {
- kty: 'oct',
- key_ops: ['encrypt', 'decrypt'],
- alg: 'A256CTR',
- k: base64Url.encode(key),
- ext: true
- };
-
- const encryptedFile = {
- mimetype: file.type,
- key: jwk,
- iv: Buffer.from(iv).toString('base64').replace(/=/g, ''),
- hashes: { sha256: Buffer.from(hash).toString('base64').replace(/=/g, '') },
- v: 'v2'
- };
-
- messageContent.file = encryptedFile;
-
- // Encrypted data sent as octet-stream!
- opts.type = "application/octet-stream";
-
- const promise = matrixClient.uploadContent(data, opts);
- uploadPromise.onAbort = () => {
- matrixClient.cancelUpload(promise);
- };
- promise
- .then((response) => {
- if (response.error) {
- return reject(response.error);
- }
- encryptedFile.url = response.content_uri;
- return (msgtype == 'm.audio' ? this.generateWaveform(fileContents, messageContent) : true);
- })
- .then(() => {
- return this.sendMessage(matrixClient, roomId, "m.room.message", messageContent)
- })
- .then(result => {
- resolve(result);
- })
- .catch(err => {
- reject(err);
- });
- }
- reader.onerror = (err) => {
- reject(err);
- }
- reader.readAsArrayBuffer(file);
- });
- return uploadPromise;
- }
-
- generateWaveform(data, messageContent) {
- if (!(window.AudioContext || window.webkitAudioContext)) {
- return; // No support
- }
- const audioCtx = new (window.AudioContext || window.webkitAudioContext)();
- if (audioCtx) {
- return audioCtx.decodeAudioData(data)
- .then((audioBuffer) => {
- const rawData = audioBuffer.getChannelData(0); // TODO - currently using only 1 channel
- const samples = 1000; // Number of samples
- const blockSize = Math.floor(rawData.length / samples);
- let filteredData = [];
- for (let i = 0; i < samples; i++) {
- let blockStart = blockSize * i; // the location of the first sample in the block
- let sum = 0;
- for (let j = 0; j < blockSize; j++) {
- sum = sum + Math.abs(rawData[blockStart + j]) // find the sum of all the samples in the block
- }
- filteredData.push(sum / blockSize); // divide the sum by the block size to get the average
- }
-
- // Normalize
- const multiplier = Math.pow(Math.max(...filteredData), -1);
- filteredData = filteredData.map(n => n * multiplier);
-
- // Integerize
- filteredData = filteredData.map(n => parseInt((n * 255).toFixed()));
-
-
- // Generate SVG of waveform
- let svg = `";
-
- messageContent.format = "org.matrix.custom.html";
- messageContent.formatted_body = svg;
- })
- }
- }
-
- /**
- * Return what "mode" to use for the given room.
- *
- * The default value is given by the room itself (as state events, see roomTypeMixin).
- * This method just returns if the user has overridden this in room settings (this
- * fact will be persisted as a user specific tag on the room). Note: currently override
- * is disabled in the UI...
- */
- roomDisplayTypeOverride(roomOrNull) {
- if (roomOrNull) {
- const room = roomOrNull;
-
- // Have we changed our local view mode of this room?
- const tags = room.tags;
- if (tags && tags["ui_options"]) {
- console.error("We have a tag!");
- if (tags["ui_options"]["voice_mode"] === 1) {
- return ROOM_TYPE_VOICE_MODE;
- } else if (tags["ui_options"]["file_mode"] === 1) {
- return ROOM_TYPE_FILE_MODE;
- } else if (tags["ui_options"]["file_mode"] === 0 && tags["ui_options"]["file_mode"] === 0) {
- // Explicitly set to "default"
- return ROOM_TYPE_DEFAULT;
- }
- }
- }
- return null;
- }
-
- /**
- * Return the room type for the current room
- * @param {*} roomOrNull
- */
- roomDisplayTypeToQueryParam(roomOrNull, roomDisplayType) {
- const roomType = this.roomDisplayTypeOverride(roomOrNull) || roomDisplayType;
- if (roomType === ROOM_TYPE_FILE_MODE) {
- // Send "file" here, so the receiver of the invite link knows to display the "file drop" join page
- // instead of the standard one.
- return "file";
- } else if (roomType === ROOM_TYPE_VOICE_MODE) {
- // No need to return "voice" here. The invite page looks the same for default and voice mode,
- // so currently no point in cluttering the invite link with it. The corrent mode will be picked up from
- // room creation flags once the user joins.
- return undefined;
- }
- return undefined; // Default, just return undefined
- }
-
- /** Generate a random user name */
- randomUser(prefix) {
- var pfx = prefix ? prefix.replace(/[^0-9a-zA-Z\-_]/gi, '') : null;
- if (!pfx || pfx.length == 0) {
- pfx = "weblite-";
- }
- return pfx + this.randomString(
- 12,
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
- );
- }
-
- /**
- * Generate random 12 char password
- */
- randomPass() {
- return this.randomString(
- 12,
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!#_-*+"
- );
- }
-
- // From here: https://stackoverflow.com/questions/1349404/generate-random-string-characters-in-javascript
- randomString(length, characters) {
- var result = "";
- var charactersLength = characters.length;
- for (var i = 0; i < length; i++) {
- result += characters.charAt(
- Math.floor(Math.random() * charactersLength)
- );
- }
- return result;
- }
-
- sanitizeRoomId(roomId) {
- if (roomId && roomId.match(/^(!|#).+$/)) {
- return roomId;
- }
- return null;
- }
-
- sanitizeUserId(userId) {
- if (userId && userId.match(/^([0-9a-z-.=_/]+|@[0-9a-z-.=_/]+:.+)$/)) {
- return userId;
- }
- return null;
- }
-
- invalidUserIdChars() {
- return /[^0-9a-z-.=_/]+/g;
- }
-
- getFirstVisibleElement(parentNode, where) {
- let visible = this.findVisibleElements(parentNode);
- if (visible) {
- visible = visible.filter(where);
- }
- if (visible && visible.length > 0) {
- return visible[0];
- }
- return null;
- }
-
- getLastVisibleElement(parentNode, where) {
- let visible = this.findVisibleElements(parentNode);
- if (visible) {
- visible = visible.filter(where);
- }
- if (visible && visible.length > 0) {
- return visible[visible.length - 1];
- }
- return null;
- }
-
- findVisibleElements(parentNode) {
- const middle = this.findOneVisibleElement(parentNode);
- if (middle) {
- var nodes = [parentNode.children[middle]];
- var i = middle - 1;
- while (i >= 0 && this.isChildVisible(parentNode, parentNode.children[i])) {
- nodes.splice(0, 0, parentNode.children[i]);
- i -= 1;
- }
- i = middle + 1;
- while (i < parentNode.children.length && this.isChildVisible(parentNode, parentNode.children[i])) {
- nodes.push(parentNode.children[i]);
- i += 1;
- }
- return nodes;
- }
- return null; // No visible found
- }
-
- isChildVisible(parentNode, childNode) {
- const rect1 = parentNode.getBoundingClientRect();
- const rect2 = childNode.getBoundingClientRect();
- var overlap = !(rect1.right <= rect2.left ||
- rect1.left >= rect2.right ||
- rect1.bottom <= rect2.top ||
- rect1.top >= rect2.bottom)
- return overlap;
- }
-
- findOneVisibleElement(parentNode) {
- let start = 0;
- let end = (parentNode && parentNode.children) ? parentNode.children.length - 1 : -1;
- while (start <= end) {
- let middle = Math.floor((start + end) / 2);
- let childNode = parentNode.children[middle];
- if (this.isChildVisible(parentNode, childNode)) {
- // found the key
- return middle;
- } else if (childNode.getBoundingClientRect().top <= parentNode.getBoundingClientRect().top) {
- // continue searching to the right
- start = middle + 1;
- } else {
- // search searching to the left
- end = middle - 1;
- }
- }
- // key wasn't found
- return null;
- }
-
- _importAll(r) {
- var images = [];
- r.keys().forEach(res => {
- console.log("Avatar", res);
- // // Remove"./"
- var name = res.split("_")[1];
- name = name.slice(0, name.indexOf("."));
- name = name.charAt(0).toUpperCase() + name.slice(1);
- const image = r(res);
- const randomNumber = parseInt(this.randomString(4, "0123456789")).toFixed();
- images.push({ id: res, image: image, name: "Guest " + name + " " + randomNumber});
- });
- return images;
- }
-
- getDefaultAvatars() {
- return this._importAll(require.context('../assets/avatars/', true, /\.(jpeg|jpg|png)$/));
- }
-
- setAvatar(matrix, file, onUploadProgress) {
- return new Promise((resolve, reject) => {
- axios.get(file, { responseType: 'arraybuffer' })
- .then(response => {
- const opts = {
- type: response.headers['content-type'].split(';')[0],
- name: "Avatar",
- progressHandler: onUploadProgress,
- onlyContentUri: false
- };
- var avatarUri;
- matrix.matrixClient.uploadContent(response.data, opts)
- .then((response) => {
- avatarUri = response.content_uri;
- return matrix.matrixClient.setAvatarUrl(avatarUri);
- })
- .then(result => {
- matrix.userAvatar = avatarUri;
- resolve(result);
- })
- .catch(err => {
- reject(err);
- });
- })
- .catch(err => {
- reject(err);
- });
-
+ },
})
- }
-
- setRoomAvatar(matrixClient, roomId, file, onUploadProgress) {
- return new Promise((resolve, reject) => {
- var reader = new FileReader();
- reader.onload = (e) => {
- const fileContents = e.target.result;
- var data = new Uint8Array(fileContents);
-
- const info = {
- mimetype: file.type,
- size: file.size
- };
-
- const opts = {
- type: file.type,
- name: "Room Avatar",
- progressHandler: onUploadProgress,
- onlyContentUri: false
- };
-
- var messageContent = {
- body: file.name,
- info: info
- }
-
- matrixClient.uploadContent(data, opts)
- .then((response) => {
- messageContent.url = response.content_uri;
- return matrixClient.sendStateEvent(roomId, "m.room.avatar", messageContent);
- })
- .then(result => {
- resolve(result);
- })
- .catch(err => {
- reject(err);
- });
- }
- reader.onerror = (err) => {
- reject(err);
- }
- reader.readAsArrayBuffer(file);
- });
- }
-
- loadAvatarFromFile(event, onLoad) {
- if (event.target.files && event.target.files[0]) {
- var reader = new FileReader();
- reader.onload = (e) => {
- const file = event.target.files[0];
- if (file.type.startsWith("image/")) {
- try {
- var image = e.target.result;
-
- var dimens = sizeOf(dataUriToBuffer(e.target.result));
-
- // Need to resize?
- const w = dimens.width;
- const h = dimens.height;
- if (w > 640 || h > 640) {
- var aspect = w / h;
- var newWidth = parseInt((w > h ? 640 : 640 * aspect).toFixed());
- var newHeight = parseInt(
- (w > h ? 640 / aspect : 640).toFixed()
- );
- var imageResize = new ImageResize({
- format: "png",
- width: newWidth,
- height: newHeight,
- outputType: "blob",
- });
- imageResize
- .play(event.target)
- .then((img) => {
- var resizedImageFile = new File([img], file.name, {
- type: img.type,
- lastModified: Date.now(),
- });
- var reader2 = new FileReader();
- reader2.onload = (e) => {
- onLoad(e.target.result);
- };
- reader2.readAsDataURL(resizedImageFile);
- })
- .catch((err) => {
- console.error("Resize failed:", err);
- });
- } else {
- onLoad(image);
- }
- } catch (error) {
- console.error("Failed to get image dimensions: " + error);
- }
- }
- };
- reader.readAsDataURL(event.target.files[0]);
- }
- }
-
- /**
- * Return number of whole days between the timestamps, at end of that day.
- * @param {*} ts1
- * @param {*} ts2
- */
- dayDiff(ts1, ts2) {
- var t1 = dayjs(ts1).endOf('day');
- var t2 = dayjs(ts2).endOf('day');
- return t2.diff(t1, 'day');
- }
-
- dayDiffToday(timestamp) {
- var then = dayjs(timestamp).endOf('day');
- var now = dayjs().endOf('day');
- return now.diff(then, 'day');
- }
-
- formatDay(timestamp) {
- var then = dayjs(timestamp).endOf('day');
- return then.format('L');
- }
-
- formatTime(time) {
- const date = new Date();
- date.setTime(time);
-
- const today = new Date();
- if (
- date.getDate() == today.getDate() &&
- date.getMonth() == today.getMonth() &&
- date.getFullYear() == today.getFullYear()
- ) {
- // For today, skip the date part
- return date.toLocaleTimeString();
- }
- return date.toLocaleString();
- }
-
- formatRecordDuration(ms) {
- return dayjs.duration(ms).format("HH:mm:ss");
- }
-
- formatDuration(ms) {
- if (ms >= (60 * 60000)) {
- return dayjs.duration(ms).format("H:mm:ss");
- }
- return dayjs.duration(ms).format("m:ss");
- }
-
- formatRecordStartTime(timestamp) {
- var then = dayjs(timestamp);
- return then.format('lll');
- }
-
- browserCanRecordAudio() {
- return _browserCanRecordAudio;
- }
-
- getRoomNameFromAlias(alias) {
- if (alias && alias.startsWith('#') && alias.indexOf(':') > 0) {
- return alias.slice(1).split(':')[0];
- }
- return undefined;
- }
-
- getUniqueAliasForRoomName(matrixClient, roomName, defaultMatrixDomainPart, iterationCount) {
- return new Promise((resolve, reject) => {
- var preferredAlias = roomName.replace(/\s/g, "").toLowerCase();
- var tryAlias = "#" + preferredAlias + ":" + defaultMatrixDomainPart;
- matrixClient.getRoomIdForAlias(tryAlias)
- .then(ignoredid => {
- // We got a response, this means the tryAlias already exists.
- // Try again, with appended random chars
- if (iterationCount) {
- // Not the first time around. Reached max tries?
- if (iterationCount == 5) {
- reject("Failed to get unique room alias");
- return;
- }
- // Else, strip random chars from end so we can try again
- roomName = roomName.substring(0, roomName.length - 5);
- }
- const randomChars = this.randomString(4, "abcdefghijklmnopqrstuvwxyz0123456789");
- resolve(this.getUniqueAliasForRoomName(matrixClient, roomName + "-" + randomChars, defaultMatrixDomainPart, (iterationCount || 0) + 1))
- })
- .catch(err => {
- if (err.errcode == 'M_NOT_FOUND') {
- resolve(preferredAlias);
- } else {
- reject(err);
- }
- })
- });
- }
-
- downloadableTypes() {
- return ['m.video','m.audio','m.image','m.file'];
- }
-
- download(matrixClient, event) {
- console.log("DOWNLOAD");
- this
- .getAttachment(matrixClient, event)
- .then((url) => {
- const link = document.createElement("a");
- link.href = url;
- link.target = "_blank";
- if (!this.isFileTypePDF(event)) {
- // PDFs are shown inline, not downloaded
- link.download = event.getContent().body || this.$t("fallbacks.download_name");
+ .then((response) => {
+ return decrypt ? this.decryptIfNeeded(file, response) : Promise.resolve({ buffer: response.data });
+ })
+ .then((bytes) => {
+ if (asBlob) {
+ resolve(new Blob([bytes.buffer], { type: mime }));
+ } else {
+ resolve(URL.createObjectURL(new Blob([bytes.buffer], { type: mime })));
}
- console.log("LINK", link);
- document.body.appendChild(link);
- link.click();
- setTimeout(function () {
- document.body.removeChild(link);
- URL.revokeObjectURL(url);
- }, 200);
})
.catch((err) => {
- console.log("Failed to fetch attachment: ", err);
+ console.log("Download error: ", err);
+ reject(err);
+ })
+ .finally(() => {
+ if (progressCallback) {
+ progressCallback(null);
+ }
});
- }
+ });
+ }
- getMatrixBaseUrl(user, config) {
- if (user) {
- const domain = User.domainPart(user.user_id);
- if (domain) {
- const endpoint = config.getMatrixDomainPartMapping(domain);
- if (endpoint) {
- console.log("Mapped to", endpoint);
- return Promise.resolve(endpoint);
- }
- return AutoDiscovery.findClientConfig(domain)
- .then((clientConfig) => {
- const hs = clientConfig['m.homeserver'];
- if (hs && !hs.error && hs.base_url) {
- console.log("Use home server returned from well-known", hs.base_url);
- return hs.base_url;
- }
- console.log("Fallback to default server");
- return config.defaultBaseUrl;
- })
- .catch((err) => {
- console.error("Failed well-known lookup", err);
- return config.defaultBaseUrl;
- });
- }
- }
- return Promise.resolve(config.defaultBaseUrl);
- }
-
- getMimeType(event) {
- const content = event.getContent();
- return (content.info && content.info.mimetype) ? content.info.mimetype : (content.file && content.file.mimetype) ? content.file.mimetype : "";
- }
-
- getFileName(event) {
- const content = event.getContent();
- return (content.body || content.filename || "").toLowerCase();
- }
-
- getFileExtension(event) {
- const fileName = this.getFileName(event);
- const parts = fileName.split(".");
- if (parts.length > 1) {
- return "." + parts[parts.length - 1].toLowerCase();
- }
- return "";
- }
-
- getFileSize(event) {
- const content = event.getContent();
+ getThumbnail(matrixClient, useAuthedMedia, event, config, ignoredw, ignoredh) {
+ return new Promise((resolve, reject) => {
+ const content = event.getContent();
+ var url = null;
+ var mime = "image/png";
+ var file = null;
+ let decrypt = true;
+ if (content.url != null) {
+ url = matrixClient.mxcUrlToHttp(
+ content.url,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ useAuthedMedia
+ );
+ decrypt = false;
if (content.info) {
- return content.info.size;
+ mime = content.info.mimetype;
}
- return 0;
- }
+ } else if (content && content.info && content.info.thumbnail_file && content.info.thumbnail_file.url) {
+ file = content.info.thumbnail_file;
+ // var width = w;
+ // var height = h;
+ // if (content.info.w < w || content.info.h < h) {
+ // width = content.info.w;
+ // height = content.info.h;
+ // }
+ // url = matrixClient.mxcUrlToHttp(
+ // file.url,
+ // width, height,
+ // "scale",
+ // true
+ // );
+ url = matrixClient.mxcUrlToHttp(
+ file.url,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ useAuthedMedia
+ );
+ mime = file.mimetype;
+ } else if (
+ content.file &&
+ content.file.url &&
+ this.getFileSize(event) > 0 &&
+ this.getFileSize(event) < config.maxSizeAutoDownloads
+ ) {
+ // No thumb, use real url
+ file = content.file;
+ url = matrixClient.mxcUrlToHttp(
+ file.url,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ useAuthedMedia
+ );
+ mime = file.mimetype;
+ }
- getFileSizeFormatted(event) {
- return prettyBytes(this.getFileSize(event));
- }
+ if (url == null) {
+ reject("No url found!");
+ return;
+ }
- isFileTypeAPK(event) {
- const mime = this.getMimeType(event);
- if (mime === "application/vnd.android.package-archive" || this.getFileName(event).endsWith(".apk")) {
- return true;
+ axios
+ .get(url, useAuthedMedia ? {
+ responseType: "arraybuffer",
+ headers: {
+ Authorization: `Bearer ${matrixClient.getAccessToken()}`,
+ },
+ } : { responseType: "arraybuffer" })
+ .then((response) => {
+ return decrypt ? this.decryptIfNeeded(file, response) : Promise.resolve({ buffer: response.data });
+ })
+ .then((bytes) => {
+ resolve(URL.createObjectURL(new Blob([bytes.buffer], { type: mime })));
+ })
+ .catch((err) => {
+ console.log("Download error: ", err);
+ reject(err);
+ });
+ });
+ }
+
+ b64toBuffer(val) {
+ const baseValue = val.replaceAll("-", "+").replaceAll("_", "/");
+ return Buffer.from(baseValue, "base64");
+ }
+
+ decryptIfNeeded(file, response) {
+ return new Promise((resolve, reject) => {
+ const key = this.b64toBuffer(file.key.k);
+ const iv = this.b64toBuffer(file.iv);
+ const originalHash = this.b64toBuffer(file.hashes.sha256);
+
+ var aesCtr = new aesjs.ModeOfOperation.ctr(key, new aesjs.Counter(iv));
+ const data = new Uint8Array(response.data);
+
+ crypto.subtle
+ .digest("SHA-256", data)
+ .then((hash) => {
+ // Calculate sha256 and compare hashes
+ if (Buffer.compare(Buffer.from(hash), originalHash) != 0) {
+ reject("Hashes don't match!");
+ return;
+ }
+ var decryptedBytes = aesCtr.decrypt(data);
+ resolve(decryptedBytes);
+ })
+ .catch((err) => {
+ reject("Failed to calculate hash value");
+ });
+ });
+ }
+
+ sendTextMessage(matrixClient, roomId, text, editedEvent, replyToEvent) {
+ var content = ContentHelpers.makeTextMessage(text);
+ if (editedEvent) {
+ content["m.relates_to"] = {
+ rel_type: "m.replace",
+ event_id: editedEvent.getId(),
+ };
+ content["m.new_content"] = {
+ body: content.body,
+ msgtype: content.msgtype,
+ };
+ } else if (replyToEvent) {
+ content["m.relates_to"] = {
+ "m.in_reply_to": {
+ event_id: replyToEvent.getId(),
+ },
+ };
+ let senderContent = replyToEvent.getContent();
+
+ const senderContentBody = Object.getOwnPropertyDescriptor(senderContent, "body")
+ ? senderContent.body
+ : Object.values(senderContent)[0].question.body;
+ // Prefix the content with reply info (seems to be a legacy thing)
+ const prefix = senderContentBody
+ .split("\n")
+ .map((item, index) => {
+ return "> " + (index == 0 ? "<" + replyToEvent.getSender() + "> " : "") + item;
+ })
+ .join("\n");
+ content.body = prefix + "\n\n" + content.body;
+ }
+ return this.sendMessage(matrixClient, roomId, "m.room.message", content);
+ }
+
+ sendQuickReaction(matrixClient, roomId, emoji, event, extraData = {}) {
+ const content = {
+ "m.relates_to": Object.assign(extraData, {
+ key: emoji,
+ rel_type: "m.annotation",
+ event_id: event.getId(),
+ }),
+ };
+ return this.sendMessage(matrixClient, roomId, "m.reaction", content);
+ }
+
+ createPoll(matrixClient, roomId, question, answers, isDisclosed) {
+ var idx = 0;
+ let answerData = answers.map((a) => {
+ idx++;
+ return { id: "" + idx, "org.matrix.msc1767.text": a.text };
+ });
+ const content = {
+ "org.matrix.msc3381.poll.start": {
+ question: {
+ "org.matrix.msc1767.text": question,
+ body: question,
+ },
+ kind: isDisclosed ? "org.matrix.msc3381.poll.disclosed" : "org.matrix.msc3381.poll.undisclosed",
+ max_selections: 1,
+ answers: answerData,
+ },
+ };
+ return this.sendMessage(matrixClient, roomId, "org.matrix.msc3381.poll.start", content);
+ }
+
+ closePoll(matrixClient, roomId, event) {
+ const content = {
+ "m.relates_to": {
+ rel_type: "m.reference",
+ event_id: event.getId(),
+ },
+ "org.matrix.msc3381.poll.end": {},
+ };
+ return this.sendMessage(matrixClient, roomId, "org.matrix.msc3381.poll.end", content);
+ }
+
+ sendPollAnswer(matrixClient, roomId, answers, event) {
+ const content = {
+ "m.relates_to": {
+ rel_type: "m.reference",
+ event_id: event.getId(),
+ },
+ "org.matrix.msc3381.poll.response": {
+ answers: answers,
+ },
+ };
+ return this.sendMessage(matrixClient, roomId, "org.matrix.msc3381.poll.response", content);
+ }
+
+ sendMessage(matrixClient, roomId, eventType, content) {
+ return new Promise((resolve, reject) => {
+ matrixClient
+ .sendEvent(roomId, eventType, content, undefined, undefined)
+ .then((result) => {
+ console.log("Message sent: ", result);
+ resolve(result.event_id);
+ })
+ .catch((err) => {
+ console.log("Send error: ", err);
+ if (err && err.name == "UnknownDeviceError") {
+ console.log("Unknown devices. Mark as known before retrying.");
+ var setAsKnownPromises = [];
+ for (var user of Object.keys(err.devices)) {
+ const userDevices = err.devices[user];
+ for (var deviceId of Object.keys(userDevices)) {
+ const deviceInfo = userDevices[deviceId];
+ if (!deviceInfo.known) {
+ setAsKnownPromises.push(matrixClient.setDeviceKnown(user, deviceId, true));
+ }
+ }
+ }
+ Promise.all(setAsKnownPromises).then(() => {
+ // All devices now marked as "known", try to resend
+ let event = err.event;
+ if (!event) {
+ // Seems event is no longer send in the UnknownDevices error...
+ const room = matrixClient.getRoom(roomId);
+ if (room) {
+ event = room
+ .getLiveTimeline()
+ .getEvents()
+ .find((e) => {
+ // Find the exact match (= object equality)
+ return e.error === err;
+ });
+ }
+ }
+ matrixClient
+ .resendEvent(event, matrixClient.getRoom(event.getRoomId()))
+ .then((result) => {
+ console.log("Message sent: ", result);
+ resolve(result.event_id);
+ })
+ .catch((err) => {
+ // Still error, abort
+ reject(err.toLocaleString());
+ });
+ });
+ } else {
+ reject(err.toLocaleString());
+ }
+ });
+ });
+ }
+
+ sendFile(matrixClient, roomId, file, onUploadProgress, threadRoot) {
+ const uploadPromise = new UploadPromise(undefined);
+ uploadPromise.wrappedPromise = new Promise((resolve, reject) => {
+ var reader = new FileReader();
+ reader.onload = async (e) => {
+ if (uploadPromise.aborted) {
+ reject("Aborted");
+ return;
}
- return false;
- }
+ const fileContents = e.target.result;
+ var data = new Uint8Array(fileContents);
- isFileTypeIPA(event) {
- if (this.getFileName(event).endsWith(".ipa")) {
- return true;
+ const info = {
+ mimetype: file.type,
+ size: file.size,
+ };
+
+ // If audio, send duration in ms as well
+ if (file.duration) {
+ info.duration = file.duration;
}
- return false;
- }
- isFileTypePDF(event) {
- const mime = this.getMimeType(event);
- if (mime === "application/pdf" || this.getFileName(event).endsWith(".pdf")) {
- return true;
+ var description = file.name;
+ var msgtype = "m.file";
+ if (file.type.startsWith("image/")) {
+ msgtype = "m.image";
+ } else if (file.type.startsWith("audio/")) {
+ msgtype = "m.audio";
+ } else if (file.type.startsWith("video/")) {
+ msgtype = "m.video";
}
- return false;
- }
- isFileTypeZip(event) {
- const mime = this.getMimeType(event);
- if (["application/zip", "application/x-zip-compressed", "multipart/x-zip"].includes(mime) || this.getFileName(event).endsWith(".zip")) {
- return true;
+ const opts = {
+ type: file.type,
+ name: description,
+ progressHandler: onUploadProgress,
+ onlyContentUri: false,
+ };
+
+ var messageContent = {
+ body: description,
+ info: info,
+ msgtype: msgtype,
+ };
+
+ // If thread root (an eventId) is set, add that here
+ if (threadRoot) {
+ messageContent["m.relates_to"] = {
+ rel_type: this.threadMessageType(),
+ event_id: threadRoot,
+ };
}
- return false;
+
+ // Set filename for files
+ if (msgtype == "m.file") {
+ messageContent.filename = file.name;
+ }
+
+ if (!matrixClient.isRoomEncrypted(roomId)) {
+ // Not encrypted.
+ const promise = matrixClient.uploadContent(data, opts);
+ uploadPromise.onAbort = () => {
+ matrixClient.cancelUpload(promise);
+ };
+ promise
+ .then((response) => {
+ messageContent.url = response.content_uri;
+ return msgtype == "m.audio" ? this.generateWaveform(fileContents, messageContent) : true;
+ })
+ .then(() => {
+ return this.sendMessage(matrixClient, roomId, "m.room.message", messageContent);
+ })
+ .then((result) => {
+ resolve(result);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ return; // Don't fall through
+ }
+
+ let key = Buffer.from(crypto.getRandomValues(new Uint8Array(256 / 8)));
+ let iv = Buffer.concat([Buffer.from(crypto.getRandomValues(new Uint8Array(8))), Buffer.alloc(8)]); // Initialization vector.
+
+ // Encrypt
+ var aesCtr = new aesjs.ModeOfOperation.ctr(key, new aesjs.Counter(iv));
+ var encryptedBytes = aesCtr.encrypt(data);
+ data = encryptedBytes;
+
+ // Calculate sha256
+ let hash = await crypto.subtle.digest("SHA-256", data);
+
+ const jwk = {
+ kty: "oct",
+ key_ops: ["encrypt", "decrypt"],
+ alg: "A256CTR",
+ k: key.toString("base64").replaceAll(/\//g, "_").replaceAll(/\+/g, "-"),
+ ext: true,
+ };
+
+ const encryptedFile = {
+ mimetype: file.type,
+ key: jwk,
+ iv: Buffer.from(iv).toString("base64").replace(/=/g, ""),
+ hashes: { sha256: Buffer.from(hash).toString("base64").replace(/=/g, "") },
+ v: "v2",
+ };
+
+ messageContent.file = encryptedFile;
+
+ // Encrypted data sent as octet-stream!
+ opts.type = "application/octet-stream";
+
+ const promise = matrixClient.uploadContent(data, opts);
+ uploadPromise.onAbort = () => {
+ matrixClient.cancelUpload(promise);
+ };
+ promise
+ .then((response) => {
+ if (response.error) {
+ return reject(response.error);
+ }
+ messageContent.file.url = response.content_uri;
+ return msgtype == "m.audio" ? this.generateWaveform(fileContents, messageContent) : true;
+ })
+ .then(() => {
+ return this.sendMessage(matrixClient, roomId, "m.room.message", messageContent);
+ })
+ .then((result) => {
+ resolve(result);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ };
+ reader.onerror = (err) => {
+ reject(err);
+ };
+ reader.readAsArrayBuffer(file);
+ });
+ return uploadPromise;
+ }
+
+ generateWaveform(data, messageContent) {
+ if (!(window.AudioContext || window.webkitAudioContext)) {
+ return; // No support
+ }
+ const audioCtx = new (window.AudioContext || window.webkitAudioContext)();
+ if (audioCtx) {
+ return audioCtx.decodeAudioData(data).then((audioBuffer) => {
+ const rawData = audioBuffer.getChannelData(0); // TODO - currently using only 1 channel
+ const samples = 1000; // Number of samples
+ const blockSize = Math.floor(rawData.length / samples);
+ let filteredData = [];
+ for (let i = 0; i < samples; i++) {
+ let blockStart = blockSize * i; // the location of the first sample in the block
+ let sum = 0;
+ for (let j = 0; j < blockSize; j++) {
+ sum = sum + Math.abs(rawData[blockStart + j]); // find the sum of all the samples in the block
+ }
+ filteredData.push(sum / blockSize); // divide the sum by the block size to get the average
+ }
+
+ // Normalize
+ const multiplier = Math.pow(Math.max(...filteredData), -1);
+ filteredData = filteredData.map((n) => n * multiplier);
+
+ // Integerize
+ filteredData = filteredData.map((n) => parseInt((n * 255).toFixed()));
+
+ // Generate SVG of waveform
+ let svg = `";
+
+ messageContent.format = "org.matrix.custom.html";
+ messageContent.formatted_body = svg;
+ });
+ }
+ }
+
+ /**
+ * Return what "mode" to use for the given room.
+ *
+ * The default value is given by the room itself (as state events, see roomTypeMixin).
+ * This method just returns if the user has overridden this in room settings (this
+ * fact will be persisted as a user specific tag on the room). Note: currently override
+ * is disabled in the UI...
+ */
+ roomDisplayTypeOverride(roomOrNull) {
+ if (roomOrNull) {
+ const room = roomOrNull;
+
+ // Have we changed our local view mode of this room?
+ const tags = room.tags;
+ if (tags && tags["ui_options"]) {
+ console.error("We have a tag!");
+ if (tags["ui_options"]["voice_mode"] === 1) {
+ return ROOM_TYPE_VOICE_MODE;
+ } else if (tags["ui_options"]["file_mode"] === 1) {
+ return ROOM_TYPE_FILE_MODE;
+ } else if (tags["ui_options"]["file_mode"] === 0 && tags["ui_options"]["file_mode"] === 0) {
+ // Explicitly set to "default"
+ return ROOM_TYPE_DEFAULT;
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Return the room type for the current room
+ * @param {*} roomOrNull
+ */
+ roomDisplayTypeToQueryParam(roomOrNull, roomDisplayType) {
+ const roomType = this.roomDisplayTypeOverride(roomOrNull) || roomDisplayType;
+ if (roomType === ROOM_TYPE_FILE_MODE) {
+ // Send "file" here, so the receiver of the invite link knows to display the "file drop" join page
+ // instead of the standard one.
+ return "file";
+ } else if (roomType === ROOM_TYPE_VOICE_MODE) {
+ // No need to return "voice" here. The invite page looks the same for default and voice mode,
+ // so currently no point in cluttering the invite link with it. The corrent mode will be picked up from
+ // room creation flags once the user joins.
+ return undefined;
+ }
+ return undefined; // Default, just return undefined
+ }
+
+ /** Generate a random user name */
+ randomUser(prefix) {
+ var pfx = prefix ? prefix.replace(/[^0-9a-zA-Z\-_]/gi, "") : null;
+ if (!pfx || pfx.length == 0) {
+ pfx = "weblite-";
+ }
+ return pfx + this.randomString(12, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
+ }
+
+ /**
+ * Generate random 12 char password
+ */
+ randomPass() {
+ return this.randomString(12, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!#_-*+");
+ }
+
+ // From here: https://stackoverflow.com/questions/1349404/generate-random-string-characters-in-javascript
+ randomString(length, characters) {
+ var result = "";
+ var charactersLength = characters.length;
+ for (var i = 0; i < length; i++) {
+ result += characters.charAt(Math.floor(Math.random() * charactersLength));
+ }
+ return result;
+ }
+
+ sanitizeRoomId(roomId) {
+ if (roomId && roomId.match(/^(!|#).+$/)) {
+ return roomId;
+ }
+ return null;
+ }
+
+ sanitizeUserId(userId) {
+ if (userId && userId.match(/^([0-9a-z-.=_/]+|@[0-9a-z-.=_/]+:.+)$/)) {
+ return userId;
+ }
+ return null;
+ }
+
+ invalidUserIdChars() {
+ return /[^0-9a-z-.=_/]+/g;
+ }
+
+ getFirstVisibleElement(parentNode, where) {
+ let visible = this.findVisibleElements(parentNode);
+ if (visible) {
+ visible = visible.filter(where);
+ }
+ if (visible && visible.length > 0) {
+ return visible[0];
+ }
+ return null;
+ }
+
+ getLastVisibleElement(parentNode, where) {
+ let visible = this.findVisibleElements(parentNode);
+ if (visible) {
+ visible = visible.filter(where);
+ }
+ if (visible && visible.length > 0) {
+ return visible[visible.length - 1];
+ }
+ return null;
+ }
+
+ findVisibleElements(parentNode) {
+ const middle = this.findOneVisibleElement(parentNode);
+ if (middle) {
+ var nodes = [parentNode.children[middle]];
+ var i = middle - 1;
+ while (i >= 0 && this.isChildVisible(parentNode, parentNode.children[i])) {
+ nodes.splice(0, 0, parentNode.children[i]);
+ i -= 1;
+ }
+ i = middle + 1;
+ while (i < parentNode.children.length && this.isChildVisible(parentNode, parentNode.children[i])) {
+ nodes.push(parentNode.children[i]);
+ i += 1;
+ }
+ return nodes;
+ }
+ return null; // No visible found
+ }
+
+ isChildVisible(parentNode, childNode) {
+ const rect1 = parentNode.getBoundingClientRect();
+ const rect2 = childNode.getBoundingClientRect();
+ var overlap = !(
+ rect1.right <= rect2.left ||
+ rect1.left >= rect2.right ||
+ rect1.bottom <= rect2.top ||
+ rect1.top >= rect2.bottom
+ );
+ return overlap;
+ }
+
+ findOneVisibleElement(parentNode) {
+ let start = 0;
+ let end = parentNode && parentNode.children ? parentNode.children.length - 1 : -1;
+ while (start <= end) {
+ let middle = Math.floor((start + end) / 2);
+ let childNode = parentNode.children[middle];
+ if (this.isChildVisible(parentNode, childNode)) {
+ // found the key
+ return middle;
+ } else if (childNode.getBoundingClientRect().top <= parentNode.getBoundingClientRect().top) {
+ // continue searching to the right
+ start = middle + 1;
+ } else {
+ // search searching to the left
+ end = middle - 1;
+ }
+ }
+ // key wasn't found
+ return null;
+ }
+
+ _importAll(r) {
+ var images = [];
+ r.keys().forEach((res) => {
+ console.log("Avatar", res);
+ // // Remove"./"
+ var name = res.split("_")[1];
+ name = name.slice(0, name.indexOf("."));
+ name = name.charAt(0).toUpperCase() + name.slice(1);
+ const image = r(res);
+ const randomNumber = parseInt(this.randomString(4, "0123456789")).toFixed();
+ images.push({ id: res, image: image, name: "Guest " + name + " " + randomNumber });
+ });
+ return images;
+ }
+
+ getDefaultAvatars() {
+ var images = [];
+ const modules = import.meta.glob("@/assets/avatars/*.{jpeg,jpg,png}", {
+ query: "?url",
+ import: "default",
+ eager: true,
+ });
+ Object.keys(modules).map((path) => {
+ var name = path.split("_")[1];
+ name = name.slice(0, name.indexOf("."));
+ name = name.charAt(0).toUpperCase() + name.slice(1);
+ const image = modules[path];
+ const randomNumber = parseInt(this.randomString(4, "0123456789")).toFixed();
+ const title = "Guest " + name + " " + randomNumber;
+ images.push({ id: path, image: image, name: title, title: title });
+ });
+ return images;
+ }
+
+ setAvatar(matrix, file, onUploadProgress) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(file, { responseType: "arraybuffer" })
+ .then((response) => {
+ const opts = {
+ type: response.headers["content-type"].split(";")[0],
+ name: "Avatar",
+ progressHandler: onUploadProgress,
+ onlyContentUri: false,
+ };
+ var avatarUri;
+ matrix.matrixClient
+ .uploadContent(response.data, opts)
+ .then((response) => {
+ avatarUri = response.content_uri;
+ return matrix.matrixClient.setAvatarUrl(avatarUri);
+ })
+ .then((result) => {
+ matrix.userAvatar = avatarUri;
+ resolve(result);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ }
+
+ setRoomAvatar(matrixClient, roomId, file, onUploadProgress) {
+ return new Promise((resolve, reject) => {
+ var reader = new FileReader();
+ reader.onload = (e) => {
+ const fileContents = e.target.result;
+ var data = new Uint8Array(fileContents);
+
+ const info = {
+ mimetype: file.type,
+ size: file.size,
+ };
+
+ const opts = {
+ type: file.type,
+ name: "Room Avatar",
+ progressHandler: onUploadProgress,
+ onlyContentUri: false,
+ };
+
+ var messageContent = {
+ body: file.name,
+ info: info,
+ };
+
+ matrixClient
+ .uploadContent(data, opts)
+ .then((response) => {
+ messageContent.url = response.content_uri;
+ return matrixClient.sendStateEvent(roomId, "m.room.avatar", messageContent);
+ })
+ .then((result) => {
+ resolve(matrixClient.mxcUrlToHttp(messageContent.url, 80, 80, "scale", undefined, undefined, true));
+ // resolve(result);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ };
+ reader.onerror = (err) => {
+ reject(err);
+ };
+ reader.readAsArrayBuffer(file);
+ });
+ }
+
+ loadAvatarFromFile(event, onLoad) {
+ if (event.target.files && event.target.files[0]) {
+ var reader = new FileReader();
+ reader.onload = (e) => {
+ const file = event.target.files[0];
+ if (file.type.startsWith("image/")) {
+ try {
+ var image = e.target.result;
+
+ const buffer = Uint8Array.from(window.atob(e.target.result.replace(/^data[^,]+,/, "")), (v) =>
+ v.charCodeAt(0)
+ );
+ var dimens = imageSize(buffer);
+
+ // Need to resize?
+ const w = dimens.width;
+ const h = dimens.height;
+ if (w > 640 || h > 640) {
+ var aspect = w / h;
+ var newWidth = parseInt((w > h ? 640 : 640 * aspect).toFixed());
+ var newHeight = parseInt((w > h ? 640 / aspect : 640).toFixed());
+ imageResize(image, {
+ format: "png",
+ width: newWidth,
+ height: newHeight,
+ outputType: "blob",
+ })
+ .then((img) => {
+ var resizedImageFile = new File([img], file.name, {
+ type: img.type,
+ lastModified: Date.now(),
+ });
+ var reader2 = new FileReader();
+ reader2.onload = (e) => {
+ onLoad(e.target.result);
+ };
+ reader2.readAsDataURL(resizedImageFile);
+ })
+ .catch((err) => {
+ console.error("Resize failed:", err);
+ });
+ } else {
+ onLoad(image);
+ }
+ } catch (error) {
+ console.error("Failed to get image dimensions: " + error);
+ }
+ }
+ };
+ reader.readAsDataURL(event.target.files[0]);
+ }
+ }
+
+ /**
+ * Return number of whole days between the timestamps, at end of that day.
+ * @param {*} ts1
+ * @param {*} ts2
+ */
+ dayDiff(ts1, ts2) {
+ var t1 = dayjs(ts1).endOf("day");
+ var t2 = dayjs(ts2).endOf("day");
+ return t2.diff(t1, "day");
+ }
+
+ dayDiffToday(timestamp) {
+ var then = dayjs(timestamp).endOf("day");
+ var now = dayjs().endOf("day");
+ return now.diff(then, "day");
+ }
+
+ formatDay(timestamp) {
+ var then = dayjs(timestamp).endOf("day");
+ return then.format("L");
+ }
+
+ formatTime(time) {
+ const date = new Date();
+ date.setTime(time);
+
+ const today = new Date();
+ if (
+ date.getDate() == today.getDate() &&
+ date.getMonth() == today.getMonth() &&
+ date.getFullYear() == today.getFullYear()
+ ) {
+ // For today, skip the date part
+ return date.toLocaleTimeString();
+ }
+ return date.toLocaleString();
+ }
+
+ formatRecordDuration(ms) {
+ return dayjs.duration(ms).format("HH:mm:ss");
+ }
+
+ formatDuration(ms) {
+ if (ms >= 60 * 60000) {
+ return dayjs.duration(ms).format("H:mm:ss");
+ }
+ return dayjs.duration(ms).format("m:ss");
+ }
+
+ formatRecordStartTime(timestamp) {
+ var then = dayjs(timestamp);
+ return then.format("lll");
+ }
+
+ browserCanRecordAudio() {
+ return _browserCanRecordAudio;
+ }
+
+ getRoomNameFromAlias(alias) {
+ if (alias && alias.startsWith("#") && alias.indexOf(":") > 0) {
+ return alias.slice(1).split(":")[0];
+ }
+ return undefined;
+ }
+
+ getUniqueAliasForRoomName(matrixClient, roomName, defaultMatrixDomainPart, iterationCount) {
+ return new Promise((resolve, reject) => {
+ var preferredAlias = roomName.replace(/\s/g, "").toLowerCase();
+ var tryAlias = "#" + preferredAlias + ":" + defaultMatrixDomainPart;
+ matrixClient
+ .getRoomIdForAlias(tryAlias)
+ .then((ignoredid) => {
+ // We got a response, this means the tryAlias already exists.
+ // Try again, with appended random chars
+ if (iterationCount) {
+ // Not the first time around. Reached max tries?
+ if (iterationCount == 5) {
+ reject("Failed to get unique room alias");
+ return;
+ }
+ // Else, strip random chars from end so we can try again
+ roomName = roomName.substring(0, roomName.length - 5);
+ }
+ const randomChars = this.randomString(4, "abcdefghijklmnopqrstuvwxyz0123456789");
+ resolve(
+ this.getUniqueAliasForRoomName(
+ matrixClient,
+ roomName + "-" + randomChars,
+ defaultMatrixDomainPart,
+ (iterationCount || 0) + 1
+ )
+ );
+ })
+ .catch((err) => {
+ if (err.errcode == "M_NOT_FOUND") {
+ resolve(preferredAlias);
+ } else {
+ reject(err);
+ }
+ });
+ });
+ }
+
+ downloadableTypes() {
+ return ["m.video", "m.audio", "m.image", "m.file"];
+ }
+
+ download(matrixClient, useAuthedMedia, event) {
+ console.log("DOWNLOAD");
+ this.getAttachment(matrixClient, useAuthedMedia, event)
+ .then((url) => {
+ const link = document.createElement("a");
+ link.href = url;
+ link.target = "_blank";
+ if (!this.isFileTypePDF(event)) {
+ // PDFs are shown inline, not downloaded
+ link.download = event.getContent().body || this.$t("fallbacks.download_name");
+ }
+ console.log("LINK", link);
+ document.body.appendChild(link);
+ link.click();
+ setTimeout(function () {
+ document.body.removeChild(link);
+ URL.revokeObjectURL(url);
+ }, 200);
+ })
+ .catch((err) => {
+ console.log("Failed to fetch attachment: ", err);
+ });
+ }
+
+ getMatrixBaseUrl(user, config) {
+ if (user) {
+ const domain = User.domainPart(user.user_id);
+ if (domain) {
+ const endpoint = config.getMatrixDomainPartMapping(domain);
+ if (endpoint) {
+ console.log("Mapped to", endpoint);
+ return Promise.resolve(endpoint);
+ }
+ return AutoDiscovery.findClientConfig(domain)
+ .then((clientConfig) => {
+ const hs = clientConfig["m.homeserver"];
+ if (hs && !hs.error && hs.base_url) {
+ console.log("Use home server returned from well-known", hs.base_url);
+ return hs.base_url;
+ }
+ console.log("Fallback to default server");
+ return config.defaultBaseUrl;
+ })
+ .catch((err) => {
+ console.error("Failed well-known lookup", err);
+ return config.defaultBaseUrl;
+ });
+ }
+ }
+ return Promise.resolve(config.defaultBaseUrl);
+ }
+
+ getMimeType(event) {
+ const content = event.getContent();
+ return content.info && content.info.mimetype
+ ? content.info.mimetype
+ : content.file && content.file.mimetype
+ ? content.file.mimetype
+ : "";
+ }
+
+ getFileName(event) {
+ const content = event.getContent();
+ return (content.body || content.filename || "").toLowerCase();
+ }
+
+ getFileExtension(event) {
+ const fileName = this.getFileName(event);
+ const parts = fileName.split(".");
+ if (parts.length > 1) {
+ return "." + parts[parts.length - 1].toLowerCase();
+ }
+ return "";
+ }
+
+ getFileSize(event) {
+ const content = event.getContent();
+ if (content.info) {
+ return content.info.size;
+ }
+ return 0;
+ }
+
+ getFileSizeFormatted(event) {
+ const size = this.getFileSize(event);
+ const res = prettyBytes(size);
+ return res;
+ }
+
+ isFileTypeAPK(event) {
+ const mime = this.getMimeType(event);
+ if (mime === "application/vnd.android.package-archive" || this.getFileName(event).endsWith(".apk")) {
+ return true;
+ }
+ return false;
+ }
+
+ isFileTypeIPA(event) {
+ if (this.getFileName(event).endsWith(".ipa")) {
+ return true;
+ }
+ return false;
+ }
+
+ isFileTypePDF(event) {
+ const mime = this.getMimeType(event);
+ if (mime === "application/pdf" || this.getFileName(event).endsWith(".pdf")) {
+ return true;
+ }
+ return false;
+ }
+
+ isFileTypeZip(event) {
+ const mime = this.getMimeType(event);
+ if (
+ ["application/zip", "application/x-zip-compressed", "multipart/x-zip"].includes(mime) ||
+ this.getFileName(event).endsWith(".zip")
+ ) {
+ return true;
+ }
+ 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;
+ }
+
+ /**
+ * Possibly convert numerals to local representation (currently only for "bo" locale)
+ * @param str String in which to convert numerals [0-9]
+ * @returns converted string
+ */
+ toLocalNumbers = (str) => {
+ if (i18n.locale == "my") {
+ // Translate to burmese numerals
+ var result = "";
+ for (var i = 0; i < str.length; i++) {
+ var c = str.charCodeAt(i);
+ if (c >= 48 && c <= 57) {
+ result += String.fromCharCode(c + 0x1040 - 48);
+ } else {
+ result += String.fromCharCode(c);
+ }
+ }
+ return result;
+ } else if (i18n.locale == "bo") {
+ // Translate to tibetan numerals
+ result = "";
+ for (i = 0; i < str.length; i++) {
+ c = str.charCodeAt(i);
+ if (c >= 48 && c <= 57) {
+ result += String.fromCharCode(c + 0x0f20 - 48);
+ } else {
+ result += String.fromCharCode(c);
+ }
+ }
+ return result;
}
- 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);
- }
+ return str;
+ };
- 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
- }
-}
+ deepToRaw(sourceObj) {
+ const objectIterator = (input) => {
+ if (Array.isArray(input)) {
+ return input.map((item) => objectIterator(item));
+ }
+ if (isRef(input) || isReactive(input) || isProxy(input)) {
+ return objectIterator(toRaw(input));
+ }
+ if (input && typeof input === "object") {
+ return Object.keys(input).reduce((acc, key) => {
+ acc[key] = objectIterator(input[key]);
+ return acc;
+ }, {});
+ }
+ return input;
+ };
+ return objectIterator(sourceObj);
+ }
+};
export default new Util();
-
diff --git a/src/plugins/vuetify.js b/src/plugins/vuetify.js
index dc74d40..938e670 100644
--- a/src/plugins/vuetify.js
+++ b/src/plugins/vuetify.js
@@ -1,35 +1,78 @@
-import Vue from 'vue';
-import Vuetify from 'vuetify/lib';
+import { createVuetify } from "vuetify";
+import * as components from "vuetify/components";
+import * as directives from "vuetify/directives";
+import { aliases, md } from "vuetify/iconsets/md";
+import { h } from "vue";
+import 'vuetify/styles';
// Import all .vue icons and process them, so they can be used
// as $vuetify.icons.
-var icons = {}
-function importAll(r) {
- return r.keys().map(res => {
- // Remove"./"
- const parts = res.split("/");
- const iconName = parts[1].split(".")[0];
- icons[iconName] = { component: r(res).default };
- });
+var icons = {};
+var customAliases = {};
+const modules = import.meta.glob("@/assets/icons/*.vue", { eager: true });
+Object.keys(modules).map((path) => {
+ // Remove"./"
+ const parts = path.split("/");
+ const iconName = parts[parts.length - 1].split(".")[0];
+ icons[iconName] = { component: modules[path].default };
+ customAliases["vuetify.icons." + iconName] = "custom:" + iconName;
+});
+
+const custom = {
+ component: (props) => {
+ const {
+ icon,
+ tag,
+ ...rest
+ } = props;
+ const stringIcon = icon;
+ if (icons[stringIcon]) {
+ return h(tag, rest, [h(icons[stringIcon].component, { style: "width:100%;height:100%" })]);
+ }
+ return md.component(props);
+ }
}
-importAll(require.context('@/assets/icons/', true, /\.vue$/));
-Vue.use(Vuetify);
-
-export default function(ignoredconfig) {
- return new Vuetify({
+export default {
+ install(app, ignoredOptions) {
+ const options = {
+ components,
+ directives,
icons: {
- iconfont: 'md',
- values: icons,
+ defaultSet: "md",
+ aliases: {
+ ...aliases,
+ ...customAliases,
+ },
+ sets: {
+ md, custom,
+ },
},
- options: {
- customProperties: true
+ defaults: {
+ global: {
+ density: "comfortable",
+ },
+ VBtn: {
+ variant: "flat",
+ },
},
theme: {
options: {
customProperties: true,
},
dark: false,
- }
- });
-}
+ themes: {
+ light: {
+ colors: {
+ error: "#ff5252",
+ }
+ },
+ },
+ },
+ };
+ const vuetify = createVuetify(options);
+ app.use(vuetify);
+ app.config.globalProperties.$vuetify = vuetify;
+ app.$vuetify = vuetify;
+ },
+};
diff --git a/src/router/index.js b/src/router/index.js
index 4c4286a..aef0b16 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,5 +1,3 @@
-import Vue from 'vue'
-import VueRouter from 'vue-router'
import Home from '../components/Home.vue'
import Chat from '../components/Chat.vue'
import Join from '../components/Join.vue'
@@ -12,8 +10,8 @@ import CreateChannel from '../components/CreateChannel.vue'
import CreateFileDrop from '../components/CreateFileDrop.vue'
import User from '../models/user'
import util from '../plugins/utils'
-
-Vue.use(VueRouter)
+import { createRouter, createWebHashHistory } from 'vue-router'
+import { defineAsyncComponent } from 'vue'
const routes = [
{
@@ -33,7 +31,7 @@ const routes = [
{
path: '/info',
name: 'RoomInfo',
- component: () => import('../components/RoomInfo.vue'),
+ component: defineAsyncComponent(() => import('../components/RoomInfo.vue')),
props: true,
meta: {
title: 'Info',
@@ -97,7 +95,7 @@ const routes = [
{
path: '/invite/:roomId?',
name: 'Invite',
- component: () => import('../components/Invite.vue'),
+ component: defineAsyncComponent(() => import('../components/Invite.vue')),
meta: {
title: 'Add Friends'
}
@@ -105,13 +103,14 @@ const routes = [
{
path: '/goodbye',
name: 'Goodbye',
- component: () => import('../components/QuoteView.vue'),
+ component: defineAsyncComponent(() => import('../components/QuoteView.vue')),
props: true
}
]
-const router = new VueRouter({
- routes
+const router = createRouter({
+ history: createWebHashHistory(),
+ routes: routes
});
router.beforeEach((to, from, next) => {
diff --git a/src/services/analytics.service.js b/src/services/analytics.service.js
index ce7e58f..ea644d6 100644
--- a/src/services/analytics.service.js
+++ b/src/services/analytics.service.js
@@ -1,65 +1,64 @@
-import cleaninsights from './cleaninsights.service'
-import matomo from './matomo.service'
+import cleaninsights from "./cleaninsights.service";
+import matomo from "./matomo.service";
export default {
- install(Vue) {
- const analyticsService = new Vue({
- data() {
- return {
- engines: [],
- cachedEvents: [],
- initialized: false
- }
- },
- created() {
- this.$config.promise.then((config) => {
- var analytics = config.analytics || {};
- if (!Array.isArray(analytics)) {
- analytics = [analytics];
- }
- for (const engineConfig of analytics) {
- if (engineConfig.enabled) {
- let type = engineConfig.type || "ci";
- switch (type) {
- case "ci":
- {
- let engine = cleaninsights.install(Vue, engineConfig.config);
- this.engines.push(engine);
- }
- break;
- case "matomo":
- {
- let engine = matomo.install(Vue, engineConfig.config);
- this.engines.push(engine);
- }
- break;
- }
- }
- }
+ install(app) {
+ class AnalyticsServiceClass {
+ constructor() {
+ this.engines = [];
+ this.cachedEvents = [];
+ this.initialized = false;
- this.initialized = true;
-
- // Handle cached events
- this.cachedEvents.forEach(([category, action]) => {
- this.event(category, action);
- })
- this.cachedEvents = [];
- });
- },
- methods: {
- event(category, action) {
- if (!this.initialized) {
- this.cachedEvents.push([category, action]);
- return
- }
-
- // Send the event to each configured analytics engine.
- this.engines.forEach((engine) => {
- engine.event(category, action);
- });
- }
+ app.$config.promise.then((config) => {
+ var analytics = config.analytics || {};
+ if (!Array.isArray(analytics)) {
+ analytics = [analytics];
+ }
+ for (const engineConfig of analytics) {
+ if (engineConfig.enabled) {
+ let type = engineConfig.type || "ci";
+ switch (type) {
+ case "ci":
+ {
+ let engine = cleaninsights.install(app, engineConfig.config);
+ this.engines.push(engine);
+ }
+ break;
+ case "matomo":
+ {
+ let engine = matomo.install(app, engineConfig.config);
+ this.engines.push(engine);
+ }
+ break;
+ }
}
+ }
+
+ this.initialized = true;
+
+ // Handle cached events
+ this.cachedEvents.forEach(([category, action]) => {
+ this.event(category, action);
+ });
+ this.cachedEvents = [];
});
- Vue.prototype.$analytics = analyticsService;
+ }
+
+ event(category, action) {
+ if (!this.initialized) {
+ this.cachedEvents.push([category, action]);
+ return;
+ }
+
+ // Send the event to each configured analytics engine.
+ this.engines.forEach((engine) => {
+ engine.event(category, action);
+ });
+ }
}
-}
+
+ const analyticsService = new AnalyticsServiceClass();
+ app.$analytics = analyticsService;
+ app.config.globalProperties.$analytics = analyticsService;
+ },
+};
diff --git a/src/services/audio.service.js b/src/services/audio.service.js
index 6037be4..e9cc3ed 100644
--- a/src/services/audio.service.js
+++ b/src/services/audio.service.js
@@ -1,4 +1,5 @@
import utils from "../plugins/utils";
+import emitter from 'tiny-emitter/instance';
/**
* This plugin (available in all vue components as $audioPlayer) handles
@@ -9,7 +10,7 @@ import utils from "../plugins/utils";
* an audio matrix event and a unique component id (for example the ._uid property).
*/
export default {
- install(Vue) {
+ install(app) {
class SharedAudioPlayer {
constructor() {
this.player = new Audio();
@@ -34,12 +35,12 @@ export default {
// Listeners is just a Set of component "uid" entries for now.
entry = { url: null, listeners: new Set() };
// Make these reactive, so AudioPlayer (and others) can listen to them
- Vue.set(entry, "loading", false);
- Vue.set(entry, "loadPercent", 0);
- Vue.set(entry, "duration", 0);
- Vue.set(entry, "currentTime", 0);
- Vue.set(entry, "playPercent", 0);
- Vue.set(entry, "playing", false);
+ entry["loading"] = false;
+ entry["loadPercent"] = 0;
+ entry["duration"] = 0;
+ entry["currentTime"] = 0;
+ entry["playPercent"] = 0;
+ entry["playing"] = false;
this.infoMap.set(eventId, entry);
// Get duration information
@@ -117,7 +118,7 @@ export default {
info.loading = true;
info.abortController = new AbortController();
utils
- .getAttachment(this.$root.$matrix.matrixClient, event, (progress) => {
+ .getAttachment(this.$root.$matrix.matrixClient, this.$root.$matrix.useAuthedMedia, event, (progress) => {
info.loadPercent = progress;
}, false, info.abortController)
.then((url) => {
@@ -189,14 +190,14 @@ export default {
if (entry) {
entry.playing = true;
}
- this.$root.$emit("audio-playback-started", this.currentEvent);
+ emitter.emit("audio-playback-started", this.currentEvent);
}
onPause() {
var entry = this.infoMap.get(this.currentEvent);
if (entry) {
entry.playing = false;
}
- this.$root.$emit("audio-playback-paused", this.currentEvent);
+ emitter.emit("audio-playback-paused", this.currentEvent);
}
onEnded() {
var entry = this.infoMap.get(this.currentEvent);
@@ -204,7 +205,7 @@ export default {
entry.playing = false;
entry.currentTime = entry.duration; // Next time restart
}
- this.$root.$emit("audio-playback-ended", this.currentEvent);
+ emitter.emit("audio-playback-ended", this.currentEvent);
}
onTimeUpdate() {
var entry = this.infoMap.get(this.currentEvent);
@@ -257,12 +258,14 @@ export default {
maybePlayClapEvent(previousTimeMs, timeNowMs) {
(this.currentClapReactions || []).forEach(reaction => {
if (previousTimeMs < reaction.timeOffset && timeNowMs >= reaction.timeOffset) {
- this.$root.$emit("audio-playback-reaction", reaction);
+ emitter.emit("audio-playback-reaction", reaction);
}
});
}
}
- Vue.prototype.$audioPlayer = new SharedAudioPlayer();
+ const audioPlayer = new SharedAudioPlayer();
+ app.$audioPlayer = audioPlayer;
+ app.config.globalProperties.$audioPlayer = audioPlayer;
},
};
diff --git a/src/services/cleaninsights.service.js b/src/services/cleaninsights.service.js
index ba0fe60..fa6b929 100644
--- a/src/services/cleaninsights.service.js
+++ b/src/services/cleaninsights.service.js
@@ -1,58 +1,55 @@
-import { CleanInsights, ConsentRequestUi } from 'clean-insights-sdk';
+import { CleanInsights, ConsentRequestUi } from "clean-insights-sdk";
export default {
- install(Vue, config) {
-
- class RequestUi extends ConsentRequestUi {
- showForCampaign(campaignId, campaign, complete) {
- const period = campaign.nextTotalMeasurementPeriod
- if (!period) {
- return ''
- }
- let message = 'Help us improve!\n\n'
- + `We would like to collect anonymous usage data between ${period.start.format('LLL')} and ${period.end.format('LLL')} to improve the quality of the product.\n\nYour help would be highly appreciated.`
-
- complete(window.confirm(message))
- return ''
- }
+ install(app, config) {
+ class RequestUi extends ConsentRequestUi {
+ showForCampaign(campaignId, campaign, complete) {
+ const period = campaign.nextTotalMeasurementPeriod;
+ if (!period) {
+ return "";
}
+ let message =
+ "Help us improve!\n\n" +
+ `We would like to collect anonymous usage data between ${period.start.format("LLL")} and ${period.end.format(
+ "LLL"
+ )} to improve the quality of the product.\n\nYour help would be highly appreciated.`;
- const cleanInsightsService = new Vue({
- config: config,
- data() {
- return {
- ci: null,
- campaignId: null,
- requestUi: null,
- }
- },
- created() {
- if (this.$options.config) {
- const config = this.$options.config;
- this.ci = new CleanInsights(config);
-
- // Get name of first campaign in the config.
- this.campaignId = Object.keys(config.campaigns || { invalid: {} })[0];
-
- }
- },
- methods: {
- event(category, action) {
- if (!this.ci) {
- return;
- }
- if (!this.requestUi) {
- this.requestUi = new RequestUi();
- }
- this.ci.requestConsentForCampaign(this.campaignId, this.requestUi, (granted) => {
- if (!granted) {
- return
- }
- this.ci.measureEvent(category, action, this.campaignId);
- })
- }
- }
- });
- return cleanInsightsService;
+ complete(window.confirm(message));
+ return "";
+ }
}
-}
+
+ class CleanInsightsServiceClass {
+ constructor() {
+ this.config = config;
+ this.ci = null;
+ this.campaignId = null;
+ this.requestUi = null;
+ if (config) {
+ this.ci = new CleanInsights(config);
+
+ // Get name of first campaign in the config.
+ this.campaignId = Object.keys(config.campaigns || { invalid: {} })[0];
+ }
+ }
+
+ event(category, action) {
+ if (!this.ci) {
+ return;
+ }
+ if (!this.requestUi) {
+ this.requestUi = new RequestUi();
+ }
+ this.ci.requestConsentForCampaign(this.campaignId, this.requestUi, (granted) => {
+ if (!granted) {
+ return;
+ }
+ this.ci.measureEvent(category, action, this.campaignId);
+ });
+ }
+ }
+
+ const cleanInsightsService = new CleanInsightsServiceClass();
+ return cleanInsightsService;
+ },
+};
diff --git a/src/services/config.service.js b/src/services/config.service.js
index 02f2054..206a56d 100644
--- a/src/services/config.service.js
+++ b/src/services/config.service.js
@@ -1,7 +1,9 @@
+import * as defaultConfig from "@/assets/config.json";
+
export default {
- install(Vue, defaultServerFromLocation, onloaded) {
- var config = Vue.observable(require('@/assets/config.json'));
- Vue.set(config, "loaded", false);
+ install(app, defaultServerFromLocation, onloaded) {
+ var config = defaultConfig.default;
+ config["loaded"] = false;
const getRuntimeConfig = () => {
return fetch('./config.json?ms=' + Date.now()).then((res) => res.json()).catch(err => {
console.error("Failed to get config:", err);
@@ -12,25 +14,25 @@ export default {
config.promise = getRuntimeConfig().then((json) => {
// Reactively use all the config values
for (const key of Object.keys(json)) {
- Vue.set(config, key, json[key]);
+ config[key] = json[key];
}
// If default server is not set, default to current server address
if (!json.defaultBaseUrl) {
if (json.defaultServer) {
// TODO - Only to migrate old values (defaultServer was renamed defaultBaseUrl), can be removed later...
- Vue.set(config, "defaultBaseUrl", defaultServerFromLocation);
+ config["defaultBaseUrl"] = defaultServerFromLocation;
} else {
- Vue.set(config, "defaultBaseUrl", json.defaultServer);
+ config["defaultBaseUrl"] = json.defaultServer;
}
}
if (json.useFullyQualifiedDMLinks == undefined) {
- Vue.set(config, "useFullyQualifiedDMLinks", true); // Default to true
+ config["useFullyQualifiedDMLinks"] = true; // Default to true
}
if (json.disableMediaSharing == undefined) {
Vue.set(config, "disableMediaSharing", false);
}
if (!json.maxSizeAutoDownloads) {
- Vue.set(config, "maxSizeAutoDownloads", 10 * 1024 * 1024);
+ config["maxSizeAutoDownloads"] = 10 * 1024 * 1024;
}
if (!json.roomTypes) {
let roomTypes = ["group_chat", "channel"];
@@ -38,9 +40,11 @@ export default {
if (fileDropEnabled) {
roomTypes.push("file_drop");
}
- Vue.set(config, "roomTypes", roomTypes);
+ config["roomTypes"] = roomTypes;
}
- Vue.set(config, "loaded", true);
+ config["loaded"] = true;
+
+ document.title = config.appName || "";
// Tell callback we are done loading runtime config
if (onloaded) {
@@ -66,6 +70,7 @@ export default {
return undefined;
}
- Vue.prototype.$config = config;
+ app.$config = config;
+ app.config.globalProperties.$config = config;
}
}
diff --git a/src/services/filesaver.cjs b/src/services/filesaver.cjs
new file mode 100644
index 0000000..5d204ae
--- /dev/null
+++ b/src/services/filesaver.cjs
@@ -0,0 +1,171 @@
+/*
+* FileSaver.js
+* A saveAs() FileSaver implementation.
+*
+* By Eli Grey, http://eligrey.com
+*
+* License : https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md (MIT)
+* source : http://purl.eligrey.com/github/FileSaver.js
+*/
+
+// The one and only way of getting global scope in all environments
+// https://stackoverflow.com/q/3277182/1008999
+var _global = typeof window === 'object' && window.window === window
+ ? window : typeof self === 'object' && self.self === self
+ ? self : typeof global === 'object' && global.global === global
+ ? global
+ : this
+
+function bom (blob, opts) {
+ if (typeof opts === 'undefined') opts = { autoBom: false }
+ else if (typeof opts !== 'object') {
+ console.warn('Deprecated: Expected third argument to be a object')
+ opts = { autoBom: !opts }
+ }
+
+ // prepend BOM for UTF-8 XML and text/* types (including HTML)
+ // note: your browser will automatically convert UTF-16 U+FEFF to EF BB BF
+ if (opts.autoBom && /^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(blob.type)) {
+ return new Blob([String.fromCharCode(0xFEFF), blob], { type: blob.type })
+ }
+ return blob
+}
+
+function download (url, name, opts) {
+ var xhr = new XMLHttpRequest()
+ xhr.open('GET', url)
+ xhr.responseType = 'blob'
+ xhr.onload = function () {
+ saveAs(xhr.response, name, opts)
+ }
+ xhr.onerror = function () {
+ console.error('could not download file')
+ }
+ xhr.send()
+}
+
+function corsEnabled (url) {
+ var xhr = new XMLHttpRequest()
+ // use sync to avoid popup blocker
+ xhr.open('HEAD', url, false)
+ try {
+ xhr.send()
+ } catch (e) {}
+ return xhr.status >= 200 && xhr.status <= 299
+}
+
+// `a.click()` doesn't work for all browsers (#465)
+function click (node) {
+ try {
+ node.dispatchEvent(new MouseEvent('click'))
+ } catch (e) {
+ var evt = document.createEvent('MouseEvents')
+ evt.initMouseEvent('click', true, true, window, 0, 0, 0, 80,
+ 20, false, false, false, false, 0, null)
+ node.dispatchEvent(evt)
+ }
+}
+
+// Detect WebView inside a native macOS app by ruling out all browsers
+// We just need to check for 'Safari' because all other browsers (besides Firefox) include that too
+// https://www.whatismybrowser.com/guides/the-latest-user-agent/macos
+var isMacOSWebView = _global.navigator && /Macintosh/.test(navigator.userAgent) && /AppleWebKit/.test(navigator.userAgent) && !/Safari/.test(navigator.userAgent)
+
+var saveAs = _global.saveAs || (
+ // probably in some web worker
+ (typeof window !== 'object' || window !== _global)
+ ? function saveAs () { /* noop */ }
+
+ // Use download attribute first if possible (#193 Lumia mobile) unless this is a macOS WebView
+ : ('download' in HTMLAnchorElement.prototype && !isMacOSWebView)
+ ? function saveAs (blob, name, opts) {
+ var URL = _global.URL || _global.webkitURL
+ var a = document.createElement('a')
+ name = name || blob.name || 'download'
+
+ a.download = name
+ a.rel = 'noopener' // tabnabbing
+
+ // TODO: detect chrome extensions & packaged apps
+ // a.target = '_blank'
+
+ if (typeof blob === 'string') {
+ // Support regular links
+ a.href = blob
+ if (a.origin !== location.origin) {
+ corsEnabled(a.href)
+ ? download(blob, name, opts)
+ : click(a, a.target = '_blank')
+ } else {
+ click(a)
+ }
+ } else {
+ // Support blobs
+ a.href = URL.createObjectURL(blob)
+ setTimeout(function () { URL.revokeObjectURL(a.href) }, 4E4) // 40s
+ setTimeout(function () { click(a) }, 0)
+ }
+ }
+
+ // Use msSaveOrOpenBlob as a second approach
+ : 'msSaveOrOpenBlob' in navigator
+ ? function saveAs (blob, name, opts) {
+ name = name || blob.name || 'download'
+
+ if (typeof blob === 'string') {
+ if (corsEnabled(blob)) {
+ download(blob, name, opts)
+ } else {
+ var a = document.createElement('a')
+ a.href = blob
+ a.target = '_blank'
+ setTimeout(function () { click(a) })
+ }
+ } else {
+ navigator.msSaveOrOpenBlob(bom(blob, opts), name)
+ }
+ }
+
+ // Fallback to using FileReader and a popup
+ : function saveAs (blob, name, opts, popup) {
+ // Open a popup immediately do go around popup blocker
+ // Mostly only available on user interaction and the fileReader is async so...
+ popup = popup || open('', '_blank')
+ if (popup) {
+ popup.document.title =
+ popup.document.body.innerText = 'downloading...'
+ }
+
+ if (typeof blob === 'string') return download(blob, name, opts)
+
+ var force = blob.type === 'application/octet-stream'
+ var isSafari = /constructor/i.test(_global.HTMLElement) || _global.safari
+ var isChromeIOS = /CriOS\/[\d]+/.test(navigator.userAgent)
+
+ if ((isChromeIOS || (force && isSafari) || isMacOSWebView) && typeof FileReader !== 'undefined') {
+ // Safari doesn't allow downloading of blob URLs
+ var reader = new FileReader()
+ reader.onloadend = function () {
+ var url = reader.result
+ url = isChromeIOS ? url : url.replace(/^data:[^;]*;/, 'data:attachment/file;')
+ if (popup) popup.location.href = url
+ else location = url
+ popup = null // reverse-tabnabbing #460
+ }
+ reader.readAsDataURL(blob)
+ } else {
+ var URL = _global.URL || _global.webkitURL
+ var url = URL.createObjectURL(blob)
+ if (popup) popup.location = url
+ else location.href = url
+ popup = null // reverse-tabnabbing #460
+ setTimeout(function () { URL.revokeObjectURL(url) }, 4E4) // 40s
+ }
+ }
+)
+
+_global.saveAs = saveAs.saveAs = saveAs
+
+if (typeof module !== 'undefined') {
+ module.exports = saveAs;
+}
diff --git a/src/services/jszip.min.js b/src/services/jszip.min.js
new file mode 100644
index 0000000..ff4cfd5
--- /dev/null
+++ b/src/services/jszip.min.js
@@ -0,0 +1,13 @@
+/*!
+
+JSZip v3.10.1 - A JavaScript class for generating and reading zip files
+
+
+(c) 2009-2016 Stuart Knightley
+Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/main/LICENSE.markdown.
+
+JSZip uses the library pako released under the MIT license :
+https://github.com/nodeca/pako/blob/main/LICENSE
+*/
+
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).JSZip=e()}}(function(){return function s(a,o,h){function u(r,e){if(!o[r]){if(!a[r]){var t="function"==typeof require&&require;if(!e&&t)return t(r,!0);if(l)return l(r,!0);var n=new Error("Cannot find module '"+r+"'");throw n.code="MODULE_NOT_FOUND",n}var i=o[r]={exports:{}};a[r][0].call(i.exports,function(e){var t=a[r][1][e];return u(t||e)},i,i.exports,s,a,o,h)}return o[r].exports}for(var l="function"==typeof require&&require,e=0;e>2,s=(3&t)<<4|r>>4,a=1>6:64,o=2>4,r=(15&i)<<4|(s=p.indexOf(e.charAt(o++)))>>2,n=(3&s)<<6|(a=p.indexOf(e.charAt(o++))),l[h++]=t,64!==s&&(l[h++]=r),64!==a&&(l[h++]=n);return l}},{"./support":30,"./utils":32}],2:[function(e,t,r){"use strict";var n=e("./external"),i=e("./stream/DataWorker"),s=e("./stream/Crc32Probe"),a=e("./stream/DataLengthProbe");function o(e,t,r,n,i){this.compressedSize=e,this.uncompressedSize=t,this.crc32=r,this.compression=n,this.compressedContent=i}o.prototype={getContentWorker:function(){var e=new i(n.Promise.resolve(this.compressedContent)).pipe(this.compression.uncompressWorker()).pipe(new a("data_length")),t=this;return e.on("end",function(){if(this.streamInfo.data_length!==t.uncompressedSize)throw new Error("Bug : uncompressed data size mismatch")}),e},getCompressedWorker:function(){return new i(n.Promise.resolve(this.compressedContent)).withStreamInfo("compressedSize",this.compressedSize).withStreamInfo("uncompressedSize",this.uncompressedSize).withStreamInfo("crc32",this.crc32).withStreamInfo("compression",this.compression)}},o.createWorkerFrom=function(e,t,r){return e.pipe(new s).pipe(new a("uncompressedSize")).pipe(t.compressWorker(r)).pipe(new a("compressedSize")).withStreamInfo("compression",t)},t.exports=o},{"./external":6,"./stream/Crc32Probe":25,"./stream/DataLengthProbe":26,"./stream/DataWorker":27}],3:[function(e,t,r){"use strict";var n=e("./stream/GenericWorker");r.STORE={magic:"\0\0",compressWorker:function(){return new n("STORE compression")},uncompressWorker:function(){return new n("STORE decompression")}},r.DEFLATE=e("./flate")},{"./flate":7,"./stream/GenericWorker":28}],4:[function(e,t,r){"use strict";var n=e("./utils");var o=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t){return void 0!==e&&e.length?"string"!==n.getTypeOf(e)?function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t[a])];return-1^e}(0|t,e,e.length,0):function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t.charCodeAt(a))];return-1^e}(0|t,e,e.length,0):0}},{"./utils":32}],5:[function(e,t,r){"use strict";r.base64=!1,r.binary=!1,r.dir=!1,r.createFolders=!0,r.date=null,r.compression=null,r.compressionOptions=null,r.comment=null,r.unixPermissions=null,r.dosPermissions=null},{}],6:[function(e,t,r){"use strict";var n=null;n="undefined"!=typeof Promise?Promise:e("lie"),t.exports={Promise:n}},{lie:37}],7:[function(e,t,r){"use strict";var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,i=e("pako"),s=e("./utils"),a=e("./stream/GenericWorker"),o=n?"uint8array":"array";function h(e,t){a.call(this,"FlateWorker/"+e),this._pako=null,this._pakoAction=e,this._pakoOptions=t,this.meta={}}r.magic="\b\0",s.inherits(h,a),h.prototype.processChunk=function(e){this.meta=e.meta,null===this._pako&&this._createPako(),this._pako.push(s.transformTo(o,e.data),!1)},h.prototype.flush=function(){a.prototype.flush.call(this),null===this._pako&&this._createPako(),this._pako.push([],!0)},h.prototype.cleanUp=function(){a.prototype.cleanUp.call(this),this._pako=null},h.prototype._createPako=function(){this._pako=new i[this._pakoAction]({raw:!0,level:this._pakoOptions.level||-1});var t=this;this._pako.onData=function(e){t.push({data:e,meta:t.meta})}},r.compressWorker=function(e){return new h("Deflate",e)},r.uncompressWorker=function(){return new h("Inflate",{})}},{"./stream/GenericWorker":28,"./utils":32,pako:38}],8:[function(e,t,r){"use strict";function A(e,t){var r,n="";for(r=0;r>>=8;return n}function n(e,t,r,n,i,s){var a,o,h=e.file,u=e.compression,l=s!==O.utf8encode,f=I.transformTo("string",s(h.name)),c=I.transformTo("string",O.utf8encode(h.name)),d=h.comment,p=I.transformTo("string",s(d)),m=I.transformTo("string",O.utf8encode(d)),_=c.length!==h.name.length,g=m.length!==d.length,b="",v="",y="",w=h.dir,k=h.date,x={crc32:0,compressedSize:0,uncompressedSize:0};t&&!r||(x.crc32=e.crc32,x.compressedSize=e.compressedSize,x.uncompressedSize=e.uncompressedSize);var S=0;t&&(S|=8),l||!_&&!g||(S|=2048);var z=0,C=0;w&&(z|=16),"UNIX"===i?(C=798,z|=function(e,t){var r=e;return e||(r=t?16893:33204),(65535&r)<<16}(h.unixPermissions,w)):(C=20,z|=function(e){return 63&(e||0)}(h.dosPermissions)),a=k.getUTCHours(),a<<=6,a|=k.getUTCMinutes(),a<<=5,a|=k.getUTCSeconds()/2,o=k.getUTCFullYear()-1980,o<<=4,o|=k.getUTCMonth()+1,o<<=5,o|=k.getUTCDate(),_&&(v=A(1,1)+A(B(f),4)+c,b+="up"+A(v.length,2)+v),g&&(y=A(1,1)+A(B(p),4)+m,b+="uc"+A(y.length,2)+y);var E="";return E+="\n\0",E+=A(S,2),E+=u.magic,E+=A(a,2),E+=A(o,2),E+=A(x.crc32,4),E+=A(x.compressedSize,4),E+=A(x.uncompressedSize,4),E+=A(f.length,2),E+=A(b.length,2),{fileRecord:R.LOCAL_FILE_HEADER+E+f+b,dirRecord:R.CENTRAL_FILE_HEADER+A(C,2)+E+A(p.length,2)+"\0\0\0\0"+A(z,4)+A(n,4)+f+b+p}}var I=e("../utils"),i=e("../stream/GenericWorker"),O=e("../utf8"),B=e("../crc32"),R=e("../signature");function s(e,t,r,n){i.call(this,"ZipFileWorker"),this.bytesWritten=0,this.zipComment=t,this.zipPlatform=r,this.encodeFileName=n,this.streamFiles=e,this.accumulate=!1,this.contentBuffer=[],this.dirRecords=[],this.currentSourceOffset=0,this.entriesCount=0,this.currentFile=null,this._sources=[]}I.inherits(s,i),s.prototype.push=function(e){var t=e.meta.percent||0,r=this.entriesCount,n=this._sources.length;this.accumulate?this.contentBuffer.push(e):(this.bytesWritten+=e.data.length,i.prototype.push.call(this,{data:e.data,meta:{currentFile:this.currentFile,percent:r?(t+100*(r-n-1))/r:100}}))},s.prototype.openedSource=function(e){this.currentSourceOffset=this.bytesWritten,this.currentFile=e.file.name;var t=this.streamFiles&&!e.file.dir;if(t){var r=n(e,t,!1,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);this.push({data:r.fileRecord,meta:{percent:0}})}else this.accumulate=!0},s.prototype.closedSource=function(e){this.accumulate=!1;var t=this.streamFiles&&!e.file.dir,r=n(e,t,!0,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);if(this.dirRecords.push(r.dirRecord),t)this.push({data:function(e){return R.DATA_DESCRIPTOR+A(e.crc32,4)+A(e.compressedSize,4)+A(e.uncompressedSize,4)}(e),meta:{percent:100}});else for(this.push({data:r.fileRecord,meta:{percent:0}});this.contentBuffer.length;)this.push(this.contentBuffer.shift());this.currentFile=null},s.prototype.flush=function(){for(var e=this.bytesWritten,t=0;t=this.index;t--)r=(r<<8)+this.byteAt(t);return this.index+=e,r},readString:function(e){return n.transformTo("string",this.readData(e))},readData:function(){},lastIndexOfSignature:function(){},readAndCheckSignature:function(){},readDate:function(){var e=this.readInt(4);return new Date(Date.UTC(1980+(e>>25&127),(e>>21&15)-1,e>>16&31,e>>11&31,e>>5&63,(31&e)<<1))}},t.exports=i},{"../utils":32}],19:[function(e,t,r){"use strict";var n=e("./Uint8ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./Uint8ArrayReader":21}],20:[function(e,t,r){"use strict";var n=e("./DataReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.byteAt=function(e){return this.data.charCodeAt(this.zero+e)},i.prototype.lastIndexOfSignature=function(e){return this.data.lastIndexOf(e)-this.zero},i.prototype.readAndCheckSignature=function(e){return e===this.readData(4)},i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./DataReader":18}],21:[function(e,t,r){"use strict";var n=e("./ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){if(this.checkOffset(e),0===e)return new Uint8Array(0);var t=this.data.subarray(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./ArrayReader":17}],22:[function(e,t,r){"use strict";var n=e("../utils"),i=e("../support"),s=e("./ArrayReader"),a=e("./StringReader"),o=e("./NodeBufferReader"),h=e("./Uint8ArrayReader");t.exports=function(e){var t=n.getTypeOf(e);return n.checkSupport(t),"string"!==t||i.uint8array?"nodebuffer"===t?new o(e):i.uint8array?new h(n.transformTo("uint8array",e)):new s(n.transformTo("array",e)):new a(e)}},{"../support":30,"../utils":32,"./ArrayReader":17,"./NodeBufferReader":19,"./StringReader":20,"./Uint8ArrayReader":21}],23:[function(e,t,r){"use strict";r.LOCAL_FILE_HEADER="PK",r.CENTRAL_FILE_HEADER="PK",r.CENTRAL_DIRECTORY_END="PK",r.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",r.ZIP64_CENTRAL_DIRECTORY_END="PK",r.DATA_DESCRIPTOR="PK\b"},{}],24:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../utils");function s(e){n.call(this,"ConvertWorker to "+e),this.destType=e}i.inherits(s,n),s.prototype.processChunk=function(e){this.push({data:i.transformTo(this.destType,e.data),meta:e.meta})},t.exports=s},{"../utils":32,"./GenericWorker":28}],25:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../crc32");function s(){n.call(this,"Crc32Probe"),this.withStreamInfo("crc32",0)}e("../utils").inherits(s,n),s.prototype.processChunk=function(e){this.streamInfo.crc32=i(e.data,this.streamInfo.crc32||0),this.push(e)},t.exports=s},{"../crc32":4,"../utils":32,"./GenericWorker":28}],26:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataLengthProbe for "+e),this.propName=e,this.withStreamInfo(e,0)}n.inherits(s,i),s.prototype.processChunk=function(e){if(e){var t=this.streamInfo[this.propName]||0;this.streamInfo[this.propName]=t+e.data.length}i.prototype.processChunk.call(this,e)},t.exports=s},{"../utils":32,"./GenericWorker":28}],27:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataWorker");var t=this;this.dataIsReady=!1,this.index=0,this.max=0,this.data=null,this.type="",this._tickScheduled=!1,e.then(function(e){t.dataIsReady=!0,t.data=e,t.max=e&&e.length||0,t.type=n.getTypeOf(e),t.isPaused||t._tickAndRepeat()},function(e){t.error(e)})}n.inherits(s,i),s.prototype.cleanUp=function(){i.prototype.cleanUp.call(this),this.data=null},s.prototype.resume=function(){return!!i.prototype.resume.call(this)&&(!this._tickScheduled&&this.dataIsReady&&(this._tickScheduled=!0,n.delay(this._tickAndRepeat,[],this)),!0)},s.prototype._tickAndRepeat=function(){this._tickScheduled=!1,this.isPaused||this.isFinished||(this._tick(),this.isFinished||(n.delay(this._tickAndRepeat,[],this),this._tickScheduled=!0))},s.prototype._tick=function(){if(this.isPaused||this.isFinished)return!1;var e=null,t=Math.min(this.max,this.index+16384);if(this.index>=this.max)return this.end();switch(this.type){case"string":e=this.data.substring(this.index,t);break;case"uint8array":e=this.data.subarray(this.index,t);break;case"array":case"nodebuffer":e=this.data.slice(this.index,t)}return this.index=t,this.push({data:e,meta:{percent:this.max?this.index/this.max*100:0}})},t.exports=s},{"../utils":32,"./GenericWorker":28}],28:[function(e,t,r){"use strict";function n(e){this.name=e||"default",this.streamInfo={},this.generatedError=null,this.extraStreamInfo={},this.isPaused=!0,this.isFinished=!1,this.isLocked=!1,this._listeners={data:[],end:[],error:[]},this.previous=null}n.prototype={push:function(e){this.emit("data",e)},end:function(){if(this.isFinished)return!1;this.flush();try{this.emit("end"),this.cleanUp(),this.isFinished=!0}catch(e){this.emit("error",e)}return!0},error:function(e){return!this.isFinished&&(this.isPaused?this.generatedError=e:(this.isFinished=!0,this.emit("error",e),this.previous&&this.previous.error(e),this.cleanUp()),!0)},on:function(e,t){return this._listeners[e].push(t),this},cleanUp:function(){this.streamInfo=this.generatedError=this.extraStreamInfo=null,this._listeners=[]},emit:function(e,t){if(this._listeners[e])for(var r=0;r "+e:e}},t.exports=n},{}],29:[function(e,t,r){"use strict";var h=e("../utils"),i=e("./ConvertWorker"),s=e("./GenericWorker"),u=e("../base64"),n=e("../support"),a=e("../external"),o=null;if(n.nodestream)try{o=e("../nodejs/NodejsStreamOutputAdapter")}catch(e){}function l(e,o){return new a.Promise(function(t,r){var n=[],i=e._internalType,s=e._outputType,a=e._mimeType;e.on("data",function(e,t){n.push(e),o&&o(t)}).on("error",function(e){n=[],r(e)}).on("end",function(){try{var e=function(e,t,r){switch(e){case"blob":return h.newBlob(h.transformTo("arraybuffer",t),r);case"base64":return u.encode(t);default:return h.transformTo(e,t)}}(s,function(e,t){var r,n=0,i=null,s=0;for(r=0;r>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t}(e)},s.utf8decode=function(e){return h.nodebuffer?o.transformTo("nodebuffer",e).toString("utf-8"):function(e){var t,r,n,i,s=e.length,a=new Array(2*s);for(t=r=0;t>10&1023,a[r++]=56320|1023&n)}return a.length!==r&&(a.subarray?a=a.subarray(0,r):a.length=r),o.applyFromCharCode(a)}(e=o.transformTo(h.uint8array?"uint8array":"array",e))},o.inherits(a,n),a.prototype.processChunk=function(e){var t=o.transformTo(h.uint8array?"uint8array":"array",e.data);if(this.leftOver&&this.leftOver.length){if(h.uint8array){var r=t;(t=new Uint8Array(r.length+this.leftOver.length)).set(this.leftOver,0),t.set(r,this.leftOver.length)}else t=this.leftOver.concat(t);this.leftOver=null}var n=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}(t),i=t;n!==t.length&&(h.uint8array?(i=t.subarray(0,n),this.leftOver=t.subarray(n,t.length)):(i=t.slice(0,n),this.leftOver=t.slice(n,t.length))),this.push({data:s.utf8decode(i),meta:e.meta})},a.prototype.flush=function(){this.leftOver&&this.leftOver.length&&(this.push({data:s.utf8decode(this.leftOver),meta:{}}),this.leftOver=null)},s.Utf8DecodeWorker=a,o.inherits(l,n),l.prototype.processChunk=function(e){this.push({data:s.utf8encode(e.data),meta:e.meta})},s.Utf8EncodeWorker=l},{"./nodejsUtils":14,"./stream/GenericWorker":28,"./support":30,"./utils":32}],32:[function(e,t,a){"use strict";var o=e("./support"),h=e("./base64"),r=e("./nodejsUtils"),u=e("./external");function n(e){return e}function l(e,t){for(var r=0;r>8;this.dir=!!(16&this.externalFileAttributes),0==e&&(this.dosPermissions=63&this.externalFileAttributes),3==e&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(){if(this.extraFields[1]){var e=n(this.extraFields[1].value);this.uncompressedSize===s.MAX_VALUE_32BITS&&(this.uncompressedSize=e.readInt(8)),this.compressedSize===s.MAX_VALUE_32BITS&&(this.compressedSize=e.readInt(8)),this.localHeaderOffset===s.MAX_VALUE_32BITS&&(this.localHeaderOffset=e.readInt(8)),this.diskNumberStart===s.MAX_VALUE_32BITS&&(this.diskNumberStart=e.readInt(4))}},readExtraFields:function(e){var t,r,n,i=e.index+this.extraFieldsLength;for(this.extraFields||(this.extraFields={});e.index+4>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t},r.buf2binstring=function(e){return l(e,e.length)},r.binstring2buf=function(e){for(var t=new h.Buf8(e.length),r=0,n=t.length;r>10&1023,o[n++]=56320|1023&i)}return l(o,n)},r.utf8border=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}},{"./common":41}],43:[function(e,t,r){"use strict";t.exports=function(e,t,r,n){for(var i=65535&e|0,s=e>>>16&65535|0,a=0;0!==r;){for(r-=a=2e3>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t[a])];return-1^e}},{}],46:[function(e,t,r){"use strict";var h,c=e("../utils/common"),u=e("./trees"),d=e("./adler32"),p=e("./crc32"),n=e("./messages"),l=0,f=4,m=0,_=-2,g=-1,b=4,i=2,v=8,y=9,s=286,a=30,o=19,w=2*s+1,k=15,x=3,S=258,z=S+x+1,C=42,E=113,A=1,I=2,O=3,B=4;function R(e,t){return e.msg=n[t],t}function T(e){return(e<<1)-(4e.avail_out&&(r=e.avail_out),0!==r&&(c.arraySet(e.output,t.pending_buf,t.pending_out,r,e.next_out),e.next_out+=r,t.pending_out+=r,e.total_out+=r,e.avail_out-=r,t.pending-=r,0===t.pending&&(t.pending_out=0))}function N(e,t){u._tr_flush_block(e,0<=e.block_start?e.block_start:-1,e.strstart-e.block_start,t),e.block_start=e.strstart,F(e.strm)}function U(e,t){e.pending_buf[e.pending++]=t}function P(e,t){e.pending_buf[e.pending++]=t>>>8&255,e.pending_buf[e.pending++]=255&t}function L(e,t){var r,n,i=e.max_chain_length,s=e.strstart,a=e.prev_length,o=e.nice_match,h=e.strstart>e.w_size-z?e.strstart-(e.w_size-z):0,u=e.window,l=e.w_mask,f=e.prev,c=e.strstart+S,d=u[s+a-1],p=u[s+a];e.prev_length>=e.good_match&&(i>>=2),o>e.lookahead&&(o=e.lookahead);do{if(u[(r=t)+a]===p&&u[r+a-1]===d&&u[r]===u[s]&&u[++r]===u[s+1]){s+=2,r++;do{}while(u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&sh&&0!=--i);return a<=e.lookahead?a:e.lookahead}function j(e){var t,r,n,i,s,a,o,h,u,l,f=e.w_size;do{if(i=e.window_size-e.lookahead-e.strstart,e.strstart>=f+(f-z)){for(c.arraySet(e.window,e.window,f,f,0),e.match_start-=f,e.strstart-=f,e.block_start-=f,t=r=e.hash_size;n=e.head[--t],e.head[t]=f<=n?n-f:0,--r;);for(t=r=f;n=e.prev[--t],e.prev[t]=f<=n?n-f:0,--r;);i+=f}if(0===e.strm.avail_in)break;if(a=e.strm,o=e.window,h=e.strstart+e.lookahead,u=i,l=void 0,l=a.avail_in,u=x)for(s=e.strstart-e.insert,e.ins_h=e.window[s],e.ins_h=(e.ins_h<=x&&(e.ins_h=(e.ins_h<=x)if(n=u._tr_tally(e,e.strstart-e.match_start,e.match_length-x),e.lookahead-=e.match_length,e.match_length<=e.max_lazy_match&&e.lookahead>=x){for(e.match_length--;e.strstart++,e.ins_h=(e.ins_h<=x&&(e.ins_h=(e.ins_h<=x&&e.match_length<=e.prev_length){for(i=e.strstart+e.lookahead-x,n=u._tr_tally(e,e.strstart-1-e.prev_match,e.prev_length-x),e.lookahead-=e.prev_length-1,e.prev_length-=2;++e.strstart<=i&&(e.ins_h=(e.ins_h<e.pending_buf_size-5&&(r=e.pending_buf_size-5);;){if(e.lookahead<=1){if(j(e),0===e.lookahead&&t===l)return A;if(0===e.lookahead)break}e.strstart+=e.lookahead,e.lookahead=0;var n=e.block_start+r;if((0===e.strstart||e.strstart>=n)&&(e.lookahead=e.strstart-n,e.strstart=n,N(e,!1),0===e.strm.avail_out))return A;if(e.strstart-e.block_start>=e.w_size-z&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):(e.strstart>e.block_start&&(N(e,!1),e.strm.avail_out),A)}),new M(4,4,8,4,Z),new M(4,5,16,8,Z),new M(4,6,32,32,Z),new M(4,4,16,16,W),new M(8,16,32,32,W),new M(8,16,128,128,W),new M(8,32,128,256,W),new M(32,128,258,1024,W),new M(32,258,258,4096,W)],r.deflateInit=function(e,t){return Y(e,t,v,15,8,0)},r.deflateInit2=Y,r.deflateReset=K,r.deflateResetKeep=G,r.deflateSetHeader=function(e,t){return e&&e.state?2!==e.state.wrap?_:(e.state.gzhead=t,m):_},r.deflate=function(e,t){var r,n,i,s;if(!e||!e.state||5>8&255),U(n,n.gzhead.time>>16&255),U(n,n.gzhead.time>>24&255),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,255&n.gzhead.os),n.gzhead.extra&&n.gzhead.extra.length&&(U(n,255&n.gzhead.extra.length),U(n,n.gzhead.extra.length>>8&255)),n.gzhead.hcrc&&(e.adler=p(e.adler,n.pending_buf,n.pending,0)),n.gzindex=0,n.status=69):(U(n,0),U(n,0),U(n,0),U(n,0),U(n,0),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,3),n.status=E);else{var a=v+(n.w_bits-8<<4)<<8;a|=(2<=n.strategy||n.level<2?0:n.level<6?1:6===n.level?2:3)<<6,0!==n.strstart&&(a|=32),a+=31-a%31,n.status=E,P(n,a),0!==n.strstart&&(P(n,e.adler>>>16),P(n,65535&e.adler)),e.adler=1}if(69===n.status)if(n.gzhead.extra){for(i=n.pending;n.gzindex<(65535&n.gzhead.extra.length)&&(n.pending!==n.pending_buf_size||(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending!==n.pending_buf_size));)U(n,255&n.gzhead.extra[n.gzindex]),n.gzindex++;n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),n.gzindex===n.gzhead.extra.length&&(n.gzindex=0,n.status=73)}else n.status=73;if(73===n.status)if(n.gzhead.name){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindexi&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.gzindex=0,n.status=91)}else n.status=91;if(91===n.status)if(n.gzhead.comment){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindexi&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.status=103)}else n.status=103;if(103===n.status&&(n.gzhead.hcrc?(n.pending+2>n.pending_buf_size&&F(e),n.pending+2<=n.pending_buf_size&&(U(n,255&e.adler),U(n,e.adler>>8&255),e.adler=0,n.status=E)):n.status=E),0!==n.pending){if(F(e),0===e.avail_out)return n.last_flush=-1,m}else if(0===e.avail_in&&T(t)<=T(r)&&t!==f)return R(e,-5);if(666===n.status&&0!==e.avail_in)return R(e,-5);if(0!==e.avail_in||0!==n.lookahead||t!==l&&666!==n.status){var o=2===n.strategy?function(e,t){for(var r;;){if(0===e.lookahead&&(j(e),0===e.lookahead)){if(t===l)return A;break}if(e.match_length=0,r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++,r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):3===n.strategy?function(e,t){for(var r,n,i,s,a=e.window;;){if(e.lookahead<=S){if(j(e),e.lookahead<=S&&t===l)return A;if(0===e.lookahead)break}if(e.match_length=0,e.lookahead>=x&&0e.lookahead&&(e.match_length=e.lookahead)}if(e.match_length>=x?(r=u._tr_tally(e,1,e.match_length-x),e.lookahead-=e.match_length,e.strstart+=e.match_length,e.match_length=0):(r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++),r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):h[n.level].func(n,t);if(o!==O&&o!==B||(n.status=666),o===A||o===O)return 0===e.avail_out&&(n.last_flush=-1),m;if(o===I&&(1===t?u._tr_align(n):5!==t&&(u._tr_stored_block(n,0,0,!1),3===t&&(D(n.head),0===n.lookahead&&(n.strstart=0,n.block_start=0,n.insert=0))),F(e),0===e.avail_out))return n.last_flush=-1,m}return t!==f?m:n.wrap<=0?1:(2===n.wrap?(U(n,255&e.adler),U(n,e.adler>>8&255),U(n,e.adler>>16&255),U(n,e.adler>>24&255),U(n,255&e.total_in),U(n,e.total_in>>8&255),U(n,e.total_in>>16&255),U(n,e.total_in>>24&255)):(P(n,e.adler>>>16),P(n,65535&e.adler)),F(e),0=r.w_size&&(0===s&&(D(r.head),r.strstart=0,r.block_start=0,r.insert=0),u=new c.Buf8(r.w_size),c.arraySet(u,t,l-r.w_size,r.w_size,0),t=u,l=r.w_size),a=e.avail_in,o=e.next_in,h=e.input,e.avail_in=l,e.next_in=0,e.input=t,j(r);r.lookahead>=x;){for(n=r.strstart,i=r.lookahead-(x-1);r.ins_h=(r.ins_h<>>=y=v>>>24,p-=y,0===(y=v>>>16&255))C[s++]=65535&v;else{if(!(16&y)){if(0==(64&y)){v=m[(65535&v)+(d&(1<>>=y,p-=y),p<15&&(d+=z[n++]<>>=y=v>>>24,p-=y,!(16&(y=v>>>16&255))){if(0==(64&y)){v=_[(65535&v)+(d&(1<>>=y,p-=y,(y=s-a)>3,d&=(1<<(p-=w<<3))-1,e.next_in=n,e.next_out=s,e.avail_in=n>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24)}function s(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new I.Buf16(320),this.work=new I.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function a(e){var t;return e&&e.state?(t=e.state,e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=P,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new I.Buf32(n),t.distcode=t.distdyn=new I.Buf32(i),t.sane=1,t.back=-1,N):U}function o(e){var t;return e&&e.state?((t=e.state).wsize=0,t.whave=0,t.wnext=0,a(e)):U}function h(e,t){var r,n;return e&&e.state?(n=e.state,t<0?(r=0,t=-t):(r=1+(t>>4),t<48&&(t&=15)),t&&(t<8||15=s.wsize?(I.arraySet(s.window,t,r-s.wsize,s.wsize,0),s.wnext=0,s.whave=s.wsize):(n<(i=s.wsize-s.wnext)&&(i=n),I.arraySet(s.window,t,r-n,i,s.wnext),(n-=i)?(I.arraySet(s.window,t,r-n,n,0),s.wnext=n,s.whave=s.wsize):(s.wnext+=i,s.wnext===s.wsize&&(s.wnext=0),s.whave>>8&255,r.check=B(r.check,E,2,0),l=u=0,r.mode=2;break}if(r.flags=0,r.head&&(r.head.done=!1),!(1&r.wrap)||(((255&u)<<8)+(u>>8))%31){e.msg="incorrect header check",r.mode=30;break}if(8!=(15&u)){e.msg="unknown compression method",r.mode=30;break}if(l-=4,k=8+(15&(u>>>=4)),0===r.wbits)r.wbits=k;else if(k>r.wbits){e.msg="invalid window size",r.mode=30;break}r.dmax=1<>8&1),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=3;case 3:for(;l<32;){if(0===o)break e;o--,u+=n[s++]<>>8&255,E[2]=u>>>16&255,E[3]=u>>>24&255,r.check=B(r.check,E,4,0)),l=u=0,r.mode=4;case 4:for(;l<16;){if(0===o)break e;o--,u+=n[s++]<>8),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=5;case 5:if(1024&r.flags){for(;l<16;){if(0===o)break e;o--,u+=n[s++]<>>8&255,r.check=B(r.check,E,2,0)),l=u=0}else r.head&&(r.head.extra=null);r.mode=6;case 6:if(1024&r.flags&&(o<(d=r.length)&&(d=o),d&&(r.head&&(k=r.head.extra_len-r.length,r.head.extra||(r.head.extra=new Array(r.head.extra_len)),I.arraySet(r.head.extra,n,s,d,k)),512&r.flags&&(r.check=B(r.check,n,d,s)),o-=d,s+=d,r.length-=d),r.length))break e;r.length=0,r.mode=7;case 7:if(2048&r.flags){if(0===o)break e;for(d=0;k=n[s+d++],r.head&&k&&r.length<65536&&(r.head.name+=String.fromCharCode(k)),k&&d>9&1,r.head.done=!0),e.adler=r.check=0,r.mode=12;break;case 10:for(;l<32;){if(0===o)break e;o--,u+=n[s++]<>>=7&l,l-=7&l,r.mode=27;break}for(;l<3;){if(0===o)break e;o--,u+=n[s++]<>>=1)){case 0:r.mode=14;break;case 1:if(j(r),r.mode=20,6!==t)break;u>>>=2,l-=2;break e;case 2:r.mode=17;break;case 3:e.msg="invalid block type",r.mode=30}u>>>=2,l-=2;break;case 14:for(u>>>=7&l,l-=7&l;l<32;){if(0===o)break e;o--,u+=n[s++]<>>16^65535)){e.msg="invalid stored block lengths",r.mode=30;break}if(r.length=65535&u,l=u=0,r.mode=15,6===t)break e;case 15:r.mode=16;case 16:if(d=r.length){if(o>>=5,l-=5,r.ndist=1+(31&u),u>>>=5,l-=5,r.ncode=4+(15&u),u>>>=4,l-=4,286>>=3,l-=3}for(;r.have<19;)r.lens[A[r.have++]]=0;if(r.lencode=r.lendyn,r.lenbits=7,S={bits:r.lenbits},x=T(0,r.lens,0,19,r.lencode,0,r.work,S),r.lenbits=S.bits,x){e.msg="invalid code lengths set",r.mode=30;break}r.have=0,r.mode=19;case 19:for(;r.have>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=_,l-=_,r.lens[r.have++]=b;else{if(16===b){for(z=_+2;l>>=_,l-=_,0===r.have){e.msg="invalid bit length repeat",r.mode=30;break}k=r.lens[r.have-1],d=3+(3&u),u>>>=2,l-=2}else if(17===b){for(z=_+3;l>>=_)),u>>>=3,l-=3}else{for(z=_+7;l>>=_)),u>>>=7,l-=7}if(r.have+d>r.nlen+r.ndist){e.msg="invalid bit length repeat",r.mode=30;break}for(;d--;)r.lens[r.have++]=k}}if(30===r.mode)break;if(0===r.lens[256]){e.msg="invalid code -- missing end-of-block",r.mode=30;break}if(r.lenbits=9,S={bits:r.lenbits},x=T(D,r.lens,0,r.nlen,r.lencode,0,r.work,S),r.lenbits=S.bits,x){e.msg="invalid literal/lengths set",r.mode=30;break}if(r.distbits=6,r.distcode=r.distdyn,S={bits:r.distbits},x=T(F,r.lens,r.nlen,r.ndist,r.distcode,0,r.work,S),r.distbits=S.bits,x){e.msg="invalid distances set",r.mode=30;break}if(r.mode=20,6===t)break e;case 20:r.mode=21;case 21:if(6<=o&&258<=h){e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=o,r.hold=u,r.bits=l,R(e,c),a=e.next_out,i=e.output,h=e.avail_out,s=e.next_in,n=e.input,o=e.avail_in,u=r.hold,l=r.bits,12===r.mode&&(r.back=-1);break}for(r.back=0;g=(C=r.lencode[u&(1<>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>v)])>>>16&255,b=65535&C,!(v+(_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,r.length=b,0===g){r.mode=26;break}if(32&g){r.back=-1,r.mode=12;break}if(64&g){e.msg="invalid literal/length code",r.mode=30;break}r.extra=15&g,r.mode=22;case 22:if(r.extra){for(z=r.extra;l>>=r.extra,l-=r.extra,r.back+=r.extra}r.was=r.length,r.mode=23;case 23:for(;g=(C=r.distcode[u&(1<>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>v)])>>>16&255,b=65535&C,!(v+(_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,64&g){e.msg="invalid distance code",r.mode=30;break}r.offset=b,r.extra=15&g,r.mode=24;case 24:if(r.extra){for(z=r.extra;l>>=r.extra,l-=r.extra,r.back+=r.extra}if(r.offset>r.dmax){e.msg="invalid distance too far back",r.mode=30;break}r.mode=25;case 25:if(0===h)break e;if(d=c-h,r.offset>d){if((d=r.offset-d)>r.whave&&r.sane){e.msg="invalid distance too far back",r.mode=30;break}p=d>r.wnext?(d-=r.wnext,r.wsize-d):r.wnext-d,d>r.length&&(d=r.length),m=r.window}else m=i,p=a-r.offset,d=r.length;for(hd?(m=R[T+a[v]],A[I+a[v]]):(m=96,0),h=1<>S)+(u-=h)]=p<<24|m<<16|_|0,0!==u;);for(h=1<>=1;if(0!==h?(E&=h-1,E+=h):E=0,v++,0==--O[b]){if(b===w)break;b=t[r+a[v]]}if(k>>7)]}function U(e,t){e.pending_buf[e.pending++]=255&t,e.pending_buf[e.pending++]=t>>>8&255}function P(e,t,r){e.bi_valid>d-r?(e.bi_buf|=t<>d-e.bi_valid,e.bi_valid+=r-d):(e.bi_buf|=t<>>=1,r<<=1,0<--t;);return r>>>1}function Z(e,t,r){var n,i,s=new Array(g+1),a=0;for(n=1;n<=g;n++)s[n]=a=a+r[n-1]<<1;for(i=0;i<=t;i++){var o=e[2*i+1];0!==o&&(e[2*i]=j(s[o]++,o))}}function W(e){var t;for(t=0;t>1;1<=r;r--)G(e,s,r);for(i=h;r=e.heap[1],e.heap[1]=e.heap[e.heap_len--],G(e,s,1),n=e.heap[1],e.heap[--e.heap_max]=r,e.heap[--e.heap_max]=n,s[2*i]=s[2*r]+s[2*n],e.depth[i]=(e.depth[r]>=e.depth[n]?e.depth[r]:e.depth[n])+1,s[2*r+1]=s[2*n+1]=i,e.heap[1]=i++,G(e,s,1),2<=e.heap_len;);e.heap[--e.heap_max]=e.heap[1],function(e,t){var r,n,i,s,a,o,h=t.dyn_tree,u=t.max_code,l=t.stat_desc.static_tree,f=t.stat_desc.has_stree,c=t.stat_desc.extra_bits,d=t.stat_desc.extra_base,p=t.stat_desc.max_length,m=0;for(s=0;s<=g;s++)e.bl_count[s]=0;for(h[2*e.heap[e.heap_max]+1]=0,r=e.heap_max+1;r<_;r++)p<(s=h[2*h[2*(n=e.heap[r])+1]+1]+1)&&(s=p,m++),h[2*n+1]=s,u>=7;n>>=1)if(1&r&&0!==e.dyn_ltree[2*t])return o;if(0!==e.dyn_ltree[18]||0!==e.dyn_ltree[20]||0!==e.dyn_ltree[26])return h;for(t=32;t>>3,(s=e.static_len+3+7>>>3)<=i&&(i=s)):i=s=r+5,r+4<=i&&-1!==t?J(e,t,r,n):4===e.strategy||s===i?(P(e,2+(n?1:0),3),K(e,z,C)):(P(e,4+(n?1:0),3),function(e,t,r,n){var i;for(P(e,t-257,5),P(e,r-1,5),P(e,n-4,4),i=0;i>>8&255,e.pending_buf[e.d_buf+2*e.last_lit+1]=255&t,e.pending_buf[e.l_buf+e.last_lit]=255&r,e.last_lit++,0===t?e.dyn_ltree[2*r]++:(e.matches++,t--,e.dyn_ltree[2*(A[r]+u+1)]++,e.dyn_dtree[2*N(t)]++),e.last_lit===e.lit_bufsize-1},r._tr_align=function(e){P(e,2,3),L(e,m,z),function(e){16===e.bi_valid?(U(e,e.bi_buf),e.bi_buf=0,e.bi_valid=0):8<=e.bi_valid&&(e.pending_buf[e.pending++]=255&e.bi_buf,e.bi_buf>>=8,e.bi_valid-=8)}(e)}},{"../utils/common":41}],53:[function(e,t,r){"use strict";t.exports=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}},{}],54:[function(e,t,r){(function(e){!function(r,n){"use strict";if(!r.setImmediate){var i,s,t,a,o=1,h={},u=!1,l=r.document,e=Object.getPrototypeOf&&Object.getPrototypeOf(r);e=e&&e.setTimeout?e:r,i="[object process]"==={}.toString.call(r.process)?function(e){process.nextTick(function(){c(e)})}:function(){if(r.postMessage&&!r.importScripts){var e=!0,t=r.onmessage;return r.onmessage=function(){e=!1},r.postMessage("","*"),r.onmessage=t,e}}()?(a="setImmediate$"+Math.random()+"$",r.addEventListener?r.addEventListener("message",d,!1):r.attachEvent("onmessage",d),function(e){r.postMessage(a+e,"*")}):r.MessageChannel?((t=new MessageChannel).port1.onmessage=function(e){c(e.data)},function(e){t.port2.postMessage(e)}):l&&"onreadystatechange"in l.createElement("script")?(s=l.documentElement,function(e){var t=l.createElement("script");t.onreadystatechange=function(){c(e),t.onreadystatechange=null,s.removeChild(t),t=null},s.appendChild(t)}):function(e){setTimeout(c,0,e)},e.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),r=0;r {
- return room.selfMembership === "join";
- });
+ return this.rooms.filter((room) => {
+ return room.selfMembership === "join";
+ });
},
invites() {
- return this.rooms.filter((room) => {
- return room.selfMembership === "invite";
- });
+ return this.rooms.filter((room) => {
+ return room.selfMembership === "invite";
+ });
},
joinedAndInvitedRooms() {
- return this.rooms.filter((room) => {
- return room.selfMembership === "join" || room.selfMembership === "invite";
- });
+ return this.rooms.filter((room) => {
+ return room.selfMembership === "join" || room.selfMembership === "invite";
+ });
},
- },
+ },
- watch: {
+ watch: {
currentRoomId: {
- immediate: true,
- handler(roomId) {
- this.currentRoom = this.getRoom(roomId);
- },
+ immediate: true,
+ handler(roomId) {
+ this.currentRoom = this.getRoom(roomId);
+ },
},
currentRoom: {
- immediate: true,
- handler(room) {
- if (room) {
- this.userCanSendMessageInCurrentRoom = this.userCanSendMessageInRoom(room.roomId, this.currentUserId);
- this.userCanSendReactionAndAnswerPollInCurrentRoom = this.userCanSendReactionAndAnswerPollInRoom(room.roomId, this.currentUserId);
- } else {
- this.userCanSendMessageInCurrentRoom = true;
- this.userCanSendReactionAndAnswerPollInCurrentRoom = true;
- }
- },
+ immediate: true,
+ handler(room) {
+ if (room) {
+ this.userCanSendMessageInCurrentRoom = this.userCanSendMessageInRoom(room.roomId, this.currentUserId);
+ this.userCanSendReactionAndAnswerPollInCurrentRoom = this.userCanSendReactionAndAnswerPollInRoom(room.roomId, this.currentUserId);
+ } else {
+ this.userCanSendMessageInCurrentRoom = true;
+ this.userCanSendReactionAndAnswerPollInCurrentRoom = true;
+ }
+ },
},
- },
+ },
- methods: {
+ methods: {
createCryptoStore() {
- console.log("create crypto store");
- return new LocalStorageCryptoStore(this.$store.getters.storage);
+ if (!this.legacyCryptoStore) {
+ console.log("create crypto store");
+ this.legacyCryptoStore = new LocalStorageCryptoStore(this.$store.getters.storage);
+ }
+ return this.legacyCryptoStore;
},
login(user, registrationFlowHandler, createUser = false) {
- return util.getMatrixBaseUrl(user, this.$config).then((baseUrl) => {
- const tempMatrixClient = sdk.createClient({
- baseUrl: baseUrl,
- idBaseUrl: this.$config.identityServer,
- });
- var promiseLogin;
-
- const self = this;
- if (user.access_token) {
- // Logged in on "real" account
- promiseLogin = Promise.resolve(user);
- } else if (createUser || (user.is_guest && (!user.user_id || user.registration_session))) {
- // Generate random username and password. We don't user REAL matrix
- // guest accounts because 1. They are not allowed to post media, 2. They
- // can not use avatars and 3. They can not seamlessly be upgraded to real accounts.
- //
- // Instead, we use an ILAG approach, Improved Landing as Guest.
- const userId =
- createUser || user.registration_session ? user.user_id : util.randomUser(this.$config.userIdPrefix);
- const pass = createUser || user.registration_session ? user.password : util.randomPass();
-
- const extractAndSaveUser = (response) => {
- var u = Object.assign({}, response);
- u.password = pass;
- u.is_guest = true;
- this.$store.commit("setUser", u);
- return u;
- };
-
- promiseLogin = tempMatrixClient
- .register(userId, pass, user.registration_session || null, {
- type: "m.login.dummy",
- initial_device_display_name: this.$config.appName,
- })
- .then((response) => {
- return extractAndSaveUser(response);
- })
- .catch((error) => {
- if (registrationFlowHandler && error.httpStatus == 401 && error.data) {
- const registrationSession = error.data.session;
-
- // Store user, pass and session, so we can resume if network failure occurs etc.
- //
- var u = {};
- u.user_id = userId;
- u.password = pass;
- u.is_guest = true;
- u.registration_session = registrationSession;
- this.$store.commit("setUser", u);
-
- return registrationFlowHandler(tempMatrixClient, error.data).then((response) =>
- extractAndSaveUser(response)
- );
- } else {
- console.error(error);
- }
- throw error;
+ return util.getMatrixBaseUrl(user, this.$config).then((baseUrl) => {
+ const tempMatrixClient = sdk.createClient({
+ baseUrl: baseUrl,
+ idBaseUrl: this.$config.identityServer,
});
- } else {
- var data = {
- user: User.localPart(user.user_id),
- password: user.password,
- type: "m.login.password",
- initial_device_display_name: this.$config.appName,
- };
- if (user.device_id) {
- data.device_id = user.device_id;
- }
- promiseLogin = tempMatrixClient.login("m.login.password", data).then((response) => {
- var u = Object.assign({}, response);
- if (user.is_guest) {
- // Copy over needed properties
- u = Object.assign(user, response);
- }
- this.$store.commit("setUser", u);
- return u;
- });
- }
+ var promiseLogin;
- return promiseLogin.then((user) => {
- return self.getMatrixClient(user);
+ const self = this;
+ if (user.access_token) {
+ // Logged in on "real" account
+ promiseLogin = Promise.resolve(user);
+ } else if (createUser || (user.is_guest && (!user.user_id || user.registration_session))) {
+ // Generate random username and password. We don't user REAL matrix
+ // guest accounts because 1. They are not allowed to post media, 2. They
+ // can not use avatars and 3. They can not seamlessly be upgraded to real accounts.
+ //
+ // Instead, we use an ILAG approach, Improved Landing as Guest.
+ const userId =
+ createUser || user.registration_session ? user.user_id : util.randomUser(this.$config.userIdPrefix);
+ const pass = createUser || user.registration_session ? user.password : util.randomPass();
+
+ const extractAndSaveUser = (response) => {
+ var u = Object.assign({}, response);
+ u.password = pass;
+ u.is_guest = true;
+ this.$store.commit("setUser", u);
+ return u;
+ };
+
+ promiseLogin = tempMatrixClient
+ .register(userId, pass, user.registration_session || null, {
+ type: "m.login.dummy",
+ initial_device_display_name: this.$config.appName,
+ })
+ .then((response) => {
+ return extractAndSaveUser(response);
+ })
+ .catch((error) => {
+ if (registrationFlowHandler && error.httpStatus == 401 && error.data) {
+ const registrationSession = error.data.session;
+
+ // Store user, pass and session, so we can resume if network failure occurs etc.
+ //
+ var u = {};
+ u.user_id = userId;
+ u.password = pass;
+ u.is_guest = true;
+ u.registration_session = registrationSession;
+ this.$store.commit("setUser", u);
+
+ return registrationFlowHandler(tempMatrixClient, error.data).then((response) =>
+ extractAndSaveUser(response)
+ );
+ } else {
+ console.error(error);
+ }
+ throw error;
+ });
+ } else {
+ var data = {
+ user: User.localPart(user.user_id),
+ password: user.password,
+ type: "m.login.password",
+ initial_device_display_name: this.$config.appName,
+ };
+ if (user.device_id) {
+ data.device_id = user.device_id;
+ }
+ promiseLogin = tempMatrixClient.login("m.login.password", data).then((response) => {
+ var u = Object.assign({}, response);
+ if (user.is_guest) {
+ // Copy over needed properties
+ u = Object.assign(user, response);
+ }
+ this.$store.commit("setUser", u);
+ return u;
+ });
+ }
+
+ return promiseLogin.then((user) => {
+ return self.getMatrixClient(user);
+ });
});
- });
},
clearCryptoStore() {
- // Clear crypto related data
- // TODO - for some reason "clearStores" called in "logout" only clears the "account" crypto
- // data item, not all sessions etc. Why? We need to do that manually here!
- const toRemove = [];
- const storage = this.$store.getters.storage;
- for (let i = 0; i < storage.length; ++i) {
- const key = storage.key(i);
- if (key.startsWith("crypto.")) toRemove.push(key);
- }
- for (const key of toRemove) {
- storage.removeItem(key);
- }
+ // Clear crypto related data
+ // TODO - for some reason "clearStores" called in "logout" only clears the "account" crypto
+ // data item, not all sessions etc. Why? We need to do that manually here!
+ const toRemove = [];
+ const storage = this.$store.getters.storage;
+ for (let i = 0; i < storage.length; ++i) {
+ const key = storage.key(i);
+ if (key.startsWith("crypto.")) toRemove.push(key);
+ }
+ for (const key of toRemove) {
+ storage.removeItem(key);
+ }
},
logout() {
- if (this.matrixClient) {
- this.removeMatrixClientListeners(this.matrixClient);
- this.matrixClient.stopClient();
- this.matrixClient.clearStores().then(() => {
- this.clearCryptoStore();
- });
- this.matrixClient = null;
- this.matrixClientReady = false;
- } else {
- this.clearCryptoStore();
- }
+ if (this.matrixClient) {
+ this.removeMatrixClientListeners(this.matrixClient);
+ this.matrixClient.stopClient();
+ this.matrixClient.clearStores().then(() => {
+ this.clearCryptoStore();
+ });
+ this.matrixClient = null;
+ this.matrixClientReady = false;
+ } else {
+ this.clearCryptoStore();
+ }
- this.$store.commit("setUser", null);
- this.$store.commit("setCurrentRoomId", null);
- this.rooms = [];
- this.userDisplayName = null;
- this.userAvatar = null;
- this.currentRoom = null;
- this.notificationCount = 0;
+ this.$store.commit("setUser", null);
+ this.$store.commit("setCurrentRoomId", null);
+ this.rooms = [];
+ this.userDisplayName = null;
+ this.userAvatar = null;
+ this.currentRoom = null;
+ this.notificationCount = 0;
},
initClient() {
- this.reloadRooms();
- this.matrixClientReady = true;
- this.matrixClient.emit("Matrix.initialized", this.matrixClient);
- this.matrixClient
- .getProfileInfo(this.currentUserId)
- .then((info) => {
- console.log("Got user profile: " + JSON.stringify(info));
- this.userDisplayName = info.displayname;
- this.userAvatar = info.avatar_url;
- })
- .catch((err) => {
- console.log("Failed to get user profile: ", err);
- });
+ this.reloadRooms();
+ this.matrixClientReady = true;
+ this.matrixClient.emit("Matrix.initialized", this.matrixClient);
+ this.matrixClient
+ .getProfileInfo(this.currentUserId)
+ .then((info) => {
+ console.log("Got user profile: " + JSON.stringify(info));
+ this.userDisplayName = info.displayname;
+ this.userAvatar = info.avatar_url;
+ })
+ .catch((err) => {
+ console.log("Failed to get user profile: ", err);
+ });
},
- getMatrixClient(user) {
- if (user === undefined) {
- user = this.$store.state.auth.user;
- }
- if (this.matrixClientReady) {
- return new Promise((resolve, ignoredreject) => {
- resolve(user);
- });
- } else if (this.matrixClient) {
- return new Promise((resolve, ignoredreject) => {
- this.matrixClient.once("Matrix.initialized", (ignoredclient) => {
- resolve(user);
- });
- });
- }
-
- const matrixStore = new sdk.MemoryStore(this.$store.getters.storage);
-
- return util.getMatrixBaseUrl(user, this.$config).then((baseUrl) => {
- var opts = {
- baseUrl: baseUrl,
- userId: user.user_id,
- store: matrixStore,
- deviceId: user.device_id,
- accessToken: user.access_token,
- timelineSupport: true,
- unstableClientRelationAggregation: true,
- //useAuthorizationHeader: true
- };
- this.matrixClient = sdk.createClient(opts);
- // if (user.is_guest) {
- // this.matrixClient.setGuest(true);
- // }
- return this.matrixClient
- .initCrypto()
- .then(() => {
- console.log("Crypto initialized");
-
- this.addMatrixClientListeners(this.matrixClient);
-
- this.matrixClient.startClient();
- return this.matrixClient;
- })
- .then((matrixClient) => {
- if (matrixClient.isInitialSyncComplete()) {
- console.log("Initial sync done already!");
- return matrixClient;
- } else {
- return new Promise((resolve, reject) => {
- matrixClient.once("sync", function (state, ignoredprevState, ignoredres) {
- console.log(state); // state will be 'PREPARED' when the client is ready to use
- if (state == "PREPARED") {
- resolve(matrixClient);
- } else if (state == "ERROR") {
- reject("Error syncing");
- }
- });
- });
- }
- })
- .then(() => {
- // Ready to use! Start by loading rooms.
- this.initClient();
+ async getMatrixClient(user) {
+ if (user === undefined) {
+ user = this.$store.state.auth.user;
+ }
+ if (this.matrixClientReady) {
return user;
- });
- });
+ } else if (this.matrixClient) {
+ return new Promise((resolve, ignoredreject) => {
+ this.matrixClient.once("Matrix.initialized", (ignoredclient) => {
+ resolve(user);
+ });
+ });
+ }
+
+ const matrixStore = new sdk.MemoryStore(this.$store.getters.storage);
+ const cryptoStore = this.createCryptoStore();
+
+ if (cryptoStore) {
+ const migrationState = await cryptoStore.getMigrationState();
+ if (migrationState >= 0) {
+ const store = this.$store.getters.storage;
+ // Rust crypto migration is broken, needs the sessionId to be set. So do that here, if needed.
+ for (let i = 0; i < store.length; ++i) {
+ const key = store.key(i);
+ if (key.startsWith("crypto.sessions/")) {
+ const sessions = JSON.parse(store.getItem(key));
+ for (let sessionId of Object.keys(sessions)) {
+ sessions[sessionId].sessionId = sessionId;
+ sessions[sessionId].deviceKey = key.substring("crypto.sessions/".length);
+ }
+ store.setItem(key, JSON.stringify(sessions));
+ }
+ }
+ }
+ }
+
+ const baseUrl = await util.getMatrixBaseUrl(user, this.$config);
+ var opts = {
+ baseUrl: baseUrl,
+ userId: user.user_id,
+ store: matrixStore,
+ deviceId: user.device_id,
+ accessToken: user.access_token,
+ timelineSupport: true,
+ unstableClientRelationAggregation: true,
+ cryptoStore: cryptoStore
+ //useAuthorizationHeader: true
+ };
+
+ const cryptoStorePassword = this.$config.appName + ":" + user.device_id;
+
+ const matrixClient = sdk.createClient(opts);
+ this.matrixClient = matrixClient;
+ await this.matrixClient.initRustCrypto({useIndexedDB: this.rememberMe, storagePassword: cryptoStorePassword});
+ console.log("Crypto initialized", cryptoStorePassword);
+ this.addMatrixClientListeners(this.matrixClient);
+ this.matrixClient.startClient();
+ if (!this.matrixClient.isInitialSyncComplete()) {
+ await new Promise((resolve, reject) => {
+ this.matrixClient.once("sync", function (state, ignoredprevState, ignoredres) {
+ console.log(state); // state will be 'PREPARED' when the client is ready to use
+ if (state == "PREPARED") {
+ resolve(matrixClient);
+ } else if (state == "ERROR") {
+ reject("Error syncing");
+ }
+ });
+ });
+ }
+ this.useAuthedMedia = await this.matrixClient.isVersionSupported("v1.11");
+
+ // Ready to use! Start by loading rooms.
+ this.initClient();
+ return user;
},
/**
@@ -345,268 +353,262 @@ export default {
* a random account.
*/
getLoginPromise(registrationFlowHandler) {
- if (this.ready) {
- return Promise.resolve(this.currentUser);
- }
- return this.$store.dispatch("login", {
- user: this.currentUser || new User("", "", true),
- registrationFlowHandler,
- });
+ if (this.ready) {
+ return Promise.resolve(this.currentUser);
+ }
+ return this.$store.dispatch("login", {
+ user: this.currentUser || new User("", "", true),
+ registrationFlowHandler,
+ });
},
addMatrixClientListeners(client) {
- if (client) {
- client.setMaxListeners(100); // Increate max number of listeners.
- client.on("event", this.onEvent);
- client.on("Room", this.onRoom);
- client.on("Session.logged_out", this.onSessionLoggedOut);
- client.on("Room.myMembership", this.onRoomMyMembership);
- }
+ if (client) {
+ client.setMaxListeners(100); // Increate max number of listeners.
+ client.on("event", this.onEvent);
+ client.on("Room", this.onRoom);
+ client.on("Session.logged_out", this.onSessionLoggedOut);
+ client.on("Room.myMembership", this.onRoomMyMembership);
+ }
},
removeMatrixClientListeners(client) {
- if (client) {
- client.off("event", this.onEvent);
- client.off("Room", this.onRoom);
- client.off("Session.logged_out", this.onSessionLoggedOut);
- client.off("Room.myMembership", this.onRoomMyMembership);
- }
+ if (client) {
+ client.off("event", this.onEvent);
+ client.off("Room", this.onRoom);
+ client.off("Session.logged_out", this.onSessionLoggedOut);
+ client.off("Room.myMembership", this.onRoomMyMembership);
+ }
},
onEvent(event) {
- switch (event.getType()) {
- case "m.room.topic":
- {
- const room = this.matrixClient.getRoom(event.getRoomId());
- if (room) {
- Vue.set(room, "topic", event.getContent().topic);
- }
- }
- break;
-
- case "m.room.avatar":
- {
- const room = this.matrixClient.getRoom(event.getRoomId());
- if (room) {
- Vue.set(
- room,
- "avatar",
- room.getAvatarUrl(this.matrixClient.getHomeserverUrl(), 80, 80, "scale", true)
- );
- }
- }
- break;
-
- case "m.room.power_levels":
- {
- if (this.currentRoom && event.getRoomId() == this.currentRoom.roomId) {
- this.userCanSendMessageInCurrentRoom = this.userCanSendMessageInRoom(event.getRoomId(), this.currentUserId);
- this.userCanSendReactionAndAnswerPollInCurrentRoom = this.userCanSendReactionAndAnswerPollInRoom(event.getRoomId(), this.currentUserId);
- }
- }
- break;
-
- case "m.room.join_rules":
- {
- const room = this.matrixClient.getRoom(event.getRoomId());
- if (room && room.getJoinRule() == "private" && room.selfMembership == "invite") {
- // We have an invite to a room that's now "private"? This is most probably a deleted DM room.
- // Reject the invite, i.e. call "leave" on it.
- this.matrixClient.leave(room.roomId);
- }
- }
- break;
-
- case "m.room.canonical_alias":
- {
- if (this.currentRoomId && this.currentRoomId.startsWith("#") && !this.currentRoom) {
- this.currentRoom = this.getRoom(this.currentRoomId);
- }
- }
- break;
-
- case STATE_EVENT_ROOM_DELETED:
- {
- const room = this.matrixClient.getRoom(event.getRoomId());
- if (room && room.currentState) {
- // Before we do anything, make sure the sender is an admin!
- // Also, do not react if WE are the sender, since we are probably
- // busy doing the rest of the purging process...
- if (room.currentState.maySendStateEvent("m.room.power_levels", event.getSender())) {
- if (event.getSender() !== this.currentUserId) {
- this.leaveRoomAndNavigate(room.roomId).then(() => {
- this.matrixClient.forget(room.roomId, true);
- });
+ switch (event.getType()) {
+ case "m.room.topic":
+ {
+ const room = this.matrixClient.getRoom(event.getRoomId());
+ if (room) {
+ room["topic"] = event.getContent().topic;
+ }
}
- }
- }
- }
- break;
- }
- this.updateNotificationCount();
+ break;
+
+ case "m.room.avatar":
+ {
+ const room = this.matrixClient.getRoom(event.getRoomId());
+ if (room) {
+ room["avatar"] = room.getAvatarUrl(this.matrixClient.getHomeserverUrl(), 80, 80, "scale", true, this.useAuthedMedia);
+ }
+ }
+ break;
+
+ case "m.room.power_levels":
+ {
+ if (this.currentRoom && event.getRoomId() == this.currentRoom.roomId) {
+ this.userCanSendMessageInCurrentRoom = this.userCanSendMessageInRoom(event.getRoomId(), this.currentUserId);
+ this.userCanSendReactionAndAnswerPollInCurrentRoom = this.userCanSendReactionAndAnswerPollInRoom(event.getRoomId(), this.currentUserId);
+ }
+ }
+ break;
+
+ case "m.room.join_rules":
+ {
+ const room = this.matrixClient.getRoom(event.getRoomId());
+ if (room && room.getJoinRule() == "private" && room.selfMembership == "invite") {
+ // We have an invite to a room that's now "private"? This is most probably a deleted DM room.
+ // Reject the invite, i.e. call "leave" on it.
+ this.matrixClient.leave(room.roomId);
+ }
+ }
+ break;
+
+ case "m.room.canonical_alias":
+ {
+ if (this.currentRoomId && this.currentRoomId.startsWith("#") && !this.currentRoom) {
+ this.currentRoom = this.getRoom(this.currentRoomId);
+ }
+ }
+ break;
+
+ case STATE_EVENT_ROOM_DELETED:
+ {
+ const room = this.matrixClient.getRoom(event.getRoomId());
+ if (room && room.currentState) {
+ // Before we do anything, make sure the sender is an admin!
+ // Also, do not react if WE are the sender, since we are probably
+ // busy doing the rest of the purging process...
+ if (room.currentState.maySendStateEvent("m.room.power_levels", event.getSender())) {
+ if (event.getSender() !== this.currentUserId) {
+ this.leaveRoomAndNavigate(room.roomId).then(() => {
+ this.matrixClient.forget(room.roomId, true);
+ });
+ }
+ }
+ }
+ }
+ break;
+ }
+ this.updateNotificationCount();
},
onRoom(room) {
- if (room.selfMembership === "invite") {
- this.matrixClient
- .getRoomTags(room.roomId)
- .then((reply) => {
- if (Object.keys(reply.tags).includes("m.server_notice")) {
- Vue.set(room, "isServiceNoticeRoom", true);
- }
- })
- .catch((error) => {
- console.error(error);
- });
- }
- this.reloadRooms();
- this.updateNotificationCount();
+ if (room.selfMembership === "invite") {
+ this.matrixClient
+ .getRoomTags(room.roomId)
+ .then((reply) => {
+ if (Object.keys(reply.tags).includes("m.server_notice")) {
+ room["isServiceNoticeRoom"] = true;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
+ });
+ }
+ this.reloadRooms();
+ this.updateNotificationCount();
},
onRoomMyMembership(room) {
- if (room.selfMembership === "invite") {
- // Invitation. Need to call "recalculate" to pick
- // up room name, not sure why exactly.
- room.recalculate();
- }
- this.reloadRooms();
+ if (room.selfMembership === "invite") {
+ // Invitation. Need to call "recalculate" to pick
+ // up room name, not sure why exactly.
+ room.recalculate();
+ }
+ this.reloadRooms();
},
onSessionLoggedOut() {
- console.log("Logged out!");
- if (this.matrixClient) {
- this.removeMatrixClientListeners(this.matrixClient);
- this.matrixClient.stopClient();
- this.matrixClient = null;
- this.matrixClientReady = false;
- }
+ console.log("Logged out!");
+ if (this.matrixClient) {
+ this.removeMatrixClientListeners(this.matrixClient);
+ this.matrixClient.stopClient();
+ this.matrixClient = null;
+ this.matrixClientReady = false;
+ }
- // For "real" accounts we totally wipe the user object, but for "guest"
- // accounts (i.e. created from random data and with password never changed)
- // we need to hang on to the generated password and use that to login to a new
- // session, so only wipe the token in s that case.
- // Clear the access token
- var user = this.$store.state.auth.user;
- if (user.is_guest) {
- delete user.access_token;
- this.$store.commit("setUser", user);
+ // For "real" accounts we totally wipe the user object, but for "guest"
+ // accounts (i.e. created from random data and with password never changed)
+ // we need to hang on to the generated password and use that to login to a new
+ // session, so only wipe the token in s that case.
+ // Clear the access token
+ var user = this.$store.state.auth.user;
+ if (user.is_guest) {
+ delete user.access_token;
+ this.$store.commit("setUser", user);
- // Login again
- this.login(user).catch((error) => {
- if (error.data.errcode === "M_FORBIDDEN" && this.currentUser.is_guest) {
- // Guest account and password don't work. We are in a strange state, probably because
- // of server cleanup of accounts or similar. Wipe account and restart...
+ // Login again
+ this.login(user).catch((error) => {
+ if (error.data.errcode === "M_FORBIDDEN" && this.currentUser.is_guest) {
+ // Guest account and password don't work. We are in a strange state, probably because
+ // of server cleanup of accounts or similar. Wipe account and restart...
+ this.$store.commit("setUser", null);
+ }
+ this.$store.commit("setCurrentRoomId", null);
+ this.$navigation.push({ path: "/login" }, -1);
+ });
+ } else {
this.$store.commit("setUser", null);
- }
- this.$store.commit("setCurrentRoomId", null);
- this.$navigation.push({ path: "/login" }, -1);
- });
- } else {
- this.$store.commit("setUser", null);
- this.$store.commit("setCurrentRoomId", null);
- this.$navigation.push({ path: "/login" }, -1);
- }
+ this.$store.commit("setCurrentRoomId", null);
+ this.$navigation.push({ path: "/login" }, -1);
+ }
},
reloadRooms() {
- // TODO - do incremental update instead of replacing the whole array
- // each time!
- var updatedRooms = this.matrixClient.getVisibleRooms();
- updatedRooms = updatedRooms.filter((room) => {
- return room.selfMembership && (room.selfMembership == "invite" || room.selfMembership == "join") && room.currentState.getStateEvents(STATE_EVENT_ROOM_DELETED).length == 0;
- });
- updatedRooms.forEach((room) => {
- if (!room.avatar) {
- Vue.set(room, "avatar", room.getAvatarUrl(this.matrixClient.getHomeserverUrl(), 80, 80, "scale", true));
- }
- });
- Vue.set(this, "rooms", updatedRooms);
+ // TODO - do incremental update instead of replacing the whole array
+ // each time!
+ var updatedRooms = this.matrixClient.getVisibleRooms();
+ updatedRooms = updatedRooms.filter((room) => {
+ return room.selfMembership && (room.selfMembership == "invite" || room.selfMembership == "join") && room.currentState.getStateEvents(STATE_EVENT_ROOM_DELETED).length == 0;
+ });
+ updatedRooms.forEach((room) => {
+ room["avatar"] = room.getAvatarUrl(this.matrixClient.getHomeserverUrl(), 80, 80, "scale", true, this.useAuthedMedia);
+ });
+ this["rooms"] = updatedRooms;
- const resolvedId =
- this.currentRoomId && this.currentRoomId.startsWith("#")
- ? this.matrixClient.resolveRoomAlias(this.currentRoomId).then((r) => r.room_id)
- : Promise.resolve(this.currentRoomId);
- resolvedId
- .then((roomId) => {
- const currentRoom = this.getRoom(roomId);
- if (this.currentRoom != currentRoom) {
- this.currentRoom = currentRoom;
- }
- })
- .catch((ignorederror) => {});
+ const resolvedId =
+ this.currentRoomId && this.currentRoomId.startsWith("#")
+ ? this.matrixClient.getRoomIdForAlias(this.currentRoomId).then((r) => r.room_id)
+ : Promise.resolve(this.currentRoomId);
+ resolvedId
+ .then((roomId) => {
+ const currentRoom = this.getRoom(roomId);
+ if (this.currentRoom != currentRoom) {
+ this.currentRoom = currentRoom;
+ }
+ })
+ .catch((ignorederror) => { });
},
setCurrentRoomId(roomId) {
- this.$store.commit("setCurrentRoomId", roomId);
- this.currentRoom = this.getRoom(roomId);
+ this.$store.commit("setCurrentRoomId", roomId);
+ this.currentRoom = this.getRoom(roomId);
},
getRoom(roomId) {
- if (!roomId) {
- return null;
- }
- var room = null;
- if (this.matrixClient) {
- const visibleRooms = this.matrixClient.getRooms();
- room = visibleRooms.find((room) => {
- if (roomId.startsWith("#")) {
- return room.getCanonicalAlias() == roomId;
- }
- return room.roomId == roomId;
- });
- }
- return room || null;
+ if (!roomId) {
+ return null;
+ }
+ var room = null;
+ if (this.matrixClient) {
+ const visibleRooms = this.matrixClient.getRooms();
+ room = visibleRooms.find((room) => {
+ if (roomId.startsWith("#")) {
+ return room.getCanonicalAlias() == roomId;
+ }
+ return room.roomId == roomId;
+ });
+ }
+ return room || null;
},
/**
* Return all users we are in a "invite" only room with!
*/
getAllFriends() {
- var ids = {};
- const ret = [];
- for (const room of this.rooms) {
- if (room.selfMembership == "join" && this.getRoomJoinRule(room) == "invite") {
- for (const member of room.getJoinedMembers()) {
- if (member.userId != this.currentUserId && !ids[member.userId]) {
- ids[member.userId] = member;
- ret.push(member);
+ var ids = {};
+ const ret = [];
+ for (const room of this.rooms) {
+ if (room.selfMembership == "join" && this.getRoomJoinRule(room) == "invite") {
+ for (const member of room.getJoinedMembers()) {
+ if (member.userId != this.currentUserId && !ids[member.userId]) {
+ ids[member.userId] = member;
+ ret.push(member);
+ }
+ }
}
- }
}
- }
- ret.sort((a, b) => {
- const aName = a.user ? a.user.displayName : a.name;
- const bName = b.user ? b.user.displayName : b.name;
- return aName.localeCompare(bName);
- });
- return ret;
+ ret.sort((a, b) => {
+ const aName = a.user ? a.user.displayName : a.name;
+ const bName = b.user ? b.user.displayName : b.name;
+ return aName.localeCompare(bName);
+ });
+ return ret;
},
getRoomJoinRule(room) {
- if (room) {
- const joinRules = room.currentState.getStateEvents("m.room.join_rules", "");
- return joinRules && joinRules.getContent().join_rule;
- }
- return null;
+ if (room) {
+ const joinRules = room.currentState.getStateEvents("m.room.join_rules", "");
+ return joinRules && joinRules.getContent().join_rule;
+ }
+ return null;
},
getRoomHistoryVisibility(room) {
- if (room) {
- const historyVisibility = room.currentState.getStateEvents("m.room.history_visibility", "");
- return historyVisibility && historyVisibility.getContent().history_visibility;
- }
- return null;
+ if (room) {
+ const historyVisibility = room.currentState.getStateEvents("m.room.history_visibility", "");
+ return historyVisibility && historyVisibility.getContent().history_visibility;
+ }
+ return null;
},
leaveRoom(roomId) {
- return this.matrixClient.leave(roomId).then(() => {
- this.$store.commit("setCurrentRoomId", null);
- this.rooms = this.rooms.filter((room) => {
- room.roomId != roomId;
+ return this.matrixClient.leave(roomId).then(() => {
+ this.$store.commit("setCurrentRoomId", null);
+ this.rooms = this.rooms.filter((room) => {
+ room.roomId != roomId;
+ });
+ //this.matrixClient.store.removeRoom(roomId);
+ //this.matrixClient.forget(roomId, true, undefined);
});
- //this.matrixClient.store.removeRoom(roomId);
- //this.matrixClient.forget(roomId, true, undefined);
- });
},
/**
@@ -615,64 +617,55 @@ export default {
* @param roomId
*/
leaveRoomAndNavigate(roomId) {
- const joinedRooms = this.joinedRooms;
- const isLastRoomWeAreJoinedTo = joinedRooms && joinedRooms.length == 1 && joinedRooms[0].roomId == roomId;
- return this.leaveRoom(roomId).then(() => {
- if (isLastRoomWeAreJoinedTo) {
- this.$navigation.push({ name: "Goodbye" }, -1);
- } else {
- this.$navigation.push({ name: "Home", params: { roomId: null } }, -1);
- }
- });
+ const joinedRooms = this.joinedRooms;
+ const isLastRoomWeAreJoinedTo = joinedRooms && joinedRooms.length == 1 && joinedRooms[0].roomId == roomId;
+ return this.leaveRoom(roomId).then(() => {
+ if (isLastRoomWeAreJoinedTo) {
+ this.$navigation.push({ name: "Goodbye" }, -1);
+ } else {
+ this.$navigation.push({ name: "Home", params: { roomId: null } }, -1);
+ }
+ });
},
kickUser(roomId, userId) {
- if (this.matrixClient && roomId && userId) {
- this.matrixClient.kick(roomId, userId, "");
- }
+ if (this.matrixClient && roomId && userId) {
+ this.matrixClient.kick(roomId, userId, "");
+ }
},
banUser(roomId, userId) {
- if (this.matrixClient && roomId && userId) {
- this.matrixClient.ban(roomId, userId, "");
- }
+ if (this.matrixClient && roomId && userId) {
+ this.matrixClient.ban(roomId, userId, "");
+ }
},
makeAdmin(roomId, userId) {
- if (this.matrixClient && roomId && userId) {
- const room = this.getRoom(roomId);
- if (room && room.currentState) {
- const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
- if (powerLevelEvent) {
- this.matrixClient.setPowerLevel(roomId, userId, 100, powerLevelEvent);
- }
+ if (this.matrixClient && roomId && userId) {
+ const room = this.getRoom(roomId);
+ if (room && room.currentState) {
+ this.matrixClient.setPowerLevel(roomId, userId, 100);
+ }
}
- }
},
makeModerator(roomId, userId) {
- if (this.matrixClient && roomId && userId) {
- const room = this.getRoom(roomId);
- console.log("Room", room);
- if (room && room.currentState) {
- const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
- if (powerLevelEvent) {
- this.matrixClient.setPowerLevel(roomId, userId, 50, powerLevelEvent);
- }
+ if (this.matrixClient && roomId && userId) {
+ const room = this.getRoom(roomId);
+ console.log("Room", room);
+ if (room && room.currentState) {
+ this.matrixClient.setPowerLevel(roomId, userId, 50);
+ }
}
- }
},
revokeModerator(roomId, userId) {
- if (this.matrixClient && roomId && userId) {
- const room = this.getRoom(roomId);
- if (room && room.currentState) {
- const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
- if (powerLevelEvent) {
- this.matrixClient.setPowerLevel(roomId, userId, 0, powerLevelEvent);
- }
+ if (this.matrixClient && roomId && userId) {
+ const room = this.getRoom(roomId);
+ if (room && room.currentState) {
+ this.matrixClient.setPowerLevel(roomId, userId, 0);
+ }
}
- }
},
/**
@@ -681,94 +674,94 @@ export default {
* @returns Promise - Whether the user is joined to the room or not
*/
isJoinedToRoom(roomIdOrAlias) {
- if (roomIdOrAlias && this.matrixClient) {
- try {
- const resolvedRoomId = roomIdOrAlias.startsWith("#")
- ? this.matrixClient.resolveRoomAlias(roomIdOrAlias).then((res) => res.room_id)
- : Promise.resolve(roomIdOrAlias);
- return resolvedRoomId.then((roomId) => {
- return this.matrixClient.getJoinedRooms().then((rooms) => {
- return rooms.joined_rooms.includes(roomId);
- });
- });
- } catch (ignorederror) {
- console.error(ignorederror);
- return Promise.resolve(false);
+ if (roomIdOrAlias && this.matrixClient) {
+ try {
+ const resolvedRoomId = roomIdOrAlias.startsWith("#")
+ ? this.matrixClient.getRoomIdForAlias(roomIdOrAlias).then((res) => res.room_id)
+ : Promise.resolve(roomIdOrAlias);
+ return resolvedRoomId.then((roomId) => {
+ return this.matrixClient.getJoinedRooms().then((rooms) => {
+ return rooms.joined_rooms.includes(roomId);
+ });
+ });
+ } catch (ignorederror) {
+ console.error(ignorederror);
+ return Promise.resolve(false);
+ }
}
- }
- return Promise.resolve(false);
+ return Promise.resolve(false);
},
isReadOnlyRoom(roomId) {
- if (this.matrixClient && roomId) {
- const room = this.getRoom(roomId);
- if (room && room.currentState) {
- const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
- if (powerLevelEvent) {
- if (this.roomType(roomId) == ROOM_TYPE_CHANNEL) {
- return Object.keys(powerLevelEvent.getContent().events).length == 0;
+ if (this.matrixClient && roomId) {
+ const room = this.getRoom(roomId);
+ if (room && room.currentState) {
+ const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
+ if (powerLevelEvent) {
+ if (this.roomType(roomId) == ROOM_TYPE_CHANNEL) {
+ return Object.keys(powerLevelEvent.getContent().events).length == 0;
+ }
+ return powerLevelEvent.getContent().events_default > 0;
+ }
}
- return powerLevelEvent.getContent().events_default > 0;
- }
}
- }
- return false;
+ return false;
},
setReadOnlyRoom(roomId, readOnly) {
- if (this.matrixClient && roomId) {
- const room = this.getRoom(roomId);
- if (room && room.currentState) {
- const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
- if (powerLevelEvent) {
- let content = powerLevelEvent.getContent();
- if (this.roomType(roomId) == ROOM_TYPE_CHANNEL) {
- content.events = readOnly ? {} : CHANNEL_POWER_LEVELS
- } else {
- content.events_default = readOnly ? 50 : 0;
+ if (this.matrixClient && roomId) {
+ const room = this.getRoom(roomId);
+ if (room && room.currentState) {
+ const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
+ if (powerLevelEvent) {
+ let content = powerLevelEvent.getContent();
+ if (this.roomType(roomId) == ROOM_TYPE_CHANNEL) {
+ content.events = readOnly ? {} : CHANNEL_POWER_LEVELS
+ } else {
+ content.events_default = readOnly ? 50 : 0;
+ }
+ this.matrixClient.sendStateEvent(room.roomId, "m.room.power_levels", content);
+ }
}
- this.matrixClient.sendStateEvent(room.roomId, "m.room.power_levels", content);
- }
}
- }
},
userCanSendMessageInRoom(roomId, userId) {
- if (this.matrixClient && roomId && userId) {
- const room = this.getRoom(roomId);
- if (room && room.currentState) {
- let isAdmin = room.currentState.maySendEvent("m.room.power_levels", this.currentUserId);
- return isAdmin || (this.roomType(roomId) != ROOM_TYPE_CHANNEL && !this.isReadOnlyRoom(roomId));
+ if (this.matrixClient && roomId && userId) {
+ const room = this.getRoom(roomId);
+ if (room && room.currentState) {
+ let isAdmin = room.currentState.maySendEvent("m.room.power_levels", this.currentUserId);
+ return isAdmin || (this.roomType(roomId) != ROOM_TYPE_CHANNEL && !this.isReadOnlyRoom(roomId));
+ }
}
- }
- return true;
+ return true;
},
userCanSendReactionAndAnswerPollInRoom(roomId, userId) {
- if (this.matrixClient && roomId && userId) {
- const room = this.getRoom(roomId);
- if (room && room.currentState) {
- let isAdmin = room.currentState.maySendEvent("m.room.power_levels", this.currentUserId);
- return isAdmin || !this.isReadOnlyRoom(roomId);
+ if (this.matrixClient && roomId && userId) {
+ const room = this.getRoom(roomId);
+ if (room && room.currentState) {
+ let isAdmin = room.currentState.maySendEvent("m.room.power_levels", this.currentUserId);
+ return isAdmin || !this.isReadOnlyRoom(roomId);
+ }
}
- }
- return true;
+ return true;
},
roomType(roomId) {
- if (this.matrixClient && roomId) {
- const room = this.getRoom(roomId);
- if (room && room.currentState) {
- const roomTypeEvent = room.currentState.getStateEvents(STATE_EVENT_ROOM_TYPE, "") || room.currentState.getStateEvents("m.room.create", "");
- if (roomTypeEvent) {
- const roomType = roomTypeEvent.getContent().type;
- if ([ROOM_TYPE_FILE_MODE, ROOM_TYPE_VOICE_MODE, ROOM_TYPE_CHANNEL].includes(roomType)) {
- return roomType;
+ if (this.matrixClient && roomId) {
+ const room = this.getRoom(roomId);
+ if (room && room.currentState) {
+ const roomTypeEvent = room.currentState.getStateEvents(STATE_EVENT_ROOM_TYPE, "") || room.currentState.getStateEvents("m.room.create", "");
+ if (roomTypeEvent) {
+ const roomType = roomTypeEvent.getContent().type;
+ if ([ROOM_TYPE_FILE_MODE, ROOM_TYPE_VOICE_MODE, ROOM_TYPE_CHANNEL].includes(roomType)) {
+ return roomType;
+ }
+ }
}
- }
}
- }
- return ROOM_TYPE_DEFAULT;
+ return ROOM_TYPE_DEFAULT;
},
/**
@@ -781,187 +774,187 @@ export default {
* @param roomId
*/
purgeRoom(roomId, statusCallback) {
- this.currentRoomBeingPurged = true;
+ this.currentRoomBeingPurged = true;
- //console.log("Purge room");
+ //console.log("Purge room");
- const sleep = (ms) => {
- return new Promise((resolve) => setTimeout(resolve, ms));
- };
+ const sleep = (ms) => {
+ return new Promise((resolve) => setTimeout(resolve, ms));
+ };
- const withRetry = (codeBlock) => {
- return codeBlock().catch((error) => {
- if (error && error.errcode == "M_LIMIT_EXCEEDED") {
- var retry = 1000;
- if (error.data) {
- const retryIn = error.data.retry_after_ms;
- retry = Math.max(retry, retryIn ? retryIn : 0);
+ const withRetry = (codeBlock) => {
+ return codeBlock().catch((error) => {
+ if (error && error.errcode == "M_LIMIT_EXCEEDED") {
+ var retry = 1000;
+ if (error.data) {
+ const retryIn = error.data.retry_after_ms;
+ retry = Math.max(retry, retryIn ? retryIn : 0);
+ }
+ console.log("Rate limited, retry in", retry);
+ return sleep(retry).then(() => withRetry(codeBlock));
+ } else {
+ return Promise.resolve();
+ }
+ });
+ };
+
+ const oldGlobalErrorSetting = this.matrixClient.getGlobalErrorOnUnknownDevices();
+ return new Promise((resolve, reject) => {
+ const room = this.getRoom(roomId);
+ if (!room) {
+ reject("Room not found!");
+ return;
}
- console.log("Rate limited, retry in", retry);
- return sleep(retry).then(() => withRetry(codeBlock));
- } else {
- return Promise.resolve();
- }
- });
- };
- const oldGlobalErrorSetting = this.matrixClient.getGlobalErrorOnUnknownDevices();
- return new Promise((resolve, reject) => {
- const room = this.getRoom(roomId);
- if (!room) {
- reject("Room not found!");
- return;
- }
-
- // Remove any possible pending events
- room.getLiveTimeline().getEvents().filter((e) => [EventStatus.ENCRYPTING, sdk.EventStatus.QUEUED].includes(e.status)).forEach((e) => {
- //console.log("Cancel pending event!");
- this.matrixClient.cancelPendingEvent(e);
- });
-
- const timelineWindow = new TimelineWindow(this.matrixClient, room.getUnfilteredTimelineSet(), {});
- const self = this;
-
- //console.log("Purge: set invite only");
- statusCallback(this.$t("room.purge_set_room_state"));
- withRetry(() => this.matrixClient.sendStateEvent(roomId, "m.room.join_rules", { join_rule: "private" }, ""))
- .then(() => {
- //console.log("Purge: forbid guest access");
- return withRetry(() => this.matrixClient.sendStateEvent(
- roomId,
- "m.room.guest_access",
- { guest_access: "forbidden" },
- ""
- ));
- })
- .then(() => {
- //console.log("Purge: set history visibility to 'joined'");
- return withRetry(() => this.matrixClient.sendStateEvent(roomId, "m.room.history_visibility", {
- history_visibility: "joined",
- }));
- })
- .then(() => {
- return withRetry(() => this.matrixClient.sendStateEvent(roomId, STATE_EVENT_ROOM_DELETED, { status: "deleted" }));
- })
- .then(() => {
- // Set message retention 1 minute (may be limited by server)
- return withRetry(() => this.matrixClient.sendStateEvent(roomId, "m.room.retention", { max_lifetime: 60000 }));
- })
- .then(() => {
- //console.log("Purge: create timeline");
- return timelineWindow.load(null, 100);
- })
- .then(() => {
- const getMoreIfAvailable = function _getMoreIfAvailable() {
- if (timelineWindow.canPaginate(EventTimeline.BACKWARDS)) {
- //console.log("Purge: page back");
- return timelineWindow.paginate(EventTimeline.BACKWARDS, 100, true, 5).then((gotmore) => {
- if (gotmore) {
- return _getMoreIfAvailable.call(self);
- }
- return Promise.resolve("Done");
- });
- } else {
- return Promise.resolve("Done");
- }
- }.bind(self);
- return getMoreIfAvailable();
- })
- .then(() => {
- //console.log("Purge: redact events");
- statusCallback(this.$t("room.purge_redacting_events"));
- // First ignore unknown device errors
- this.matrixClient.setGlobalErrorOnUnknownDevices(false);
- const allEvents = timelineWindow.getEvents().filter((event) => {
- return (
- !event.isRedacted() &&
- !event.isRedaction() &&
- !event.isState() &&
- (!room.currentState || room.currentState.maySendRedactionForEvent(event, this.currentUserId))
- );
+ // Remove any possible pending events
+ room.getLiveTimeline().getEvents().filter((e) => [EventStatus.ENCRYPTING, sdk.EventStatus.QUEUED].includes(e.status)).forEach((e) => {
+ //console.log("Cancel pending event!");
+ this.matrixClient.cancelPendingEvent(e);
});
- const redactFirstEvent = (events) => {
- statusCallback(
- this.$t("room.purge_redacting_events", {
- count: allEvents.length - events.length + 1,
- total: allEvents.length,
+ const timelineWindow = new TimelineWindow(this.matrixClient, room.getUnfilteredTimelineSet(), {});
+ const self = this;
+
+ //console.log("Purge: set invite only");
+ statusCallback(this.$t("room.purge_set_room_state"));
+ withRetry(() => this.matrixClient.sendStateEvent(roomId, "m.room.join_rules", { join_rule: "private" }, ""))
+ .then(() => {
+ //console.log("Purge: forbid guest access");
+ return withRetry(() => this.matrixClient.sendStateEvent(
+ roomId,
+ "m.room.guest_access",
+ { guest_access: "forbidden" },
+ ""
+ ));
})
- );
- if (events.length == 0) {
- return Promise.resolve(true);
- }
- const event = events[0];
- return withRetry(() => this.matrixClient.redactEvent(event.getRoomId(), event.getId())).then(() =>
- redactFirstEvent(events.slice(1))
- );
- };
-
- return redactFirstEvent(allEvents);
- })
- .then(() => {
- //console.log("Purge: kick members");
- statusCallback(this.$t("room.purge_removing_members"));
- var joined = room.getMembersWithMembership("join");
- var invited = room.getMembersWithMembership("invite");
- var allMembers = joined.concat(invited);
-
- const me = allMembers.find((m) => m.userId == self.currentUserId);
-
- const kickFirstMember = (members) => {
- //console.log(`Kicking ${members.length} members`);
- statusCallback(
- this.$t("room.purge_removing_members", {
- count: allMembers.length - members.length + 1,
- total: allMembers.length,
+ .then(() => {
+ //console.log("Purge: set history visibility to 'joined'");
+ return withRetry(() => this.matrixClient.sendStateEvent(roomId, "m.room.history_visibility", {
+ history_visibility: "joined",
+ }));
})
- );
- if (members.length == 0) {
- return Promise.resolve(true);
- }
- const member = members[0];
- if (member.userId == self.currentUserId) {
- return kickFirstMember(members.slice(1));
- } else {
- // Slight pause to avoid rate limiting.
- return sleep(0.1)
- .then(() => withRetry(() => {
- if (member.membership == "invite" && me && me.powerLevel <= member.powerLevel) {
- // The user is invited, but we can't kick them because of power levels.
- // Send a new invite with reason set to "Room Deleted".
- // The client will be sent stripped room state, and can from that see the
- // join_rule of "private". It will then "leave", i.e. reject the invite.
- return this.matrixClient.invite(roomId, member.userId, "Room Deleted");
- }
- return this.matrixClient.kick(roomId, member.userId, "Room Deleted")
- }))
- .then(() => kickFirstMember(members.slice(1)));
- }
- };
+ .then(() => {
+ return withRetry(() => this.matrixClient.sendStateEvent(roomId, STATE_EVENT_ROOM_DELETED, { status: "deleted" }));
+ })
+ .then(() => {
+ // Set message retention 1 minute (may be limited by server)
+ return withRetry(() => this.matrixClient.sendStateEvent(roomId, "m.room.retention", { max_lifetime: 60000 }));
+ })
+ .then(() => {
+ //console.log("Purge: create timeline");
+ return timelineWindow.load(null, 100);
+ })
+ .then(() => {
+ const getMoreIfAvailable = function _getMoreIfAvailable() {
+ if (timelineWindow.canPaginate(EventTimeline.BACKWARDS)) {
+ //console.log("Purge: page back");
+ return timelineWindow.paginate(EventTimeline.BACKWARDS, 100, true, 5).then((gotmore) => {
+ if (gotmore) {
+ return _getMoreIfAvailable.call(self);
+ }
+ return Promise.resolve("Done");
+ });
+ } else {
+ return Promise.resolve("Done");
+ }
+ }.bind(self);
+ return getMoreIfAvailable();
+ })
+ .then(() => {
+ //console.log("Purge: redact events");
+ statusCallback(this.$t("room.purge_redacting_events"));
+ // First ignore unknown device errors
+ this.matrixClient.setGlobalErrorOnUnknownDevices(false);
+ const allEvents = timelineWindow.getEvents().filter((event) => {
+ return (
+ !event.isRedacted() &&
+ !event.isRedaction() &&
+ !event.isState() &&
+ (!room.currentState || room.currentState.maySendRedactionForEvent(event, this.currentUserId))
+ );
+ });
- return kickFirstMember(allMembers);
- })
- .then(() => {
- return withRetry(() =>
- this.matrixClient.sendStateEvent(roomId, STATE_EVENT_ROOM_DELETED, { status: "deleted" })
- );
- })
- .then(() => {
- statusCallback(null);
- this.matrixClient.setGlobalErrorOnUnknownDevices(oldGlobalErrorSetting);
- return withRetry(() => this.leaveRoom(roomId));
- })
- .then(() => {
- this.currentRoomBeingPurged = false;
- resolve(true); // Done!
- })
- .catch((err) => {
- console.error("Error purging room", err);
- this.currentRoomBeingPurged = false;
- this.matrixClient.setGlobalErrorOnUnknownDevices(oldGlobalErrorSetting);
- reject(err);
- });
- });
+ const redactFirstEvent = (events) => {
+ statusCallback(
+ this.$t("room.purge_redacting_events", {
+ count: allEvents.length - events.length + 1,
+ total: allEvents.length,
+ })
+ );
+ if (events.length == 0) {
+ return Promise.resolve(true);
+ }
+ const event = events[0];
+ return withRetry(() => this.matrixClient.redactEvent(event.getRoomId(), event.getId())).then(() =>
+ redactFirstEvent(events.slice(1))
+ );
+ };
+
+ return redactFirstEvent(allEvents);
+ })
+ .then(() => {
+ //console.log("Purge: kick members");
+ statusCallback(this.$t("room.purge_removing_members"));
+ var joined = room.getMembersWithMembership("join");
+ var invited = room.getMembersWithMembership("invite");
+ var allMembers = joined.concat(invited);
+
+ const me = allMembers.find((m) => m.userId == self.currentUserId);
+
+ const kickFirstMember = (members) => {
+ //console.log(`Kicking ${members.length} members`);
+ statusCallback(
+ this.$t("room.purge_removing_members", {
+ count: allMembers.length - members.length + 1,
+ total: allMembers.length,
+ })
+ );
+ if (members.length == 0) {
+ return Promise.resolve(true);
+ }
+ const member = members[0];
+ if (member.userId == self.currentUserId) {
+ return kickFirstMember(members.slice(1));
+ } else {
+ // Slight pause to avoid rate limiting.
+ return sleep(0.1)
+ .then(() => withRetry(() => {
+ if (member.membership == "invite" && me && me.powerLevel <= member.powerLevel) {
+ // The user is invited, but we can't kick them because of power levels.
+ // Send a new invite with reason set to "Room Deleted".
+ // The client will be sent stripped room state, and can from that see the
+ // join_rule of "private". It will then "leave", i.e. reject the invite.
+ return this.matrixClient.invite(roomId, member.userId, "Room Deleted");
+ }
+ return this.matrixClient.kick(roomId, member.userId, "Room Deleted")
+ }))
+ .then(() => kickFirstMember(members.slice(1)));
+ }
+ };
+
+ return kickFirstMember(allMembers);
+ })
+ .then(() => {
+ return withRetry(() =>
+ this.matrixClient.sendStateEvent(roomId, STATE_EVENT_ROOM_DELETED, { status: "deleted" })
+ );
+ })
+ .then(() => {
+ statusCallback(null);
+ this.matrixClient.setGlobalErrorOnUnknownDevices(oldGlobalErrorSetting);
+ return withRetry(() => this.leaveRoom(roomId));
+ })
+ .then(() => {
+ this.currentRoomBeingPurged = false;
+ resolve(true); // Done!
+ })
+ .catch((err) => {
+ console.error("Error purging room", err);
+ this.currentRoomBeingPurged = false;
+ this.matrixClient.setGlobalErrorOnUnknownDevices(oldGlobalErrorSetting);
+ reject(err);
+ });
+ });
},
/**
@@ -970,74 +963,74 @@ export default {
* @param {*} userId The user to chat with.
*/
getOrCreatePrivateChat(userId) {
- return new Promise((resolve, reject) => {
- for (const room of this.rooms) {
- // Is the other member the one we are looking for?
- if (this.isDirectRoomWith(room, userId)) {
- if (room.getMyMembership() == "invite") {
- this.matrixClient.joinRoom(room.roomId);
- } else {
- var member = room.getMember(userId);
- if (member && member.membership != "join") {
- // Resend invite
- this.matrixClient.invite(room.roomId, userId);
- }
+ return new Promise((resolve, reject) => {
+ for (const room of this.rooms) {
+ // Is the other member the one we are looking for?
+ if (this.isDirectRoomWith(room, userId)) {
+ if (room.getMyMembership() == "invite") {
+ this.matrixClient.joinRoom(room.roomId);
+ } else {
+ var member = room.getMember(userId);
+ if (member && member.membership != "join") {
+ // Resend invite
+ this.matrixClient.invite(room.roomId, userId);
+ }
+ }
+ resolve(room);
+ return;
+ }
}
- resolve(room);
- return;
- }
- }
- // No room found, create one
- //
- const createRoomOptions = {
- visibility: "private", // Not listed!
- preset: "private_chat",
- is_direct: true,
- initial_state: [
- {
- type: "m.room.encryption",
- state_key: "",
- content: {
- algorithm: "m.megolm.v1.aes-sha2",
- },
- },
- {
- type: "m.room.guest_access",
- state_key: "",
- content: {
- guest_access: "forbidden",
- },
- },
- {
- type: "m.room.history_visibility",
- state_key: "",
- content: {
- history_visibility: "invited",
- },
- },
- {
- type: "m.room.power_levels",
- state_key: "",
- content: {
- users: {
- [this.currentUserId]: 100,
- [userId]: 100,
- },
- },
- },
- ],
- invite: [userId],
- };
- return this.matrixClient
- .createRoom(createRoomOptions)
- .then(({ room_id, room_alias }) => {
- resolve(this.getRoom(room_alias || room_id));
- })
- .catch((error) => {
- reject(error);
- });
- });
+ // No room found, create one
+ //
+ const createRoomOptions = {
+ visibility: "private", // Not listed!
+ preset: "private_chat",
+ is_direct: true,
+ initial_state: [
+ {
+ type: "m.room.encryption",
+ state_key: "",
+ content: {
+ algorithm: "m.megolm.v1.aes-sha2",
+ },
+ },
+ {
+ type: "m.room.guest_access",
+ state_key: "",
+ content: {
+ guest_access: "forbidden",
+ },
+ },
+ {
+ type: "m.room.history_visibility",
+ state_key: "",
+ content: {
+ history_visibility: "invited",
+ },
+ },
+ {
+ type: "m.room.power_levels",
+ state_key: "",
+ content: {
+ users: {
+ [this.currentUserId]: 100,
+ [userId]: 100,
+ },
+ },
+ },
+ ],
+ invite: [userId],
+ };
+ return this.matrixClient
+ .createRoom(createRoomOptions)
+ .then(({ room_id, room_alias }) => {
+ resolve(this.getRoom(room_alias || room_id));
+ })
+ .catch((error) => {
+ reject(error);
+ });
+ });
},
/**
@@ -1046,19 +1039,19 @@ export default {
* @param {*} userId
*/
isDirectRoomWith(room, userId) {
- if (room && room.getJoinRule() == "invite" && room.getMembers().length == 2) {
- let other = room.getMember(userId);
- if (other) {
- if (room.getMyMembership() == "invite" && other.membership == "join") {
- return true;
- } else if (room.getMyMembership() == "join" && room.canInvite(this.currentUserId)) {
- return true;
- } else if (room.getMyMembership() == "join" && other.membership == "join") {
- return true;
- }
+ if (room && room.getJoinRule() == "invite" && room.getMembers().length == 2) {
+ let other = room.getMember(userId);
+ if (other) {
+ if (room.getMyMembership() == "invite" && other.membership == "join") {
+ return true;
+ } else if (room.getMyMembership() == "join" && room.canInvite(this.currentUserId)) {
+ return true;
+ } else if (room.getMyMembership() == "join" && other.membership == "join") {
+ return true;
+ }
+ }
}
- }
- return false;
+ return false;
},
/**
@@ -1067,68 +1060,68 @@ export default {
* @param { } room
*/
isDirectRoom(room) {
- // TODO - Use the is_direct accountData flag (m.direct). WE (as the client)
- // apprently need to set this...
- if (room && room.getJoinRule() == "invite" && room.getMembers().length == 2) {
- return true;
- }
- return false;
+ // TODO - Use the is_direct accountData flag (m.direct). WE (as the client)
+ // apprently need to set this...
+ if (room && room.getJoinRule() == "invite" && room.getMembers().length == 2) {
+ return true;
+ }
+ return false;
},
on(event, handler) {
- if (this.matrixClient) {
- this.matrixClient.on(event, handler);
- }
+ if (this.matrixClient) {
+ this.matrixClient.on(event, handler);
+ }
},
off(event, handler) {
- if (this.matrixClient) {
- this.matrixClient.off(event, handler);
- }
+ if (this.matrixClient) {
+ this.matrixClient.off(event, handler);
+ }
},
setUserDisplayName(name) {
- if (this.matrixClient) {
- return this.matrixClient
- .setDisplayName(name || this.user.userId)
- .then(() => (this.userDisplayName = name))
- .catch((err) => console.err("Failed to set display name", err));
- } else {
- return Promise.reject("No matrix client");
- }
+ if (this.matrixClient) {
+ return this.matrixClient
+ .setDisplayName(name || this.user.userId)
+ .then(() => (this.userDisplayName = name))
+ .catch((err) => console.err("Failed to set display name", err));
+ } else {
+ return Promise.reject("No matrix client");
+ }
},
setPassword(oldPassword, newPassword) {
- if (this.matrixClient && this.currentUser) {
- const authDict = {
- type: "m.login.password",
- identifier: {
- type: "m.id.user",
- user: this.currentUser.user_id,
- },
- // TODO: Remove `user` once servers support proper UIA
- // See https://github.com/matrix-org/synapse/issues/5665
- user: this.currentUser.user_id,
- password: oldPassword,
- };
- const self = this;
- return this.matrixClient
- .setPassword(authDict, newPassword)
- .then(() => {
- // Forget password and remove the 'is_guest' flag, we are now a "real" user!
- self.currentUser.password = undefined;
- self.currentUser.is_guest = false;
- self.$store.commit("setUser", self.currentUser);
- })
- .then(() => {
- return true;
- });
- }
- return Promise.resolve(false);
+ if (this.matrixClient && this.currentUser) {
+ const authDict = {
+ type: "m.login.password",
+ identifier: {
+ type: "m.id.user",
+ user: this.currentUser.user_id,
+ },
+ // TODO: Remove `user` once servers support proper UIA
+ // See https://github.com/matrix-org/synapse/issues/5665
+ user: this.currentUser.user_id,
+ password: oldPassword,
+ };
+ const self = this;
+ return this.matrixClient
+ .setPassword(authDict, newPassword)
+ .then(() => {
+ // Forget password and remove the 'is_guest' flag, we are now a "real" user!
+ self.currentUser.password = undefined;
+ self.currentUser.is_guest = false;
+ self.$store.commit("setUser", self.currentUser);
+ })
+ .then(() => {
+ return true;
+ });
+ }
+ return Promise.resolve(false);
},
uploadFile(file, opts) {
- return this.matrixClient.uploadContent(file, opts);
+ return this.matrixClient.uploadContent(file, opts);
},
/**
@@ -1137,201 +1130,187 @@ export default {
* @returns A MatrixClient that can be used for public queries
*/
getPublicQueryMatrixClient() {
- if (this.matrixClient) {
- return this.getMatrixClient().then(() => {
- return this.matrixClient;
- });
- } else {
- var tempUserString = this.$store.state.tempuser;
- var tempUser = null;
- if (tempUserString) {
- tempUser = JSON.parse(tempUserString);
- }
- return util.getMatrixBaseUrl(tempUser, this.$config).then((baseUrl) => {
- const tempMatrixClient = sdk.createClient({ baseUrl: baseUrl });
-
- var clientPromise;
-
- // Need to create an account?
- //
- if (tempUser) {
- clientPromise = Promise.resolve(tempUser);
- } else {
- const user = util.randomUser(this.$config.userIdPrefix);
- const pass = util.randomPass();
- clientPromise = tempMatrixClient
- .register(user, pass, null, {
- type: "m.login.dummy",
- initial_device_display_name: this.$config.appName,
- })
- .then((response) => {
- console.log("Response", response);
- response.password = pass;
- response.is_guest = true;
- this.$store.commit("setTempUser", response);
- return response;
- });
- }
-
- // Get an access token
- clientPromise = clientPromise.then((user) => {
- var data = {
- user: User.localPart(user.user_id),
- password: user.password,
- type: "m.login.password",
- initial_device_display_name: this.$config.appName,
- };
- if (user.device_id) {
- data.device_id = user.device_id;
+ if (this.matrixClient) {
+ return this.getMatrixClient().then(() => {
+ return this.matrixClient;
+ });
+ } else {
+ var tempUserString = this.$store.state.tempuser;
+ var tempUser = null;
+ if (tempUserString) {
+ tempUser = JSON.parse(tempUserString);
}
- return tempMatrixClient.login("m.login.password", data);
- });
+ return util.getMatrixBaseUrl(tempUser, this.$config).then((baseUrl) => {
+ const tempMatrixClient = sdk.createClient({ baseUrl: baseUrl });
- // Then login
- //
- // Create a slimmed down client, without crypto. This one is
- // Only used to get public room info from.
- clientPromise = clientPromise.then((user) => {
- var opts = {
- baseUrl: baseUrl,
- userId: user.user_id,
- accessToken: user.access_token,
- timelineSupport: false,
- };
- var matrixClient = sdk.createClient(opts);
- matrixClient.startClient();
- return matrixClient;
- });
+ var clientPromise;
- return clientPromise;
- });
- }
- },
+ // Need to create an account?
+ //
+ if (tempUser) {
+ clientPromise = Promise.resolve(tempUser);
+ } else {
+ const user = util.randomUser(this.$config.userIdPrefix);
+ const pass = util.randomPass();
+ clientPromise = tempMatrixClient
+ .register(user, pass, null, {
+ type: "m.login.dummy",
+ initial_device_display_name: this.$config.appName,
+ })
+ .then((response) => {
+ console.log("Response", response);
+ response.password = pass;
+ response.is_guest = true;
+ this.$store.commit("setTempUser", response);
+ return response;
+ });
+ }
- getPublicUserInfo(userId) {
- if (!userId) {
- return Promise.reject("Invalid parameters");
- }
+ // Get an access token
+ clientPromise = clientPromise.then((user) => {
+ var data = {
+ user: User.localPart(user.user_id),
+ password: user.password,
+ type: "m.login.password",
+ initial_device_display_name: this.$config.appName,
+ };
+ if (user.device_id) {
+ data.device_id = user.device_id;
+ }
+ return tempMatrixClient.login("m.login.password", data);
+ });
- const parts = userId.split(":");
- if (parts.length != 2) {
- return Promise.reject("Unknown home server");
- }
+ // Then login
+ //
+ // Create a slimmed down client, without crypto. This one is
+ // Only used to get public room info from.
+ clientPromise = clientPromise.then((user) => {
+ var opts = {
+ baseUrl: baseUrl,
+ userId: user.user_id,
+ accessToken: user.access_token,
+ timelineSupport: false,
+ };
+ var matrixClient = sdk.createClient(opts);
+ matrixClient.startClient();
+ return matrixClient;
+ });
- const clientPromise = this.getPublicQueryMatrixClient();
- let matrixClient;
- return clientPromise
- .then((client) => {
- matrixClient = client;
- return client.getProfileInfo(userId);
- })
- .then((response) => {
- if (response.avatar_url) {
- response.avatar = matrixClient.mxcUrlToHttp(response.avatar_url, 80, 80, "scale", true);
- }
- return Promise.resolve(response);
- })
- .catch((err) => {
- return Promise.reject("Failed to find user info: " + err);
- });
+ return clientPromise;
+ });
+ }
},
getPublicRoomInfo(roomId) {
- if (!roomId) {
- return Promise.reject("Invalid parameters");
- }
-
- const parts = roomId.split(":");
- if (parts.length != 2) {
- return Promise.reject("Unknown room server");
- }
- const server = parts[1];
-
- const clientPromise = this.getPublicQueryMatrixClient();
-
- const findOrGetMore = function _findOrGetMore(client, response) {
- for (var room of response.chunk) {
- if (
- (roomId.startsWith("#") && room.canonical_alias == roomId) ||
- (roomId.startsWith("!") && room.room_id == roomId)
- ) {
- if (room.avatar_url) {
- room.avatar = client.mxcUrlToHttp(room.avatar_url, 80, 80, "scale", true);
- }
- return Promise.resolve(room);
- }
+ if (!roomId) {
+ return Promise.reject("Invalid parameters");
}
- if (response.next_batch) {
- return client
- .publicRooms({
- server: server,
- limit: 1000,
- since: response.next_batch,
+
+ const parts = roomId.split(":");
+ if (parts.length != 2) {
+ return Promise.reject("Unknown room server");
+ }
+ const server = parts[1];
+
+ const clientPromise = this.getPublicQueryMatrixClient();
+
+ const findOrGetMore = function _findOrGetMore(client, useAuthedMedia, response) {
+ for (var room of response.chunk) {
+ if (
+ (roomId.startsWith("#") && room.canonical_alias == roomId) ||
+ (roomId.startsWith("!") && room.room_id == roomId)
+ ) {
+ if (room.avatar_url) {
+ room["avatar"] = client.mxcUrlToHttp(room.avatar_url, 80, 80, "scale", false, undefined, useAuthedMedia);
+ }
+ return Promise.resolve(room);
+ }
+ }
+ if (response.next_batch) {
+ return client
+ .publicRooms({
+ server: server,
+ limit: 1000,
+ since: response.next_batch,
+ })
+ .then((response) => {
+ return _findOrGetMore(client, response);
+ })
+ .catch((err) => {
+ return Promise.reject("Failed to find room: " + err);
+ });
+ } else {
+ return Promise.reject("No more data");
+ }
+ };
+
+ var matrixClient;
+ let useAuthedMedia = false;
+ return clientPromise
+ .then((client) => {
+ matrixClient = client;
+ return client.isVersionSupported("v1.11");
+ })
+ .then((version1_11) => {
+ useAuthedMedia = version1_11;
+ return matrixClient.publicRooms({ server: server, limit: 1000 });
})
.then((response) => {
- return _findOrGetMore(client, response);
+ return findOrGetMore(matrixClient, useAuthedMedia, response);
})
.catch((err) => {
- return Promise.reject("Failed to find room: " + err);
+ return Promise.reject("Failed to find room: " + err);
});
- } else {
- return Promise.reject("No more data");
- }
- };
-
- var matrixClient;
- return clientPromise
- .then((client) => {
- matrixClient = client;
- return matrixClient.publicRooms({ server: server, limit: 1000 });
- })
- .then((response) => {
- return findOrGetMore(matrixClient, response);
- })
- .catch((err) => {
- return Promise.reject("Failed to find room: " + err);
- });
},
updateNotificationCount() {
- var count = 0;
- this.rooms.forEach((room) => {
- count += room.getUnreadNotificationCount("total") || 0;
- });
- this.notificationCount = count;
+ var count = 0;
+ this.rooms.forEach((room) => {
+ count += room.getUnreadNotificationCount("total") || 0;
+ });
+ this.notificationCount = count;
},
setEventPinned(room, event, pinned) {
- if (room && room.currentState && event) {
- const pinnedMessagesEvent = room.currentState.getStateEvents("m.room.pinned_events", "");
- const content = pinnedMessagesEvent ? pinnedMessagesEvent.getContent() : {}
- let pinnedEvents = content["pinned"] || [];
- if (pinned && !pinnedEvents.includes(event.getId())) {
- pinnedEvents.push(event.getId());
- } else if (!pinned && pinnedEvents.includes(event.getId())) {
- pinnedEvents = pinnedEvents.filter((e) => e != event.getId());
- } else {
- return; // no change
+ if (room && room.currentState && event) {
+ const pinnedMessagesEvent = room.currentState.getStateEvents("m.room.pinned_events", "");
+ const content = pinnedMessagesEvent ? pinnedMessagesEvent.getContent() : {}
+ let pinnedEvents = content["pinned"] || [];
+ if (pinned && !pinnedEvents.includes(event.getId())) {
+ pinnedEvents.push(event.getId());
+ } else if (!pinned && pinnedEvents.includes(event.getId())) {
+ pinnedEvents = pinnedEvents.filter((e) => e != event.getId());
+ } else {
+ return; // no change
+ }
+ content.pinned = pinnedEvents;
+ this.matrixClient.sendStateEvent(room.roomId, "m.room.pinned_events", content);
}
- content.pinned = pinnedEvents;
- this.matrixClient.sendStateEvent(room.roomId, "m.room.pinned_events", content);
- }
},
getPinnedEvents(room) {
- if (room && room.currentState) {
- const pinnedMessagesEvent = room.currentState.getStateEvents("m.room.pinned_events", "");
- const content = pinnedMessagesEvent ? pinnedMessagesEvent.getContent() : {}
- return content["pinned"] || [];
- } else {
- return [];
- }
+ if (room && room.currentState) {
+ const pinnedMessagesEvent = room.currentState.getStateEvents("m.room.pinned_events", "");
+ const content = pinnedMessagesEvent ? pinnedMessagesEvent.getContent() : {}
+ return content["pinned"] || [];
+ } else {
+ return [];
+ }
},
},
+ render: () => {}
});
-
- sdk.setCryptoStoreFactory(matrixService.createCryptoStore.bind(matrixService));
-
- Vue.prototype.$matrix = matrixService;
+ matrixService.config.globalProperties.$store = store;
+ matrixService.config.globalProperties.$config = app.$config;
+ matrixService.config.globalProperties.$t = app.$t;
+ matrixService.config.globalProperties.$navigation = app.$navigation;
+ matrixService.$store = store;
+ matrixService.$config = app.$config;
+ matrixService.$t = app.$t;
+ matrixService.$navigation = app.$navigation;
+ const instance = matrixService.mount("#app2");
+ app.config.globalProperties.$matrix = instance;
+ app.$matrix = instance;
+ sdk.setCryptoStoreFactory(instance.createCryptoStore.bind(instance));
},
};
diff --git a/src/services/navigation.service.js b/src/services/navigation.service.js
index 680d78a..a03c19f 100644
--- a/src/services/navigation.service.js
+++ b/src/services/navigation.service.js
@@ -1,5 +1,5 @@
export default {
- install(Vue, router) {
+ install(app, router) {
var routes = [];
var nextRoutes = null;
var zeroIndex = undefined;
@@ -75,6 +75,8 @@ export default {
router.go(-1);
}
}
- Vue.prototype.$navigation = navigationService;
+
+ app.$navigation = navigationService;
+ app.config.globalProperties.$navigation = navigationService;
}
}
diff --git a/src/store/index.js b/src/store/index.js
index a544b2e..a0716c0 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,8 +1,6 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
-import VuexPersist from 'vuex-persist'
+import { createStore } from 'vuex'
+import VuexPersistence from 'vuex-persist'
-Vue.use(Vuex)
const USER = `convene_${ window.location.hostname }_user`
const SETTINGS = `convene_${ window.location.hostname }_settings`
@@ -32,7 +30,7 @@ const persistUserPlugin = store => {
}
-const vuexPersistLocalStorage = new VuexPersist({
+const vuexPersistLocalStorage = new VuexPersistence({
key: SETTINGS,
storage: localStorage,
reducer: state => {
@@ -49,7 +47,7 @@ const vuexPersistLocalStorage = new VuexPersist({
}
})
-const vuexPersistSessionStorage = new VuexPersist({
+const vuexPersistSessionStorage = new VuexPersistence({
key: SETTINGS,
storage: sessionStorage,
reducer: state => {
@@ -67,7 +65,7 @@ const vuexPersistSessionStorage = new VuexPersist({
const defaultUseSessionStorage = (sessionStorage.getItem(USER) != null);
-export default new Vuex.Store({
+const store = createStore({
state: { language: null, currentRoomId: null, auth: null, tempuser: null, useLocalStorage: !defaultUseSessionStorage, globalNotification: false },
mutations: {
loginSuccess(state, user) {
@@ -106,7 +104,7 @@ export default new Vuex.Store({
},
actions: {
login({ commit }, { user, registrationFlowHandler }) {
- return this._vm.$matrix.login(user, registrationFlowHandler).then(
+ return this.$matrix.login(user, registrationFlowHandler).then(
user => {
commit('loginSuccess', user);
return Promise.resolve(user);
@@ -118,7 +116,7 @@ export default new Vuex.Store({
);
},
createUser({ commit }, { user, registrationFlowHandler }) {
- return this._vm.$matrix.login(user, registrationFlowHandler, true).then(
+ return this.$matrix.login(user, registrationFlowHandler, true).then(
user => {
commit('loginSuccess', user);
return Promise.resolve(user);
@@ -130,7 +128,7 @@ export default new Vuex.Store({
);
},
logout({ commit }) {
- this._vm.$matrix.logout();
+ this.$matrix.logout();
commit('logout');
},
},
@@ -144,4 +142,6 @@ export default new Vuex.Store({
}
},
plugins: [vuexPersistLocalStorage.plugin, vuexPersistSessionStorage.plugin, persistUserPlugin]
-})
+});
+
+export default store;
diff --git a/vite.config.mjs b/vite.config.mjs
new file mode 100644
index 0000000..800b292
--- /dev/null
+++ b/vite.config.mjs
@@ -0,0 +1,120 @@
+import { defineConfig } from "vite";
+import vue from "@vitejs/plugin-vue";
+import vueJsx from "@vitejs/plugin-vue-jsx";
+import vitePluginVuetify from "vite-plugin-vuetify";
+import { fileURLToPath, URL } from "node:url";
+import Components from "unplugin-vue-components/vite";
+import { viteStaticCopy } from 'vite-plugin-static-copy';
+import nodePolyfills from 'rollup-plugin-polyfill-node';
+import { resolve } from "path";
+import commonjs from '@rollup/plugin-commonjs';
+
+function VuetifyResolver() {
+ return {
+ type: 'component',
+ resolve: (name) => {
+ console.log("rESOLVE", name);
+ if (name.match(/^V[A-Z]/) && !name.includes("VEmojiPicker"))
+ return { name, from: './node_modules/vuetify/components' }
+ },
+ }
+}
+
+// https://vitejs.dev/config/
+export default defineConfig(({mode}) => ({
+ plugins: [
+ // commonjs({
+ // include: /node_modules/,
+ // requireReturnsDefault: 'auto', // <---- this solves default issue
+ // }),
+ // commonjs({
+ // exclude: ["*vuex-persist*", "*deepmerge*"]
+ // }),
+ vue({
+ template: {
+ compilerOptions: {
+ comments: false
+ }
+ }
+ }),
+ vueJsx(),
+ vitePluginVuetify(),
+ // Components({
+ // resolvers: [VuetifyResolver()],
+ // }),
+ viteStaticCopy({
+ targets: [
+ {
+ src: "src/assets/config.json",
+ dest: ''
+ },
+ {
+ src: "node_modules/@matrix-org/olm/olm.wasm",
+ dest: ''
+ },
+ {
+ src: 'node_modules/@matrix-org/matrix-sdk-crypto-wasm/pkg/matrix_sdk_crypto_wasm_bg.wasm',
+ dest: mode == "development" ? '/node_modules/.vite/deps/pkg' : ''
+ }
+ ]
+ }),
+ //nodePolyfills(),
+ ],
+ resolve: {
+ extensions: ['.vue','.mjs', '.js', '.ts', '.jsx', '.tsx', '.json','.wasm'],
+ alias: [
+ { find: "@", replacement: fileURLToPath(new URL("./src", import.meta.url)) },
+ { find: "~@", replacement: fileURLToPath(new URL("./src", import.meta.url)) },
+ { find: "vue", replacement: fileURLToPath(new URL("./node_modules/vue/dist/vue.esm-bundler.js", import.meta.url)) },
+ ],
+ },
+ define: {
+ //global: "window",
+ //module: {},
+ Lame: "window.Lame",
+ Presets: "window.Presets",
+ GainAnalysis: "window.GainAnalysis",
+ QuantizePVT: "window.QuantizePVT",
+ Quantize: "window.Quantize",
+ Takehiro: "window.Takehiro",
+ Reservoir: "window.Reservoir",
+ MPEGMode: "window.MPEGMode",
+ BitStream: "window.BitStream",
+ },
+ build: {
+ commonjsOptions: { transformMixedEsModules: true } // Change
+ }
+ // optimizeDeps: {
+ // include: ["deepmerge", "vuex-persist"],
+ // },
+ // optimizeDeps: {
+ // include: [
+ // "vuex-persist", "vue-sanitize"
+ // ],
+ // esbuildOptions:{
+ // plugins:[
+ // commonjs()
+ // ]
+ // }
+ // },
+ // build: {
+ // commonjsOptions: {
+ // include: [/node_modules/],
+ // requireReturnsDefault: true,
+ // exclude: ["vuex-persist"]
+ // }
+ // },
+ // rollupOptions: {
+ // //Here, we are externalizing Vue to prevent it to be bundled
+ // //with our library
+ // external: ["vue"],
+ // //Add this so the UMD build will recognize the global variables
+ // //of externalized dependencies
+ // output: {
+ // globals: {
+ // vue: "Vue",
+ // },
+ // exports: "named",
+ // },
+ // },
+}));
diff --git a/vue.config.js b/vue.config.js
deleted file mode 100644
index ab49c9e..0000000
--- a/vue.config.js
+++ /dev/null
@@ -1,62 +0,0 @@
-const CopyWebpackPlugin = require("copy-webpack-plugin");
-const webpack = require("webpack");
-//const fs = require('fs')
-
-module.exports = {
- transpileDependencies: ["vuetify"],
-
- publicPath: process.env.NODE_ENV === "production" ? "./" : "./",
-
- chainWebpack: (config) => {
- config.plugin("html").tap((args) => {
- var c = require("./src/assets/config.json");
- args[0].title = c.appName;
- return args;
- });
- },
-
- configureWebpack: {
- devtool: "source-map",
- resolve: {
- fallback: {
- "path": require.resolve("path-browserify"),
- "crypto": require.resolve("crypto-browserify"),
- "stream": require.resolve("stream-browserify"),
- "fs": require.resolve("browserify-fs"),
- "buffer": require.resolve("buffer")
- }
- },
- plugins: [
- new webpack.ProvidePlugin({
- Buffer: ['buffer', 'Buffer'],
- }),
- new webpack.ProvidePlugin({
- process: 'process/browser',
- }),
- new CopyWebpackPlugin({patterns: [
- {
- from: "./src/assets/config.json",
- to: "./",
- },
- {
- from: "./node_modules/@matrix-org/olm/olm.wasm",
- to: "./js/olm.wasm",
- },
- ]}),
- ],
- },
-
- devServer: {
- //https: true,
-
- /***
- * For testing notification via service worker in Mobile
- * Run your site locally with secure HTTPS using mkcert
- * https://web.dev/how-to-use-local-https/#running-your-site-locally-with-https-using-mkcert-recommended
- */
- // https: {
- // key: fs.readFileSync('./your-local-ip-address-key.pem'),
- // cert: fs.readFileSync('./your-local-ip-address.pem'),
- // }
- }
-};
{{ $t("profile_info_popup.you_are") }}
-
+
{{ displayName }}
-
+
-
-
+
- ![]()
- {{ userAvatarLetter }}
+
@@ -77,10 +77,12 @@
\ No newline at end of file
diff --git a/src/components/RoomAvatarPicker.vue b/src/components/RoomAvatarPicker.vue
index 84f5f57..1c2b3e8 100644
--- a/src/components/RoomAvatarPicker.vue
+++ b/src/components/RoomAvatarPicker.vue
@@ -1,7 +1,7 @@
+
{{ displayName }}
-
+
{{ room.name }}
- {{ $tc("room.members", room.getJoinedMemberCount()) }}
+ {{ $t("room.members", room.getJoinedMemberCount()) }}
{{ statusText }}
- {{ $t("global.different_browser_title") }}
@@ -12,7 +12,7 @@
@@ -39,22 +37,22 @@
-
- $vuetify.icons.direct_chat {{ $t("menu.direct_chat") }}
+
+ $vuetify.icons.direct_chat {{ $t("menu.direct_chat") }}
- $vuetify.icons.make_admin {{ $t("menu.user_make_admin") }}
+
+ $vuetify.icons.make_admin {{ $t("menu.user_make_admin") }}
-
- $vuetify.icons.make_moderator {{ $t("menu.user_make_moderator") }}
+
+ $vuetify.icons.make_moderator {{ $t("menu.user_make_moderator") }}
-
- $vuetify.icons.revoke {{ $t("menu.user_revoke_moderator") }}
+
+ $vuetify.icons.revoke {{ $t("menu.user_revoke_moderator") }}
-
- $vuetify.icons.kickout {{ $t("menu.user_kick_and_ban") }}
+
+ $vuetify.icons.kickout {{ $t("menu.user_kick_and_ban") }}
-
@@ -86,7 +89,7 @@
v-if="willCancel"
class="will-cancel"
>
-
+
delete_outline
@@ -106,7 +109,7 @@
v-if="recordingLocked"
class="locked"
>
-
+
- {{
+ {{
$t("menu.cancel")
}}
@@ -132,7 +135,7 @@
v-if="state == states.ERROR"
class="error"
>
-
+
@@ -114,7 +117,7 @@
@@ -167,10 +170,9 @@ const State = {
};
import util from "../plugins/utils";
import VoiceRecorderLock from "./VoiceRecorderLock";
-require("md-gum-polyfill");
-import MicRecorder from "mic-recorder-to-mp3";
-import ysFixWebmDuration from "fix-webm-duration";
-//import { duration } from "dayjs";
+import "md-gum-polyfill";
+import { RecordRTCPromisesHandler } from "recordrtc";
+import recordStop from "@/assets/sounds/record_stop.mp3";
export default {
name: "VoiceRecorder",
@@ -371,13 +373,14 @@ export default {
event.stopPropagation();
},
- startRecording() {
+ async startRecording() {
// Start recording. Browser will request permission to use your microphone.
- this.recorder = new MicRecorder({
- bitRate: 128,
+ let stream = await navigator.mediaDevices.getUserMedia({video: false, audio: true});
+ this.recorder = new RecordRTCPromisesHandler(stream, {
+ type: 'audio'
});
this.recorder
- .start()
+ .startRecording()
.then(() => {
this.state = State.RECORDING;
this.recordStartedAt = Date.now();
@@ -400,7 +403,7 @@ export default {
}
},
playRecordedSound() {
- const audio = new Audio(require("@/assets/sounds/record_stop.mp3"));
+ const audio = new Audio(recordStop);
audio.play();
},
aquireWakeLock() {
@@ -422,7 +425,7 @@ export default {
},
cancelRecording() {
if(this.recorder) {
- this.recorder.stop();
+ this.recorder.stopRecording();
this.recorder = null;
}
this.releaseWakeLock();
@@ -471,14 +474,13 @@ export default {
getFile(send) {
const duration = Date.now() - this.recordStartedAt;
this.recorder
- .stop()
- .getMp3()
- .then(([buffer, blob]) => {
- // do what ever you want with buffer and blob
- // Example: Create a mp3 file and play
+ .stopRecording()
+ .then(() => this.recorder.getBlob())
+ .then((blob) => {
+ console.log("BLOB IS", blob);
this.recordedFile = new File(
- buffer,
- util.formatRecordStartTime(this.recordStartedAt) + ".mp3",
+ [blob],
+ util.formatRecordStartTime(this.recordStartedAt) + ".webm",
{
type: blob.type,
lastModified: Date.now(),
@@ -511,25 +513,6 @@ export default {
}
},
- /*
- * There is an issue with browsers not setting correct metadata in the generated webm file.
- * See here: https://bugs.chromium.org/p/chromium/issues/detail?id=642012
- * Use fix-webm-duration package to try to update the cues section.
- */
- async correctMetadata(blob, duration) {
- return new Promise((resolve, reject) => {
- try {
- ysFixWebmDuration(blob, duration, function(fixedBlob) {
- const b = new Blob([fixedBlob], { type: blob.type });
- resolve(b);
- });
- } catch (err) {
- console.error(err);
- reject(err);
- }
- });
- },
-
/**
* Show import picker to select file
*/
@@ -570,6 +553,6 @@ export default {
diff --git a/src/components/VoiceRecorderLock.vue b/src/components/VoiceRecorderLock.vue
index c1b1785..aad8fda 100644
--- a/src/components/VoiceRecorderLock.vue
+++ b/src/components/VoiceRecorderLock.vue
@@ -24,5 +24,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/YouAre.vue b/src/components/YouAre.vue
index a4d11ac..c4e94a1 100644
--- a/src/components/YouAre.vue
+++ b/src/components/YouAre.vue
@@ -3,45 +3,45 @@
{{ $t("profile_info_popup.you_are") }}
+ color="#ededed"
+ variant="outlined"
+ >
+
+
+ {{ $t("profile_info_popup.you_are") }}
-
+
{{ displayName }}
-
+
-
+
{{ displayName }}
-
+
-
- ![]()
- {{ userAvatarLetter }}
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/chatMixin.js b/src/components/chatMixin.js
index 533649b..45aa163 100644
--- a/src/components/chatMixin.js
+++ b/src/components/chatMixin.js
@@ -1,3 +1,4 @@
+import { markRaw } from "vue";
import util, { ROOM_TYPE_CHANNEL, STATE_EVENT_ROOM_DELETION_NOTICE } from "../plugins/utils";
import MessageIncomingText from "./messages/MessageIncomingText";
import MessageIncomingFile from "./messages/MessageIncomingFile";
@@ -57,7 +58,7 @@ import ReadMarker from "./messages/ReadMarker.vue";
import roomDisplayOptionsMixin from "./roomDisplayOptionsMixin";
import roomTypeMixin from "./roomTypeMixin";
-export const ROOM_READ_MARKER_EVENT_PLACEHOLDER = { getId: () => "ROOM_READ_MARKER" };
+export const ROOM_READ_MARKER_EVENT_PLACEHOLDER = { getId: () => "ROOM_READ_MARKER", getTs: () => Date.now() };
export default {
mixins: [ roomDisplayOptionsMixin, roomTypeMixin ],
@@ -106,6 +107,11 @@ export default {
CreatePollDialog,
ReadMarker
},
+ computed: {
+ debugging() {
+ return false; //(window.location.host || "").startsWith("localhost");
+ },
+ },
methods: {
showDayMarkerBeforeEvent(event) {
const idx = this.events.indexOf(event);
@@ -119,7 +125,7 @@ export default {
dayForEvent(event) {
let dayDiff = util.dayDiffToday(event.getTs());
if (dayDiff < 7) {
- return this.$tc("message.time_ago", dayDiff);
+ return this.$t("message.time_ago", dayDiff);
} else {
return util.formatDay(event.getTs());
}
@@ -130,6 +136,14 @@ export default {
},
componentForEvent(event, isForExport = false) {
+ let component = this.componentForEventInternal(event, isForExport);
+ if (component) {
+ return markRaw(component);
+ }
+ return component;
+ },
+
+ componentForEventInternal(event, isForExport = false) {
const isChannel = this.roomDisplayType === ROOM_TYPE_CHANNEL;
if (event === ROOM_READ_MARKER_EVENT_PLACEHOLDER) {
return ReadMarker;
diff --git a/src/components/create/CreateRoomAvatar.vue b/src/components/create/CreateRoomAvatar.vue
index 3ec348e..ec66588 100644
--- a/src/components/create/CreateRoomAvatar.vue
+++ b/src/components/create/CreateRoomAvatar.vue
@@ -1,6 +1,6 @@
- $vuetify.icons.room_avatar_placeholder
$vuetify.icons.ic_camera
\ No newline at end of file
diff --git a/src/components/file_mode/GalleryItemsView.vue b/src/components/file_mode/GalleryItemsView.vue
index 2a5d94a..fec79a2 100644
--- a/src/components/file_mode/GalleryItemsView.vue
+++ b/src/components/file_mode/GalleryItemsView.vue
@@ -65,7 +65,7 @@ export default {
}
}
},
- beforeDestroy() {
+ beforeUnmount() {
document.body.classList.remove("dark");
},
computed: {
@@ -95,18 +95,18 @@ export default {
methods: {
downloadOne() {
if (this.currentItemIndex >= 0 && this.currentItemIndex < this.items.length) {
- util.download(this.$matrix.matrixClient, this.items[this.currentItemIndex].event);
+ util.download(this.$matrix.matrixClient, this.$matrix.useAuthedMedia, this.items[this.currentItemIndex].event);
}
},
downloadAll() {
- this.items.forEach(item => util.download(this.$matrix.matrixClient, item.event));
+ this.items.forEach(item => util.download(this.$matrix.matrixClient, this.$matrix.useAuthedMedia, item.event));
}
}
};
diff --git a/src/components/messages/AudioWaveformView.vue b/src/components/messages/AudioWaveformView.vue
index 905fbbc..d8bb406 100644
--- a/src/components/messages/AudioWaveformView.vue
+++ b/src/components/messages/AudioWaveformView.vue
@@ -32,7 +32,7 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/ContactChanged.vue b/src/components/messages/ContactChanged.vue
index e03d24a..8708f82 100644
--- a/src/components/messages/ContactChanged.vue
+++ b/src/components/messages/ContactChanged.vue
@@ -40,5 +40,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/ContactInvited.vue b/src/components/messages/ContactInvited.vue
index 110c43e..8e9337e 100644
--- a/src/components/messages/ContactInvited.vue
+++ b/src/components/messages/ContactInvited.vue
@@ -14,5 +14,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/ContactJoin.vue b/src/components/messages/ContactJoin.vue
index d8aa6d8..eb8defd 100644
--- a/src/components/messages/ContactJoin.vue
+++ b/src/components/messages/ContactJoin.vue
@@ -14,5 +14,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/ContactKicked.vue b/src/components/messages/ContactKicked.vue
index b34da00..4f2375c 100644
--- a/src/components/messages/ContactKicked.vue
+++ b/src/components/messages/ContactKicked.vue
@@ -21,5 +21,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/ContactLeave.vue b/src/components/messages/ContactLeave.vue
index 1e40799..eb21a48 100644
--- a/src/components/messages/ContactLeave.vue
+++ b/src/components/messages/ContactLeave.vue
@@ -19,5 +19,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/DebugEvent.vue b/src/components/messages/DebugEvent.vue
index e678340..24705db 100644
--- a/src/components/messages/DebugEvent.vue
+++ b/src/components/messages/DebugEvent.vue
@@ -11,5 +11,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageIncoming.vue b/src/components/messages/MessageIncoming.vue
index d468d5c..3ec7e44 100644
--- a/src/components/messages/MessageIncoming.vue
+++ b/src/components/messages/MessageIncoming.vue
@@ -8,8 +8,8 @@
@@ -30,5 +30,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageIncomingImage.vue b/src/components/messages/MessageIncomingImage.vue
index d89d9fc..d554dce 100644
--- a/src/components/messages/MessageIncomingImage.vue
+++ b/src/components/messages/MessageIncomingImage.vue
@@ -1,5 +1,5 @@
-
+
@@ -50,7 +50,7 @@ export default {
const width = this.$refs.image.$el.clientWidth;
const height = (width * 9) / 16;
util
- .getThumbnail(this.$matrix.matrixClient, this.event, this.$config, width, height)
+ .getThumbnail(this.$matrix.matrixClient, this.$matrix.useAuthedMedia, this.event, this.$config, width, height)
.then((url) => {
const info = this.event.getContent().info;
// JPEGs use cover, PNG and GIF ect contain. This is because PNG and GIF are expected to
@@ -71,7 +71,7 @@ export default {
console.log("Failed to fetch thumbnail: ", err);
});
},
- beforeDestroy() {
+ beforeUnmount() {
if (this.src) {
const objectUrl = this.src;
this.src = null;
@@ -82,5 +82,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageIncomingPoll.vue b/src/components/messages/MessageIncomingPoll.vue
index 3008f22..e2f4ca8 100644
--- a/src/components/messages/MessageIncomingPoll.vue
+++ b/src/components/messages/MessageIncomingPoll.vue
@@ -1,8 +1,8 @@
-
+
{{ answer.text }} {{ answer.max }}
$vuetify.icons.ic_check
+
@@ -93,6 +93,6 @@ export default {
diff --git a/src/components/messages/MessageIncomingSticker.vue b/src/components/messages/MessageIncomingSticker.vue
index afa5800..96d2d0b 100644
--- a/src/components/messages/MessageIncomingSticker.vue
+++ b/src/components/messages/MessageIncomingSticker.vue
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/components/messages/MessageIncomingText.vue b/src/components/messages/MessageIncomingText.vue
index f98648d..94a4848 100644
--- a/src/components/messages/MessageIncomingText.vue
+++ b/src/components/messages/MessageIncomingText.vue
@@ -1,5 +1,5 @@
-
+
{{ pollQuestion }}
@@ -22,8 +22,8 @@
>
-
+ $vuetify.icons.ic_check_small
{{ $t("poll_create.poll_status_closed") }}
+
@@ -39,5 +39,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageIncomingThread.vue b/src/components/messages/MessageIncomingThread.vue
index bacf1e6..f30734c 100644
--- a/src/components/messages/MessageIncomingThread.vue
+++ b/src/components/messages/MessageIncomingThread.vue
@@ -1,5 +1,5 @@
-
+
+
{{ $t('fallbacks.audio_file')}}
@@ -17,5 +17,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageOutgoingFile.vue b/src/components/messages/MessageOutgoingFile.vue
index 87e8e6d..fe454fa 100644
--- a/src/components/messages/MessageOutgoingFile.vue
+++ b/src/components/messages/MessageOutgoingFile.vue
@@ -1,5 +1,5 @@
-
+
-
@@ -31,8 +31,8 @@
![]()
- {{ userAvatarLetter }}
+
@@ -41,10 +41,11 @@ import messageMixin from "./messageMixin";
import util, { ROOM_TYPE_CHANNEL } from "../../plugins/utils";
import QuickReactions from "./QuickReactions.vue";
import QuickReactionsChannel from "./channel/QuickReactionsChannel.vue";
+import AuthedImage from "../AuthedImage.vue";
export default {
mixins: [messageMixin],
- components: { QuickReactions, QuickReactionsChannel, SeenBy },
+ components: { QuickReactions, QuickReactionsChannel, SeenBy, AuthedImage },
data() {
return { ROOM_TYPE_CHANNEL: ROOM_TYPE_CHANNEL }
},
@@ -56,5 +57,5 @@ export default {
};
\ No newline at end of file
diff --git a/src/components/messages/MessageOutgoingAudio.vue b/src/components/messages/MessageOutgoingAudio.vue
index 70db51d..e353179 100644
--- a/src/components/messages/MessageOutgoingAudio.vue
+++ b/src/components/messages/MessageOutgoingAudio.vue
@@ -1,5 +1,5 @@
-
-
-
- {{ item.data }}
+
+
+ {{ item.i }}
- $vuetify.icons.addReaction
+ $vuetify.icons.addReaction
reply
- edit
+ edit
- delete
+ delete
- get_app
+ get_app
@@ -72,5 +72,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageOperationsPicker.vue b/src/components/messages/MessageOperationsPicker.vue
index d1b80fb..145975a 100644
--- a/src/components/messages/MessageOperationsPicker.vue
+++ b/src/components/messages/MessageOperationsPicker.vue
@@ -47,5 +47,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageOutgoing.vue b/src/components/messages/MessageOutgoing.vue
index da41b18..137356f 100644
--- a/src/components/messages/MessageOutgoing.vue
+++ b/src/components/messages/MessageOutgoing.vue
@@ -26,11 +26,11 @@
color="#ededed"
@click.stop="ownAvatarClicked"
>
-
@@ -30,5 +30,5 @@ export default {
};
\ No newline at end of file
diff --git a/src/components/messages/MessageOutgoingImage.vue b/src/components/messages/MessageOutgoingImage.vue
index 73bcb3e..5225196 100644
--- a/src/components/messages/MessageOutgoingImage.vue
+++ b/src/components/messages/MessageOutgoingImage.vue
@@ -1,5 +1,5 @@
-
+
@@ -49,7 +49,7 @@ export default {
const width = this.$refs.image.$el.clientWidth;
const height = (width * 9) / 16;
util
- .getThumbnail(this.$matrix.matrixClient, this.event, this.$config, width, height)
+ .getThumbnail(this.$matrix.matrixClient, this.$matrix.useAuthedMedia, this.event, this.$config, width, height)
.then((url) => {
const info = this.event.getContent().info;
// JPEGs use cover, PNG and GIF ect contain. This is because PNG and GIF are expected to
@@ -70,7 +70,7 @@ export default {
console.log("Failed to fetch thumbnail: ", err);
});
},
- beforeDestroy() {
+ beforeUnmount() {
if (this.src) {
const objectUrl = this.src;
this.src = null;
@@ -81,5 +81,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/MessageOutgoingPoll.vue b/src/components/messages/MessageOutgoingPoll.vue
index 779c63e..c3a7a60 100644
--- a/src/components/messages/MessageOutgoingPoll.vue
+++ b/src/components/messages/MessageOutgoingPoll.vue
@@ -1,8 +1,8 @@
-
+
{{ answer.text }} {{ answer.max }}
$vuetify.icons.ic_check
+
@@ -93,6 +93,6 @@ export default {
diff --git a/src/components/messages/MessageOutgoingSticker.vue b/src/components/messages/MessageOutgoingSticker.vue
index 2fa7655..757e59e 100644
--- a/src/components/messages/MessageOutgoingSticker.vue
+++ b/src/components/messages/MessageOutgoingSticker.vue
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/components/messages/MessageOutgoingText.vue b/src/components/messages/MessageOutgoingText.vue
index fd55d75..948ce13 100644
--- a/src/components/messages/MessageOutgoingText.vue
+++ b/src/components/messages/MessageOutgoingText.vue
@@ -1,5 +1,5 @@
-
+
{{ pollQuestion }}
@@ -22,8 +22,8 @@
>
-
+ $vuetify.icons.ic_check_small
{{ $t("poll_create.poll_status_closed") }}
+
@@ -35,5 +35,5 @@ export default {
};
\ No newline at end of file
diff --git a/src/components/messages/MessageOutgoingThread.vue b/src/components/messages/MessageOutgoingThread.vue
index 0785d94..d00f514 100644
--- a/src/components/messages/MessageOutgoingThread.vue
+++ b/src/components/messages/MessageOutgoingThread.vue
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,7 @@
-
@@ -32,8 +32,8 @@
-
+
{{ name }} {{ value.length }}
@@ -24,8 +23,8 @@
{{ name }} {{ value.length }}
@@ -34,22 +33,21 @@
v-if="totalReaction > REACTION_LIMIT"
@click="showAllReaction = !showAllReaction"
class="pa-2 ma-1 ml-0"
- outlined
- small
+ variant="outlined"
+ size="small"
>
{{ otherReactionText }}
-
+
- $vuetify.icons.addReaction
+ $vuetify.icons.addReaction
{{ $t("global.add_reaction") }}
@@ -88,7 +86,7 @@ export default {
this.reactions = this.timelineSet.relations.getChildEventsForEvent(this.event.getId(), 'm.annotation', 'm.reaction');
this.event.on("Event.relationsCreated", this.onRelationsCreated);
},
- beforeDestroy() {
+ beforeUnmount() {
this.event.off("Event.relationsCreated", this.onRelationsCreated);
if (this.reactions) {
this.reactions.off('Relations.add', this.onAddRelation);
@@ -163,5 +161,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/ReadMarker.vue b/src/components/messages/ReadMarker.vue
index f8b3969..ba5360a 100644
--- a/src/components/messages/ReadMarker.vue
+++ b/src/components/messages/ReadMarker.vue
@@ -13,5 +13,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomAliased.vue b/src/components/messages/RoomAliased.vue
index 9c87f29..1f4dac4 100644
--- a/src/components/messages/RoomAliased.vue
+++ b/src/components/messages/RoomAliased.vue
@@ -13,5 +13,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomAvatarChanged.vue b/src/components/messages/RoomAvatarChanged.vue
index cc68bca..590d71b 100644
--- a/src/components/messages/RoomAvatarChanged.vue
+++ b/src/components/messages/RoomAvatarChanged.vue
@@ -14,5 +14,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomCreated.vue b/src/components/messages/RoomCreated.vue
index c83ad15..9d4fc08 100644
--- a/src/components/messages/RoomCreated.vue
+++ b/src/components/messages/RoomCreated.vue
@@ -13,5 +13,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomDeletionNotice.vue b/src/components/messages/RoomDeletionNotice.vue
index f8b7524..9bd43f7 100644
--- a/src/components/messages/RoomDeletionNotice.vue
+++ b/src/components/messages/RoomDeletionNotice.vue
@@ -19,5 +19,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomEncrypted.vue b/src/components/messages/RoomEncrypted.vue
index 874d989..8154ea8 100644
--- a/src/components/messages/RoomEncrypted.vue
+++ b/src/components/messages/RoomEncrypted.vue
@@ -13,5 +13,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomGuestAccessChanged.vue b/src/components/messages/RoomGuestAccessChanged.vue
index b89501c..84fe7e6 100644
--- a/src/components/messages/RoomGuestAccessChanged.vue
+++ b/src/components/messages/RoomGuestAccessChanged.vue
@@ -30,5 +30,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomHistoryVisibility.vue b/src/components/messages/RoomHistoryVisibility.vue
index a6e1592..70272cc 100644
--- a/src/components/messages/RoomHistoryVisibility.vue
+++ b/src/components/messages/RoomHistoryVisibility.vue
@@ -30,5 +30,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomJoinRules.vue b/src/components/messages/RoomJoinRules.vue
index 0ee433b..9a57b78 100644
--- a/src/components/messages/RoomJoinRules.vue
+++ b/src/components/messages/RoomJoinRules.vue
@@ -26,5 +26,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomNameChanged.vue b/src/components/messages/RoomNameChanged.vue
index 1e844c5..381a920 100644
--- a/src/components/messages/RoomNameChanged.vue
+++ b/src/components/messages/RoomNameChanged.vue
@@ -14,5 +14,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomPowerLevelsChanged.vue b/src/components/messages/RoomPowerLevelsChanged.vue
index 14df1ff..97cc259 100644
--- a/src/components/messages/RoomPowerLevelsChanged.vue
+++ b/src/components/messages/RoomPowerLevelsChanged.vue
@@ -82,5 +82,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/RoomTopicChanged.vue b/src/components/messages/RoomTopicChanged.vue
index 9268756..e66d7bc 100644
--- a/src/components/messages/RoomTopicChanged.vue
+++ b/src/components/messages/RoomTopicChanged.vue
@@ -14,5 +14,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/SeenBy.vue b/src/components/messages/SeenBy.vue
index 70480a1..f72c8a7 100644
--- a/src/components/messages/SeenBy.vue
+++ b/src/components/messages/SeenBy.vue
@@ -2,21 +2,21 @@
-
-
- {{ $tc("message.seen_by") }}
-
-
+ {{ $t("message.seen_by") }}
+
+
- ![]()
- {{
+
-
-
- {{member.roomMember.name}}
- {{ seenByTimeStamp(member.readTimestamp) }}
-
+
+ {{member.roomMember.name}}
+ {{ seenByTimeStamp(member.readTimestamp) }}
@@ -45,12 +43,14 @@
\ No newline at end of file
diff --git a/src/components/messages/attachmentMixin.js b/src/components/messages/attachmentMixin.js
index 0fed50b..5379834 100644
--- a/src/components/messages/attachmentMixin.js
+++ b/src/components/messages/attachmentMixin.js
@@ -19,7 +19,7 @@ export default {
mounted() {
this.loadAttachmentSource(this.event);
},
- beforeDestroy() {
+ beforeUnmount() {
this.loadAttachmentSource(null); // Release
},
computed: {
@@ -44,7 +44,7 @@ export default {
return;
}
util
- .getAttachment(this.$matrix.matrixClient, event, (progress) => {
+ .getAttachment(this.$matrix.matrixClient, this.$matrix.useAuthedMedia, event, (progress) => {
this.downloadProgress = progress;
console.log("Progress: " + progress);
})
diff --git a/src/components/messages/channel/MessageOperationsChannel.vue b/src/components/messages/channel/MessageOperationsChannel.vue
index 7a726ab..7541e4e 100644
--- a/src/components/messages/channel/MessageOperationsChannel.vue
+++ b/src/components/messages/channel/MessageOperationsChannel.vue
@@ -1,29 +1,21 @@
-
- $vuetify.icons.ic_like_filled
+
+ $vuetify.icons.ic_like_filled
{{ $t("global.click_to_remove") }}
- $vuetify.icons.ic_like {{ $i18n.toLocalNumbers(value.length.toFixed()) }}
+ $vuetify.icons.ic_like {{ utils.toLocalNumbers(value.length.toFixed()) }}
\ No newline at end of file
diff --git a/src/components/messages/channel/SwipeableThumbnailsView.vue b/src/components/messages/channel/SwipeableThumbnailsView.vue
index fe1dcc6..4c4df19 100644
--- a/src/components/messages/channel/SwipeableThumbnailsView.vue
+++ b/src/components/messages/channel/SwipeableThumbnailsView.vue
@@ -53,5 +53,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/export/MessageIncomingAudioExport.vue b/src/components/messages/export/MessageIncomingAudioExport.vue
index b7d3032..967b801 100644
--- a/src/components/messages/export/MessageIncomingAudioExport.vue
+++ b/src/components/messages/export/MessageIncomingAudioExport.vue
@@ -1,5 +1,5 @@
-
+
@@ -17,5 +17,5 @@ export default {
diff --git a/src/components/messages/export/MessageIncomingFileExport.vue b/src/components/messages/export/MessageIncomingFileExport.vue
index 3696760..02f53a4 100644
--- a/src/components/messages/export/MessageIncomingFileExport.vue
+++ b/src/components/messages/export/MessageIncomingFileExport.vue
@@ -1,5 +1,5 @@
-
+
@@ -42,5 +42,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/welcome_headers/WelcomeHeaderDirectChat.vue b/src/components/welcome_headers/WelcomeHeaderDirectChat.vue
index 6ae80c9..1ac85a4 100644
--- a/src/components/welcome_headers/WelcomeHeaderDirectChat.vue
+++ b/src/components/welcome_headers/WelcomeHeaderDirectChat.vue
@@ -61,5 +61,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/welcome_headers/WelcomeHeaderRoom.vue b/src/components/welcome_headers/WelcomeHeaderRoom.vue
index bd66de1..6f86f7e 100644
--- a/src/components/welcome_headers/WelcomeHeaderRoom.vue
+++ b/src/components/welcome_headers/WelcomeHeaderRoom.vue
@@ -2,22 +2,22 @@
-var icons = {}
-function importAll(r) {
- return r.keys().map(res => {
- // Remove"./"
- const parts = res.split("/");
- const iconName = parts[1].split(".")[0];
- icons[iconName] = { component: r(res).default };
- });
+var icons = {};
+var customAliases = {};
+const modules = import.meta.glob("@/assets/icons/*.vue", { eager: true });
+Object.keys(modules).map((path) => {
+ // Remove"./"
+ const parts = path.split("/");
+ const iconName = parts[parts.length - 1].split(".")[0];
+ icons[iconName] = { component: modules[path].default };
+ customAliases["vuetify.icons." + iconName] = "custom:" + iconName;
+});
+
+const custom = {
+ component: (props) => {
+ const {
+ icon,
+ tag,
+ ...rest
+ } = props;
+ const stringIcon = icon;
+ if (icons[stringIcon]) {
+ return h(tag, rest, [h(icons[stringIcon].component, { style: "width:100%;height:100%" })]);
+ }
+ return md.component(props);
+ }
}
-importAll(require.context('@/assets/icons/', true, /\.vue$/));
-Vue.use(Vuetify);
-
-export default function(ignoredconfig) {
- return new Vuetify({
+export default {
+ install(app, ignoredOptions) {
+ const options = {
+ components,
+ directives,
icons: {
- iconfont: 'md',
- values: icons,
+ defaultSet: "md",
+ aliases: {
+ ...aliases,
+ ...customAliases,
+ },
+ sets: {
+ md, custom,
+ },
},
- options: {
- customProperties: true
+ defaults: {
+ global: {
+ density: "comfortable",
+ },
+ VBtn: {
+ variant: "flat",
+ },
},
theme: {
options: {
customProperties: true,
},
dark: false,
- }
- });
-}
+ themes: {
+ light: {
+ colors: {
+ error: "#ff5252",
+ }
+ },
+ },
+ },
+ };
+ const vuetify = createVuetify(options);
+ app.use(vuetify);
+ app.config.globalProperties.$vuetify = vuetify;
+ app.$vuetify = vuetify;
+ },
+};
diff --git a/src/router/index.js b/src/router/index.js
index 4c4286a..aef0b16 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,5 +1,3 @@
-import Vue from 'vue'
-import VueRouter from 'vue-router'
import Home from '../components/Home.vue'
import Chat from '../components/Chat.vue'
import Join from '../components/Join.vue'
@@ -12,8 +10,8 @@ import CreateChannel from '../components/CreateChannel.vue'
import CreateFileDrop from '../components/CreateFileDrop.vue'
import User from '../models/user'
import util from '../plugins/utils'
-
-Vue.use(VueRouter)
+import { createRouter, createWebHashHistory } from 'vue-router'
+import { defineAsyncComponent } from 'vue'
const routes = [
{
@@ -33,7 +31,7 @@ const routes = [
{
path: '/info',
name: 'RoomInfo',
- component: () => import('../components/RoomInfo.vue'),
+ component: defineAsyncComponent(() => import('../components/RoomInfo.vue')),
props: true,
meta: {
title: 'Info',
@@ -97,7 +95,7 @@ const routes = [
{
path: '/invite/:roomId?',
name: 'Invite',
- component: () => import('../components/Invite.vue'),
+ component: defineAsyncComponent(() => import('../components/Invite.vue')),
meta: {
title: 'Add Friends'
}
@@ -105,13 +103,14 @@ const routes = [
{
path: '/goodbye',
name: 'Goodbye',
- component: () => import('../components/QuoteView.vue'),
+ component: defineAsyncComponent(() => import('../components/QuoteView.vue')),
props: true
}
]
-const router = new VueRouter({
- routes
+const router = createRouter({
+ history: createWebHashHistory(),
+ routes: routes
});
router.beforeEach((to, from, next) => {
diff --git a/src/services/analytics.service.js b/src/services/analytics.service.js
index ce7e58f..ea644d6 100644
--- a/src/services/analytics.service.js
+++ b/src/services/analytics.service.js
@@ -1,65 +1,64 @@
-import cleaninsights from './cleaninsights.service'
-import matomo from './matomo.service'
+import cleaninsights from "./cleaninsights.service";
+import matomo from "./matomo.service";
export default {
- install(Vue) {
- const analyticsService = new Vue({
- data() {
- return {
- engines: [],
- cachedEvents: [],
- initialized: false
- }
- },
- created() {
- this.$config.promise.then((config) => {
- var analytics = config.analytics || {};
- if (!Array.isArray(analytics)) {
- analytics = [analytics];
- }
- for (const engineConfig of analytics) {
- if (engineConfig.enabled) {
- let type = engineConfig.type || "ci";
- switch (type) {
- case "ci":
- {
- let engine = cleaninsights.install(Vue, engineConfig.config);
- this.engines.push(engine);
- }
- break;
- case "matomo":
- {
- let engine = matomo.install(Vue, engineConfig.config);
- this.engines.push(engine);
- }
- break;
- }
- }
- }
+ install(app) {
+ class AnalyticsServiceClass {
+ constructor() {
+ this.engines = [];
+ this.cachedEvents = [];
+ this.initialized = false;
- this.initialized = true;
-
- // Handle cached events
- this.cachedEvents.forEach(([category, action]) => {
- this.event(category, action);
- })
- this.cachedEvents = [];
- });
- },
- methods: {
- event(category, action) {
- if (!this.initialized) {
- this.cachedEvents.push([category, action]);
- return
- }
-
- // Send the event to each configured analytics engine.
- this.engines.forEach((engine) => {
- engine.event(category, action);
- });
- }
+ app.$config.promise.then((config) => {
+ var analytics = config.analytics || {};
+ if (!Array.isArray(analytics)) {
+ analytics = [analytics];
+ }
+ for (const engineConfig of analytics) {
+ if (engineConfig.enabled) {
+ let type = engineConfig.type || "ci";
+ switch (type) {
+ case "ci":
+ {
+ let engine = cleaninsights.install(app, engineConfig.config);
+ this.engines.push(engine);
+ }
+ break;
+ case "matomo":
+ {
+ let engine = matomo.install(app, engineConfig.config);
+ this.engines.push(engine);
+ }
+ break;
+ }
}
+ }
+
+ this.initialized = true;
+
+ // Handle cached events
+ this.cachedEvents.forEach(([category, action]) => {
+ this.event(category, action);
+ });
+ this.cachedEvents = [];
});
- Vue.prototype.$analytics = analyticsService;
+ }
+
+ event(category, action) {
+ if (!this.initialized) {
+ this.cachedEvents.push([category, action]);
+ return;
+ }
+
+ // Send the event to each configured analytics engine.
+ this.engines.forEach((engine) => {
+ engine.event(category, action);
+ });
+ }
}
-}
+
+ const analyticsService = new AnalyticsServiceClass();
+ app.$analytics = analyticsService;
+ app.config.globalProperties.$analytics = analyticsService;
+ },
+};
diff --git a/src/services/audio.service.js b/src/services/audio.service.js
index 6037be4..e9cc3ed 100644
--- a/src/services/audio.service.js
+++ b/src/services/audio.service.js
@@ -1,4 +1,5 @@
import utils from "../plugins/utils";
+import emitter from 'tiny-emitter/instance';
/**
* This plugin (available in all vue components as $audioPlayer) handles
@@ -9,7 +10,7 @@ import utils from "../plugins/utils";
* an audio matrix event and a unique component id (for example the ._uid property).
*/
export default {
- install(Vue) {
+ install(app) {
class SharedAudioPlayer {
constructor() {
this.player = new Audio();
@@ -34,12 +35,12 @@ export default {
// Listeners is just a Set of component "uid" entries for now.
entry = { url: null, listeners: new Set() };
// Make these reactive, so AudioPlayer (and others) can listen to them
- Vue.set(entry, "loading", false);
- Vue.set(entry, "loadPercent", 0);
- Vue.set(entry, "duration", 0);
- Vue.set(entry, "currentTime", 0);
- Vue.set(entry, "playPercent", 0);
- Vue.set(entry, "playing", false);
+ entry["loading"] = false;
+ entry["loadPercent"] = 0;
+ entry["duration"] = 0;
+ entry["currentTime"] = 0;
+ entry["playPercent"] = 0;
+ entry["playing"] = false;
this.infoMap.set(eventId, entry);
// Get duration information
@@ -117,7 +118,7 @@ export default {
info.loading = true;
info.abortController = new AbortController();
utils
- .getAttachment(this.$root.$matrix.matrixClient, event, (progress) => {
+ .getAttachment(this.$root.$matrix.matrixClient, this.$root.$matrix.useAuthedMedia, event, (progress) => {
info.loadPercent = progress;
}, false, info.abortController)
.then((url) => {
@@ -189,14 +190,14 @@ export default {
if (entry) {
entry.playing = true;
}
- this.$root.$emit("audio-playback-started", this.currentEvent);
+ emitter.emit("audio-playback-started", this.currentEvent);
}
onPause() {
var entry = this.infoMap.get(this.currentEvent);
if (entry) {
entry.playing = false;
}
- this.$root.$emit("audio-playback-paused", this.currentEvent);
+ emitter.emit("audio-playback-paused", this.currentEvent);
}
onEnded() {
var entry = this.infoMap.get(this.currentEvent);
@@ -204,7 +205,7 @@ export default {
entry.playing = false;
entry.currentTime = entry.duration; // Next time restart
}
- this.$root.$emit("audio-playback-ended", this.currentEvent);
+ emitter.emit("audio-playback-ended", this.currentEvent);
}
onTimeUpdate() {
var entry = this.infoMap.get(this.currentEvent);
@@ -257,12 +258,14 @@ export default {
maybePlayClapEvent(previousTimeMs, timeNowMs) {
(this.currentClapReactions || []).forEach(reaction => {
if (previousTimeMs < reaction.timeOffset && timeNowMs >= reaction.timeOffset) {
- this.$root.$emit("audio-playback-reaction", reaction);
+ emitter.emit("audio-playback-reaction", reaction);
}
});
}
}
- Vue.prototype.$audioPlayer = new SharedAudioPlayer();
+ const audioPlayer = new SharedAudioPlayer();
+ app.$audioPlayer = audioPlayer;
+ app.config.globalProperties.$audioPlayer = audioPlayer;
},
};
diff --git a/src/services/cleaninsights.service.js b/src/services/cleaninsights.service.js
index ba0fe60..fa6b929 100644
--- a/src/services/cleaninsights.service.js
+++ b/src/services/cleaninsights.service.js
@@ -1,58 +1,55 @@
-import { CleanInsights, ConsentRequestUi } from 'clean-insights-sdk';
+import { CleanInsights, ConsentRequestUi } from "clean-insights-sdk";
export default {
- install(Vue, config) {
-
- class RequestUi extends ConsentRequestUi {
- showForCampaign(campaignId, campaign, complete) {
- const period = campaign.nextTotalMeasurementPeriod
- if (!period) {
- return ''
- }
- let message = 'Help us improve!\n\n'
- + `We would like to collect anonymous usage data between ${period.start.format('LLL')} and ${period.end.format('LLL')} to improve the quality of the product.\n\nYour help would be highly appreciated.`
-
- complete(window.confirm(message))
- return ''
- }
+ install(app, config) {
+ class RequestUi extends ConsentRequestUi {
+ showForCampaign(campaignId, campaign, complete) {
+ const period = campaign.nextTotalMeasurementPeriod;
+ if (!period) {
+ return "";
}
+ let message =
+ "Help us improve!\n\n" +
+ `We would like to collect anonymous usage data between ${period.start.format("LLL")} and ${period.end.format(
+ "LLL"
+ )} to improve the quality of the product.\n\nYour help would be highly appreciated.`;
- const cleanInsightsService = new Vue({
- config: config,
- data() {
- return {
- ci: null,
- campaignId: null,
- requestUi: null,
- }
- },
- created() {
- if (this.$options.config) {
- const config = this.$options.config;
- this.ci = new CleanInsights(config);
-
- // Get name of first campaign in the config.
- this.campaignId = Object.keys(config.campaigns || { invalid: {} })[0];
-
- }
- },
- methods: {
- event(category, action) {
- if (!this.ci) {
- return;
- }
- if (!this.requestUi) {
- this.requestUi = new RequestUi();
- }
- this.ci.requestConsentForCampaign(this.campaignId, this.requestUi, (granted) => {
- if (!granted) {
- return
- }
- this.ci.measureEvent(category, action, this.campaignId);
- })
- }
- }
- });
- return cleanInsightsService;
+ complete(window.confirm(message));
+ return "";
+ }
}
-}
+
+ class CleanInsightsServiceClass {
+ constructor() {
+ this.config = config;
+ this.ci = null;
+ this.campaignId = null;
+ this.requestUi = null;
+ if (config) {
+ this.ci = new CleanInsights(config);
+
+ // Get name of first campaign in the config.
+ this.campaignId = Object.keys(config.campaigns || { invalid: {} })[0];
+ }
+ }
+
+ event(category, action) {
+ if (!this.ci) {
+ return;
+ }
+ if (!this.requestUi) {
+ this.requestUi = new RequestUi();
+ }
+ this.ci.requestConsentForCampaign(this.campaignId, this.requestUi, (granted) => {
+ if (!granted) {
+ return;
+ }
+ this.ci.measureEvent(category, action, this.campaignId);
+ });
+ }
+ }
+
+ const cleanInsightsService = new CleanInsightsServiceClass();
+ return cleanInsightsService;
+ },
+};
diff --git a/src/services/config.service.js b/src/services/config.service.js
index 02f2054..206a56d 100644
--- a/src/services/config.service.js
+++ b/src/services/config.service.js
@@ -1,7 +1,9 @@
+import * as defaultConfig from "@/assets/config.json";
+
export default {
- install(Vue, defaultServerFromLocation, onloaded) {
- var config = Vue.observable(require('@/assets/config.json'));
- Vue.set(config, "loaded", false);
+ install(app, defaultServerFromLocation, onloaded) {
+ var config = defaultConfig.default;
+ config["loaded"] = false;
const getRuntimeConfig = () => {
return fetch('./config.json?ms=' + Date.now()).then((res) => res.json()).catch(err => {
console.error("Failed to get config:", err);
@@ -12,25 +14,25 @@ export default {
config.promise = getRuntimeConfig().then((json) => {
// Reactively use all the config values
for (const key of Object.keys(json)) {
- Vue.set(config, key, json[key]);
+ config[key] = json[key];
}
// If default server is not set, default to current server address
if (!json.defaultBaseUrl) {
if (json.defaultServer) {
// TODO - Only to migrate old values (defaultServer was renamed defaultBaseUrl), can be removed later...
- Vue.set(config, "defaultBaseUrl", defaultServerFromLocation);
+ config["defaultBaseUrl"] = defaultServerFromLocation;
} else {
- Vue.set(config, "defaultBaseUrl", json.defaultServer);
+ config["defaultBaseUrl"] = json.defaultServer;
}
}
if (json.useFullyQualifiedDMLinks == undefined) {
- Vue.set(config, "useFullyQualifiedDMLinks", true); // Default to true
+ config["useFullyQualifiedDMLinks"] = true; // Default to true
}
if (json.disableMediaSharing == undefined) {
Vue.set(config, "disableMediaSharing", false);
}
if (!json.maxSizeAutoDownloads) {
- Vue.set(config, "maxSizeAutoDownloads", 10 * 1024 * 1024);
+ config["maxSizeAutoDownloads"] = 10 * 1024 * 1024;
}
if (!json.roomTypes) {
let roomTypes = ["group_chat", "channel"];
@@ -38,9 +40,11 @@ export default {
if (fileDropEnabled) {
roomTypes.push("file_drop");
}
- Vue.set(config, "roomTypes", roomTypes);
+ config["roomTypes"] = roomTypes;
}
- Vue.set(config, "loaded", true);
+ config["loaded"] = true;
+
+ document.title = config.appName || "";
// Tell callback we are done loading runtime config
if (onloaded) {
@@ -66,6 +70,7 @@ export default {
return undefined;
}
- Vue.prototype.$config = config;
+ app.$config = config;
+ app.config.globalProperties.$config = config;
}
}
diff --git a/src/services/filesaver.cjs b/src/services/filesaver.cjs
new file mode 100644
index 0000000..5d204ae
--- /dev/null
+++ b/src/services/filesaver.cjs
@@ -0,0 +1,171 @@
+/*
+* FileSaver.js
+* A saveAs() FileSaver implementation.
+*
+* By Eli Grey, http://eligrey.com
+*
+* License : https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md (MIT)
+* source : http://purl.eligrey.com/github/FileSaver.js
+*/
+
+// The one and only way of getting global scope in all environments
+// https://stackoverflow.com/q/3277182/1008999
+var _global = typeof window === 'object' && window.window === window
+ ? window : typeof self === 'object' && self.self === self
+ ? self : typeof global === 'object' && global.global === global
+ ? global
+ : this
+
+function bom (blob, opts) {
+ if (typeof opts === 'undefined') opts = { autoBom: false }
+ else if (typeof opts !== 'object') {
+ console.warn('Deprecated: Expected third argument to be a object')
+ opts = { autoBom: !opts }
+ }
+
+ // prepend BOM for UTF-8 XML and text/* types (including HTML)
+ // note: your browser will automatically convert UTF-16 U+FEFF to EF BB BF
+ if (opts.autoBom && /^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(blob.type)) {
+ return new Blob([String.fromCharCode(0xFEFF), blob], { type: blob.type })
+ }
+ return blob
+}
+
+function download (url, name, opts) {
+ var xhr = new XMLHttpRequest()
+ xhr.open('GET', url)
+ xhr.responseType = 'blob'
+ xhr.onload = function () {
+ saveAs(xhr.response, name, opts)
+ }
+ xhr.onerror = function () {
+ console.error('could not download file')
+ }
+ xhr.send()
+}
+
+function corsEnabled (url) {
+ var xhr = new XMLHttpRequest()
+ // use sync to avoid popup blocker
+ xhr.open('HEAD', url, false)
+ try {
+ xhr.send()
+ } catch (e) {}
+ return xhr.status >= 200 && xhr.status <= 299
+}
+
+// `a.click()` doesn't work for all browsers (#465)
+function click (node) {
+ try {
+ node.dispatchEvent(new MouseEvent('click'))
+ } catch (e) {
+ var evt = document.createEvent('MouseEvents')
+ evt.initMouseEvent('click', true, true, window, 0, 0, 0, 80,
+ 20, false, false, false, false, 0, null)
+ node.dispatchEvent(evt)
+ }
+}
+
+// Detect WebView inside a native macOS app by ruling out all browsers
+// We just need to check for 'Safari' because all other browsers (besides Firefox) include that too
+// https://www.whatismybrowser.com/guides/the-latest-user-agent/macos
+var isMacOSWebView = _global.navigator && /Macintosh/.test(navigator.userAgent) && /AppleWebKit/.test(navigator.userAgent) && !/Safari/.test(navigator.userAgent)
+
+var saveAs = _global.saveAs || (
+ // probably in some web worker
+ (typeof window !== 'object' || window !== _global)
+ ? function saveAs () { /* noop */ }
+
+ // Use download attribute first if possible (#193 Lumia mobile) unless this is a macOS WebView
+ : ('download' in HTMLAnchorElement.prototype && !isMacOSWebView)
+ ? function saveAs (blob, name, opts) {
+ var URL = _global.URL || _global.webkitURL
+ var a = document.createElement('a')
+ name = name || blob.name || 'download'
+
+ a.download = name
+ a.rel = 'noopener' // tabnabbing
+
+ // TODO: detect chrome extensions & packaged apps
+ // a.target = '_blank'
+
+ if (typeof blob === 'string') {
+ // Support regular links
+ a.href = blob
+ if (a.origin !== location.origin) {
+ corsEnabled(a.href)
+ ? download(blob, name, opts)
+ : click(a, a.target = '_blank')
+ } else {
+ click(a)
+ }
+ } else {
+ // Support blobs
+ a.href = URL.createObjectURL(blob)
+ setTimeout(function () { URL.revokeObjectURL(a.href) }, 4E4) // 40s
+ setTimeout(function () { click(a) }, 0)
+ }
+ }
+
+ // Use msSaveOrOpenBlob as a second approach
+ : 'msSaveOrOpenBlob' in navigator
+ ? function saveAs (blob, name, opts) {
+ name = name || blob.name || 'download'
+
+ if (typeof blob === 'string') {
+ if (corsEnabled(blob)) {
+ download(blob, name, opts)
+ } else {
+ var a = document.createElement('a')
+ a.href = blob
+ a.target = '_blank'
+ setTimeout(function () { click(a) })
+ }
+ } else {
+ navigator.msSaveOrOpenBlob(bom(blob, opts), name)
+ }
+ }
+
+ // Fallback to using FileReader and a popup
+ : function saveAs (blob, name, opts, popup) {
+ // Open a popup immediately do go around popup blocker
+ // Mostly only available on user interaction and the fileReader is async so...
+ popup = popup || open('', '_blank')
+ if (popup) {
+ popup.document.title =
+ popup.document.body.innerText = 'downloading...'
+ }
+
+ if (typeof blob === 'string') return download(blob, name, opts)
+
+ var force = blob.type === 'application/octet-stream'
+ var isSafari = /constructor/i.test(_global.HTMLElement) || _global.safari
+ var isChromeIOS = /CriOS\/[\d]+/.test(navigator.userAgent)
+
+ if ((isChromeIOS || (force && isSafari) || isMacOSWebView) && typeof FileReader !== 'undefined') {
+ // Safari doesn't allow downloading of blob URLs
+ var reader = new FileReader()
+ reader.onloadend = function () {
+ var url = reader.result
+ url = isChromeIOS ? url : url.replace(/^data:[^;]*;/, 'data:attachment/file;')
+ if (popup) popup.location.href = url
+ else location = url
+ popup = null // reverse-tabnabbing #460
+ }
+ reader.readAsDataURL(blob)
+ } else {
+ var URL = _global.URL || _global.webkitURL
+ var url = URL.createObjectURL(blob)
+ if (popup) popup.location = url
+ else location.href = url
+ popup = null // reverse-tabnabbing #460
+ setTimeout(function () { URL.revokeObjectURL(url) }, 4E4) // 40s
+ }
+ }
+)
+
+_global.saveAs = saveAs.saveAs = saveAs
+
+if (typeof module !== 'undefined') {
+ module.exports = saveAs;
+}
diff --git a/src/services/jszip.min.js b/src/services/jszip.min.js
new file mode 100644
index 0000000..ff4cfd5
--- /dev/null
+++ b/src/services/jszip.min.js
@@ -0,0 +1,13 @@
+/*!
+
+JSZip v3.10.1 - A JavaScript class for generating and reading zip files
+
+
+(c) 2009-2016 Stuart Knightley
+Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/main/LICENSE.markdown.
+
+JSZip uses the library pako released under the MIT license :
+https://github.com/nodeca/pako/blob/main/LICENSE
+*/
+
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).JSZip=e()}}(function(){return function s(a,o,h){function u(r,e){if(!o[r]){if(!a[r]){var t="function"==typeof require&&require;if(!e&&t)return t(r,!0);if(l)return l(r,!0);var n=new Error("Cannot find module '"+r+"'");throw n.code="MODULE_NOT_FOUND",n}var i=o[r]={exports:{}};a[r][0].call(i.exports,function(e){var t=a[r][1][e];return u(t||e)},i,i.exports,s,a,o,h)}return o[r].exports}for(var l="function"==typeof require&&require,e=0;e>2,s=(3&t)<<4|r>>4,a=1>6:64,o=2>4,r=(15&i)<<4|(s=p.indexOf(e.charAt(o++)))>>2,n=(3&s)<<6|(a=p.indexOf(e.charAt(o++))),l[h++]=t,64!==s&&(l[h++]=r),64!==a&&(l[h++]=n);return l}},{"./support":30,"./utils":32}],2:[function(e,t,r){"use strict";var n=e("./external"),i=e("./stream/DataWorker"),s=e("./stream/Crc32Probe"),a=e("./stream/DataLengthProbe");function o(e,t,r,n,i){this.compressedSize=e,this.uncompressedSize=t,this.crc32=r,this.compression=n,this.compressedContent=i}o.prototype={getContentWorker:function(){var e=new i(n.Promise.resolve(this.compressedContent)).pipe(this.compression.uncompressWorker()).pipe(new a("data_length")),t=this;return e.on("end",function(){if(this.streamInfo.data_length!==t.uncompressedSize)throw new Error("Bug : uncompressed data size mismatch")}),e},getCompressedWorker:function(){return new i(n.Promise.resolve(this.compressedContent)).withStreamInfo("compressedSize",this.compressedSize).withStreamInfo("uncompressedSize",this.uncompressedSize).withStreamInfo("crc32",this.crc32).withStreamInfo("compression",this.compression)}},o.createWorkerFrom=function(e,t,r){return e.pipe(new s).pipe(new a("uncompressedSize")).pipe(t.compressWorker(r)).pipe(new a("compressedSize")).withStreamInfo("compression",t)},t.exports=o},{"./external":6,"./stream/Crc32Probe":25,"./stream/DataLengthProbe":26,"./stream/DataWorker":27}],3:[function(e,t,r){"use strict";var n=e("./stream/GenericWorker");r.STORE={magic:"\0\0",compressWorker:function(){return new n("STORE compression")},uncompressWorker:function(){return new n("STORE decompression")}},r.DEFLATE=e("./flate")},{"./flate":7,"./stream/GenericWorker":28}],4:[function(e,t,r){"use strict";var n=e("./utils");var o=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t){return void 0!==e&&e.length?"string"!==n.getTypeOf(e)?function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t[a])];return-1^e}(0|t,e,e.length,0):function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t.charCodeAt(a))];return-1^e}(0|t,e,e.length,0):0}},{"./utils":32}],5:[function(e,t,r){"use strict";r.base64=!1,r.binary=!1,r.dir=!1,r.createFolders=!0,r.date=null,r.compression=null,r.compressionOptions=null,r.comment=null,r.unixPermissions=null,r.dosPermissions=null},{}],6:[function(e,t,r){"use strict";var n=null;n="undefined"!=typeof Promise?Promise:e("lie"),t.exports={Promise:n}},{lie:37}],7:[function(e,t,r){"use strict";var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,i=e("pako"),s=e("./utils"),a=e("./stream/GenericWorker"),o=n?"uint8array":"array";function h(e,t){a.call(this,"FlateWorker/"+e),this._pako=null,this._pakoAction=e,this._pakoOptions=t,this.meta={}}r.magic="\b\0",s.inherits(h,a),h.prototype.processChunk=function(e){this.meta=e.meta,null===this._pako&&this._createPako(),this._pako.push(s.transformTo(o,e.data),!1)},h.prototype.flush=function(){a.prototype.flush.call(this),null===this._pako&&this._createPako(),this._pako.push([],!0)},h.prototype.cleanUp=function(){a.prototype.cleanUp.call(this),this._pako=null},h.prototype._createPako=function(){this._pako=new i[this._pakoAction]({raw:!0,level:this._pakoOptions.level||-1});var t=this;this._pako.onData=function(e){t.push({data:e,meta:t.meta})}},r.compressWorker=function(e){return new h("Deflate",e)},r.uncompressWorker=function(){return new h("Inflate",{})}},{"./stream/GenericWorker":28,"./utils":32,pako:38}],8:[function(e,t,r){"use strict";function A(e,t){var r,n="";for(r=0;r>>=8;return n}function n(e,t,r,n,i,s){var a,o,h=e.file,u=e.compression,l=s!==O.utf8encode,f=I.transformTo("string",s(h.name)),c=I.transformTo("string",O.utf8encode(h.name)),d=h.comment,p=I.transformTo("string",s(d)),m=I.transformTo("string",O.utf8encode(d)),_=c.length!==h.name.length,g=m.length!==d.length,b="",v="",y="",w=h.dir,k=h.date,x={crc32:0,compressedSize:0,uncompressedSize:0};t&&!r||(x.crc32=e.crc32,x.compressedSize=e.compressedSize,x.uncompressedSize=e.uncompressedSize);var S=0;t&&(S|=8),l||!_&&!g||(S|=2048);var z=0,C=0;w&&(z|=16),"UNIX"===i?(C=798,z|=function(e,t){var r=e;return e||(r=t?16893:33204),(65535&r)<<16}(h.unixPermissions,w)):(C=20,z|=function(e){return 63&(e||0)}(h.dosPermissions)),a=k.getUTCHours(),a<<=6,a|=k.getUTCMinutes(),a<<=5,a|=k.getUTCSeconds()/2,o=k.getUTCFullYear()-1980,o<<=4,o|=k.getUTCMonth()+1,o<<=5,o|=k.getUTCDate(),_&&(v=A(1,1)+A(B(f),4)+c,b+="up"+A(v.length,2)+v),g&&(y=A(1,1)+A(B(p),4)+m,b+="uc"+A(y.length,2)+y);var E="";return E+="\n\0",E+=A(S,2),E+=u.magic,E+=A(a,2),E+=A(o,2),E+=A(x.crc32,4),E+=A(x.compressedSize,4),E+=A(x.uncompressedSize,4),E+=A(f.length,2),E+=A(b.length,2),{fileRecord:R.LOCAL_FILE_HEADER+E+f+b,dirRecord:R.CENTRAL_FILE_HEADER+A(C,2)+E+A(p.length,2)+"\0\0\0\0"+A(z,4)+A(n,4)+f+b+p}}var I=e("../utils"),i=e("../stream/GenericWorker"),O=e("../utf8"),B=e("../crc32"),R=e("../signature");function s(e,t,r,n){i.call(this,"ZipFileWorker"),this.bytesWritten=0,this.zipComment=t,this.zipPlatform=r,this.encodeFileName=n,this.streamFiles=e,this.accumulate=!1,this.contentBuffer=[],this.dirRecords=[],this.currentSourceOffset=0,this.entriesCount=0,this.currentFile=null,this._sources=[]}I.inherits(s,i),s.prototype.push=function(e){var t=e.meta.percent||0,r=this.entriesCount,n=this._sources.length;this.accumulate?this.contentBuffer.push(e):(this.bytesWritten+=e.data.length,i.prototype.push.call(this,{data:e.data,meta:{currentFile:this.currentFile,percent:r?(t+100*(r-n-1))/r:100}}))},s.prototype.openedSource=function(e){this.currentSourceOffset=this.bytesWritten,this.currentFile=e.file.name;var t=this.streamFiles&&!e.file.dir;if(t){var r=n(e,t,!1,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);this.push({data:r.fileRecord,meta:{percent:0}})}else this.accumulate=!0},s.prototype.closedSource=function(e){this.accumulate=!1;var t=this.streamFiles&&!e.file.dir,r=n(e,t,!0,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);if(this.dirRecords.push(r.dirRecord),t)this.push({data:function(e){return R.DATA_DESCRIPTOR+A(e.crc32,4)+A(e.compressedSize,4)+A(e.uncompressedSize,4)}(e),meta:{percent:100}});else for(this.push({data:r.fileRecord,meta:{percent:0}});this.contentBuffer.length;)this.push(this.contentBuffer.shift());this.currentFile=null},s.prototype.flush=function(){for(var e=this.bytesWritten,t=0;t=this.index;t--)r=(r<<8)+this.byteAt(t);return this.index+=e,r},readString:function(e){return n.transformTo("string",this.readData(e))},readData:function(){},lastIndexOfSignature:function(){},readAndCheckSignature:function(){},readDate:function(){var e=this.readInt(4);return new Date(Date.UTC(1980+(e>>25&127),(e>>21&15)-1,e>>16&31,e>>11&31,e>>5&63,(31&e)<<1))}},t.exports=i},{"../utils":32}],19:[function(e,t,r){"use strict";var n=e("./Uint8ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./Uint8ArrayReader":21}],20:[function(e,t,r){"use strict";var n=e("./DataReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.byteAt=function(e){return this.data.charCodeAt(this.zero+e)},i.prototype.lastIndexOfSignature=function(e){return this.data.lastIndexOf(e)-this.zero},i.prototype.readAndCheckSignature=function(e){return e===this.readData(4)},i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./DataReader":18}],21:[function(e,t,r){"use strict";var n=e("./ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){if(this.checkOffset(e),0===e)return new Uint8Array(0);var t=this.data.subarray(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./ArrayReader":17}],22:[function(e,t,r){"use strict";var n=e("../utils"),i=e("../support"),s=e("./ArrayReader"),a=e("./StringReader"),o=e("./NodeBufferReader"),h=e("./Uint8ArrayReader");t.exports=function(e){var t=n.getTypeOf(e);return n.checkSupport(t),"string"!==t||i.uint8array?"nodebuffer"===t?new o(e):i.uint8array?new h(n.transformTo("uint8array",e)):new s(n.transformTo("array",e)):new a(e)}},{"../support":30,"../utils":32,"./ArrayReader":17,"./NodeBufferReader":19,"./StringReader":20,"./Uint8ArrayReader":21}],23:[function(e,t,r){"use strict";r.LOCAL_FILE_HEADER="PK",r.CENTRAL_FILE_HEADER="PK",r.CENTRAL_DIRECTORY_END="PK",r.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",r.ZIP64_CENTRAL_DIRECTORY_END="PK",r.DATA_DESCRIPTOR="PK\b"},{}],24:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../utils");function s(e){n.call(this,"ConvertWorker to "+e),this.destType=e}i.inherits(s,n),s.prototype.processChunk=function(e){this.push({data:i.transformTo(this.destType,e.data),meta:e.meta})},t.exports=s},{"../utils":32,"./GenericWorker":28}],25:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../crc32");function s(){n.call(this,"Crc32Probe"),this.withStreamInfo("crc32",0)}e("../utils").inherits(s,n),s.prototype.processChunk=function(e){this.streamInfo.crc32=i(e.data,this.streamInfo.crc32||0),this.push(e)},t.exports=s},{"../crc32":4,"../utils":32,"./GenericWorker":28}],26:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataLengthProbe for "+e),this.propName=e,this.withStreamInfo(e,0)}n.inherits(s,i),s.prototype.processChunk=function(e){if(e){var t=this.streamInfo[this.propName]||0;this.streamInfo[this.propName]=t+e.data.length}i.prototype.processChunk.call(this,e)},t.exports=s},{"../utils":32,"./GenericWorker":28}],27:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataWorker");var t=this;this.dataIsReady=!1,this.index=0,this.max=0,this.data=null,this.type="",this._tickScheduled=!1,e.then(function(e){t.dataIsReady=!0,t.data=e,t.max=e&&e.length||0,t.type=n.getTypeOf(e),t.isPaused||t._tickAndRepeat()},function(e){t.error(e)})}n.inherits(s,i),s.prototype.cleanUp=function(){i.prototype.cleanUp.call(this),this.data=null},s.prototype.resume=function(){return!!i.prototype.resume.call(this)&&(!this._tickScheduled&&this.dataIsReady&&(this._tickScheduled=!0,n.delay(this._tickAndRepeat,[],this)),!0)},s.prototype._tickAndRepeat=function(){this._tickScheduled=!1,this.isPaused||this.isFinished||(this._tick(),this.isFinished||(n.delay(this._tickAndRepeat,[],this),this._tickScheduled=!0))},s.prototype._tick=function(){if(this.isPaused||this.isFinished)return!1;var e=null,t=Math.min(this.max,this.index+16384);if(this.index>=this.max)return this.end();switch(this.type){case"string":e=this.data.substring(this.index,t);break;case"uint8array":e=this.data.subarray(this.index,t);break;case"array":case"nodebuffer":e=this.data.slice(this.index,t)}return this.index=t,this.push({data:e,meta:{percent:this.max?this.index/this.max*100:0}})},t.exports=s},{"../utils":32,"./GenericWorker":28}],28:[function(e,t,r){"use strict";function n(e){this.name=e||"default",this.streamInfo={},this.generatedError=null,this.extraStreamInfo={},this.isPaused=!0,this.isFinished=!1,this.isLocked=!1,this._listeners={data:[],end:[],error:[]},this.previous=null}n.prototype={push:function(e){this.emit("data",e)},end:function(){if(this.isFinished)return!1;this.flush();try{this.emit("end"),this.cleanUp(),this.isFinished=!0}catch(e){this.emit("error",e)}return!0},error:function(e){return!this.isFinished&&(this.isPaused?this.generatedError=e:(this.isFinished=!0,this.emit("error",e),this.previous&&this.previous.error(e),this.cleanUp()),!0)},on:function(e,t){return this._listeners[e].push(t),this},cleanUp:function(){this.streamInfo=this.generatedError=this.extraStreamInfo=null,this._listeners=[]},emit:function(e,t){if(this._listeners[e])for(var r=0;r "+e:e}},t.exports=n},{}],29:[function(e,t,r){"use strict";var h=e("../utils"),i=e("./ConvertWorker"),s=e("./GenericWorker"),u=e("../base64"),n=e("../support"),a=e("../external"),o=null;if(n.nodestream)try{o=e("../nodejs/NodejsStreamOutputAdapter")}catch(e){}function l(e,o){return new a.Promise(function(t,r){var n=[],i=e._internalType,s=e._outputType,a=e._mimeType;e.on("data",function(e,t){n.push(e),o&&o(t)}).on("error",function(e){n=[],r(e)}).on("end",function(){try{var e=function(e,t,r){switch(e){case"blob":return h.newBlob(h.transformTo("arraybuffer",t),r);case"base64":return u.encode(t);default:return h.transformTo(e,t)}}(s,function(e,t){var r,n=0,i=null,s=0;for(r=0;r>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t}(e)},s.utf8decode=function(e){return h.nodebuffer?o.transformTo("nodebuffer",e).toString("utf-8"):function(e){var t,r,n,i,s=e.length,a=new Array(2*s);for(t=r=0;t>10&1023,a[r++]=56320|1023&n)}return a.length!==r&&(a.subarray?a=a.subarray(0,r):a.length=r),o.applyFromCharCode(a)}(e=o.transformTo(h.uint8array?"uint8array":"array",e))},o.inherits(a,n),a.prototype.processChunk=function(e){var t=o.transformTo(h.uint8array?"uint8array":"array",e.data);if(this.leftOver&&this.leftOver.length){if(h.uint8array){var r=t;(t=new Uint8Array(r.length+this.leftOver.length)).set(this.leftOver,0),t.set(r,this.leftOver.length)}else t=this.leftOver.concat(t);this.leftOver=null}var n=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}(t),i=t;n!==t.length&&(h.uint8array?(i=t.subarray(0,n),this.leftOver=t.subarray(n,t.length)):(i=t.slice(0,n),this.leftOver=t.slice(n,t.length))),this.push({data:s.utf8decode(i),meta:e.meta})},a.prototype.flush=function(){this.leftOver&&this.leftOver.length&&(this.push({data:s.utf8decode(this.leftOver),meta:{}}),this.leftOver=null)},s.Utf8DecodeWorker=a,o.inherits(l,n),l.prototype.processChunk=function(e){this.push({data:s.utf8encode(e.data),meta:e.meta})},s.Utf8EncodeWorker=l},{"./nodejsUtils":14,"./stream/GenericWorker":28,"./support":30,"./utils":32}],32:[function(e,t,a){"use strict";var o=e("./support"),h=e("./base64"),r=e("./nodejsUtils"),u=e("./external");function n(e){return e}function l(e,t){for(var r=0;r>8;this.dir=!!(16&this.externalFileAttributes),0==e&&(this.dosPermissions=63&this.externalFileAttributes),3==e&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(){if(this.extraFields[1]){var e=n(this.extraFields[1].value);this.uncompressedSize===s.MAX_VALUE_32BITS&&(this.uncompressedSize=e.readInt(8)),this.compressedSize===s.MAX_VALUE_32BITS&&(this.compressedSize=e.readInt(8)),this.localHeaderOffset===s.MAX_VALUE_32BITS&&(this.localHeaderOffset=e.readInt(8)),this.diskNumberStart===s.MAX_VALUE_32BITS&&(this.diskNumberStart=e.readInt(4))}},readExtraFields:function(e){var t,r,n,i=e.index+this.extraFieldsLength;for(this.extraFields||(this.extraFields={});e.index+4>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t},r.buf2binstring=function(e){return l(e,e.length)},r.binstring2buf=function(e){for(var t=new h.Buf8(e.length),r=0,n=t.length;r>10&1023,o[n++]=56320|1023&i)}return l(o,n)},r.utf8border=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}},{"./common":41}],43:[function(e,t,r){"use strict";t.exports=function(e,t,r,n){for(var i=65535&e|0,s=e>>>16&65535|0,a=0;0!==r;){for(r-=a=2e3>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t[a])];return-1^e}},{}],46:[function(e,t,r){"use strict";var h,c=e("../utils/common"),u=e("./trees"),d=e("./adler32"),p=e("./crc32"),n=e("./messages"),l=0,f=4,m=0,_=-2,g=-1,b=4,i=2,v=8,y=9,s=286,a=30,o=19,w=2*s+1,k=15,x=3,S=258,z=S+x+1,C=42,E=113,A=1,I=2,O=3,B=4;function R(e,t){return e.msg=n[t],t}function T(e){return(e<<1)-(4e.avail_out&&(r=e.avail_out),0!==r&&(c.arraySet(e.output,t.pending_buf,t.pending_out,r,e.next_out),e.next_out+=r,t.pending_out+=r,e.total_out+=r,e.avail_out-=r,t.pending-=r,0===t.pending&&(t.pending_out=0))}function N(e,t){u._tr_flush_block(e,0<=e.block_start?e.block_start:-1,e.strstart-e.block_start,t),e.block_start=e.strstart,F(e.strm)}function U(e,t){e.pending_buf[e.pending++]=t}function P(e,t){e.pending_buf[e.pending++]=t>>>8&255,e.pending_buf[e.pending++]=255&t}function L(e,t){var r,n,i=e.max_chain_length,s=e.strstart,a=e.prev_length,o=e.nice_match,h=e.strstart>e.w_size-z?e.strstart-(e.w_size-z):0,u=e.window,l=e.w_mask,f=e.prev,c=e.strstart+S,d=u[s+a-1],p=u[s+a];e.prev_length>=e.good_match&&(i>>=2),o>e.lookahead&&(o=e.lookahead);do{if(u[(r=t)+a]===p&&u[r+a-1]===d&&u[r]===u[s]&&u[++r]===u[s+1]){s+=2,r++;do{}while(u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&sh&&0!=--i);return a<=e.lookahead?a:e.lookahead}function j(e){var t,r,n,i,s,a,o,h,u,l,f=e.w_size;do{if(i=e.window_size-e.lookahead-e.strstart,e.strstart>=f+(f-z)){for(c.arraySet(e.window,e.window,f,f,0),e.match_start-=f,e.strstart-=f,e.block_start-=f,t=r=e.hash_size;n=e.head[--t],e.head[t]=f<=n?n-f:0,--r;);for(t=r=f;n=e.prev[--t],e.prev[t]=f<=n?n-f:0,--r;);i+=f}if(0===e.strm.avail_in)break;if(a=e.strm,o=e.window,h=e.strstart+e.lookahead,u=i,l=void 0,l=a.avail_in,u=x)for(s=e.strstart-e.insert,e.ins_h=e.window[s],e.ins_h=(e.ins_h<=x&&(e.ins_h=(e.ins_h<=x)if(n=u._tr_tally(e,e.strstart-e.match_start,e.match_length-x),e.lookahead-=e.match_length,e.match_length<=e.max_lazy_match&&e.lookahead>=x){for(e.match_length--;e.strstart++,e.ins_h=(e.ins_h<=x&&(e.ins_h=(e.ins_h<=x&&e.match_length<=e.prev_length){for(i=e.strstart+e.lookahead-x,n=u._tr_tally(e,e.strstart-1-e.prev_match,e.prev_length-x),e.lookahead-=e.prev_length-1,e.prev_length-=2;++e.strstart<=i&&(e.ins_h=(e.ins_h<e.pending_buf_size-5&&(r=e.pending_buf_size-5);;){if(e.lookahead<=1){if(j(e),0===e.lookahead&&t===l)return A;if(0===e.lookahead)break}e.strstart+=e.lookahead,e.lookahead=0;var n=e.block_start+r;if((0===e.strstart||e.strstart>=n)&&(e.lookahead=e.strstart-n,e.strstart=n,N(e,!1),0===e.strm.avail_out))return A;if(e.strstart-e.block_start>=e.w_size-z&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):(e.strstart>e.block_start&&(N(e,!1),e.strm.avail_out),A)}),new M(4,4,8,4,Z),new M(4,5,16,8,Z),new M(4,6,32,32,Z),new M(4,4,16,16,W),new M(8,16,32,32,W),new M(8,16,128,128,W),new M(8,32,128,256,W),new M(32,128,258,1024,W),new M(32,258,258,4096,W)],r.deflateInit=function(e,t){return Y(e,t,v,15,8,0)},r.deflateInit2=Y,r.deflateReset=K,r.deflateResetKeep=G,r.deflateSetHeader=function(e,t){return e&&e.state?2!==e.state.wrap?_:(e.state.gzhead=t,m):_},r.deflate=function(e,t){var r,n,i,s;if(!e||!e.state||5>8&255),U(n,n.gzhead.time>>16&255),U(n,n.gzhead.time>>24&255),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,255&n.gzhead.os),n.gzhead.extra&&n.gzhead.extra.length&&(U(n,255&n.gzhead.extra.length),U(n,n.gzhead.extra.length>>8&255)),n.gzhead.hcrc&&(e.adler=p(e.adler,n.pending_buf,n.pending,0)),n.gzindex=0,n.status=69):(U(n,0),U(n,0),U(n,0),U(n,0),U(n,0),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,3),n.status=E);else{var a=v+(n.w_bits-8<<4)<<8;a|=(2<=n.strategy||n.level<2?0:n.level<6?1:6===n.level?2:3)<<6,0!==n.strstart&&(a|=32),a+=31-a%31,n.status=E,P(n,a),0!==n.strstart&&(P(n,e.adler>>>16),P(n,65535&e.adler)),e.adler=1}if(69===n.status)if(n.gzhead.extra){for(i=n.pending;n.gzindex<(65535&n.gzhead.extra.length)&&(n.pending!==n.pending_buf_size||(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending!==n.pending_buf_size));)U(n,255&n.gzhead.extra[n.gzindex]),n.gzindex++;n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),n.gzindex===n.gzhead.extra.length&&(n.gzindex=0,n.status=73)}else n.status=73;if(73===n.status)if(n.gzhead.name){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindexi&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.gzindex=0,n.status=91)}else n.status=91;if(91===n.status)if(n.gzhead.comment){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindexi&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.status=103)}else n.status=103;if(103===n.status&&(n.gzhead.hcrc?(n.pending+2>n.pending_buf_size&&F(e),n.pending+2<=n.pending_buf_size&&(U(n,255&e.adler),U(n,e.adler>>8&255),e.adler=0,n.status=E)):n.status=E),0!==n.pending){if(F(e),0===e.avail_out)return n.last_flush=-1,m}else if(0===e.avail_in&&T(t)<=T(r)&&t!==f)return R(e,-5);if(666===n.status&&0!==e.avail_in)return R(e,-5);if(0!==e.avail_in||0!==n.lookahead||t!==l&&666!==n.status){var o=2===n.strategy?function(e,t){for(var r;;){if(0===e.lookahead&&(j(e),0===e.lookahead)){if(t===l)return A;break}if(e.match_length=0,r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++,r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):3===n.strategy?function(e,t){for(var r,n,i,s,a=e.window;;){if(e.lookahead<=S){if(j(e),e.lookahead<=S&&t===l)return A;if(0===e.lookahead)break}if(e.match_length=0,e.lookahead>=x&&0e.lookahead&&(e.match_length=e.lookahead)}if(e.match_length>=x?(r=u._tr_tally(e,1,e.match_length-x),e.lookahead-=e.match_length,e.strstart+=e.match_length,e.match_length=0):(r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++),r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):h[n.level].func(n,t);if(o!==O&&o!==B||(n.status=666),o===A||o===O)return 0===e.avail_out&&(n.last_flush=-1),m;if(o===I&&(1===t?u._tr_align(n):5!==t&&(u._tr_stored_block(n,0,0,!1),3===t&&(D(n.head),0===n.lookahead&&(n.strstart=0,n.block_start=0,n.insert=0))),F(e),0===e.avail_out))return n.last_flush=-1,m}return t!==f?m:n.wrap<=0?1:(2===n.wrap?(U(n,255&e.adler),U(n,e.adler>>8&255),U(n,e.adler>>16&255),U(n,e.adler>>24&255),U(n,255&e.total_in),U(n,e.total_in>>8&255),U(n,e.total_in>>16&255),U(n,e.total_in>>24&255)):(P(n,e.adler>>>16),P(n,65535&e.adler)),F(e),0=r.w_size&&(0===s&&(D(r.head),r.strstart=0,r.block_start=0,r.insert=0),u=new c.Buf8(r.w_size),c.arraySet(u,t,l-r.w_size,r.w_size,0),t=u,l=r.w_size),a=e.avail_in,o=e.next_in,h=e.input,e.avail_in=l,e.next_in=0,e.input=t,j(r);r.lookahead>=x;){for(n=r.strstart,i=r.lookahead-(x-1);r.ins_h=(r.ins_h<>>=y=v>>>24,p-=y,0===(y=v>>>16&255))C[s++]=65535&v;else{if(!(16&y)){if(0==(64&y)){v=m[(65535&v)+(d&(1<>>=y,p-=y),p<15&&(d+=z[n++]<>>=y=v>>>24,p-=y,!(16&(y=v>>>16&255))){if(0==(64&y)){v=_[(65535&v)+(d&(1<>>=y,p-=y,(y=s-a)>3,d&=(1<<(p-=w<<3))-1,e.next_in=n,e.next_out=s,e.avail_in=n>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24)}function s(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new I.Buf16(320),this.work=new I.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function a(e){var t;return e&&e.state?(t=e.state,e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=P,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new I.Buf32(n),t.distcode=t.distdyn=new I.Buf32(i),t.sane=1,t.back=-1,N):U}function o(e){var t;return e&&e.state?((t=e.state).wsize=0,t.whave=0,t.wnext=0,a(e)):U}function h(e,t){var r,n;return e&&e.state?(n=e.state,t<0?(r=0,t=-t):(r=1+(t>>4),t<48&&(t&=15)),t&&(t<8||15=s.wsize?(I.arraySet(s.window,t,r-s.wsize,s.wsize,0),s.wnext=0,s.whave=s.wsize):(n<(i=s.wsize-s.wnext)&&(i=n),I.arraySet(s.window,t,r-n,i,s.wnext),(n-=i)?(I.arraySet(s.window,t,r-n,n,0),s.wnext=n,s.whave=s.wsize):(s.wnext+=i,s.wnext===s.wsize&&(s.wnext=0),s.whave>>8&255,r.check=B(r.check,E,2,0),l=u=0,r.mode=2;break}if(r.flags=0,r.head&&(r.head.done=!1),!(1&r.wrap)||(((255&u)<<8)+(u>>8))%31){e.msg="incorrect header check",r.mode=30;break}if(8!=(15&u)){e.msg="unknown compression method",r.mode=30;break}if(l-=4,k=8+(15&(u>>>=4)),0===r.wbits)r.wbits=k;else if(k>r.wbits){e.msg="invalid window size",r.mode=30;break}r.dmax=1<>8&1),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=3;case 3:for(;l<32;){if(0===o)break e;o--,u+=n[s++]<>>8&255,E[2]=u>>>16&255,E[3]=u>>>24&255,r.check=B(r.check,E,4,0)),l=u=0,r.mode=4;case 4:for(;l<16;){if(0===o)break e;o--,u+=n[s++]<>8),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=5;case 5:if(1024&r.flags){for(;l<16;){if(0===o)break e;o--,u+=n[s++]<>>8&255,r.check=B(r.check,E,2,0)),l=u=0}else r.head&&(r.head.extra=null);r.mode=6;case 6:if(1024&r.flags&&(o<(d=r.length)&&(d=o),d&&(r.head&&(k=r.head.extra_len-r.length,r.head.extra||(r.head.extra=new Array(r.head.extra_len)),I.arraySet(r.head.extra,n,s,d,k)),512&r.flags&&(r.check=B(r.check,n,d,s)),o-=d,s+=d,r.length-=d),r.length))break e;r.length=0,r.mode=7;case 7:if(2048&r.flags){if(0===o)break e;for(d=0;k=n[s+d++],r.head&&k&&r.length<65536&&(r.head.name+=String.fromCharCode(k)),k&&d>9&1,r.head.done=!0),e.adler=r.check=0,r.mode=12;break;case 10:for(;l<32;){if(0===o)break e;o--,u+=n[s++]<>>=7&l,l-=7&l,r.mode=27;break}for(;l<3;){if(0===o)break e;o--,u+=n[s++]<>>=1)){case 0:r.mode=14;break;case 1:if(j(r),r.mode=20,6!==t)break;u>>>=2,l-=2;break e;case 2:r.mode=17;break;case 3:e.msg="invalid block type",r.mode=30}u>>>=2,l-=2;break;case 14:for(u>>>=7&l,l-=7&l;l<32;){if(0===o)break e;o--,u+=n[s++]<>>16^65535)){e.msg="invalid stored block lengths",r.mode=30;break}if(r.length=65535&u,l=u=0,r.mode=15,6===t)break e;case 15:r.mode=16;case 16:if(d=r.length){if(o>>=5,l-=5,r.ndist=1+(31&u),u>>>=5,l-=5,r.ncode=4+(15&u),u>>>=4,l-=4,286>>=3,l-=3}for(;r.have<19;)r.lens[A[r.have++]]=0;if(r.lencode=r.lendyn,r.lenbits=7,S={bits:r.lenbits},x=T(0,r.lens,0,19,r.lencode,0,r.work,S),r.lenbits=S.bits,x){e.msg="invalid code lengths set",r.mode=30;break}r.have=0,r.mode=19;case 19:for(;r.have>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=_,l-=_,r.lens[r.have++]=b;else{if(16===b){for(z=_+2;l>>=_,l-=_,0===r.have){e.msg="invalid bit length repeat",r.mode=30;break}k=r.lens[r.have-1],d=3+(3&u),u>>>=2,l-=2}else if(17===b){for(z=_+3;l>>=_)),u>>>=3,l-=3}else{for(z=_+7;l>>=_)),u>>>=7,l-=7}if(r.have+d>r.nlen+r.ndist){e.msg="invalid bit length repeat",r.mode=30;break}for(;d--;)r.lens[r.have++]=k}}if(30===r.mode)break;if(0===r.lens[256]){e.msg="invalid code -- missing end-of-block",r.mode=30;break}if(r.lenbits=9,S={bits:r.lenbits},x=T(D,r.lens,0,r.nlen,r.lencode,0,r.work,S),r.lenbits=S.bits,x){e.msg="invalid literal/lengths set",r.mode=30;break}if(r.distbits=6,r.distcode=r.distdyn,S={bits:r.distbits},x=T(F,r.lens,r.nlen,r.ndist,r.distcode,0,r.work,S),r.distbits=S.bits,x){e.msg="invalid distances set",r.mode=30;break}if(r.mode=20,6===t)break e;case 20:r.mode=21;case 21:if(6<=o&&258<=h){e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=o,r.hold=u,r.bits=l,R(e,c),a=e.next_out,i=e.output,h=e.avail_out,s=e.next_in,n=e.input,o=e.avail_in,u=r.hold,l=r.bits,12===r.mode&&(r.back=-1);break}for(r.back=0;g=(C=r.lencode[u&(1<>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>v)])>>>16&255,b=65535&C,!(v+(_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,r.length=b,0===g){r.mode=26;break}if(32&g){r.back=-1,r.mode=12;break}if(64&g){e.msg="invalid literal/length code",r.mode=30;break}r.extra=15&g,r.mode=22;case 22:if(r.extra){for(z=r.extra;l>>=r.extra,l-=r.extra,r.back+=r.extra}r.was=r.length,r.mode=23;case 23:for(;g=(C=r.distcode[u&(1<>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>v)])>>>16&255,b=65535&C,!(v+(_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,64&g){e.msg="invalid distance code",r.mode=30;break}r.offset=b,r.extra=15&g,r.mode=24;case 24:if(r.extra){for(z=r.extra;l>>=r.extra,l-=r.extra,r.back+=r.extra}if(r.offset>r.dmax){e.msg="invalid distance too far back",r.mode=30;break}r.mode=25;case 25:if(0===h)break e;if(d=c-h,r.offset>d){if((d=r.offset-d)>r.whave&&r.sane){e.msg="invalid distance too far back",r.mode=30;break}p=d>r.wnext?(d-=r.wnext,r.wsize-d):r.wnext-d,d>r.length&&(d=r.length),m=r.window}else m=i,p=a-r.offset,d=r.length;for(hd?(m=R[T+a[v]],A[I+a[v]]):(m=96,0),h=1<>S)+(u-=h)]=p<<24|m<<16|_|0,0!==u;);for(h=1<>=1;if(0!==h?(E&=h-1,E+=h):E=0,v++,0==--O[b]){if(b===w)break;b=t[r+a[v]]}if(k>>7)]}function U(e,t){e.pending_buf[e.pending++]=255&t,e.pending_buf[e.pending++]=t>>>8&255}function P(e,t,r){e.bi_valid>d-r?(e.bi_buf|=t<>d-e.bi_valid,e.bi_valid+=r-d):(e.bi_buf|=t<>>=1,r<<=1,0<--t;);return r>>>1}function Z(e,t,r){var n,i,s=new Array(g+1),a=0;for(n=1;n<=g;n++)s[n]=a=a+r[n-1]<<1;for(i=0;i<=t;i++){var o=e[2*i+1];0!==o&&(e[2*i]=j(s[o]++,o))}}function W(e){var t;for(t=0;t>1;1<=r;r--)G(e,s,r);for(i=h;r=e.heap[1],e.heap[1]=e.heap[e.heap_len--],G(e,s,1),n=e.heap[1],e.heap[--e.heap_max]=r,e.heap[--e.heap_max]=n,s[2*i]=s[2*r]+s[2*n],e.depth[i]=(e.depth[r]>=e.depth[n]?e.depth[r]:e.depth[n])+1,s[2*r+1]=s[2*n+1]=i,e.heap[1]=i++,G(e,s,1),2<=e.heap_len;);e.heap[--e.heap_max]=e.heap[1],function(e,t){var r,n,i,s,a,o,h=t.dyn_tree,u=t.max_code,l=t.stat_desc.static_tree,f=t.stat_desc.has_stree,c=t.stat_desc.extra_bits,d=t.stat_desc.extra_base,p=t.stat_desc.max_length,m=0;for(s=0;s<=g;s++)e.bl_count[s]=0;for(h[2*e.heap[e.heap_max]+1]=0,r=e.heap_max+1;r<_;r++)p<(s=h[2*h[2*(n=e.heap[r])+1]+1]+1)&&(s=p,m++),h[2*n+1]=s,u>=7;n>>=1)if(1&r&&0!==e.dyn_ltree[2*t])return o;if(0!==e.dyn_ltree[18]||0!==e.dyn_ltree[20]||0!==e.dyn_ltree[26])return h;for(t=32;t>>3,(s=e.static_len+3+7>>>3)<=i&&(i=s)):i=s=r+5,r+4<=i&&-1!==t?J(e,t,r,n):4===e.strategy||s===i?(P(e,2+(n?1:0),3),K(e,z,C)):(P(e,4+(n?1:0),3),function(e,t,r,n){var i;for(P(e,t-257,5),P(e,r-1,5),P(e,n-4,4),i=0;i>>8&255,e.pending_buf[e.d_buf+2*e.last_lit+1]=255&t,e.pending_buf[e.l_buf+e.last_lit]=255&r,e.last_lit++,0===t?e.dyn_ltree[2*r]++:(e.matches++,t--,e.dyn_ltree[2*(A[r]+u+1)]++,e.dyn_dtree[2*N(t)]++),e.last_lit===e.lit_bufsize-1},r._tr_align=function(e){P(e,2,3),L(e,m,z),function(e){16===e.bi_valid?(U(e,e.bi_buf),e.bi_buf=0,e.bi_valid=0):8<=e.bi_valid&&(e.pending_buf[e.pending++]=255&e.bi_buf,e.bi_buf>>=8,e.bi_valid-=8)}(e)}},{"../utils/common":41}],53:[function(e,t,r){"use strict";t.exports=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}},{}],54:[function(e,t,r){(function(e){!function(r,n){"use strict";if(!r.setImmediate){var i,s,t,a,o=1,h={},u=!1,l=r.document,e=Object.getPrototypeOf&&Object.getPrototypeOf(r);e=e&&e.setTimeout?e:r,i="[object process]"==={}.toString.call(r.process)?function(e){process.nextTick(function(){c(e)})}:function(){if(r.postMessage&&!r.importScripts){var e=!0,t=r.onmessage;return r.onmessage=function(){e=!1},r.postMessage("","*"),r.onmessage=t,e}}()?(a="setImmediate$"+Math.random()+"$",r.addEventListener?r.addEventListener("message",d,!1):r.attachEvent("onmessage",d),function(e){r.postMessage(a+e,"*")}):r.MessageChannel?((t=new MessageChannel).port1.onmessage=function(e){c(e.data)},function(e){t.port2.postMessage(e)}):l&&"onreadystatechange"in l.createElement("script")?(s=l.documentElement,function(e){var t=l.createElement("script");t.onreadystatechange=function(){c(e),t.onreadystatechange=null,s.removeChild(t),t=null},s.appendChild(t)}):function(e){setTimeout(c,0,e)},e.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),r=0;r {
- return room.selfMembership === "join";
- });
+ return this.rooms.filter((room) => {
+ return room.selfMembership === "join";
+ });
},
invites() {
- return this.rooms.filter((room) => {
- return room.selfMembership === "invite";
- });
+ return this.rooms.filter((room) => {
+ return room.selfMembership === "invite";
+ });
},
joinedAndInvitedRooms() {
- return this.rooms.filter((room) => {
- return room.selfMembership === "join" || room.selfMembership === "invite";
- });
+ return this.rooms.filter((room) => {
+ return room.selfMembership === "join" || room.selfMembership === "invite";
+ });
},
- },
+ },
- watch: {
+ watch: {
currentRoomId: {
- immediate: true,
- handler(roomId) {
- this.currentRoom = this.getRoom(roomId);
- },
+ immediate: true,
+ handler(roomId) {
+ this.currentRoom = this.getRoom(roomId);
+ },
},
currentRoom: {
- immediate: true,
- handler(room) {
- if (room) {
- this.userCanSendMessageInCurrentRoom = this.userCanSendMessageInRoom(room.roomId, this.currentUserId);
- this.userCanSendReactionAndAnswerPollInCurrentRoom = this.userCanSendReactionAndAnswerPollInRoom(room.roomId, this.currentUserId);
- } else {
- this.userCanSendMessageInCurrentRoom = true;
- this.userCanSendReactionAndAnswerPollInCurrentRoom = true;
- }
- },
+ immediate: true,
+ handler(room) {
+ if (room) {
+ this.userCanSendMessageInCurrentRoom = this.userCanSendMessageInRoom(room.roomId, this.currentUserId);
+ this.userCanSendReactionAndAnswerPollInCurrentRoom = this.userCanSendReactionAndAnswerPollInRoom(room.roomId, this.currentUserId);
+ } else {
+ this.userCanSendMessageInCurrentRoom = true;
+ this.userCanSendReactionAndAnswerPollInCurrentRoom = true;
+ }
+ },
},
- },
+ },
- methods: {
+ methods: {
createCryptoStore() {
- console.log("create crypto store");
- return new LocalStorageCryptoStore(this.$store.getters.storage);
+ if (!this.legacyCryptoStore) {
+ console.log("create crypto store");
+ this.legacyCryptoStore = new LocalStorageCryptoStore(this.$store.getters.storage);
+ }
+ return this.legacyCryptoStore;
},
login(user, registrationFlowHandler, createUser = false) {
- return util.getMatrixBaseUrl(user, this.$config).then((baseUrl) => {
- const tempMatrixClient = sdk.createClient({
- baseUrl: baseUrl,
- idBaseUrl: this.$config.identityServer,
- });
- var promiseLogin;
-
- const self = this;
- if (user.access_token) {
- // Logged in on "real" account
- promiseLogin = Promise.resolve(user);
- } else if (createUser || (user.is_guest && (!user.user_id || user.registration_session))) {
- // Generate random username and password. We don't user REAL matrix
- // guest accounts because 1. They are not allowed to post media, 2. They
- // can not use avatars and 3. They can not seamlessly be upgraded to real accounts.
- //
- // Instead, we use an ILAG approach, Improved Landing as Guest.
- const userId =
- createUser || user.registration_session ? user.user_id : util.randomUser(this.$config.userIdPrefix);
- const pass = createUser || user.registration_session ? user.password : util.randomPass();
-
- const extractAndSaveUser = (response) => {
- var u = Object.assign({}, response);
- u.password = pass;
- u.is_guest = true;
- this.$store.commit("setUser", u);
- return u;
- };
-
- promiseLogin = tempMatrixClient
- .register(userId, pass, user.registration_session || null, {
- type: "m.login.dummy",
- initial_device_display_name: this.$config.appName,
- })
- .then((response) => {
- return extractAndSaveUser(response);
- })
- .catch((error) => {
- if (registrationFlowHandler && error.httpStatus == 401 && error.data) {
- const registrationSession = error.data.session;
-
- // Store user, pass and session, so we can resume if network failure occurs etc.
- //
- var u = {};
- u.user_id = userId;
- u.password = pass;
- u.is_guest = true;
- u.registration_session = registrationSession;
- this.$store.commit("setUser", u);
-
- return registrationFlowHandler(tempMatrixClient, error.data).then((response) =>
- extractAndSaveUser(response)
- );
- } else {
- console.error(error);
- }
- throw error;
+ return util.getMatrixBaseUrl(user, this.$config).then((baseUrl) => {
+ const tempMatrixClient = sdk.createClient({
+ baseUrl: baseUrl,
+ idBaseUrl: this.$config.identityServer,
});
- } else {
- var data = {
- user: User.localPart(user.user_id),
- password: user.password,
- type: "m.login.password",
- initial_device_display_name: this.$config.appName,
- };
- if (user.device_id) {
- data.device_id = user.device_id;
- }
- promiseLogin = tempMatrixClient.login("m.login.password", data).then((response) => {
- var u = Object.assign({}, response);
- if (user.is_guest) {
- // Copy over needed properties
- u = Object.assign(user, response);
- }
- this.$store.commit("setUser", u);
- return u;
- });
- }
+ var promiseLogin;
- return promiseLogin.then((user) => {
- return self.getMatrixClient(user);
+ const self = this;
+ if (user.access_token) {
+ // Logged in on "real" account
+ promiseLogin = Promise.resolve(user);
+ } else if (createUser || (user.is_guest && (!user.user_id || user.registration_session))) {
+ // Generate random username and password. We don't user REAL matrix
+ // guest accounts because 1. They are not allowed to post media, 2. They
+ // can not use avatars and 3. They can not seamlessly be upgraded to real accounts.
+ //
+ // Instead, we use an ILAG approach, Improved Landing as Guest.
+ const userId =
+ createUser || user.registration_session ? user.user_id : util.randomUser(this.$config.userIdPrefix);
+ const pass = createUser || user.registration_session ? user.password : util.randomPass();
+
+ const extractAndSaveUser = (response) => {
+ var u = Object.assign({}, response);
+ u.password = pass;
+ u.is_guest = true;
+ this.$store.commit("setUser", u);
+ return u;
+ };
+
+ promiseLogin = tempMatrixClient
+ .register(userId, pass, user.registration_session || null, {
+ type: "m.login.dummy",
+ initial_device_display_name: this.$config.appName,
+ })
+ .then((response) => {
+ return extractAndSaveUser(response);
+ })
+ .catch((error) => {
+ if (registrationFlowHandler && error.httpStatus == 401 && error.data) {
+ const registrationSession = error.data.session;
+
+ // Store user, pass and session, so we can resume if network failure occurs etc.
+ //
+ var u = {};
+ u.user_id = userId;
+ u.password = pass;
+ u.is_guest = true;
+ u.registration_session = registrationSession;
+ this.$store.commit("setUser", u);
+
+ return registrationFlowHandler(tempMatrixClient, error.data).then((response) =>
+ extractAndSaveUser(response)
+ );
+ } else {
+ console.error(error);
+ }
+ throw error;
+ });
+ } else {
+ var data = {
+ user: User.localPart(user.user_id),
+ password: user.password,
+ type: "m.login.password",
+ initial_device_display_name: this.$config.appName,
+ };
+ if (user.device_id) {
+ data.device_id = user.device_id;
+ }
+ promiseLogin = tempMatrixClient.login("m.login.password", data).then((response) => {
+ var u = Object.assign({}, response);
+ if (user.is_guest) {
+ // Copy over needed properties
+ u = Object.assign(user, response);
+ }
+ this.$store.commit("setUser", u);
+ return u;
+ });
+ }
+
+ return promiseLogin.then((user) => {
+ return self.getMatrixClient(user);
+ });
});
- });
},
clearCryptoStore() {
- // Clear crypto related data
- // TODO - for some reason "clearStores" called in "logout" only clears the "account" crypto
- // data item, not all sessions etc. Why? We need to do that manually here!
- const toRemove = [];
- const storage = this.$store.getters.storage;
- for (let i = 0; i < storage.length; ++i) {
- const key = storage.key(i);
- if (key.startsWith("crypto.")) toRemove.push(key);
- }
- for (const key of toRemove) {
- storage.removeItem(key);
- }
+ // Clear crypto related data
+ // TODO - for some reason "clearStores" called in "logout" only clears the "account" crypto
+ // data item, not all sessions etc. Why? We need to do that manually here!
+ const toRemove = [];
+ const storage = this.$store.getters.storage;
+ for (let i = 0; i < storage.length; ++i) {
+ const key = storage.key(i);
+ if (key.startsWith("crypto.")) toRemove.push(key);
+ }
+ for (const key of toRemove) {
+ storage.removeItem(key);
+ }
},
logout() {
- if (this.matrixClient) {
- this.removeMatrixClientListeners(this.matrixClient);
- this.matrixClient.stopClient();
- this.matrixClient.clearStores().then(() => {
- this.clearCryptoStore();
- });
- this.matrixClient = null;
- this.matrixClientReady = false;
- } else {
- this.clearCryptoStore();
- }
+ if (this.matrixClient) {
+ this.removeMatrixClientListeners(this.matrixClient);
+ this.matrixClient.stopClient();
+ this.matrixClient.clearStores().then(() => {
+ this.clearCryptoStore();
+ });
+ this.matrixClient = null;
+ this.matrixClientReady = false;
+ } else {
+ this.clearCryptoStore();
+ }
- this.$store.commit("setUser", null);
- this.$store.commit("setCurrentRoomId", null);
- this.rooms = [];
- this.userDisplayName = null;
- this.userAvatar = null;
- this.currentRoom = null;
- this.notificationCount = 0;
+ this.$store.commit("setUser", null);
+ this.$store.commit("setCurrentRoomId", null);
+ this.rooms = [];
+ this.userDisplayName = null;
+ this.userAvatar = null;
+ this.currentRoom = null;
+ this.notificationCount = 0;
},
initClient() {
- this.reloadRooms();
- this.matrixClientReady = true;
- this.matrixClient.emit("Matrix.initialized", this.matrixClient);
- this.matrixClient
- .getProfileInfo(this.currentUserId)
- .then((info) => {
- console.log("Got user profile: " + JSON.stringify(info));
- this.userDisplayName = info.displayname;
- this.userAvatar = info.avatar_url;
- })
- .catch((err) => {
- console.log("Failed to get user profile: ", err);
- });
+ this.reloadRooms();
+ this.matrixClientReady = true;
+ this.matrixClient.emit("Matrix.initialized", this.matrixClient);
+ this.matrixClient
+ .getProfileInfo(this.currentUserId)
+ .then((info) => {
+ console.log("Got user profile: " + JSON.stringify(info));
+ this.userDisplayName = info.displayname;
+ this.userAvatar = info.avatar_url;
+ })
+ .catch((err) => {
+ console.log("Failed to get user profile: ", err);
+ });
},
- getMatrixClient(user) {
- if (user === undefined) {
- user = this.$store.state.auth.user;
- }
- if (this.matrixClientReady) {
- return new Promise((resolve, ignoredreject) => {
- resolve(user);
- });
- } else if (this.matrixClient) {
- return new Promise((resolve, ignoredreject) => {
- this.matrixClient.once("Matrix.initialized", (ignoredclient) => {
- resolve(user);
- });
- });
- }
-
- const matrixStore = new sdk.MemoryStore(this.$store.getters.storage);
-
- return util.getMatrixBaseUrl(user, this.$config).then((baseUrl) => {
- var opts = {
- baseUrl: baseUrl,
- userId: user.user_id,
- store: matrixStore,
- deviceId: user.device_id,
- accessToken: user.access_token,
- timelineSupport: true,
- unstableClientRelationAggregation: true,
- //useAuthorizationHeader: true
- };
- this.matrixClient = sdk.createClient(opts);
- // if (user.is_guest) {
- // this.matrixClient.setGuest(true);
- // }
- return this.matrixClient
- .initCrypto()
- .then(() => {
- console.log("Crypto initialized");
-
- this.addMatrixClientListeners(this.matrixClient);
-
- this.matrixClient.startClient();
- return this.matrixClient;
- })
- .then((matrixClient) => {
- if (matrixClient.isInitialSyncComplete()) {
- console.log("Initial sync done already!");
- return matrixClient;
- } else {
- return new Promise((resolve, reject) => {
- matrixClient.once("sync", function (state, ignoredprevState, ignoredres) {
- console.log(state); // state will be 'PREPARED' when the client is ready to use
- if (state == "PREPARED") {
- resolve(matrixClient);
- } else if (state == "ERROR") {
- reject("Error syncing");
- }
- });
- });
- }
- })
- .then(() => {
- // Ready to use! Start by loading rooms.
- this.initClient();
+ async getMatrixClient(user) {
+ if (user === undefined) {
+ user = this.$store.state.auth.user;
+ }
+ if (this.matrixClientReady) {
return user;
- });
- });
+ } else if (this.matrixClient) {
+ return new Promise((resolve, ignoredreject) => {
+ this.matrixClient.once("Matrix.initialized", (ignoredclient) => {
+ resolve(user);
+ });
+ });
+ }
+
+ const matrixStore = new sdk.MemoryStore(this.$store.getters.storage);
+ const cryptoStore = this.createCryptoStore();
+
+ if (cryptoStore) {
+ const migrationState = await cryptoStore.getMigrationState();
+ if (migrationState >= 0) {
+ const store = this.$store.getters.storage;
+ // Rust crypto migration is broken, needs the sessionId to be set. So do that here, if needed.
+ for (let i = 0; i < store.length; ++i) {
+ const key = store.key(i);
+ if (key.startsWith("crypto.sessions/")) {
+ const sessions = JSON.parse(store.getItem(key));
+ for (let sessionId of Object.keys(sessions)) {
+ sessions[sessionId].sessionId = sessionId;
+ sessions[sessionId].deviceKey = key.substring("crypto.sessions/".length);
+ }
+ store.setItem(key, JSON.stringify(sessions));
+ }
+ }
+ }
+ }
+
+ const baseUrl = await util.getMatrixBaseUrl(user, this.$config);
+ var opts = {
+ baseUrl: baseUrl,
+ userId: user.user_id,
+ store: matrixStore,
+ deviceId: user.device_id,
+ accessToken: user.access_token,
+ timelineSupport: true,
+ unstableClientRelationAggregation: true,
+ cryptoStore: cryptoStore
+ //useAuthorizationHeader: true
+ };
+
+ const cryptoStorePassword = this.$config.appName + ":" + user.device_id;
+
+ const matrixClient = sdk.createClient(opts);
+ this.matrixClient = matrixClient;
+ await this.matrixClient.initRustCrypto({useIndexedDB: this.rememberMe, storagePassword: cryptoStorePassword});
+ console.log("Crypto initialized", cryptoStorePassword);
+ this.addMatrixClientListeners(this.matrixClient);
+ this.matrixClient.startClient();
+ if (!this.matrixClient.isInitialSyncComplete()) {
+ await new Promise((resolve, reject) => {
+ this.matrixClient.once("sync", function (state, ignoredprevState, ignoredres) {
+ console.log(state); // state will be 'PREPARED' when the client is ready to use
+ if (state == "PREPARED") {
+ resolve(matrixClient);
+ } else if (state == "ERROR") {
+ reject("Error syncing");
+ }
+ });
+ });
+ }
+ this.useAuthedMedia = await this.matrixClient.isVersionSupported("v1.11");
+
+ // Ready to use! Start by loading rooms.
+ this.initClient();
+ return user;
},
/**
@@ -345,268 +353,262 @@ export default {
* a random account.
*/
getLoginPromise(registrationFlowHandler) {
- if (this.ready) {
- return Promise.resolve(this.currentUser);
- }
- return this.$store.dispatch("login", {
- user: this.currentUser || new User("", "", true),
- registrationFlowHandler,
- });
+ if (this.ready) {
+ return Promise.resolve(this.currentUser);
+ }
+ return this.$store.dispatch("login", {
+ user: this.currentUser || new User("", "", true),
+ registrationFlowHandler,
+ });
},
addMatrixClientListeners(client) {
- if (client) {
- client.setMaxListeners(100); // Increate max number of listeners.
- client.on("event", this.onEvent);
- client.on("Room", this.onRoom);
- client.on("Session.logged_out", this.onSessionLoggedOut);
- client.on("Room.myMembership", this.onRoomMyMembership);
- }
+ if (client) {
+ client.setMaxListeners(100); // Increate max number of listeners.
+ client.on("event", this.onEvent);
+ client.on("Room", this.onRoom);
+ client.on("Session.logged_out", this.onSessionLoggedOut);
+ client.on("Room.myMembership", this.onRoomMyMembership);
+ }
},
removeMatrixClientListeners(client) {
- if (client) {
- client.off("event", this.onEvent);
- client.off("Room", this.onRoom);
- client.off("Session.logged_out", this.onSessionLoggedOut);
- client.off("Room.myMembership", this.onRoomMyMembership);
- }
+ if (client) {
+ client.off("event", this.onEvent);
+ client.off("Room", this.onRoom);
+ client.off("Session.logged_out", this.onSessionLoggedOut);
+ client.off("Room.myMembership", this.onRoomMyMembership);
+ }
},
onEvent(event) {
- switch (event.getType()) {
- case "m.room.topic":
- {
- const room = this.matrixClient.getRoom(event.getRoomId());
- if (room) {
- Vue.set(room, "topic", event.getContent().topic);
- }
- }
- break;
-
- case "m.room.avatar":
- {
- const room = this.matrixClient.getRoom(event.getRoomId());
- if (room) {
- Vue.set(
- room,
- "avatar",
- room.getAvatarUrl(this.matrixClient.getHomeserverUrl(), 80, 80, "scale", true)
- );
- }
- }
- break;
-
- case "m.room.power_levels":
- {
- if (this.currentRoom && event.getRoomId() == this.currentRoom.roomId) {
- this.userCanSendMessageInCurrentRoom = this.userCanSendMessageInRoom(event.getRoomId(), this.currentUserId);
- this.userCanSendReactionAndAnswerPollInCurrentRoom = this.userCanSendReactionAndAnswerPollInRoom(event.getRoomId(), this.currentUserId);
- }
- }
- break;
-
- case "m.room.join_rules":
- {
- const room = this.matrixClient.getRoom(event.getRoomId());
- if (room && room.getJoinRule() == "private" && room.selfMembership == "invite") {
- // We have an invite to a room that's now "private"? This is most probably a deleted DM room.
- // Reject the invite, i.e. call "leave" on it.
- this.matrixClient.leave(room.roomId);
- }
- }
- break;
-
- case "m.room.canonical_alias":
- {
- if (this.currentRoomId && this.currentRoomId.startsWith("#") && !this.currentRoom) {
- this.currentRoom = this.getRoom(this.currentRoomId);
- }
- }
- break;
-
- case STATE_EVENT_ROOM_DELETED:
- {
- const room = this.matrixClient.getRoom(event.getRoomId());
- if (room && room.currentState) {
- // Before we do anything, make sure the sender is an admin!
- // Also, do not react if WE are the sender, since we are probably
- // busy doing the rest of the purging process...
- if (room.currentState.maySendStateEvent("m.room.power_levels", event.getSender())) {
- if (event.getSender() !== this.currentUserId) {
- this.leaveRoomAndNavigate(room.roomId).then(() => {
- this.matrixClient.forget(room.roomId, true);
- });
+ switch (event.getType()) {
+ case "m.room.topic":
+ {
+ const room = this.matrixClient.getRoom(event.getRoomId());
+ if (room) {
+ room["topic"] = event.getContent().topic;
+ }
}
- }
- }
- }
- break;
- }
- this.updateNotificationCount();
+ break;
+
+ case "m.room.avatar":
+ {
+ const room = this.matrixClient.getRoom(event.getRoomId());
+ if (room) {
+ room["avatar"] = room.getAvatarUrl(this.matrixClient.getHomeserverUrl(), 80, 80, "scale", true, this.useAuthedMedia);
+ }
+ }
+ break;
+
+ case "m.room.power_levels":
+ {
+ if (this.currentRoom && event.getRoomId() == this.currentRoom.roomId) {
+ this.userCanSendMessageInCurrentRoom = this.userCanSendMessageInRoom(event.getRoomId(), this.currentUserId);
+ this.userCanSendReactionAndAnswerPollInCurrentRoom = this.userCanSendReactionAndAnswerPollInRoom(event.getRoomId(), this.currentUserId);
+ }
+ }
+ break;
+
+ case "m.room.join_rules":
+ {
+ const room = this.matrixClient.getRoom(event.getRoomId());
+ if (room && room.getJoinRule() == "private" && room.selfMembership == "invite") {
+ // We have an invite to a room that's now "private"? This is most probably a deleted DM room.
+ // Reject the invite, i.e. call "leave" on it.
+ this.matrixClient.leave(room.roomId);
+ }
+ }
+ break;
+
+ case "m.room.canonical_alias":
+ {
+ if (this.currentRoomId && this.currentRoomId.startsWith("#") && !this.currentRoom) {
+ this.currentRoom = this.getRoom(this.currentRoomId);
+ }
+ }
+ break;
+
+ case STATE_EVENT_ROOM_DELETED:
+ {
+ const room = this.matrixClient.getRoom(event.getRoomId());
+ if (room && room.currentState) {
+ // Before we do anything, make sure the sender is an admin!
+ // Also, do not react if WE are the sender, since we are probably
+ // busy doing the rest of the purging process...
+ if (room.currentState.maySendStateEvent("m.room.power_levels", event.getSender())) {
+ if (event.getSender() !== this.currentUserId) {
+ this.leaveRoomAndNavigate(room.roomId).then(() => {
+ this.matrixClient.forget(room.roomId, true);
+ });
+ }
+ }
+ }
+ }
+ break;
+ }
+ this.updateNotificationCount();
},
onRoom(room) {
- if (room.selfMembership === "invite") {
- this.matrixClient
- .getRoomTags(room.roomId)
- .then((reply) => {
- if (Object.keys(reply.tags).includes("m.server_notice")) {
- Vue.set(room, "isServiceNoticeRoom", true);
- }
- })
- .catch((error) => {
- console.error(error);
- });
- }
- this.reloadRooms();
- this.updateNotificationCount();
+ if (room.selfMembership === "invite") {
+ this.matrixClient
+ .getRoomTags(room.roomId)
+ .then((reply) => {
+ if (Object.keys(reply.tags).includes("m.server_notice")) {
+ room["isServiceNoticeRoom"] = true;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
+ });
+ }
+ this.reloadRooms();
+ this.updateNotificationCount();
},
onRoomMyMembership(room) {
- if (room.selfMembership === "invite") {
- // Invitation. Need to call "recalculate" to pick
- // up room name, not sure why exactly.
- room.recalculate();
- }
- this.reloadRooms();
+ if (room.selfMembership === "invite") {
+ // Invitation. Need to call "recalculate" to pick
+ // up room name, not sure why exactly.
+ room.recalculate();
+ }
+ this.reloadRooms();
},
onSessionLoggedOut() {
- console.log("Logged out!");
- if (this.matrixClient) {
- this.removeMatrixClientListeners(this.matrixClient);
- this.matrixClient.stopClient();
- this.matrixClient = null;
- this.matrixClientReady = false;
- }
+ console.log("Logged out!");
+ if (this.matrixClient) {
+ this.removeMatrixClientListeners(this.matrixClient);
+ this.matrixClient.stopClient();
+ this.matrixClient = null;
+ this.matrixClientReady = false;
+ }
- // For "real" accounts we totally wipe the user object, but for "guest"
- // accounts (i.e. created from random data and with password never changed)
- // we need to hang on to the generated password and use that to login to a new
- // session, so only wipe the token in s that case.
- // Clear the access token
- var user = this.$store.state.auth.user;
- if (user.is_guest) {
- delete user.access_token;
- this.$store.commit("setUser", user);
+ // For "real" accounts we totally wipe the user object, but for "guest"
+ // accounts (i.e. created from random data and with password never changed)
+ // we need to hang on to the generated password and use that to login to a new
+ // session, so only wipe the token in s that case.
+ // Clear the access token
+ var user = this.$store.state.auth.user;
+ if (user.is_guest) {
+ delete user.access_token;
+ this.$store.commit("setUser", user);
- // Login again
- this.login(user).catch((error) => {
- if (error.data.errcode === "M_FORBIDDEN" && this.currentUser.is_guest) {
- // Guest account and password don't work. We are in a strange state, probably because
- // of server cleanup of accounts or similar. Wipe account and restart...
+ // Login again
+ this.login(user).catch((error) => {
+ if (error.data.errcode === "M_FORBIDDEN" && this.currentUser.is_guest) {
+ // Guest account and password don't work. We are in a strange state, probably because
+ // of server cleanup of accounts or similar. Wipe account and restart...
+ this.$store.commit("setUser", null);
+ }
+ this.$store.commit("setCurrentRoomId", null);
+ this.$navigation.push({ path: "/login" }, -1);
+ });
+ } else {
this.$store.commit("setUser", null);
- }
- this.$store.commit("setCurrentRoomId", null);
- this.$navigation.push({ path: "/login" }, -1);
- });
- } else {
- this.$store.commit("setUser", null);
- this.$store.commit("setCurrentRoomId", null);
- this.$navigation.push({ path: "/login" }, -1);
- }
+ this.$store.commit("setCurrentRoomId", null);
+ this.$navigation.push({ path: "/login" }, -1);
+ }
},
reloadRooms() {
- // TODO - do incremental update instead of replacing the whole array
- // each time!
- var updatedRooms = this.matrixClient.getVisibleRooms();
- updatedRooms = updatedRooms.filter((room) => {
- return room.selfMembership && (room.selfMembership == "invite" || room.selfMembership == "join") && room.currentState.getStateEvents(STATE_EVENT_ROOM_DELETED).length == 0;
- });
- updatedRooms.forEach((room) => {
- if (!room.avatar) {
- Vue.set(room, "avatar", room.getAvatarUrl(this.matrixClient.getHomeserverUrl(), 80, 80, "scale", true));
- }
- });
- Vue.set(this, "rooms", updatedRooms);
+ // TODO - do incremental update instead of replacing the whole array
+ // each time!
+ var updatedRooms = this.matrixClient.getVisibleRooms();
+ updatedRooms = updatedRooms.filter((room) => {
+ return room.selfMembership && (room.selfMembership == "invite" || room.selfMembership == "join") && room.currentState.getStateEvents(STATE_EVENT_ROOM_DELETED).length == 0;
+ });
+ updatedRooms.forEach((room) => {
+ room["avatar"] = room.getAvatarUrl(this.matrixClient.getHomeserverUrl(), 80, 80, "scale", true, this.useAuthedMedia);
+ });
+ this["rooms"] = updatedRooms;
- const resolvedId =
- this.currentRoomId && this.currentRoomId.startsWith("#")
- ? this.matrixClient.resolveRoomAlias(this.currentRoomId).then((r) => r.room_id)
- : Promise.resolve(this.currentRoomId);
- resolvedId
- .then((roomId) => {
- const currentRoom = this.getRoom(roomId);
- if (this.currentRoom != currentRoom) {
- this.currentRoom = currentRoom;
- }
- })
- .catch((ignorederror) => {});
+ const resolvedId =
+ this.currentRoomId && this.currentRoomId.startsWith("#")
+ ? this.matrixClient.getRoomIdForAlias(this.currentRoomId).then((r) => r.room_id)
+ : Promise.resolve(this.currentRoomId);
+ resolvedId
+ .then((roomId) => {
+ const currentRoom = this.getRoom(roomId);
+ if (this.currentRoom != currentRoom) {
+ this.currentRoom = currentRoom;
+ }
+ })
+ .catch((ignorederror) => { });
},
setCurrentRoomId(roomId) {
- this.$store.commit("setCurrentRoomId", roomId);
- this.currentRoom = this.getRoom(roomId);
+ this.$store.commit("setCurrentRoomId", roomId);
+ this.currentRoom = this.getRoom(roomId);
},
getRoom(roomId) {
- if (!roomId) {
- return null;
- }
- var room = null;
- if (this.matrixClient) {
- const visibleRooms = this.matrixClient.getRooms();
- room = visibleRooms.find((room) => {
- if (roomId.startsWith("#")) {
- return room.getCanonicalAlias() == roomId;
- }
- return room.roomId == roomId;
- });
- }
- return room || null;
+ if (!roomId) {
+ return null;
+ }
+ var room = null;
+ if (this.matrixClient) {
+ const visibleRooms = this.matrixClient.getRooms();
+ room = visibleRooms.find((room) => {
+ if (roomId.startsWith("#")) {
+ return room.getCanonicalAlias() == roomId;
+ }
+ return room.roomId == roomId;
+ });
+ }
+ return room || null;
},
/**
* Return all users we are in a "invite" only room with!
*/
getAllFriends() {
- var ids = {};
- const ret = [];
- for (const room of this.rooms) {
- if (room.selfMembership == "join" && this.getRoomJoinRule(room) == "invite") {
- for (const member of room.getJoinedMembers()) {
- if (member.userId != this.currentUserId && !ids[member.userId]) {
- ids[member.userId] = member;
- ret.push(member);
+ var ids = {};
+ const ret = [];
+ for (const room of this.rooms) {
+ if (room.selfMembership == "join" && this.getRoomJoinRule(room) == "invite") {
+ for (const member of room.getJoinedMembers()) {
+ if (member.userId != this.currentUserId && !ids[member.userId]) {
+ ids[member.userId] = member;
+ ret.push(member);
+ }
+ }
}
- }
}
- }
- ret.sort((a, b) => {
- const aName = a.user ? a.user.displayName : a.name;
- const bName = b.user ? b.user.displayName : b.name;
- return aName.localeCompare(bName);
- });
- return ret;
+ ret.sort((a, b) => {
+ const aName = a.user ? a.user.displayName : a.name;
+ const bName = b.user ? b.user.displayName : b.name;
+ return aName.localeCompare(bName);
+ });
+ return ret;
},
getRoomJoinRule(room) {
- if (room) {
- const joinRules = room.currentState.getStateEvents("m.room.join_rules", "");
- return joinRules && joinRules.getContent().join_rule;
- }
- return null;
+ if (room) {
+ const joinRules = room.currentState.getStateEvents("m.room.join_rules", "");
+ return joinRules && joinRules.getContent().join_rule;
+ }
+ return null;
},
getRoomHistoryVisibility(room) {
- if (room) {
- const historyVisibility = room.currentState.getStateEvents("m.room.history_visibility", "");
- return historyVisibility && historyVisibility.getContent().history_visibility;
- }
- return null;
+ if (room) {
+ const historyVisibility = room.currentState.getStateEvents("m.room.history_visibility", "");
+ return historyVisibility && historyVisibility.getContent().history_visibility;
+ }
+ return null;
},
leaveRoom(roomId) {
- return this.matrixClient.leave(roomId).then(() => {
- this.$store.commit("setCurrentRoomId", null);
- this.rooms = this.rooms.filter((room) => {
- room.roomId != roomId;
+ return this.matrixClient.leave(roomId).then(() => {
+ this.$store.commit("setCurrentRoomId", null);
+ this.rooms = this.rooms.filter((room) => {
+ room.roomId != roomId;
+ });
+ //this.matrixClient.store.removeRoom(roomId);
+ //this.matrixClient.forget(roomId, true, undefined);
});
- //this.matrixClient.store.removeRoom(roomId);
- //this.matrixClient.forget(roomId, true, undefined);
- });
},
/**
@@ -615,64 +617,55 @@ export default {
* @param roomId
*/
leaveRoomAndNavigate(roomId) {
- const joinedRooms = this.joinedRooms;
- const isLastRoomWeAreJoinedTo = joinedRooms && joinedRooms.length == 1 && joinedRooms[0].roomId == roomId;
- return this.leaveRoom(roomId).then(() => {
- if (isLastRoomWeAreJoinedTo) {
- this.$navigation.push({ name: "Goodbye" }, -1);
- } else {
- this.$navigation.push({ name: "Home", params: { roomId: null } }, -1);
- }
- });
+ const joinedRooms = this.joinedRooms;
+ const isLastRoomWeAreJoinedTo = joinedRooms && joinedRooms.length == 1 && joinedRooms[0].roomId == roomId;
+ return this.leaveRoom(roomId).then(() => {
+ if (isLastRoomWeAreJoinedTo) {
+ this.$navigation.push({ name: "Goodbye" }, -1);
+ } else {
+ this.$navigation.push({ name: "Home", params: { roomId: null } }, -1);
+ }
+ });
},
kickUser(roomId, userId) {
- if (this.matrixClient && roomId && userId) {
- this.matrixClient.kick(roomId, userId, "");
- }
+ if (this.matrixClient && roomId && userId) {
+ this.matrixClient.kick(roomId, userId, "");
+ }
},
banUser(roomId, userId) {
- if (this.matrixClient && roomId && userId) {
- this.matrixClient.ban(roomId, userId, "");
- }
+ if (this.matrixClient && roomId && userId) {
+ this.matrixClient.ban(roomId, userId, "");
+ }
},
makeAdmin(roomId, userId) {
- if (this.matrixClient && roomId && userId) {
- const room = this.getRoom(roomId);
- if (room && room.currentState) {
- const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
- if (powerLevelEvent) {
- this.matrixClient.setPowerLevel(roomId, userId, 100, powerLevelEvent);
- }
+ if (this.matrixClient && roomId && userId) {
+ const room = this.getRoom(roomId);
+ if (room && room.currentState) {
+ this.matrixClient.setPowerLevel(roomId, userId, 100);
+ }
}
- }
},
makeModerator(roomId, userId) {
- if (this.matrixClient && roomId && userId) {
- const room = this.getRoom(roomId);
- console.log("Room", room);
- if (room && room.currentState) {
- const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
- if (powerLevelEvent) {
- this.matrixClient.setPowerLevel(roomId, userId, 50, powerLevelEvent);
- }
+ if (this.matrixClient && roomId && userId) {
+ const room = this.getRoom(roomId);
+ console.log("Room", room);
+ if (room && room.currentState) {
+ this.matrixClient.setPowerLevel(roomId, userId, 50);
+ }
}
- }
},
revokeModerator(roomId, userId) {
- if (this.matrixClient && roomId && userId) {
- const room = this.getRoom(roomId);
- if (room && room.currentState) {
- const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
- if (powerLevelEvent) {
- this.matrixClient.setPowerLevel(roomId, userId, 0, powerLevelEvent);
- }
+ if (this.matrixClient && roomId && userId) {
+ const room = this.getRoom(roomId);
+ if (room && room.currentState) {
+ this.matrixClient.setPowerLevel(roomId, userId, 0);
+ }
}
- }
},
/**
@@ -681,94 +674,94 @@ export default {
* @returns Promise - Whether the user is joined to the room or not
*/
isJoinedToRoom(roomIdOrAlias) {
- if (roomIdOrAlias && this.matrixClient) {
- try {
- const resolvedRoomId = roomIdOrAlias.startsWith("#")
- ? this.matrixClient.resolveRoomAlias(roomIdOrAlias).then((res) => res.room_id)
- : Promise.resolve(roomIdOrAlias);
- return resolvedRoomId.then((roomId) => {
- return this.matrixClient.getJoinedRooms().then((rooms) => {
- return rooms.joined_rooms.includes(roomId);
- });
- });
- } catch (ignorederror) {
- console.error(ignorederror);
- return Promise.resolve(false);
+ if (roomIdOrAlias && this.matrixClient) {
+ try {
+ const resolvedRoomId = roomIdOrAlias.startsWith("#")
+ ? this.matrixClient.getRoomIdForAlias(roomIdOrAlias).then((res) => res.room_id)
+ : Promise.resolve(roomIdOrAlias);
+ return resolvedRoomId.then((roomId) => {
+ return this.matrixClient.getJoinedRooms().then((rooms) => {
+ return rooms.joined_rooms.includes(roomId);
+ });
+ });
+ } catch (ignorederror) {
+ console.error(ignorederror);
+ return Promise.resolve(false);
+ }
}
- }
- return Promise.resolve(false);
+ return Promise.resolve(false);
},
isReadOnlyRoom(roomId) {
- if (this.matrixClient && roomId) {
- const room = this.getRoom(roomId);
- if (room && room.currentState) {
- const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
- if (powerLevelEvent) {
- if (this.roomType(roomId) == ROOM_TYPE_CHANNEL) {
- return Object.keys(powerLevelEvent.getContent().events).length == 0;
+ if (this.matrixClient && roomId) {
+ const room = this.getRoom(roomId);
+ if (room && room.currentState) {
+ const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
+ if (powerLevelEvent) {
+ if (this.roomType(roomId) == ROOM_TYPE_CHANNEL) {
+ return Object.keys(powerLevelEvent.getContent().events).length == 0;
+ }
+ return powerLevelEvent.getContent().events_default > 0;
+ }
}
- return powerLevelEvent.getContent().events_default > 0;
- }
}
- }
- return false;
+ return false;
},
setReadOnlyRoom(roomId, readOnly) {
- if (this.matrixClient && roomId) {
- const room = this.getRoom(roomId);
- if (room && room.currentState) {
- const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
- if (powerLevelEvent) {
- let content = powerLevelEvent.getContent();
- if (this.roomType(roomId) == ROOM_TYPE_CHANNEL) {
- content.events = readOnly ? {} : CHANNEL_POWER_LEVELS
- } else {
- content.events_default = readOnly ? 50 : 0;
+ if (this.matrixClient && roomId) {
+ const room = this.getRoom(roomId);
+ if (room && room.currentState) {
+ const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
+ if (powerLevelEvent) {
+ let content = powerLevelEvent.getContent();
+ if (this.roomType(roomId) == ROOM_TYPE_CHANNEL) {
+ content.events = readOnly ? {} : CHANNEL_POWER_LEVELS
+ } else {
+ content.events_default = readOnly ? 50 : 0;
+ }
+ this.matrixClient.sendStateEvent(room.roomId, "m.room.power_levels", content);
+ }
}
- this.matrixClient.sendStateEvent(room.roomId, "m.room.power_levels", content);
- }
}
- }
},
userCanSendMessageInRoom(roomId, userId) {
- if (this.matrixClient && roomId && userId) {
- const room = this.getRoom(roomId);
- if (room && room.currentState) {
- let isAdmin = room.currentState.maySendEvent("m.room.power_levels", this.currentUserId);
- return isAdmin || (this.roomType(roomId) != ROOM_TYPE_CHANNEL && !this.isReadOnlyRoom(roomId));
+ if (this.matrixClient && roomId && userId) {
+ const room = this.getRoom(roomId);
+ if (room && room.currentState) {
+ let isAdmin = room.currentState.maySendEvent("m.room.power_levels", this.currentUserId);
+ return isAdmin || (this.roomType(roomId) != ROOM_TYPE_CHANNEL && !this.isReadOnlyRoom(roomId));
+ }
}
- }
- return true;
+ return true;
},
userCanSendReactionAndAnswerPollInRoom(roomId, userId) {
- if (this.matrixClient && roomId && userId) {
- const room = this.getRoom(roomId);
- if (room && room.currentState) {
- let isAdmin = room.currentState.maySendEvent("m.room.power_levels", this.currentUserId);
- return isAdmin || !this.isReadOnlyRoom(roomId);
+ if (this.matrixClient && roomId && userId) {
+ const room = this.getRoom(roomId);
+ if (room && room.currentState) {
+ let isAdmin = room.currentState.maySendEvent("m.room.power_levels", this.currentUserId);
+ return isAdmin || !this.isReadOnlyRoom(roomId);
+ }
}
- }
- return true;
+ return true;
},
roomType(roomId) {
- if (this.matrixClient && roomId) {
- const room = this.getRoom(roomId);
- if (room && room.currentState) {
- const roomTypeEvent = room.currentState.getStateEvents(STATE_EVENT_ROOM_TYPE, "") || room.currentState.getStateEvents("m.room.create", "");
- if (roomTypeEvent) {
- const roomType = roomTypeEvent.getContent().type;
- if ([ROOM_TYPE_FILE_MODE, ROOM_TYPE_VOICE_MODE, ROOM_TYPE_CHANNEL].includes(roomType)) {
- return roomType;
+ if (this.matrixClient && roomId) {
+ const room = this.getRoom(roomId);
+ if (room && room.currentState) {
+ const roomTypeEvent = room.currentState.getStateEvents(STATE_EVENT_ROOM_TYPE, "") || room.currentState.getStateEvents("m.room.create", "");
+ if (roomTypeEvent) {
+ const roomType = roomTypeEvent.getContent().type;
+ if ([ROOM_TYPE_FILE_MODE, ROOM_TYPE_VOICE_MODE, ROOM_TYPE_CHANNEL].includes(roomType)) {
+ return roomType;
+ }
+ }
}
- }
}
- }
- return ROOM_TYPE_DEFAULT;
+ return ROOM_TYPE_DEFAULT;
},
/**
@@ -781,187 +774,187 @@ export default {
* @param roomId
*/
purgeRoom(roomId, statusCallback) {
- this.currentRoomBeingPurged = true;
+ this.currentRoomBeingPurged = true;
- //console.log("Purge room");
+ //console.log("Purge room");
- const sleep = (ms) => {
- return new Promise((resolve) => setTimeout(resolve, ms));
- };
+ const sleep = (ms) => {
+ return new Promise((resolve) => setTimeout(resolve, ms));
+ };
- const withRetry = (codeBlock) => {
- return codeBlock().catch((error) => {
- if (error && error.errcode == "M_LIMIT_EXCEEDED") {
- var retry = 1000;
- if (error.data) {
- const retryIn = error.data.retry_after_ms;
- retry = Math.max(retry, retryIn ? retryIn : 0);
+ const withRetry = (codeBlock) => {
+ return codeBlock().catch((error) => {
+ if (error && error.errcode == "M_LIMIT_EXCEEDED") {
+ var retry = 1000;
+ if (error.data) {
+ const retryIn = error.data.retry_after_ms;
+ retry = Math.max(retry, retryIn ? retryIn : 0);
+ }
+ console.log("Rate limited, retry in", retry);
+ return sleep(retry).then(() => withRetry(codeBlock));
+ } else {
+ return Promise.resolve();
+ }
+ });
+ };
+
+ const oldGlobalErrorSetting = this.matrixClient.getGlobalErrorOnUnknownDevices();
+ return new Promise((resolve, reject) => {
+ const room = this.getRoom(roomId);
+ if (!room) {
+ reject("Room not found!");
+ return;
}
- console.log("Rate limited, retry in", retry);
- return sleep(retry).then(() => withRetry(codeBlock));
- } else {
- return Promise.resolve();
- }
- });
- };
- const oldGlobalErrorSetting = this.matrixClient.getGlobalErrorOnUnknownDevices();
- return new Promise((resolve, reject) => {
- const room = this.getRoom(roomId);
- if (!room) {
- reject("Room not found!");
- return;
- }
-
- // Remove any possible pending events
- room.getLiveTimeline().getEvents().filter((e) => [EventStatus.ENCRYPTING, sdk.EventStatus.QUEUED].includes(e.status)).forEach((e) => {
- //console.log("Cancel pending event!");
- this.matrixClient.cancelPendingEvent(e);
- });
-
- const timelineWindow = new TimelineWindow(this.matrixClient, room.getUnfilteredTimelineSet(), {});
- const self = this;
-
- //console.log("Purge: set invite only");
- statusCallback(this.$t("room.purge_set_room_state"));
- withRetry(() => this.matrixClient.sendStateEvent(roomId, "m.room.join_rules", { join_rule: "private" }, ""))
- .then(() => {
- //console.log("Purge: forbid guest access");
- return withRetry(() => this.matrixClient.sendStateEvent(
- roomId,
- "m.room.guest_access",
- { guest_access: "forbidden" },
- ""
- ));
- })
- .then(() => {
- //console.log("Purge: set history visibility to 'joined'");
- return withRetry(() => this.matrixClient.sendStateEvent(roomId, "m.room.history_visibility", {
- history_visibility: "joined",
- }));
- })
- .then(() => {
- return withRetry(() => this.matrixClient.sendStateEvent(roomId, STATE_EVENT_ROOM_DELETED, { status: "deleted" }));
- })
- .then(() => {
- // Set message retention 1 minute (may be limited by server)
- return withRetry(() => this.matrixClient.sendStateEvent(roomId, "m.room.retention", { max_lifetime: 60000 }));
- })
- .then(() => {
- //console.log("Purge: create timeline");
- return timelineWindow.load(null, 100);
- })
- .then(() => {
- const getMoreIfAvailable = function _getMoreIfAvailable() {
- if (timelineWindow.canPaginate(EventTimeline.BACKWARDS)) {
- //console.log("Purge: page back");
- return timelineWindow.paginate(EventTimeline.BACKWARDS, 100, true, 5).then((gotmore) => {
- if (gotmore) {
- return _getMoreIfAvailable.call(self);
- }
- return Promise.resolve("Done");
- });
- } else {
- return Promise.resolve("Done");
- }
- }.bind(self);
- return getMoreIfAvailable();
- })
- .then(() => {
- //console.log("Purge: redact events");
- statusCallback(this.$t("room.purge_redacting_events"));
- // First ignore unknown device errors
- this.matrixClient.setGlobalErrorOnUnknownDevices(false);
- const allEvents = timelineWindow.getEvents().filter((event) => {
- return (
- !event.isRedacted() &&
- !event.isRedaction() &&
- !event.isState() &&
- (!room.currentState || room.currentState.maySendRedactionForEvent(event, this.currentUserId))
- );
+ // Remove any possible pending events
+ room.getLiveTimeline().getEvents().filter((e) => [EventStatus.ENCRYPTING, sdk.EventStatus.QUEUED].includes(e.status)).forEach((e) => {
+ //console.log("Cancel pending event!");
+ this.matrixClient.cancelPendingEvent(e);
});
- const redactFirstEvent = (events) => {
- statusCallback(
- this.$t("room.purge_redacting_events", {
- count: allEvents.length - events.length + 1,
- total: allEvents.length,
+ const timelineWindow = new TimelineWindow(this.matrixClient, room.getUnfilteredTimelineSet(), {});
+ const self = this;
+
+ //console.log("Purge: set invite only");
+ statusCallback(this.$t("room.purge_set_room_state"));
+ withRetry(() => this.matrixClient.sendStateEvent(roomId, "m.room.join_rules", { join_rule: "private" }, ""))
+ .then(() => {
+ //console.log("Purge: forbid guest access");
+ return withRetry(() => this.matrixClient.sendStateEvent(
+ roomId,
+ "m.room.guest_access",
+ { guest_access: "forbidden" },
+ ""
+ ));
})
- );
- if (events.length == 0) {
- return Promise.resolve(true);
- }
- const event = events[0];
- return withRetry(() => this.matrixClient.redactEvent(event.getRoomId(), event.getId())).then(() =>
- redactFirstEvent(events.slice(1))
- );
- };
-
- return redactFirstEvent(allEvents);
- })
- .then(() => {
- //console.log("Purge: kick members");
- statusCallback(this.$t("room.purge_removing_members"));
- var joined = room.getMembersWithMembership("join");
- var invited = room.getMembersWithMembership("invite");
- var allMembers = joined.concat(invited);
-
- const me = allMembers.find((m) => m.userId == self.currentUserId);
-
- const kickFirstMember = (members) => {
- //console.log(`Kicking ${members.length} members`);
- statusCallback(
- this.$t("room.purge_removing_members", {
- count: allMembers.length - members.length + 1,
- total: allMembers.length,
+ .then(() => {
+ //console.log("Purge: set history visibility to 'joined'");
+ return withRetry(() => this.matrixClient.sendStateEvent(roomId, "m.room.history_visibility", {
+ history_visibility: "joined",
+ }));
})
- );
- if (members.length == 0) {
- return Promise.resolve(true);
- }
- const member = members[0];
- if (member.userId == self.currentUserId) {
- return kickFirstMember(members.slice(1));
- } else {
- // Slight pause to avoid rate limiting.
- return sleep(0.1)
- .then(() => withRetry(() => {
- if (member.membership == "invite" && me && me.powerLevel <= member.powerLevel) {
- // The user is invited, but we can't kick them because of power levels.
- // Send a new invite with reason set to "Room Deleted".
- // The client will be sent stripped room state, and can from that see the
- // join_rule of "private". It will then "leave", i.e. reject the invite.
- return this.matrixClient.invite(roomId, member.userId, "Room Deleted");
- }
- return this.matrixClient.kick(roomId, member.userId, "Room Deleted")
- }))
- .then(() => kickFirstMember(members.slice(1)));
- }
- };
+ .then(() => {
+ return withRetry(() => this.matrixClient.sendStateEvent(roomId, STATE_EVENT_ROOM_DELETED, { status: "deleted" }));
+ })
+ .then(() => {
+ // Set message retention 1 minute (may be limited by server)
+ return withRetry(() => this.matrixClient.sendStateEvent(roomId, "m.room.retention", { max_lifetime: 60000 }));
+ })
+ .then(() => {
+ //console.log("Purge: create timeline");
+ return timelineWindow.load(null, 100);
+ })
+ .then(() => {
+ const getMoreIfAvailable = function _getMoreIfAvailable() {
+ if (timelineWindow.canPaginate(EventTimeline.BACKWARDS)) {
+ //console.log("Purge: page back");
+ return timelineWindow.paginate(EventTimeline.BACKWARDS, 100, true, 5).then((gotmore) => {
+ if (gotmore) {
+ return _getMoreIfAvailable.call(self);
+ }
+ return Promise.resolve("Done");
+ });
+ } else {
+ return Promise.resolve("Done");
+ }
+ }.bind(self);
+ return getMoreIfAvailable();
+ })
+ .then(() => {
+ //console.log("Purge: redact events");
+ statusCallback(this.$t("room.purge_redacting_events"));
+ // First ignore unknown device errors
+ this.matrixClient.setGlobalErrorOnUnknownDevices(false);
+ const allEvents = timelineWindow.getEvents().filter((event) => {
+ return (
+ !event.isRedacted() &&
+ !event.isRedaction() &&
+ !event.isState() &&
+ (!room.currentState || room.currentState.maySendRedactionForEvent(event, this.currentUserId))
+ );
+ });
- return kickFirstMember(allMembers);
- })
- .then(() => {
- return withRetry(() =>
- this.matrixClient.sendStateEvent(roomId, STATE_EVENT_ROOM_DELETED, { status: "deleted" })
- );
- })
- .then(() => {
- statusCallback(null);
- this.matrixClient.setGlobalErrorOnUnknownDevices(oldGlobalErrorSetting);
- return withRetry(() => this.leaveRoom(roomId));
- })
- .then(() => {
- this.currentRoomBeingPurged = false;
- resolve(true); // Done!
- })
- .catch((err) => {
- console.error("Error purging room", err);
- this.currentRoomBeingPurged = false;
- this.matrixClient.setGlobalErrorOnUnknownDevices(oldGlobalErrorSetting);
- reject(err);
- });
- });
+ const redactFirstEvent = (events) => {
+ statusCallback(
+ this.$t("room.purge_redacting_events", {
+ count: allEvents.length - events.length + 1,
+ total: allEvents.length,
+ })
+ );
+ if (events.length == 0) {
+ return Promise.resolve(true);
+ }
+ const event = events[0];
+ return withRetry(() => this.matrixClient.redactEvent(event.getRoomId(), event.getId())).then(() =>
+ redactFirstEvent(events.slice(1))
+ );
+ };
+
+ return redactFirstEvent(allEvents);
+ })
+ .then(() => {
+ //console.log("Purge: kick members");
+ statusCallback(this.$t("room.purge_removing_members"));
+ var joined = room.getMembersWithMembership("join");
+ var invited = room.getMembersWithMembership("invite");
+ var allMembers = joined.concat(invited);
+
+ const me = allMembers.find((m) => m.userId == self.currentUserId);
+
+ const kickFirstMember = (members) => {
+ //console.log(`Kicking ${members.length} members`);
+ statusCallback(
+ this.$t("room.purge_removing_members", {
+ count: allMembers.length - members.length + 1,
+ total: allMembers.length,
+ })
+ );
+ if (members.length == 0) {
+ return Promise.resolve(true);
+ }
+ const member = members[0];
+ if (member.userId == self.currentUserId) {
+ return kickFirstMember(members.slice(1));
+ } else {
+ // Slight pause to avoid rate limiting.
+ return sleep(0.1)
+ .then(() => withRetry(() => {
+ if (member.membership == "invite" && me && me.powerLevel <= member.powerLevel) {
+ // The user is invited, but we can't kick them because of power levels.
+ // Send a new invite with reason set to "Room Deleted".
+ // The client will be sent stripped room state, and can from that see the
+ // join_rule of "private". It will then "leave", i.e. reject the invite.
+ return this.matrixClient.invite(roomId, member.userId, "Room Deleted");
+ }
+ return this.matrixClient.kick(roomId, member.userId, "Room Deleted")
+ }))
+ .then(() => kickFirstMember(members.slice(1)));
+ }
+ };
+
+ return kickFirstMember(allMembers);
+ })
+ .then(() => {
+ return withRetry(() =>
+ this.matrixClient.sendStateEvent(roomId, STATE_EVENT_ROOM_DELETED, { status: "deleted" })
+ );
+ })
+ .then(() => {
+ statusCallback(null);
+ this.matrixClient.setGlobalErrorOnUnknownDevices(oldGlobalErrorSetting);
+ return withRetry(() => this.leaveRoom(roomId));
+ })
+ .then(() => {
+ this.currentRoomBeingPurged = false;
+ resolve(true); // Done!
+ })
+ .catch((err) => {
+ console.error("Error purging room", err);
+ this.currentRoomBeingPurged = false;
+ this.matrixClient.setGlobalErrorOnUnknownDevices(oldGlobalErrorSetting);
+ reject(err);
+ });
+ });
},
/**
@@ -970,74 +963,74 @@ export default {
* @param {*} userId The user to chat with.
*/
getOrCreatePrivateChat(userId) {
- return new Promise((resolve, reject) => {
- for (const room of this.rooms) {
- // Is the other member the one we are looking for?
- if (this.isDirectRoomWith(room, userId)) {
- if (room.getMyMembership() == "invite") {
- this.matrixClient.joinRoom(room.roomId);
- } else {
- var member = room.getMember(userId);
- if (member && member.membership != "join") {
- // Resend invite
- this.matrixClient.invite(room.roomId, userId);
- }
+ return new Promise((resolve, reject) => {
+ for (const room of this.rooms) {
+ // Is the other member the one we are looking for?
+ if (this.isDirectRoomWith(room, userId)) {
+ if (room.getMyMembership() == "invite") {
+ this.matrixClient.joinRoom(room.roomId);
+ } else {
+ var member = room.getMember(userId);
+ if (member && member.membership != "join") {
+ // Resend invite
+ this.matrixClient.invite(room.roomId, userId);
+ }
+ }
+ resolve(room);
+ return;
+ }
}
- resolve(room);
- return;
- }
- }
- // No room found, create one
- //
- const createRoomOptions = {
- visibility: "private", // Not listed!
- preset: "private_chat",
- is_direct: true,
- initial_state: [
- {
- type: "m.room.encryption",
- state_key: "",
- content: {
- algorithm: "m.megolm.v1.aes-sha2",
- },
- },
- {
- type: "m.room.guest_access",
- state_key: "",
- content: {
- guest_access: "forbidden",
- },
- },
- {
- type: "m.room.history_visibility",
- state_key: "",
- content: {
- history_visibility: "invited",
- },
- },
- {
- type: "m.room.power_levels",
- state_key: "",
- content: {
- users: {
- [this.currentUserId]: 100,
- [userId]: 100,
- },
- },
- },
- ],
- invite: [userId],
- };
- return this.matrixClient
- .createRoom(createRoomOptions)
- .then(({ room_id, room_alias }) => {
- resolve(this.getRoom(room_alias || room_id));
- })
- .catch((error) => {
- reject(error);
- });
- });
+ // No room found, create one
+ //
+ const createRoomOptions = {
+ visibility: "private", // Not listed!
+ preset: "private_chat",
+ is_direct: true,
+ initial_state: [
+ {
+ type: "m.room.encryption",
+ state_key: "",
+ content: {
+ algorithm: "m.megolm.v1.aes-sha2",
+ },
+ },
+ {
+ type: "m.room.guest_access",
+ state_key: "",
+ content: {
+ guest_access: "forbidden",
+ },
+ },
+ {
+ type: "m.room.history_visibility",
+ state_key: "",
+ content: {
+ history_visibility: "invited",
+ },
+ },
+ {
+ type: "m.room.power_levels",
+ state_key: "",
+ content: {
+ users: {
+ [this.currentUserId]: 100,
+ [userId]: 100,
+ },
+ },
+ },
+ ],
+ invite: [userId],
+ };
+ return this.matrixClient
+ .createRoom(createRoomOptions)
+ .then(({ room_id, room_alias }) => {
+ resolve(this.getRoom(room_alias || room_id));
+ })
+ .catch((error) => {
+ reject(error);
+ });
+ });
},
/**
@@ -1046,19 +1039,19 @@ export default {
* @param {*} userId
*/
isDirectRoomWith(room, userId) {
- if (room && room.getJoinRule() == "invite" && room.getMembers().length == 2) {
- let other = room.getMember(userId);
- if (other) {
- if (room.getMyMembership() == "invite" && other.membership == "join") {
- return true;
- } else if (room.getMyMembership() == "join" && room.canInvite(this.currentUserId)) {
- return true;
- } else if (room.getMyMembership() == "join" && other.membership == "join") {
- return true;
- }
+ if (room && room.getJoinRule() == "invite" && room.getMembers().length == 2) {
+ let other = room.getMember(userId);
+ if (other) {
+ if (room.getMyMembership() == "invite" && other.membership == "join") {
+ return true;
+ } else if (room.getMyMembership() == "join" && room.canInvite(this.currentUserId)) {
+ return true;
+ } else if (room.getMyMembership() == "join" && other.membership == "join") {
+ return true;
+ }
+ }
}
- }
- return false;
+ return false;
},
/**
@@ -1067,68 +1060,68 @@ export default {
* @param { } room
*/
isDirectRoom(room) {
- // TODO - Use the is_direct accountData flag (m.direct). WE (as the client)
- // apprently need to set this...
- if (room && room.getJoinRule() == "invite" && room.getMembers().length == 2) {
- return true;
- }
- return false;
+ // TODO - Use the is_direct accountData flag (m.direct). WE (as the client)
+ // apprently need to set this...
+ if (room && room.getJoinRule() == "invite" && room.getMembers().length == 2) {
+ return true;
+ }
+ return false;
},
on(event, handler) {
- if (this.matrixClient) {
- this.matrixClient.on(event, handler);
- }
+ if (this.matrixClient) {
+ this.matrixClient.on(event, handler);
+ }
},
off(event, handler) {
- if (this.matrixClient) {
- this.matrixClient.off(event, handler);
- }
+ if (this.matrixClient) {
+ this.matrixClient.off(event, handler);
+ }
},
setUserDisplayName(name) {
- if (this.matrixClient) {
- return this.matrixClient
- .setDisplayName(name || this.user.userId)
- .then(() => (this.userDisplayName = name))
- .catch((err) => console.err("Failed to set display name", err));
- } else {
- return Promise.reject("No matrix client");
- }
+ if (this.matrixClient) {
+ return this.matrixClient
+ .setDisplayName(name || this.user.userId)
+ .then(() => (this.userDisplayName = name))
+ .catch((err) => console.err("Failed to set display name", err));
+ } else {
+ return Promise.reject("No matrix client");
+ }
},
setPassword(oldPassword, newPassword) {
- if (this.matrixClient && this.currentUser) {
- const authDict = {
- type: "m.login.password",
- identifier: {
- type: "m.id.user",
- user: this.currentUser.user_id,
- },
- // TODO: Remove `user` once servers support proper UIA
- // See https://github.com/matrix-org/synapse/issues/5665
- user: this.currentUser.user_id,
- password: oldPassword,
- };
- const self = this;
- return this.matrixClient
- .setPassword(authDict, newPassword)
- .then(() => {
- // Forget password and remove the 'is_guest' flag, we are now a "real" user!
- self.currentUser.password = undefined;
- self.currentUser.is_guest = false;
- self.$store.commit("setUser", self.currentUser);
- })
- .then(() => {
- return true;
- });
- }
- return Promise.resolve(false);
+ if (this.matrixClient && this.currentUser) {
+ const authDict = {
+ type: "m.login.password",
+ identifier: {
+ type: "m.id.user",
+ user: this.currentUser.user_id,
+ },
+ // TODO: Remove `user` once servers support proper UIA
+ // See https://github.com/matrix-org/synapse/issues/5665
+ user: this.currentUser.user_id,
+ password: oldPassword,
+ };
+ const self = this;
+ return this.matrixClient
+ .setPassword(authDict, newPassword)
+ .then(() => {
+ // Forget password and remove the 'is_guest' flag, we are now a "real" user!
+ self.currentUser.password = undefined;
+ self.currentUser.is_guest = false;
+ self.$store.commit("setUser", self.currentUser);
+ })
+ .then(() => {
+ return true;
+ });
+ }
+ return Promise.resolve(false);
},
uploadFile(file, opts) {
- return this.matrixClient.uploadContent(file, opts);
+ return this.matrixClient.uploadContent(file, opts);
},
/**
@@ -1137,201 +1130,187 @@ export default {
* @returns A MatrixClient that can be used for public queries
*/
getPublicQueryMatrixClient() {
- if (this.matrixClient) {
- return this.getMatrixClient().then(() => {
- return this.matrixClient;
- });
- } else {
- var tempUserString = this.$store.state.tempuser;
- var tempUser = null;
- if (tempUserString) {
- tempUser = JSON.parse(tempUserString);
- }
- return util.getMatrixBaseUrl(tempUser, this.$config).then((baseUrl) => {
- const tempMatrixClient = sdk.createClient({ baseUrl: baseUrl });
-
- var clientPromise;
-
- // Need to create an account?
- //
- if (tempUser) {
- clientPromise = Promise.resolve(tempUser);
- } else {
- const user = util.randomUser(this.$config.userIdPrefix);
- const pass = util.randomPass();
- clientPromise = tempMatrixClient
- .register(user, pass, null, {
- type: "m.login.dummy",
- initial_device_display_name: this.$config.appName,
- })
- .then((response) => {
- console.log("Response", response);
- response.password = pass;
- response.is_guest = true;
- this.$store.commit("setTempUser", response);
- return response;
- });
- }
-
- // Get an access token
- clientPromise = clientPromise.then((user) => {
- var data = {
- user: User.localPart(user.user_id),
- password: user.password,
- type: "m.login.password",
- initial_device_display_name: this.$config.appName,
- };
- if (user.device_id) {
- data.device_id = user.device_id;
+ if (this.matrixClient) {
+ return this.getMatrixClient().then(() => {
+ return this.matrixClient;
+ });
+ } else {
+ var tempUserString = this.$store.state.tempuser;
+ var tempUser = null;
+ if (tempUserString) {
+ tempUser = JSON.parse(tempUserString);
}
- return tempMatrixClient.login("m.login.password", data);
- });
+ return util.getMatrixBaseUrl(tempUser, this.$config).then((baseUrl) => {
+ const tempMatrixClient = sdk.createClient({ baseUrl: baseUrl });
- // Then login
- //
- // Create a slimmed down client, without crypto. This one is
- // Only used to get public room info from.
- clientPromise = clientPromise.then((user) => {
- var opts = {
- baseUrl: baseUrl,
- userId: user.user_id,
- accessToken: user.access_token,
- timelineSupport: false,
- };
- var matrixClient = sdk.createClient(opts);
- matrixClient.startClient();
- return matrixClient;
- });
+ var clientPromise;
- return clientPromise;
- });
- }
- },
+ // Need to create an account?
+ //
+ if (tempUser) {
+ clientPromise = Promise.resolve(tempUser);
+ } else {
+ const user = util.randomUser(this.$config.userIdPrefix);
+ const pass = util.randomPass();
+ clientPromise = tempMatrixClient
+ .register(user, pass, null, {
+ type: "m.login.dummy",
+ initial_device_display_name: this.$config.appName,
+ })
+ .then((response) => {
+ console.log("Response", response);
+ response.password = pass;
+ response.is_guest = true;
+ this.$store.commit("setTempUser", response);
+ return response;
+ });
+ }
- getPublicUserInfo(userId) {
- if (!userId) {
- return Promise.reject("Invalid parameters");
- }
+ // Get an access token
+ clientPromise = clientPromise.then((user) => {
+ var data = {
+ user: User.localPart(user.user_id),
+ password: user.password,
+ type: "m.login.password",
+ initial_device_display_name: this.$config.appName,
+ };
+ if (user.device_id) {
+ data.device_id = user.device_id;
+ }
+ return tempMatrixClient.login("m.login.password", data);
+ });
- const parts = userId.split(":");
- if (parts.length != 2) {
- return Promise.reject("Unknown home server");
- }
+ // Then login
+ //
+ // Create a slimmed down client, without crypto. This one is
+ // Only used to get public room info from.
+ clientPromise = clientPromise.then((user) => {
+ var opts = {
+ baseUrl: baseUrl,
+ userId: user.user_id,
+ accessToken: user.access_token,
+ timelineSupport: false,
+ };
+ var matrixClient = sdk.createClient(opts);
+ matrixClient.startClient();
+ return matrixClient;
+ });
- const clientPromise = this.getPublicQueryMatrixClient();
- let matrixClient;
- return clientPromise
- .then((client) => {
- matrixClient = client;
- return client.getProfileInfo(userId);
- })
- .then((response) => {
- if (response.avatar_url) {
- response.avatar = matrixClient.mxcUrlToHttp(response.avatar_url, 80, 80, "scale", true);
- }
- return Promise.resolve(response);
- })
- .catch((err) => {
- return Promise.reject("Failed to find user info: " + err);
- });
+ return clientPromise;
+ });
+ }
},
getPublicRoomInfo(roomId) {
- if (!roomId) {
- return Promise.reject("Invalid parameters");
- }
-
- const parts = roomId.split(":");
- if (parts.length != 2) {
- return Promise.reject("Unknown room server");
- }
- const server = parts[1];
-
- const clientPromise = this.getPublicQueryMatrixClient();
-
- const findOrGetMore = function _findOrGetMore(client, response) {
- for (var room of response.chunk) {
- if (
- (roomId.startsWith("#") && room.canonical_alias == roomId) ||
- (roomId.startsWith("!") && room.room_id == roomId)
- ) {
- if (room.avatar_url) {
- room.avatar = client.mxcUrlToHttp(room.avatar_url, 80, 80, "scale", true);
- }
- return Promise.resolve(room);
- }
+ if (!roomId) {
+ return Promise.reject("Invalid parameters");
}
- if (response.next_batch) {
- return client
- .publicRooms({
- server: server,
- limit: 1000,
- since: response.next_batch,
+
+ const parts = roomId.split(":");
+ if (parts.length != 2) {
+ return Promise.reject("Unknown room server");
+ }
+ const server = parts[1];
+
+ const clientPromise = this.getPublicQueryMatrixClient();
+
+ const findOrGetMore = function _findOrGetMore(client, useAuthedMedia, response) {
+ for (var room of response.chunk) {
+ if (
+ (roomId.startsWith("#") && room.canonical_alias == roomId) ||
+ (roomId.startsWith("!") && room.room_id == roomId)
+ ) {
+ if (room.avatar_url) {
+ room["avatar"] = client.mxcUrlToHttp(room.avatar_url, 80, 80, "scale", false, undefined, useAuthedMedia);
+ }
+ return Promise.resolve(room);
+ }
+ }
+ if (response.next_batch) {
+ return client
+ .publicRooms({
+ server: server,
+ limit: 1000,
+ since: response.next_batch,
+ })
+ .then((response) => {
+ return _findOrGetMore(client, response);
+ })
+ .catch((err) => {
+ return Promise.reject("Failed to find room: " + err);
+ });
+ } else {
+ return Promise.reject("No more data");
+ }
+ };
+
+ var matrixClient;
+ let useAuthedMedia = false;
+ return clientPromise
+ .then((client) => {
+ matrixClient = client;
+ return client.isVersionSupported("v1.11");
+ })
+ .then((version1_11) => {
+ useAuthedMedia = version1_11;
+ return matrixClient.publicRooms({ server: server, limit: 1000 });
})
.then((response) => {
- return _findOrGetMore(client, response);
+ return findOrGetMore(matrixClient, useAuthedMedia, response);
})
.catch((err) => {
- return Promise.reject("Failed to find room: " + err);
+ return Promise.reject("Failed to find room: " + err);
});
- } else {
- return Promise.reject("No more data");
- }
- };
-
- var matrixClient;
- return clientPromise
- .then((client) => {
- matrixClient = client;
- return matrixClient.publicRooms({ server: server, limit: 1000 });
- })
- .then((response) => {
- return findOrGetMore(matrixClient, response);
- })
- .catch((err) => {
- return Promise.reject("Failed to find room: " + err);
- });
},
updateNotificationCount() {
- var count = 0;
- this.rooms.forEach((room) => {
- count += room.getUnreadNotificationCount("total") || 0;
- });
- this.notificationCount = count;
+ var count = 0;
+ this.rooms.forEach((room) => {
+ count += room.getUnreadNotificationCount("total") || 0;
+ });
+ this.notificationCount = count;
},
setEventPinned(room, event, pinned) {
- if (room && room.currentState && event) {
- const pinnedMessagesEvent = room.currentState.getStateEvents("m.room.pinned_events", "");
- const content = pinnedMessagesEvent ? pinnedMessagesEvent.getContent() : {}
- let pinnedEvents = content["pinned"] || [];
- if (pinned && !pinnedEvents.includes(event.getId())) {
- pinnedEvents.push(event.getId());
- } else if (!pinned && pinnedEvents.includes(event.getId())) {
- pinnedEvents = pinnedEvents.filter((e) => e != event.getId());
- } else {
- return; // no change
+ if (room && room.currentState && event) {
+ const pinnedMessagesEvent = room.currentState.getStateEvents("m.room.pinned_events", "");
+ const content = pinnedMessagesEvent ? pinnedMessagesEvent.getContent() : {}
+ let pinnedEvents = content["pinned"] || [];
+ if (pinned && !pinnedEvents.includes(event.getId())) {
+ pinnedEvents.push(event.getId());
+ } else if (!pinned && pinnedEvents.includes(event.getId())) {
+ pinnedEvents = pinnedEvents.filter((e) => e != event.getId());
+ } else {
+ return; // no change
+ }
+ content.pinned = pinnedEvents;
+ this.matrixClient.sendStateEvent(room.roomId, "m.room.pinned_events", content);
}
- content.pinned = pinnedEvents;
- this.matrixClient.sendStateEvent(room.roomId, "m.room.pinned_events", content);
- }
},
getPinnedEvents(room) {
- if (room && room.currentState) {
- const pinnedMessagesEvent = room.currentState.getStateEvents("m.room.pinned_events", "");
- const content = pinnedMessagesEvent ? pinnedMessagesEvent.getContent() : {}
- return content["pinned"] || [];
- } else {
- return [];
- }
+ if (room && room.currentState) {
+ const pinnedMessagesEvent = room.currentState.getStateEvents("m.room.pinned_events", "");
+ const content = pinnedMessagesEvent ? pinnedMessagesEvent.getContent() : {}
+ return content["pinned"] || [];
+ } else {
+ return [];
+ }
},
},
+ render: () => {}
});
-
- sdk.setCryptoStoreFactory(matrixService.createCryptoStore.bind(matrixService));
-
- Vue.prototype.$matrix = matrixService;
+ matrixService.config.globalProperties.$store = store;
+ matrixService.config.globalProperties.$config = app.$config;
+ matrixService.config.globalProperties.$t = app.$t;
+ matrixService.config.globalProperties.$navigation = app.$navigation;
+ matrixService.$store = store;
+ matrixService.$config = app.$config;
+ matrixService.$t = app.$t;
+ matrixService.$navigation = app.$navigation;
+ const instance = matrixService.mount("#app2");
+ app.config.globalProperties.$matrix = instance;
+ app.$matrix = instance;
+ sdk.setCryptoStoreFactory(instance.createCryptoStore.bind(instance));
},
};
diff --git a/src/services/navigation.service.js b/src/services/navigation.service.js
index 680d78a..a03c19f 100644
--- a/src/services/navigation.service.js
+++ b/src/services/navigation.service.js
@@ -1,5 +1,5 @@
export default {
- install(Vue, router) {
+ install(app, router) {
var routes = [];
var nextRoutes = null;
var zeroIndex = undefined;
@@ -75,6 +75,8 @@ export default {
router.go(-1);
}
}
- Vue.prototype.$navigation = navigationService;
+
+ app.$navigation = navigationService;
+ app.config.globalProperties.$navigation = navigationService;
}
}
diff --git a/src/store/index.js b/src/store/index.js
index a544b2e..a0716c0 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,8 +1,6 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
-import VuexPersist from 'vuex-persist'
+import { createStore } from 'vuex'
+import VuexPersistence from 'vuex-persist'
-Vue.use(Vuex)
const USER = `convene_${ window.location.hostname }_user`
const SETTINGS = `convene_${ window.location.hostname }_settings`
@@ -32,7 +30,7 @@ const persistUserPlugin = store => {
}
-const vuexPersistLocalStorage = new VuexPersist({
+const vuexPersistLocalStorage = new VuexPersistence({
key: SETTINGS,
storage: localStorage,
reducer: state => {
@@ -49,7 +47,7 @@ const vuexPersistLocalStorage = new VuexPersist({
}
})
-const vuexPersistSessionStorage = new VuexPersist({
+const vuexPersistSessionStorage = new VuexPersistence({
key: SETTINGS,
storage: sessionStorage,
reducer: state => {
@@ -67,7 +65,7 @@ const vuexPersistSessionStorage = new VuexPersist({
const defaultUseSessionStorage = (sessionStorage.getItem(USER) != null);
-export default new Vuex.Store({
+const store = createStore({
state: { language: null, currentRoomId: null, auth: null, tempuser: null, useLocalStorage: !defaultUseSessionStorage, globalNotification: false },
mutations: {
loginSuccess(state, user) {
@@ -106,7 +104,7 @@ export default new Vuex.Store({
},
actions: {
login({ commit }, { user, registrationFlowHandler }) {
- return this._vm.$matrix.login(user, registrationFlowHandler).then(
+ return this.$matrix.login(user, registrationFlowHandler).then(
user => {
commit('loginSuccess', user);
return Promise.resolve(user);
@@ -118,7 +116,7 @@ export default new Vuex.Store({
);
},
createUser({ commit }, { user, registrationFlowHandler }) {
- return this._vm.$matrix.login(user, registrationFlowHandler, true).then(
+ return this.$matrix.login(user, registrationFlowHandler, true).then(
user => {
commit('loginSuccess', user);
return Promise.resolve(user);
@@ -130,7 +128,7 @@ export default new Vuex.Store({
);
},
logout({ commit }) {
- this._vm.$matrix.logout();
+ this.$matrix.logout();
commit('logout');
},
},
@@ -144,4 +142,6 @@ export default new Vuex.Store({
}
},
plugins: [vuexPersistLocalStorage.plugin, vuexPersistSessionStorage.plugin, persistUserPlugin]
-})
+});
+
+export default store;
diff --git a/vite.config.mjs b/vite.config.mjs
new file mode 100644
index 0000000..800b292
--- /dev/null
+++ b/vite.config.mjs
@@ -0,0 +1,120 @@
+import { defineConfig } from "vite";
+import vue from "@vitejs/plugin-vue";
+import vueJsx from "@vitejs/plugin-vue-jsx";
+import vitePluginVuetify from "vite-plugin-vuetify";
+import { fileURLToPath, URL } from "node:url";
+import Components from "unplugin-vue-components/vite";
+import { viteStaticCopy } from 'vite-plugin-static-copy';
+import nodePolyfills from 'rollup-plugin-polyfill-node';
+import { resolve } from "path";
+import commonjs from '@rollup/plugin-commonjs';
+
+function VuetifyResolver() {
+ return {
+ type: 'component',
+ resolve: (name) => {
+ console.log("rESOLVE", name);
+ if (name.match(/^V[A-Z]/) && !name.includes("VEmojiPicker"))
+ return { name, from: './node_modules/vuetify/components' }
+ },
+ }
+}
+
+// https://vitejs.dev/config/
+export default defineConfig(({mode}) => ({
+ plugins: [
+ // commonjs({
+ // include: /node_modules/,
+ // requireReturnsDefault: 'auto', // <---- this solves default issue
+ // }),
+ // commonjs({
+ // exclude: ["*vuex-persist*", "*deepmerge*"]
+ // }),
+ vue({
+ template: {
+ compilerOptions: {
+ comments: false
+ }
+ }
+ }),
+ vueJsx(),
+ vitePluginVuetify(),
+ // Components({
+ // resolvers: [VuetifyResolver()],
+ // }),
+ viteStaticCopy({
+ targets: [
+ {
+ src: "src/assets/config.json",
+ dest: ''
+ },
+ {
+ src: "node_modules/@matrix-org/olm/olm.wasm",
+ dest: ''
+ },
+ {
+ src: 'node_modules/@matrix-org/matrix-sdk-crypto-wasm/pkg/matrix_sdk_crypto_wasm_bg.wasm',
+ dest: mode == "development" ? '/node_modules/.vite/deps/pkg' : ''
+ }
+ ]
+ }),
+ //nodePolyfills(),
+ ],
+ resolve: {
+ extensions: ['.vue','.mjs', '.js', '.ts', '.jsx', '.tsx', '.json','.wasm'],
+ alias: [
+ { find: "@", replacement: fileURLToPath(new URL("./src", import.meta.url)) },
+ { find: "~@", replacement: fileURLToPath(new URL("./src", import.meta.url)) },
+ { find: "vue", replacement: fileURLToPath(new URL("./node_modules/vue/dist/vue.esm-bundler.js", import.meta.url)) },
+ ],
+ },
+ define: {
+ //global: "window",
+ //module: {},
+ Lame: "window.Lame",
+ Presets: "window.Presets",
+ GainAnalysis: "window.GainAnalysis",
+ QuantizePVT: "window.QuantizePVT",
+ Quantize: "window.Quantize",
+ Takehiro: "window.Takehiro",
+ Reservoir: "window.Reservoir",
+ MPEGMode: "window.MPEGMode",
+ BitStream: "window.BitStream",
+ },
+ build: {
+ commonjsOptions: { transformMixedEsModules: true } // Change
+ }
+ // optimizeDeps: {
+ // include: ["deepmerge", "vuex-persist"],
+ // },
+ // optimizeDeps: {
+ // include: [
+ // "vuex-persist", "vue-sanitize"
+ // ],
+ // esbuildOptions:{
+ // plugins:[
+ // commonjs()
+ // ]
+ // }
+ // },
+ // build: {
+ // commonjsOptions: {
+ // include: [/node_modules/],
+ // requireReturnsDefault: true,
+ // exclude: ["vuex-persist"]
+ // }
+ // },
+ // rollupOptions: {
+ // //Here, we are externalizing Vue to prevent it to be bundled
+ // //with our library
+ // external: ["vue"],
+ // //Add this so the UMD build will recognize the global variables
+ // //of externalized dependencies
+ // output: {
+ // globals: {
+ // vue: "Vue",
+ // },
+ // exports: "named",
+ // },
+ // },
+}));
diff --git a/vue.config.js b/vue.config.js
deleted file mode 100644
index ab49c9e..0000000
--- a/vue.config.js
+++ /dev/null
@@ -1,62 +0,0 @@
-const CopyWebpackPlugin = require("copy-webpack-plugin");
-const webpack = require("webpack");
-//const fs = require('fs')
-
-module.exports = {
- transpileDependencies: ["vuetify"],
-
- publicPath: process.env.NODE_ENV === "production" ? "./" : "./",
-
- chainWebpack: (config) => {
- config.plugin("html").tap((args) => {
- var c = require("./src/assets/config.json");
- args[0].title = c.appName;
- return args;
- });
- },
-
- configureWebpack: {
- devtool: "source-map",
- resolve: {
- fallback: {
- "path": require.resolve("path-browserify"),
- "crypto": require.resolve("crypto-browserify"),
- "stream": require.resolve("stream-browserify"),
- "fs": require.resolve("browserify-fs"),
- "buffer": require.resolve("buffer")
- }
- },
- plugins: [
- new webpack.ProvidePlugin({
- Buffer: ['buffer', 'Buffer'],
- }),
- new webpack.ProvidePlugin({
- process: 'process/browser',
- }),
- new CopyWebpackPlugin({patterns: [
- {
- from: "./src/assets/config.json",
- to: "./",
- },
- {
- from: "./node_modules/@matrix-org/olm/olm.wasm",
- to: "./js/olm.wasm",
- },
- ]}),
- ],
- },
-
- devServer: {
- //https: true,
-
- /***
- * For testing notification via service worker in Mobile
- * Run your site locally with secure HTTPS using mkcert
- * https://web.dev/how-to-use-local-https/#running-your-site-locally-with-https-using-mkcert-recommended
- */
- // https: {
- // key: fs.readFileSync('./your-local-ip-address-key.pem'),
- // cert: fs.readFileSync('./your-local-ip-address.pem'),
- // }
- }
-};
+
+
- ![]()
- {{
+
- {{ $tc("message.seen_by_count", seenBy.length) }}
+ {{ $t("message.seen_by_count", seenBy.length) }}
{{ moreItems }}
-
+
- $vuetify.icons.ic_edit
- {{ $t("menu.edit") }}
-
+ $vuetify.icons.ic_edit
+ {{ $t("menu.edit") }}
- $vuetify.icons.ic_pin
- {{ $t("menu.pin") }}
-
+ $vuetify.icons.ic_pin
+ {{ $t("menu.pin") }}
- $vuetify.icons.ic_pin
- {{ $t("menu.unpin") }}
-
+ $vuetify.icons.ic_pin
+ {{ $t("menu.unpin") }}
- delete_outline
- {{ $t("menu.delete") }}
-
+ delete_outline
+ {{ $t("menu.delete") }}
@@ -50,5 +42,5 @@ export default {
\ No newline at end of file
diff --git a/src/components/messages/channel/QuickReactionsChannel.vue b/src/components/messages/channel/QuickReactionsChannel.vue
index 8e2e422..c05998e 100644
--- a/src/components/messages/channel/QuickReactionsChannel.vue
+++ b/src/components/messages/channel/QuickReactionsChannel.vue
@@ -7,18 +7,19 @@
v-show="name == '❤️'"
>
{{ $sanitize(fileName) }}
@@ -27,7 +27,7 @@ export default {
diff --git a/src/components/messages/export/MessageIncomingThreadExport.vue b/src/components/messages/export/MessageIncomingThreadExport.vue
index a527dd2..70c15c2 100644
--- a/src/components/messages/export/MessageIncomingThreadExport.vue
+++ b/src/components/messages/export/MessageIncomingThreadExport.vue
@@ -1,7 +1,7 @@
-
@@ -25,7 +25,7 @@ export default {
this.event.on("Event.relationsCreated", this.onRelationsCreated);
}
},
- beforeDestroy() {
+ beforeUnmount() {
this.event.off("Event.relationsCreated", this.onRelationsCreated);
},
methods: {
@@ -49,7 +49,7 @@ export default {
diff --git a/src/components/messages/export/MessageOutgoingAudioExport.vue b/src/components/messages/export/MessageOutgoingAudioExport.vue
index f32c19a..85ccadb 100644
--- a/src/components/messages/export/MessageOutgoingAudioExport.vue
+++ b/src/components/messages/export/MessageOutgoingAudioExport.vue
@@ -1,5 +1,5 @@
-
+
@@ -17,5 +17,5 @@ export default {
diff --git a/src/components/messages/export/MessageOutgoingFileExport.vue b/src/components/messages/export/MessageOutgoingFileExport.vue
index 0bcaa6f..1599a99 100644
--- a/src/components/messages/export/MessageOutgoingFileExport.vue
+++ b/src/components/messages/export/MessageOutgoingFileExport.vue
@@ -1,5 +1,5 @@
-
+
{{ $sanitize(fileName) }}
@@ -27,7 +27,7 @@ export default {
diff --git a/src/components/messages/export/MessageOutgoingThreadExport.vue b/src/components/messages/export/MessageOutgoingThreadExport.vue
index 108e5cf..4feee8d 100644
--- a/src/components/messages/export/MessageOutgoingThreadExport.vue
+++ b/src/components/messages/export/MessageOutgoingThreadExport.vue
@@ -1,7 +1,6 @@
-
@@ -25,7 +24,7 @@ export default {
this.event.on("Event.relationsCreated", this.onRelationsCreated);
}
},
- beforeDestroy() {
+ beforeUnmount() {
this.event.off("Event.relationsCreated", this.onRelationsCreated);
},
methods: {
@@ -49,7 +48,7 @@ export default {
diff --git a/src/components/messages/messageMixin.js b/src/components/messages/messageMixin.js
index 3340863..bcce0e7 100644
--- a/src/components/messages/messageMixin.js
+++ b/src/components/messages/messageMixin.js
@@ -1,8 +1,7 @@
import QuickReactions from "./QuickReactions.vue";
import * as linkify from 'linkifyjs';
import linkifyHtml from 'linkify-html';
-import utils from "../../plugins/utils"
-import util from "../../plugins/utils";
+import utils from "../../plugins/utils";
import Hammer from "hammerjs";
linkify.options.defaults.className = "link";
@@ -53,7 +52,7 @@ export default {
mcCustom: null
};
},
- beforeDestroy() {
+ beforeUnmount() {
this.thread = null;
},
watch: {
@@ -140,7 +139,7 @@ export default {
if (this.inReplyToEvent && (this.inReplyToEvent.isThreadRoot || this.inReplyToEvent.isMxThread)) {
const children = this.timelineSet.relations
.getAllChildEventsForEvent(this.inReplyToEvent.getId())
- .filter((e) => util.downloadableTypes().includes(e.getContent().msgtype));
+ .filter((e) => utils.downloadableTypes().includes(e.getContent().msgtype));
return this.$t("message.sent_media", { count: children.length });
}
const content = this.event.getContent();
@@ -200,7 +199,7 @@ export default {
if (!this.$matrix.userAvatar) {
return null;
}
- return this.$matrix.matrixClient.mxcUrlToHttp(this.$matrix.userAvatar, 80, 80, "scale", true);
+ return this.$matrix.matrixClient.mxcUrlToHttp(this.$matrix.userAvatar, 80, 80, "scale", true, undefined, this.$matrix.useAuthedMedia);
},
userAvatarLetter() {
@@ -268,7 +267,7 @@ export default {
if (this.room) {
const member = this.room.getMember(event.getSender());
if (member) {
- return member.getAvatarUrl(this.$matrix.matrixClient.getHomeserverUrl(), 40, 40, "scale", true);
+ return member.getAvatarUrl(this.$matrix.matrixClient.getHomeserverUrl(), 40, 40, "scale", true, false, this.$matrix.useAuthedMedia);
}
}
return null;
@@ -305,35 +304,13 @@ export default {
if (ti < 60) {
s = this.$t("global.time.recently");
} else if (ti < 3600 && Math.round(ti / 60) < 60) {
- s = this.$tc("global.time.minutes", Math.round(ti / 60));
+ s = this.$t("global.time.minutes", Math.round(ti / 60));
} else if (ti < 86400 && Math.round(ti / 60 / 60) < 24) {
- s = this.$tc("global.time.hours", Math.round(ti / 60 / 60));
+ s = this.$t("global.time.hours", Math.round(ti / 60 / 60));
} else {
- s = this.$tc("global.time.days", Math.round(ti / 60 / 60 / 24));
+ s = this.$t("global.time.days", Math.round(ti / 60 / 60 / 24));
}
- return this.toLocalNumbers(s);
- },
-
- /**
- * Possibly convert numerals to local representation (currently only for "bo" locale)
- * @param str String in which to convert numerals [0-9]
- * @returns converted string
- */
- toLocalNumbers(str) {
- if (this.$i18n.locale == "bo") {
- // Translate to tibetan numerals
- let result = "";
- for (let i = 0; i < str.length; i++) {
- let c = str.charCodeAt(i);
- if (c >= 48 && c <= 57) {
- result += String.fromCharCode(c + 0x0f20 - 48);
- } else {
- result += String.fromCharCode(c);
- }
- }
- return result;
- }
- return str;
+ return utils.toLocalNumbers(s);
},
linkify(text) {
diff --git a/src/components/messages/pollMixin.js b/src/components/messages/pollMixin.js
index b1da22f..5761fa3 100644
--- a/src/components/messages/pollMixin.js
+++ b/src/components/messages/pollMixin.js
@@ -26,10 +26,10 @@ export default {
"";
this.updateAnswers();
},
- destroyed() {
+ unmounted() {
this.$matrix.off("Room.timeline", this.pollMixinOnEvent);
},
- beforeDestroy() {
+ beforeUnmount() {
if (this.pollResponseRelations) {
this.pollResponseRelations.off("Relations.add", this.onAddRelation);
this.pollResponseRelations = null;
diff --git a/src/components/profileInfoMixin.js b/src/components/profileInfoMixin.js
index d0627dc..45c1e12 100644
--- a/src/components/profileInfoMixin.js
+++ b/src/components/profileInfoMixin.js
@@ -23,7 +23,7 @@ export default {
if (!this.$matrix.userAvatar) {
return null;
}
- return this.$matrix.matrixClient.mxcUrlToHttp(this.$matrix.userAvatar, 80, 80, 'scale', true);
+ return this.$matrix.matrixClient.mxcUrlToHttp(this.$matrix.userAvatar, 80, 80, 'scale', true, undefined, this.$matrix.useAuthedMedia);
},
userAvatarLetter() {
diff --git a/src/components/rememberMeMixin.js b/src/components/rememberMeMixin.js
index ffade3a..a093c2f 100644
--- a/src/components/rememberMeMixin.js
+++ b/src/components/rememberMeMixin.js
@@ -4,9 +4,18 @@ export default {
rememberMe: this.$store.state.useLocalStorage
}
},
- methods: {
- onRememberMe(val) {
- this.$store.commit("setUseLocalStorage", val);
+ watch: {
+ rememberMe(val) {
+ if (val != this.$store.state.useLocalStorage) {
+ this.$store.commit("setUseLocalStorage", val);
+ }
+ },
+ "$store.state.useLocalStorage": {
+ handler(val) {
+ if (val != this.rememberMe) {
+ this.rememberMe = val;
+ }
+ }
}
}
}
\ No newline at end of file
diff --git a/src/components/roomInfoMixin.js b/src/components/roomInfoMixin.js
index b3b8e55..04dc632 100644
--- a/src/components/roomInfoMixin.js
+++ b/src/components/roomInfoMixin.js
@@ -24,7 +24,7 @@ export default {
this.updateMessageRetention();
},
- destroyed() {
+ unmounted() {
this.$matrix.off("Room.timeline", this.roomInfoMixinOnEvent);
},
@@ -140,7 +140,9 @@ export default {
40,
40,
"scale",
- true
+ true,
+ false,
+ this.$matrix.useAuthedMedia
);
}
return null;
@@ -243,7 +245,7 @@ export default {
privatePartyAvatar(size) {
const other = this.privateParty;
if (other) {
- return other.getAvatarUrl(this.$matrix.matrixClient.getHomeserverUrl(), size, size, "scale", true);
+ return other.getAvatarUrl(this.$matrix.matrixClient.getHomeserverUrl(), size, size, "scale", true, false, this.$matrix.useAuthedMedia);
}
return undefined;
},
diff --git a/src/components/roomMembersMixin.js b/src/components/roomMembersMixin.js
index ac5ec09..71e79a9 100644
--- a/src/components/roomMembersMixin.js
+++ b/src/components/roomMembersMixin.js
@@ -9,7 +9,7 @@ export default {
this.updateMembers();
},
- destroyed() {
+ unmounted() {
this.$matrix.off("Room.timeline", this.roomMembersMixinOnEvent);
},
diff --git a/src/components/roomTypeMixin.js b/src/components/roomTypeMixin.js
index 5b6ce3e..1f94a38 100644
--- a/src/components/roomTypeMixin.js
+++ b/src/components/roomTypeMixin.js
@@ -9,7 +9,7 @@ export default {
mounted() {
this.$matrix.on("Room.timeline", this.onRoomTypeMixinEvent);
},
- destroyed() {
+ unmounted() {
this.$matrix.off("Room.timeline", this.onRoomTypeMixinEvent);
},
watch: {
diff --git a/src/components/welcome_headers/WelcomeHeaderChannel.vue b/src/components/welcome_headers/WelcomeHeaderChannel.vue
index 6d6c163..4477d94 100644
--- a/src/components/welcome_headers/WelcomeHeaderChannel.vue
+++ b/src/components/welcome_headers/WelcomeHeaderChannel.vue
@@ -1,35 +1,37 @@
-
+
+
- {{ publicRoomLink }}
- {{ publicRoomLink }}
+ {{
$t("room_info.link_copied") }}
-
{{ $t("room_welcome.join_invite") }}
-
+
{{ messageRetentionDisplay }}
-
+
{{ $t("room_welcome.change") }}
-
+
{{ $t("room_welcome.got_it") }}
-
-
+
{{ messageRetentionDisplay }}
-
+
{{ $t("room_welcome.info") }}
-
+
-
+
{{ $t("room_welcome.join_invite") }}
@@ -30,7 +30,7 @@
{{ roomHistoryDescription }}
-
+
{{ $t("room_welcome.got_it") }}
@@ -92,5 +92,5 @@ export default {
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 4d0cef6..35a0775 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,4 +1,3 @@
-import Vue from 'vue'
import App from './App.vue'
import store from './store'
import i18n from './plugins/lang';
@@ -10,40 +9,42 @@ import analytics from './services/analytics.service'
import audioPlayer from './services/audio.service';
import 'roboto-fontface/css/roboto/roboto-fontface.css'
import 'material-design-icons-iconfont/dist/material-design-icons.css'
-import VEmojiPicker from 'v-emoji-picker';
-import VueResize from 'vue-resize';
-import 'vue-resize/dist/vue-resize.css';
+import VueResize from 'vue3-resize';
+import 'vue3-resize/dist/vue3-resize.css';
import VueClipboard from 'vue-clipboard2'
-import VueSanitize from "vue-sanitize";
-import createVuetify from './plugins/vuetify';
+import Vue3Sanitize from "vue-3-sanitize";
+import vuetify from './plugins/vuetify';
+import { Buffer } from 'buffer/'
+import { createApp, h } from 'vue';
+globalThis.Buffer = Buffer;
-var defaultOptions = VueSanitize.defaults;
+var defaultOptions = Vue3Sanitize.defaults;
defaultOptions.disallowedTagsMode = "recursiveEscape";
defaultOptions.allowedTags = [];
-Vue.use(VueSanitize, defaultOptions);
-Vue.config.productionTip = false
+const app = createApp({
+ render: () => h(App)
+});
+app.use(Vue3Sanitize, defaultOptions);
-Vue.use(VueResize);
-Vue.use(VEmojiPicker);
-Vue.use(matrix, { store: store, i18n: i18n });
+app.config.productionTip = false
+
+app.use(VueResize);
const configLoadedPromise = new Promise((resolve, ignoredreject) => {
// eslint-disable-next-line
- Vue.use(config, globalThis.window.location.origin, (config) => {
+ app.use(config, globalThis.window.location.origin, (config) => {
resolve(config);
}); // Use this before cleaninsights below, it depends on config!
});
-Vue.use(analytics);
-Vue.use(VueClipboard);
-Vue.use(audioPlayer);
-
-const vuetify = createVuetify(config);
+app.use(analytics);
+app.use(VueClipboard);
+app.use(audioPlayer);
// Add bubble functionality to custom events.
// From here: https://stackoverflow.com/questions/41993508/vuejs-bubbling-custom-events
-Vue.use((Vue) => {
- Vue.prototype.$bubble = function $bubble(eventName, ...args) {
+app.use((instance) => {
+ instance.$bubble = function $bubble(eventName, ...args) {
// Emit the event on all parent components
let component = this;
let arg = args.at(0);
@@ -62,8 +63,8 @@ Vue.use((Vue) => {
});
// Register a global custom directive called `v-blur` that prevents focus
-Vue.directive('blur', {
- inserted: function (el) {
+app.directive('blur', {
+ mounted: function (el) {
el.onfocus = (ev) => ev.target.blur()
}
});
@@ -75,8 +76,8 @@ Vue.directive('blur', {
*
* Like this: v-linkTap:500="[tapped,longTapped]"
*/
-Vue.directive('longTap', {
- bind: function (el, binding, ignoredvnode) {
+app.directive('longTap', {
+ beforeMount: function (el, binding, ignoredvnode) {
el.longTapTimeout = parseInt(binding.arg || "500");
el.longTapCallbacks = binding.value;
for (var i = el.longTapCallbacks.length; i < 2; i++) {
@@ -156,7 +157,7 @@ Vue.directive('longTap', {
el.addEventListener("mouseup", touchEnd);
el.addEventListener("mousemove", touchMove);
},
- unbind: function (el) {
+ unmounted: function (el) {
el.longTapTimer && clearTimeout(el.longTapTimer);
el.removeEventListener("touchstart", el.longTapTouchStart);
el.removeEventListener("touchend", el.longTapTouchEnd);
@@ -168,27 +169,32 @@ Vue.directive('longTap', {
},
});
-Vue.use(navigation, router);
+app.use(store);
+app.$store = store;
+app.config.globalProperties.$store = store;
-const vueInstance = new Vue({
- vuetify,
- store,
- i18n,
- router,
- matrix,
- config,
- analytics,
- audioPlayer,
- render: h => h(App),
-});
-if (vueInstance.$config.accentColor) {
- vueInstance.$vuetify.theme.themes.light.primary = vueInstance.$config.accentColor;
+app.use(router);
+router.app = app;
+
+app.use(navigation, router);
+app.use(vuetify);
+app.use(i18n);
+app.$i18n = i18n;
+app.config.globalProperties.$i18n = i18n;
+
+app.use(matrix, { store: store, i18n: i18n });
+
+// Set $matrix inside data store
+store.$matrix = app.$matrix;
+
+if (app.$config.accentColor) {
+ app.$vuetify.theme.themes.light.primary = app.$config.accentColor;
}
-vueInstance.$audioPlayer.$root = vueInstance; // Make sure a $root is available here
+app.$audioPlayer.$root = app; // Make sure a $root is available here
configLoadedPromise.then((config) => {
if (config.accentColor) {
- vueInstance.$vuetify.theme.themes.light.primary = config.accentColor;
+ app.$vuetify.theme.themes.light.primary = config.accentColor;
}
- vueInstance.$mount('#app');
+ app.mount('#app');
});
diff --git a/src/plugins/lang.js b/src/plugins/lang.js
index 456ecc0..d305bf2 100644
--- a/src/plugins/lang.js
+++ b/src/plugins/lang.js
@@ -1,23 +1,19 @@
-import Vue from 'vue'
-import VueI18n from 'vue-i18n'
-
-Vue.use(VueI18n)
+import { createI18n } from 'vue-i18n'
var messages = {}
-function importAll(r) {
- return r.keys().map(res => {
- // Remove"./"
- const parts = res.split("/");
- const locale = parts[1].split(".")[0];
- messages[locale] = r(res);
- });
-}
-importAll(require.context('@/assets/translations/', true, /\.json$/));
+const modules = import.meta.glob('@/assets/translations/*.json', {eager: true});
+Object.keys(modules).map(path => {
+ // Remove"./"
+ const parts = path.split("/");
+ const locale = parts[parts.length - 1].split(".")[0];
+ messages[locale] = modules[path];
+});
-const vue18n = new VueI18n({
+const vue18n = new createI18n({
locale: 'en',
fallbackLocale: 'en',
+ globalInjection: true,
silentFallbackWarn: true,
messages: messages,
pluralizationRules: {
@@ -52,35 +48,4 @@ const vue18n = new VueI18n({
}
})
-vue18n.toLocalNumbers = (str) => {
- if (vue18n.locale == "my") {
- // Translate to burmese numerals
- var result = "";
- for (var i = 0; i < str.length; i++) {
- var c = str.charCodeAt(i);
- if (c >= 48 && c <= 57) {
- result += String.fromCharCode(c + 0x1040 - 48);
- } else {
- result += String.fromCharCode(c);
- }
- }
- return result;
- } else if (vue18n.locale == "bo") {
- // Translate to tibetan numerals
- result = "";
- for (i = 0; i < str.length; i++) {
- c = str.charCodeAt(i);
- if (c >= 48 && c <= 57) {
- result += String.fromCharCode(c + 0x0f20 - 48);
- } else {
- result += String.fromCharCode(c);
- }
- }
- return result;
- }
-
- return str;
-};
-
-
export default vue18n;
\ No newline at end of file
diff --git a/src/plugins/utils.js b/src/plugins/utils.js
index bdc8646..9a0784b 100644
--- a/src/plugins/utils.js
+++ b/src/plugins/utils.js
@@ -1,12 +1,23 @@
-import axios from 'axios';
+import axios from "axios";
import * as ContentHelpers from "matrix-js-sdk/lib/content-helpers";
-import dataUriToBuffer from "data-uri-to-buffer";
-import ImageResize from "image-resize";
-import { AutoDiscovery } from 'matrix-js-sdk';
-import User from '../models/user';
-const prettyBytes = require("pretty-bytes");
+import imageResize from "image-resize";
+import { AutoDiscovery } from "matrix-js-sdk";
+import User from "../models/user";
+import prettyBytes from "pretty-bytes";
import Hammer from "hammerjs";
-import { Thread } from 'matrix-js-sdk/lib/models/thread';
+import { Thread } from "matrix-js-sdk/lib/models/thread";
+import { imageSize } from "image-size";
+import dayjs from "dayjs";
+import aesjs from "aes-js";
+import localizedFormat from "dayjs/plugin/localizedFormat";
+import duration from "dayjs/plugin/duration";
+import i18n from "./lang";
+import {
+ toRaw,
+ isRef,
+ isReactive,
+ isProxy,
+} from 'vue';
export const STATE_EVENT_ROOM_DELETION_NOTICE = "im.keanu.room_deletion_notice";
export const STATE_EVENT_ROOM_DELETED = "im.keanu.room_deleted";
@@ -18,1085 +29,1224 @@ export const ROOM_TYPE_CHANNEL = "im.keanu.room_type_channel";
export const STATE_EVENT_ROOM_TYPE = "im.keanu.room_type";
-const sizeOf = require("image-size");
-
-var dayjs = require('dayjs');
-var sha256 = require('js-sha256').sha256;
-var aesjs = require('aes-js');
-var base64Url = require('json-web-key/lib/base64url');
-
// Install extended localized format
-var localizedFormat = require('dayjs/plugin/localizedFormat')
-dayjs.extend(localizedFormat)
-var duration = require('dayjs/plugin/duration')
+dayjs.extend(localizedFormat);
dayjs.extend(duration);
// Store info about getUserMedia BEFORE we aply polyfill(s)!
var _browserCanRecordAudioF = function () {
- var legacyGetUserMedia = (navigator.getUserMedia ||
- navigator.webkitGetUserMedia ||
- navigator.mozGetUserMedia ||
- navigator.msGetUserMedia);
- return legacyGetUserMedia !== undefined || (navigator.mediaDevices && navigator.mediaDevices.getUserMedia !== undefined);
-}
+ var legacyGetUserMedia =
+ navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
+ return (
+ legacyGetUserMedia !== undefined || (navigator.mediaDevices && navigator.mediaDevices.getUserMedia !== undefined)
+ );
+};
var _browserCanRecordAudio = _browserCanRecordAudioF();
class UploadPromise {
- aborted = false;
- onAbort = undefined;
+ aborted = false;
+ onAbort = undefined;
- constructor(wrappedPromise) {
- this.wrappedPromise = wrappedPromise;
- }
+ constructor(wrappedPromise) {
+ this.wrappedPromise = wrappedPromise;
+ }
- abort() {
- this.aborted = true;
- if (this.onAbort) {
- this.onAbort();
- }
+ abort() {
+ this.aborted = true;
+ if (this.onAbort) {
+ this.onAbort();
}
+ }
- then(resolve, reject) {
- this.wrappedPromise = this.wrappedPromise.then(resolve, reject);
- return this;
- }
+ then(resolve, reject) {
+ this.wrappedPromise = this.wrappedPromise.then(resolve, reject);
+ return this;
+ }
- catch(handler) {
- this.wrappedPromise = this.wrappedPromise.catch(handler);
- return this;
- }
+ catch(handler) {
+ this.wrappedPromise = this.wrappedPromise.catch(handler);
+ return this;
+ }
}
class Util {
+ threadMessageType() {
+ return Thread.hasServerSideSupport ? "m.thread" : "io.element.thread";
+ }
- threadMessageType() {
- return Thread.hasServerSideSupport ? "m.thread" : "io.element.thread"
- }
+ getAttachmentUrlAndDuration(event) {
+ return new Promise((resolve, reject) => {
+ const content = event.getContent();
+ if (content.url != null) {
+ resolve([content.url, content.info.duration]);
+ return;
+ }
+ if (content.file && content.file.url) {
+ resolve([content.file.url, content.info.duration]);
+ } else {
+ reject("No url found!");
+ }
+ });
+ }
- getAttachmentUrlAndDuration(event) {
- return new Promise((resolve, reject) => {
- const content = event.getContent();
- if (content.url != null) {
- resolve([content.url, content.info.duration]);
- return;
- }
- if (content.file && content.file.url) {
- resolve([content.file.url, content.info.duration]);
- } else {
- reject("No url found!");
- }
- });
+ getAttachment(matrixClient, useAuthedMedia, event, progressCallback, asBlob = false, abortController = undefined) {
+ return new Promise((resolve, reject) => {
+ const content = event.getContent();
+ var url = null;
+ var mime = "image/png";
+ var file = null;
+ let decrypt = true;
+ if (content.url != null) {
+ url = matrixClient.mxcUrlToHttp(
+ content.url,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ useAuthedMedia
+ );
+ decrypt = false;
+ if (content.info) {
+ mime = content.info.mimetype;
+ }
+ } else if (content.file && content.file.url) {
+ file = content.file;
+ url = matrixClient.mxcUrlToHttp(
+ file.url,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ useAuthedMedia
+ );
+ mime = file.mimetype;
}
- getAttachment(matrixClient, event, progressCallback, asBlob = false, abortController = undefined) {
- return new Promise((resolve, reject) => {
- const content = event.getContent();
- if (content.url != null) {
- // Unencrypted, just return!
- resolve(matrixClient.mxcUrlToHttp(content.url));
- return;
+ if (url == null) {
+ reject("No url found!");
+ }
+
+ axios
+ .get(url, {
+ headers: {
+ Authorization: `Bearer ${matrixClient.getAccessToken()}`,
+ },
+ signal: abortController ? abortController.signal : undefined,
+ responseType: "arraybuffer",
+ onDownloadProgress: (progressEvent) => {
+ let percentCompleted = Math.floor((progressEvent.loaded * 100) / progressEvent.total);
+ if (progressCallback) {
+ progressCallback(percentCompleted);
}
- var url = null;
- var file = null;
- if (content.file && content.file.url) {
- file = content.file;
- url = matrixClient.mxcUrlToHttp(file.url);
- }
-
- if (url == null) {
- reject("No url found!");
- }
-
- axios.get(url, {
- signal: abortController ? abortController.signal : undefined,
- responseType: 'arraybuffer', onDownloadProgress: progressEvent => {
- let percentCompleted = Math.floor((progressEvent.loaded * 100) / progressEvent.total);
- if (progressCallback) {
- progressCallback(percentCompleted);
- }
- }
- })
- .then(response => {
- return this.decryptIfNeeded(file, response);
- })
- .then(bytes => {
- if (asBlob) {
- resolve(new Blob([bytes.buffer], { type: file.mimetype }));
- } else {
- resolve(URL.createObjectURL(new Blob([bytes.buffer], { type: file.mimetype })));
- }
- })
- .catch(err => {
- console.log("Download error: ", err);
- reject(err);
- })
- .finally(() => {
- if (progressCallback) {
- progressCallback(null);
- }
- });
- });
- }
-
- getThumbnail(matrixClient, event, config, ignoredw, ignoredh) {
- return new Promise((resolve, reject) => {
- const content = event.getContent();
- if (content.url != null) {
- // Unencrypted, just return!
- resolve(matrixClient.mxcUrlToHttp(content.url));
- return;
- }
- var url = null;
- var file = null;
- if (
- content &&
- content.info &&
- content.info.thumbnail_file &&
- content.info.thumbnail_file.url
- ) {
- file = content.info.thumbnail_file;
- // var width = w;
- // var height = h;
- // if (content.info.w < w || content.info.h < h) {
- // width = content.info.w;
- // height = content.info.h;
- // }
- // url = matrixClient.mxcUrlToHttp(
- // file.url,
- // width, height,
- // "scale",
- // true
- // );
- url = matrixClient.mxcUrlToHttp(file.url);
- } else if (content.file && content.file.url && this.getFileSize(event) > 0 && this.getFileSize(event) < config.maxSizeAutoDownloads) {
- // No thumb, use real url
- file = content.file;
- url = matrixClient.mxcUrlToHttp(file.url);
- }
-
- if (url == null) {
- reject("No url found!");
- return;
- }
- axios.get(url, { responseType: 'arraybuffer' })
- .then(response => {
- return this.decryptIfNeeded(file, response);
- })
- .then(bytes => {
- resolve(URL.createObjectURL(new Blob([bytes.buffer], { type: file.mimetype })));
- })
- .catch(err => {
- console.log("Download error: ", err);
- reject(err);
- });
- });
- }
-
- decryptIfNeeded(file, response) {
- return new Promise((resolve, reject) => {
- var key = base64Url.decode(file.key.k);
- var iv = base64Url.decode(file.iv);
- var aesCtr = new aesjs.ModeOfOperation.ctr(key, new aesjs.Counter(iv));
-
- const data = new Uint8Array(response.data);
-
- // Calculate sha256 and compare hashes
- var hash = new Uint8Array(sha256.create().update(data).arrayBuffer());
- const originalHash = base64Url.decode(file.hashes.sha256);
- if (Buffer.compare(Buffer.from(hash), Buffer.from(originalHash.buffer)) != 0) {
- reject("Hashes don't match!");
- return;
- }
-
- var decryptedBytes = aesCtr.decrypt(data);
- resolve(decryptedBytes);
- });
- }
-
- sendTextMessage(matrixClient, roomId, text, editedEvent, replyToEvent) {
- var content = ContentHelpers.makeTextMessage(text);
- if (editedEvent) {
- content['m.relates_to'] = {
- rel_type: 'm.replace',
- event_id: editedEvent.getId()
- }
- content['m.new_content'] = {
- body: content.body,
- msgtype: content.msgtype
- }
- } else if (replyToEvent) {
- content['m.relates_to'] = {
- 'm.in_reply_to': {
- event_id: replyToEvent.getId()
- }
- }
- let senderContent = replyToEvent.getContent()
-
- const senderContentBody = Object.getOwnPropertyDescriptor(senderContent, 'body') ? senderContent.body : Object.values(senderContent)[0].question.body
- // Prefix the content with reply info (seems to be a legacy thing)
- const prefix = senderContentBody.split('\n').map((item, index) => {
- return "> " + (index == 0 ? ("<" + replyToEvent.getSender() + "> ") : "") + item;
- }).join('\n');
- content.body = prefix + "\n\n" + content.body;
- }
- return this.sendMessage(matrixClient, roomId, "m.room.message", content);
- }
-
- sendQuickReaction(matrixClient, roomId, emoji, event, extraData = {}) {
- const content = {
- 'm.relates_to': Object.assign(extraData, {
- key: emoji,
- rel_type: 'm.annotation',
- event_id: event.getId()
- })
- };
- return this.sendMessage(matrixClient, roomId, "m.reaction", content);
- }
-
- createPoll(matrixClient, roomId, question, answers, isDisclosed) {
- var idx = 0;
- let answerData = answers.map(a => {
- idx++;
- return { id: "" + idx, 'org.matrix.msc1767.text': a.text }
- });
- const content = {
- 'org.matrix.msc3381.poll.start': {
- question: {
- 'org.matrix.msc1767.text': question,
- body: question
- },
- kind: isDisclosed ? "org.matrix.msc3381.poll.disclosed" : "org.matrix.msc3381.poll.undisclosed",
- max_selections: 1,
- answers: answerData
- },
- };
- return this.sendMessage(matrixClient, roomId, "org.matrix.msc3381.poll.start", content);
- }
-
- closePoll(matrixClient, roomId, event) {
- const content = {
- 'm.relates_to': {
- rel_type: 'm.reference',
- event_id: event.getId()
- },
- 'org.matrix.msc3381.poll.end': {
- },
- };
- return this.sendMessage(matrixClient, roomId, "org.matrix.msc3381.poll.end", content);
- }
-
- sendPollAnswer(matrixClient, roomId, answers, event) {
- const content = {
- 'm.relates_to': {
- rel_type: 'm.reference',
- event_id: event.getId()
- },
- 'org.matrix.msc3381.poll.response': {
- answers: answers
- },
- };
- return this.sendMessage(matrixClient, roomId, "org.matrix.msc3381.poll.response", content);
- }
-
- sendMessage(matrixClient, roomId, eventType, content) {
- return new Promise((resolve, reject) => {
- matrixClient.sendEvent(roomId, eventType, content, undefined, undefined)
- .then((result) => {
- console.log("Message sent: ", result);
- resolve(result.event_id);
- })
- .catch(err => {
- console.log("Send error: ", err);
- if (err && err.name == "UnknownDeviceError") {
- console.log("Unknown devices. Mark as known before retrying.");
- var setAsKnownPromises = [];
- for (var user of Object.keys(err.devices)) {
- const userDevices = err.devices[user];
- for (var deviceId of Object.keys(userDevices)) {
- const deviceInfo = userDevices[deviceId];
- if (!deviceInfo.known) {
- setAsKnownPromises.push(
- matrixClient.setDeviceKnown(
- user,
- deviceId,
- true
- )
- );
- }
- }
- }
- Promise.all(setAsKnownPromises)
- .then(() => {
- // All devices now marked as "known", try to resend
- let event = err.event;
- if (!event) {
- // Seems event is no longer send in the UnknownDevices error...
- const room = matrixClient.getRoom(roomId);
- if (room) {
- event = room.getLiveTimeline().getEvents().find(e => {
- // Find the exact match (= object equality)
- return e.error === err
- });
- }
- }
- matrixClient.resendEvent(event, matrixClient.getRoom(event.getRoomId()))
- .then((result) => {
- console.log("Message sent: ", result);
- resolve(result.event_id);
- })
- .catch((err) => {
- // Still error, abort
- reject(err.toLocaleString());
- });
- });
- }
- else {
- reject(err.toLocaleString());
- }
- });
- });
- }
-
- sendFile(matrixClient, roomId, file, onUploadProgress, threadRoot) {
- const uploadPromise = new UploadPromise(undefined);
- uploadPromise.wrappedPromise = new Promise((resolve, reject) => {
- var reader = new FileReader();
- reader.onload = (e) => {
- if (uploadPromise.aborted) {
- reject("Aborted");
- return;
- }
- const fileContents = e.target.result;
- var data = new Uint8Array(fileContents);
-
- const info = {
- mimetype: file.type,
- size: file.size
- };
-
- // If audio, send duration in ms as well
- if (file.duration) {
- info.duration = file.duration;
- }
-
- var description = file.name;
- var msgtype = 'm.file';
- if (file.type.startsWith("image/")) {
- msgtype = 'm.image';
- } else if (file.type.startsWith("audio/")) {
- msgtype = 'm.audio';
- } else if (file.type.startsWith("video/")) {
- msgtype = 'm.video';
- }
-
- const opts = {
- type: file.type,
- name: description,
- progressHandler: onUploadProgress,
- onlyContentUri: false
- };
-
- var messageContent = {
- body: description,
- info: info,
- msgtype: msgtype
- }
-
- // If thread root (an eventId) is set, add that here
- if (threadRoot) {
- messageContent["m.relates_to"] = {
- "rel_type": this.threadMessageType(),
- "event_id": threadRoot
- };
- }
-
- // Set filename for files
- if (msgtype == 'm.file') {
- messageContent.filename = file.name;
- }
-
- if (!matrixClient.isRoomEncrypted(roomId)) {
- // Not encrypted.
- const promise = matrixClient.uploadContent(data, opts);
- uploadPromise.onAbort = () => {
- matrixClient.cancelUpload(promise);
- };
- promise
- .then((response) => {
- messageContent.url = response.content_uri;
- return (msgtype == 'm.audio' ? this.generateWaveform(fileContents, messageContent) : true);
- })
- .then(() => {
- return this.sendMessage(matrixClient, roomId, "m.room.message", messageContent)
- })
- .then(result => {
- resolve(result);
- })
- .catch(err => {
- reject(err);
- });
- return; // Don't fall through
- }
-
- const crypto = require('crypto');
- let key = crypto.randomBytes(256 / 8);
- let iv = Buffer.concat([crypto.randomBytes(8), Buffer.alloc(8)]); // Initialization vector.
-
- // Encrypt
- var aesCtr = new aesjs.ModeOfOperation.ctr(key, new aesjs.Counter(iv));
- var encryptedBytes = aesCtr.encrypt(data);
- data = encryptedBytes;
-
- // Calculate sha256
- var hash = new Uint8Array(sha256.create().update(data).arrayBuffer());
-
- const jwk = {
- kty: 'oct',
- key_ops: ['encrypt', 'decrypt'],
- alg: 'A256CTR',
- k: base64Url.encode(key),
- ext: true
- };
-
- const encryptedFile = {
- mimetype: file.type,
- key: jwk,
- iv: Buffer.from(iv).toString('base64').replace(/=/g, ''),
- hashes: { sha256: Buffer.from(hash).toString('base64').replace(/=/g, '') },
- v: 'v2'
- };
-
- messageContent.file = encryptedFile;
-
- // Encrypted data sent as octet-stream!
- opts.type = "application/octet-stream";
-
- const promise = matrixClient.uploadContent(data, opts);
- uploadPromise.onAbort = () => {
- matrixClient.cancelUpload(promise);
- };
- promise
- .then((response) => {
- if (response.error) {
- return reject(response.error);
- }
- encryptedFile.url = response.content_uri;
- return (msgtype == 'm.audio' ? this.generateWaveform(fileContents, messageContent) : true);
- })
- .then(() => {
- return this.sendMessage(matrixClient, roomId, "m.room.message", messageContent)
- })
- .then(result => {
- resolve(result);
- })
- .catch(err => {
- reject(err);
- });
- }
- reader.onerror = (err) => {
- reject(err);
- }
- reader.readAsArrayBuffer(file);
- });
- return uploadPromise;
- }
-
- generateWaveform(data, messageContent) {
- if (!(window.AudioContext || window.webkitAudioContext)) {
- return; // No support
- }
- const audioCtx = new (window.AudioContext || window.webkitAudioContext)();
- if (audioCtx) {
- return audioCtx.decodeAudioData(data)
- .then((audioBuffer) => {
- const rawData = audioBuffer.getChannelData(0); // TODO - currently using only 1 channel
- const samples = 1000; // Number of samples
- const blockSize = Math.floor(rawData.length / samples);
- let filteredData = [];
- for (let i = 0; i < samples; i++) {
- let blockStart = blockSize * i; // the location of the first sample in the block
- let sum = 0;
- for (let j = 0; j < blockSize; j++) {
- sum = sum + Math.abs(rawData[blockStart + j]) // find the sum of all the samples in the block
- }
- filteredData.push(sum / blockSize); // divide the sum by the block size to get the average
- }
-
- // Normalize
- const multiplier = Math.pow(Math.max(...filteredData), -1);
- filteredData = filteredData.map(n => n * multiplier);
-
- // Integerize
- filteredData = filteredData.map(n => parseInt((n * 255).toFixed()));
-
-
- // Generate SVG of waveform
- let svg = `";
-
- messageContent.format = "org.matrix.custom.html";
- messageContent.formatted_body = svg;
- })
- }
- }
-
- /**
- * Return what "mode" to use for the given room.
- *
- * The default value is given by the room itself (as state events, see roomTypeMixin).
- * This method just returns if the user has overridden this in room settings (this
- * fact will be persisted as a user specific tag on the room). Note: currently override
- * is disabled in the UI...
- */
- roomDisplayTypeOverride(roomOrNull) {
- if (roomOrNull) {
- const room = roomOrNull;
-
- // Have we changed our local view mode of this room?
- const tags = room.tags;
- if (tags && tags["ui_options"]) {
- console.error("We have a tag!");
- if (tags["ui_options"]["voice_mode"] === 1) {
- return ROOM_TYPE_VOICE_MODE;
- } else if (tags["ui_options"]["file_mode"] === 1) {
- return ROOM_TYPE_FILE_MODE;
- } else if (tags["ui_options"]["file_mode"] === 0 && tags["ui_options"]["file_mode"] === 0) {
- // Explicitly set to "default"
- return ROOM_TYPE_DEFAULT;
- }
- }
- }
- return null;
- }
-
- /**
- * Return the room type for the current room
- * @param {*} roomOrNull
- */
- roomDisplayTypeToQueryParam(roomOrNull, roomDisplayType) {
- const roomType = this.roomDisplayTypeOverride(roomOrNull) || roomDisplayType;
- if (roomType === ROOM_TYPE_FILE_MODE) {
- // Send "file" here, so the receiver of the invite link knows to display the "file drop" join page
- // instead of the standard one.
- return "file";
- } else if (roomType === ROOM_TYPE_VOICE_MODE) {
- // No need to return "voice" here. The invite page looks the same for default and voice mode,
- // so currently no point in cluttering the invite link with it. The corrent mode will be picked up from
- // room creation flags once the user joins.
- return undefined;
- }
- return undefined; // Default, just return undefined
- }
-
- /** Generate a random user name */
- randomUser(prefix) {
- var pfx = prefix ? prefix.replace(/[^0-9a-zA-Z\-_]/gi, '') : null;
- if (!pfx || pfx.length == 0) {
- pfx = "weblite-";
- }
- return pfx + this.randomString(
- 12,
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
- );
- }
-
- /**
- * Generate random 12 char password
- */
- randomPass() {
- return this.randomString(
- 12,
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!#_-*+"
- );
- }
-
- // From here: https://stackoverflow.com/questions/1349404/generate-random-string-characters-in-javascript
- randomString(length, characters) {
- var result = "";
- var charactersLength = characters.length;
- for (var i = 0; i < length; i++) {
- result += characters.charAt(
- Math.floor(Math.random() * charactersLength)
- );
- }
- return result;
- }
-
- sanitizeRoomId(roomId) {
- if (roomId && roomId.match(/^(!|#).+$/)) {
- return roomId;
- }
- return null;
- }
-
- sanitizeUserId(userId) {
- if (userId && userId.match(/^([0-9a-z-.=_/]+|@[0-9a-z-.=_/]+:.+)$/)) {
- return userId;
- }
- return null;
- }
-
- invalidUserIdChars() {
- return /[^0-9a-z-.=_/]+/g;
- }
-
- getFirstVisibleElement(parentNode, where) {
- let visible = this.findVisibleElements(parentNode);
- if (visible) {
- visible = visible.filter(where);
- }
- if (visible && visible.length > 0) {
- return visible[0];
- }
- return null;
- }
-
- getLastVisibleElement(parentNode, where) {
- let visible = this.findVisibleElements(parentNode);
- if (visible) {
- visible = visible.filter(where);
- }
- if (visible && visible.length > 0) {
- return visible[visible.length - 1];
- }
- return null;
- }
-
- findVisibleElements(parentNode) {
- const middle = this.findOneVisibleElement(parentNode);
- if (middle) {
- var nodes = [parentNode.children[middle]];
- var i = middle - 1;
- while (i >= 0 && this.isChildVisible(parentNode, parentNode.children[i])) {
- nodes.splice(0, 0, parentNode.children[i]);
- i -= 1;
- }
- i = middle + 1;
- while (i < parentNode.children.length && this.isChildVisible(parentNode, parentNode.children[i])) {
- nodes.push(parentNode.children[i]);
- i += 1;
- }
- return nodes;
- }
- return null; // No visible found
- }
-
- isChildVisible(parentNode, childNode) {
- const rect1 = parentNode.getBoundingClientRect();
- const rect2 = childNode.getBoundingClientRect();
- var overlap = !(rect1.right <= rect2.left ||
- rect1.left >= rect2.right ||
- rect1.bottom <= rect2.top ||
- rect1.top >= rect2.bottom)
- return overlap;
- }
-
- findOneVisibleElement(parentNode) {
- let start = 0;
- let end = (parentNode && parentNode.children) ? parentNode.children.length - 1 : -1;
- while (start <= end) {
- let middle = Math.floor((start + end) / 2);
- let childNode = parentNode.children[middle];
- if (this.isChildVisible(parentNode, childNode)) {
- // found the key
- return middle;
- } else if (childNode.getBoundingClientRect().top <= parentNode.getBoundingClientRect().top) {
- // continue searching to the right
- start = middle + 1;
- } else {
- // search searching to the left
- end = middle - 1;
- }
- }
- // key wasn't found
- return null;
- }
-
- _importAll(r) {
- var images = [];
- r.keys().forEach(res => {
- console.log("Avatar", res);
- // // Remove"./"
- var name = res.split("_")[1];
- name = name.slice(0, name.indexOf("."));
- name = name.charAt(0).toUpperCase() + name.slice(1);
- const image = r(res);
- const randomNumber = parseInt(this.randomString(4, "0123456789")).toFixed();
- images.push({ id: res, image: image, name: "Guest " + name + " " + randomNumber});
- });
- return images;
- }
-
- getDefaultAvatars() {
- return this._importAll(require.context('../assets/avatars/', true, /\.(jpeg|jpg|png)$/));
- }
-
- setAvatar(matrix, file, onUploadProgress) {
- return new Promise((resolve, reject) => {
- axios.get(file, { responseType: 'arraybuffer' })
- .then(response => {
- const opts = {
- type: response.headers['content-type'].split(';')[0],
- name: "Avatar",
- progressHandler: onUploadProgress,
- onlyContentUri: false
- };
- var avatarUri;
- matrix.matrixClient.uploadContent(response.data, opts)
- .then((response) => {
- avatarUri = response.content_uri;
- return matrix.matrixClient.setAvatarUrl(avatarUri);
- })
- .then(result => {
- matrix.userAvatar = avatarUri;
- resolve(result);
- })
- .catch(err => {
- reject(err);
- });
- })
- .catch(err => {
- reject(err);
- });
-
+ },
})
- }
-
- setRoomAvatar(matrixClient, roomId, file, onUploadProgress) {
- return new Promise((resolve, reject) => {
- var reader = new FileReader();
- reader.onload = (e) => {
- const fileContents = e.target.result;
- var data = new Uint8Array(fileContents);
-
- const info = {
- mimetype: file.type,
- size: file.size
- };
-
- const opts = {
- type: file.type,
- name: "Room Avatar",
- progressHandler: onUploadProgress,
- onlyContentUri: false
- };
-
- var messageContent = {
- body: file.name,
- info: info
- }
-
- matrixClient.uploadContent(data, opts)
- .then((response) => {
- messageContent.url = response.content_uri;
- return matrixClient.sendStateEvent(roomId, "m.room.avatar", messageContent);
- })
- .then(result => {
- resolve(result);
- })
- .catch(err => {
- reject(err);
- });
- }
- reader.onerror = (err) => {
- reject(err);
- }
- reader.readAsArrayBuffer(file);
- });
- }
-
- loadAvatarFromFile(event, onLoad) {
- if (event.target.files && event.target.files[0]) {
- var reader = new FileReader();
- reader.onload = (e) => {
- const file = event.target.files[0];
- if (file.type.startsWith("image/")) {
- try {
- var image = e.target.result;
-
- var dimens = sizeOf(dataUriToBuffer(e.target.result));
-
- // Need to resize?
- const w = dimens.width;
- const h = dimens.height;
- if (w > 640 || h > 640) {
- var aspect = w / h;
- var newWidth = parseInt((w > h ? 640 : 640 * aspect).toFixed());
- var newHeight = parseInt(
- (w > h ? 640 / aspect : 640).toFixed()
- );
- var imageResize = new ImageResize({
- format: "png",
- width: newWidth,
- height: newHeight,
- outputType: "blob",
- });
- imageResize
- .play(event.target)
- .then((img) => {
- var resizedImageFile = new File([img], file.name, {
- type: img.type,
- lastModified: Date.now(),
- });
- var reader2 = new FileReader();
- reader2.onload = (e) => {
- onLoad(e.target.result);
- };
- reader2.readAsDataURL(resizedImageFile);
- })
- .catch((err) => {
- console.error("Resize failed:", err);
- });
- } else {
- onLoad(image);
- }
- } catch (error) {
- console.error("Failed to get image dimensions: " + error);
- }
- }
- };
- reader.readAsDataURL(event.target.files[0]);
- }
- }
-
- /**
- * Return number of whole days between the timestamps, at end of that day.
- * @param {*} ts1
- * @param {*} ts2
- */
- dayDiff(ts1, ts2) {
- var t1 = dayjs(ts1).endOf('day');
- var t2 = dayjs(ts2).endOf('day');
- return t2.diff(t1, 'day');
- }
-
- dayDiffToday(timestamp) {
- var then = dayjs(timestamp).endOf('day');
- var now = dayjs().endOf('day');
- return now.diff(then, 'day');
- }
-
- formatDay(timestamp) {
- var then = dayjs(timestamp).endOf('day');
- return then.format('L');
- }
-
- formatTime(time) {
- const date = new Date();
- date.setTime(time);
-
- const today = new Date();
- if (
- date.getDate() == today.getDate() &&
- date.getMonth() == today.getMonth() &&
- date.getFullYear() == today.getFullYear()
- ) {
- // For today, skip the date part
- return date.toLocaleTimeString();
- }
- return date.toLocaleString();
- }
-
- formatRecordDuration(ms) {
- return dayjs.duration(ms).format("HH:mm:ss");
- }
-
- formatDuration(ms) {
- if (ms >= (60 * 60000)) {
- return dayjs.duration(ms).format("H:mm:ss");
- }
- return dayjs.duration(ms).format("m:ss");
- }
-
- formatRecordStartTime(timestamp) {
- var then = dayjs(timestamp);
- return then.format('lll');
- }
-
- browserCanRecordAudio() {
- return _browserCanRecordAudio;
- }
-
- getRoomNameFromAlias(alias) {
- if (alias && alias.startsWith('#') && alias.indexOf(':') > 0) {
- return alias.slice(1).split(':')[0];
- }
- return undefined;
- }
-
- getUniqueAliasForRoomName(matrixClient, roomName, defaultMatrixDomainPart, iterationCount) {
- return new Promise((resolve, reject) => {
- var preferredAlias = roomName.replace(/\s/g, "").toLowerCase();
- var tryAlias = "#" + preferredAlias + ":" + defaultMatrixDomainPart;
- matrixClient.getRoomIdForAlias(tryAlias)
- .then(ignoredid => {
- // We got a response, this means the tryAlias already exists.
- // Try again, with appended random chars
- if (iterationCount) {
- // Not the first time around. Reached max tries?
- if (iterationCount == 5) {
- reject("Failed to get unique room alias");
- return;
- }
- // Else, strip random chars from end so we can try again
- roomName = roomName.substring(0, roomName.length - 5);
- }
- const randomChars = this.randomString(4, "abcdefghijklmnopqrstuvwxyz0123456789");
- resolve(this.getUniqueAliasForRoomName(matrixClient, roomName + "-" + randomChars, defaultMatrixDomainPart, (iterationCount || 0) + 1))
- })
- .catch(err => {
- if (err.errcode == 'M_NOT_FOUND') {
- resolve(preferredAlias);
- } else {
- reject(err);
- }
- })
- });
- }
-
- downloadableTypes() {
- return ['m.video','m.audio','m.image','m.file'];
- }
-
- download(matrixClient, event) {
- console.log("DOWNLOAD");
- this
- .getAttachment(matrixClient, event)
- .then((url) => {
- const link = document.createElement("a");
- link.href = url;
- link.target = "_blank";
- if (!this.isFileTypePDF(event)) {
- // PDFs are shown inline, not downloaded
- link.download = event.getContent().body || this.$t("fallbacks.download_name");
+ .then((response) => {
+ return decrypt ? this.decryptIfNeeded(file, response) : Promise.resolve({ buffer: response.data });
+ })
+ .then((bytes) => {
+ if (asBlob) {
+ resolve(new Blob([bytes.buffer], { type: mime }));
+ } else {
+ resolve(URL.createObjectURL(new Blob([bytes.buffer], { type: mime })));
}
- console.log("LINK", link);
- document.body.appendChild(link);
- link.click();
- setTimeout(function () {
- document.body.removeChild(link);
- URL.revokeObjectURL(url);
- }, 200);
})
.catch((err) => {
- console.log("Failed to fetch attachment: ", err);
+ console.log("Download error: ", err);
+ reject(err);
+ })
+ .finally(() => {
+ if (progressCallback) {
+ progressCallback(null);
+ }
});
- }
+ });
+ }
- getMatrixBaseUrl(user, config) {
- if (user) {
- const domain = User.domainPart(user.user_id);
- if (domain) {
- const endpoint = config.getMatrixDomainPartMapping(domain);
- if (endpoint) {
- console.log("Mapped to", endpoint);
- return Promise.resolve(endpoint);
- }
- return AutoDiscovery.findClientConfig(domain)
- .then((clientConfig) => {
- const hs = clientConfig['m.homeserver'];
- if (hs && !hs.error && hs.base_url) {
- console.log("Use home server returned from well-known", hs.base_url);
- return hs.base_url;
- }
- console.log("Fallback to default server");
- return config.defaultBaseUrl;
- })
- .catch((err) => {
- console.error("Failed well-known lookup", err);
- return config.defaultBaseUrl;
- });
- }
- }
- return Promise.resolve(config.defaultBaseUrl);
- }
-
- getMimeType(event) {
- const content = event.getContent();
- return (content.info && content.info.mimetype) ? content.info.mimetype : (content.file && content.file.mimetype) ? content.file.mimetype : "";
- }
-
- getFileName(event) {
- const content = event.getContent();
- return (content.body || content.filename || "").toLowerCase();
- }
-
- getFileExtension(event) {
- const fileName = this.getFileName(event);
- const parts = fileName.split(".");
- if (parts.length > 1) {
- return "." + parts[parts.length - 1].toLowerCase();
- }
- return "";
- }
-
- getFileSize(event) {
- const content = event.getContent();
+ getThumbnail(matrixClient, useAuthedMedia, event, config, ignoredw, ignoredh) {
+ return new Promise((resolve, reject) => {
+ const content = event.getContent();
+ var url = null;
+ var mime = "image/png";
+ var file = null;
+ let decrypt = true;
+ if (content.url != null) {
+ url = matrixClient.mxcUrlToHttp(
+ content.url,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ useAuthedMedia
+ );
+ decrypt = false;
if (content.info) {
- return content.info.size;
+ mime = content.info.mimetype;
}
- return 0;
- }
+ } else if (content && content.info && content.info.thumbnail_file && content.info.thumbnail_file.url) {
+ file = content.info.thumbnail_file;
+ // var width = w;
+ // var height = h;
+ // if (content.info.w < w || content.info.h < h) {
+ // width = content.info.w;
+ // height = content.info.h;
+ // }
+ // url = matrixClient.mxcUrlToHttp(
+ // file.url,
+ // width, height,
+ // "scale",
+ // true
+ // );
+ url = matrixClient.mxcUrlToHttp(
+ file.url,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ useAuthedMedia
+ );
+ mime = file.mimetype;
+ } else if (
+ content.file &&
+ content.file.url &&
+ this.getFileSize(event) > 0 &&
+ this.getFileSize(event) < config.maxSizeAutoDownloads
+ ) {
+ // No thumb, use real url
+ file = content.file;
+ url = matrixClient.mxcUrlToHttp(
+ file.url,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ useAuthedMedia
+ );
+ mime = file.mimetype;
+ }
- getFileSizeFormatted(event) {
- return prettyBytes(this.getFileSize(event));
- }
+ if (url == null) {
+ reject("No url found!");
+ return;
+ }
- isFileTypeAPK(event) {
- const mime = this.getMimeType(event);
- if (mime === "application/vnd.android.package-archive" || this.getFileName(event).endsWith(".apk")) {
- return true;
+ axios
+ .get(url, useAuthedMedia ? {
+ responseType: "arraybuffer",
+ headers: {
+ Authorization: `Bearer ${matrixClient.getAccessToken()}`,
+ },
+ } : { responseType: "arraybuffer" })
+ .then((response) => {
+ return decrypt ? this.decryptIfNeeded(file, response) : Promise.resolve({ buffer: response.data });
+ })
+ .then((bytes) => {
+ resolve(URL.createObjectURL(new Blob([bytes.buffer], { type: mime })));
+ })
+ .catch((err) => {
+ console.log("Download error: ", err);
+ reject(err);
+ });
+ });
+ }
+
+ b64toBuffer(val) {
+ const baseValue = val.replaceAll("-", "+").replaceAll("_", "/");
+ return Buffer.from(baseValue, "base64");
+ }
+
+ decryptIfNeeded(file, response) {
+ return new Promise((resolve, reject) => {
+ const key = this.b64toBuffer(file.key.k);
+ const iv = this.b64toBuffer(file.iv);
+ const originalHash = this.b64toBuffer(file.hashes.sha256);
+
+ var aesCtr = new aesjs.ModeOfOperation.ctr(key, new aesjs.Counter(iv));
+ const data = new Uint8Array(response.data);
+
+ crypto.subtle
+ .digest("SHA-256", data)
+ .then((hash) => {
+ // Calculate sha256 and compare hashes
+ if (Buffer.compare(Buffer.from(hash), originalHash) != 0) {
+ reject("Hashes don't match!");
+ return;
+ }
+ var decryptedBytes = aesCtr.decrypt(data);
+ resolve(decryptedBytes);
+ })
+ .catch((err) => {
+ reject("Failed to calculate hash value");
+ });
+ });
+ }
+
+ sendTextMessage(matrixClient, roomId, text, editedEvent, replyToEvent) {
+ var content = ContentHelpers.makeTextMessage(text);
+ if (editedEvent) {
+ content["m.relates_to"] = {
+ rel_type: "m.replace",
+ event_id: editedEvent.getId(),
+ };
+ content["m.new_content"] = {
+ body: content.body,
+ msgtype: content.msgtype,
+ };
+ } else if (replyToEvent) {
+ content["m.relates_to"] = {
+ "m.in_reply_to": {
+ event_id: replyToEvent.getId(),
+ },
+ };
+ let senderContent = replyToEvent.getContent();
+
+ const senderContentBody = Object.getOwnPropertyDescriptor(senderContent, "body")
+ ? senderContent.body
+ : Object.values(senderContent)[0].question.body;
+ // Prefix the content with reply info (seems to be a legacy thing)
+ const prefix = senderContentBody
+ .split("\n")
+ .map((item, index) => {
+ return "> " + (index == 0 ? "<" + replyToEvent.getSender() + "> " : "") + item;
+ })
+ .join("\n");
+ content.body = prefix + "\n\n" + content.body;
+ }
+ return this.sendMessage(matrixClient, roomId, "m.room.message", content);
+ }
+
+ sendQuickReaction(matrixClient, roomId, emoji, event, extraData = {}) {
+ const content = {
+ "m.relates_to": Object.assign(extraData, {
+ key: emoji,
+ rel_type: "m.annotation",
+ event_id: event.getId(),
+ }),
+ };
+ return this.sendMessage(matrixClient, roomId, "m.reaction", content);
+ }
+
+ createPoll(matrixClient, roomId, question, answers, isDisclosed) {
+ var idx = 0;
+ let answerData = answers.map((a) => {
+ idx++;
+ return { id: "" + idx, "org.matrix.msc1767.text": a.text };
+ });
+ const content = {
+ "org.matrix.msc3381.poll.start": {
+ question: {
+ "org.matrix.msc1767.text": question,
+ body: question,
+ },
+ kind: isDisclosed ? "org.matrix.msc3381.poll.disclosed" : "org.matrix.msc3381.poll.undisclosed",
+ max_selections: 1,
+ answers: answerData,
+ },
+ };
+ return this.sendMessage(matrixClient, roomId, "org.matrix.msc3381.poll.start", content);
+ }
+
+ closePoll(matrixClient, roomId, event) {
+ const content = {
+ "m.relates_to": {
+ rel_type: "m.reference",
+ event_id: event.getId(),
+ },
+ "org.matrix.msc3381.poll.end": {},
+ };
+ return this.sendMessage(matrixClient, roomId, "org.matrix.msc3381.poll.end", content);
+ }
+
+ sendPollAnswer(matrixClient, roomId, answers, event) {
+ const content = {
+ "m.relates_to": {
+ rel_type: "m.reference",
+ event_id: event.getId(),
+ },
+ "org.matrix.msc3381.poll.response": {
+ answers: answers,
+ },
+ };
+ return this.sendMessage(matrixClient, roomId, "org.matrix.msc3381.poll.response", content);
+ }
+
+ sendMessage(matrixClient, roomId, eventType, content) {
+ return new Promise((resolve, reject) => {
+ matrixClient
+ .sendEvent(roomId, eventType, content, undefined, undefined)
+ .then((result) => {
+ console.log("Message sent: ", result);
+ resolve(result.event_id);
+ })
+ .catch((err) => {
+ console.log("Send error: ", err);
+ if (err && err.name == "UnknownDeviceError") {
+ console.log("Unknown devices. Mark as known before retrying.");
+ var setAsKnownPromises = [];
+ for (var user of Object.keys(err.devices)) {
+ const userDevices = err.devices[user];
+ for (var deviceId of Object.keys(userDevices)) {
+ const deviceInfo = userDevices[deviceId];
+ if (!deviceInfo.known) {
+ setAsKnownPromises.push(matrixClient.setDeviceKnown(user, deviceId, true));
+ }
+ }
+ }
+ Promise.all(setAsKnownPromises).then(() => {
+ // All devices now marked as "known", try to resend
+ let event = err.event;
+ if (!event) {
+ // Seems event is no longer send in the UnknownDevices error...
+ const room = matrixClient.getRoom(roomId);
+ if (room) {
+ event = room
+ .getLiveTimeline()
+ .getEvents()
+ .find((e) => {
+ // Find the exact match (= object equality)
+ return e.error === err;
+ });
+ }
+ }
+ matrixClient
+ .resendEvent(event, matrixClient.getRoom(event.getRoomId()))
+ .then((result) => {
+ console.log("Message sent: ", result);
+ resolve(result.event_id);
+ })
+ .catch((err) => {
+ // Still error, abort
+ reject(err.toLocaleString());
+ });
+ });
+ } else {
+ reject(err.toLocaleString());
+ }
+ });
+ });
+ }
+
+ sendFile(matrixClient, roomId, file, onUploadProgress, threadRoot) {
+ const uploadPromise = new UploadPromise(undefined);
+ uploadPromise.wrappedPromise = new Promise((resolve, reject) => {
+ var reader = new FileReader();
+ reader.onload = async (e) => {
+ if (uploadPromise.aborted) {
+ reject("Aborted");
+ return;
}
- return false;
- }
+ const fileContents = e.target.result;
+ var data = new Uint8Array(fileContents);
- isFileTypeIPA(event) {
- if (this.getFileName(event).endsWith(".ipa")) {
- return true;
+ const info = {
+ mimetype: file.type,
+ size: file.size,
+ };
+
+ // If audio, send duration in ms as well
+ if (file.duration) {
+ info.duration = file.duration;
}
- return false;
- }
- isFileTypePDF(event) {
- const mime = this.getMimeType(event);
- if (mime === "application/pdf" || this.getFileName(event).endsWith(".pdf")) {
- return true;
+ var description = file.name;
+ var msgtype = "m.file";
+ if (file.type.startsWith("image/")) {
+ msgtype = "m.image";
+ } else if (file.type.startsWith("audio/")) {
+ msgtype = "m.audio";
+ } else if (file.type.startsWith("video/")) {
+ msgtype = "m.video";
}
- return false;
- }
- isFileTypeZip(event) {
- const mime = this.getMimeType(event);
- if (["application/zip", "application/x-zip-compressed", "multipart/x-zip"].includes(mime) || this.getFileName(event).endsWith(".zip")) {
- return true;
+ const opts = {
+ type: file.type,
+ name: description,
+ progressHandler: onUploadProgress,
+ onlyContentUri: false,
+ };
+
+ var messageContent = {
+ body: description,
+ info: info,
+ msgtype: msgtype,
+ };
+
+ // If thread root (an eventId) is set, add that here
+ if (threadRoot) {
+ messageContent["m.relates_to"] = {
+ rel_type: this.threadMessageType(),
+ event_id: threadRoot,
+ };
}
- return false;
+
+ // Set filename for files
+ if (msgtype == "m.file") {
+ messageContent.filename = file.name;
+ }
+
+ if (!matrixClient.isRoomEncrypted(roomId)) {
+ // Not encrypted.
+ const promise = matrixClient.uploadContent(data, opts);
+ uploadPromise.onAbort = () => {
+ matrixClient.cancelUpload(promise);
+ };
+ promise
+ .then((response) => {
+ messageContent.url = response.content_uri;
+ return msgtype == "m.audio" ? this.generateWaveform(fileContents, messageContent) : true;
+ })
+ .then(() => {
+ return this.sendMessage(matrixClient, roomId, "m.room.message", messageContent);
+ })
+ .then((result) => {
+ resolve(result);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ return; // Don't fall through
+ }
+
+ let key = Buffer.from(crypto.getRandomValues(new Uint8Array(256 / 8)));
+ let iv = Buffer.concat([Buffer.from(crypto.getRandomValues(new Uint8Array(8))), Buffer.alloc(8)]); // Initialization vector.
+
+ // Encrypt
+ var aesCtr = new aesjs.ModeOfOperation.ctr(key, new aesjs.Counter(iv));
+ var encryptedBytes = aesCtr.encrypt(data);
+ data = encryptedBytes;
+
+ // Calculate sha256
+ let hash = await crypto.subtle.digest("SHA-256", data);
+
+ const jwk = {
+ kty: "oct",
+ key_ops: ["encrypt", "decrypt"],
+ alg: "A256CTR",
+ k: key.toString("base64").replaceAll(/\//g, "_").replaceAll(/\+/g, "-"),
+ ext: true,
+ };
+
+ const encryptedFile = {
+ mimetype: file.type,
+ key: jwk,
+ iv: Buffer.from(iv).toString("base64").replace(/=/g, ""),
+ hashes: { sha256: Buffer.from(hash).toString("base64").replace(/=/g, "") },
+ v: "v2",
+ };
+
+ messageContent.file = encryptedFile;
+
+ // Encrypted data sent as octet-stream!
+ opts.type = "application/octet-stream";
+
+ const promise = matrixClient.uploadContent(data, opts);
+ uploadPromise.onAbort = () => {
+ matrixClient.cancelUpload(promise);
+ };
+ promise
+ .then((response) => {
+ if (response.error) {
+ return reject(response.error);
+ }
+ messageContent.file.url = response.content_uri;
+ return msgtype == "m.audio" ? this.generateWaveform(fileContents, messageContent) : true;
+ })
+ .then(() => {
+ return this.sendMessage(matrixClient, roomId, "m.room.message", messageContent);
+ })
+ .then((result) => {
+ resolve(result);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ };
+ reader.onerror = (err) => {
+ reject(err);
+ };
+ reader.readAsArrayBuffer(file);
+ });
+ return uploadPromise;
+ }
+
+ generateWaveform(data, messageContent) {
+ if (!(window.AudioContext || window.webkitAudioContext)) {
+ return; // No support
+ }
+ const audioCtx = new (window.AudioContext || window.webkitAudioContext)();
+ if (audioCtx) {
+ return audioCtx.decodeAudioData(data).then((audioBuffer) => {
+ const rawData = audioBuffer.getChannelData(0); // TODO - currently using only 1 channel
+ const samples = 1000; // Number of samples
+ const blockSize = Math.floor(rawData.length / samples);
+ let filteredData = [];
+ for (let i = 0; i < samples; i++) {
+ let blockStart = blockSize * i; // the location of the first sample in the block
+ let sum = 0;
+ for (let j = 0; j < blockSize; j++) {
+ sum = sum + Math.abs(rawData[blockStart + j]); // find the sum of all the samples in the block
+ }
+ filteredData.push(sum / blockSize); // divide the sum by the block size to get the average
+ }
+
+ // Normalize
+ const multiplier = Math.pow(Math.max(...filteredData), -1);
+ filteredData = filteredData.map((n) => n * multiplier);
+
+ // Integerize
+ filteredData = filteredData.map((n) => parseInt((n * 255).toFixed()));
+
+ // Generate SVG of waveform
+ let svg = `";
+
+ messageContent.format = "org.matrix.custom.html";
+ messageContent.formatted_body = svg;
+ });
+ }
+ }
+
+ /**
+ * Return what "mode" to use for the given room.
+ *
+ * The default value is given by the room itself (as state events, see roomTypeMixin).
+ * This method just returns if the user has overridden this in room settings (this
+ * fact will be persisted as a user specific tag on the room). Note: currently override
+ * is disabled in the UI...
+ */
+ roomDisplayTypeOverride(roomOrNull) {
+ if (roomOrNull) {
+ const room = roomOrNull;
+
+ // Have we changed our local view mode of this room?
+ const tags = room.tags;
+ if (tags && tags["ui_options"]) {
+ console.error("We have a tag!");
+ if (tags["ui_options"]["voice_mode"] === 1) {
+ return ROOM_TYPE_VOICE_MODE;
+ } else if (tags["ui_options"]["file_mode"] === 1) {
+ return ROOM_TYPE_FILE_MODE;
+ } else if (tags["ui_options"]["file_mode"] === 0 && tags["ui_options"]["file_mode"] === 0) {
+ // Explicitly set to "default"
+ return ROOM_TYPE_DEFAULT;
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Return the room type for the current room
+ * @param {*} roomOrNull
+ */
+ roomDisplayTypeToQueryParam(roomOrNull, roomDisplayType) {
+ const roomType = this.roomDisplayTypeOverride(roomOrNull) || roomDisplayType;
+ if (roomType === ROOM_TYPE_FILE_MODE) {
+ // Send "file" here, so the receiver of the invite link knows to display the "file drop" join page
+ // instead of the standard one.
+ return "file";
+ } else if (roomType === ROOM_TYPE_VOICE_MODE) {
+ // No need to return "voice" here. The invite page looks the same for default and voice mode,
+ // so currently no point in cluttering the invite link with it. The corrent mode will be picked up from
+ // room creation flags once the user joins.
+ return undefined;
+ }
+ return undefined; // Default, just return undefined
+ }
+
+ /** Generate a random user name */
+ randomUser(prefix) {
+ var pfx = prefix ? prefix.replace(/[^0-9a-zA-Z\-_]/gi, "") : null;
+ if (!pfx || pfx.length == 0) {
+ pfx = "weblite-";
+ }
+ return pfx + this.randomString(12, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
+ }
+
+ /**
+ * Generate random 12 char password
+ */
+ randomPass() {
+ return this.randomString(12, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!#_-*+");
+ }
+
+ // From here: https://stackoverflow.com/questions/1349404/generate-random-string-characters-in-javascript
+ randomString(length, characters) {
+ var result = "";
+ var charactersLength = characters.length;
+ for (var i = 0; i < length; i++) {
+ result += characters.charAt(Math.floor(Math.random() * charactersLength));
+ }
+ return result;
+ }
+
+ sanitizeRoomId(roomId) {
+ if (roomId && roomId.match(/^(!|#).+$/)) {
+ return roomId;
+ }
+ return null;
+ }
+
+ sanitizeUserId(userId) {
+ if (userId && userId.match(/^([0-9a-z-.=_/]+|@[0-9a-z-.=_/]+:.+)$/)) {
+ return userId;
+ }
+ return null;
+ }
+
+ invalidUserIdChars() {
+ return /[^0-9a-z-.=_/]+/g;
+ }
+
+ getFirstVisibleElement(parentNode, where) {
+ let visible = this.findVisibleElements(parentNode);
+ if (visible) {
+ visible = visible.filter(where);
+ }
+ if (visible && visible.length > 0) {
+ return visible[0];
+ }
+ return null;
+ }
+
+ getLastVisibleElement(parentNode, where) {
+ let visible = this.findVisibleElements(parentNode);
+ if (visible) {
+ visible = visible.filter(where);
+ }
+ if (visible && visible.length > 0) {
+ return visible[visible.length - 1];
+ }
+ return null;
+ }
+
+ findVisibleElements(parentNode) {
+ const middle = this.findOneVisibleElement(parentNode);
+ if (middle) {
+ var nodes = [parentNode.children[middle]];
+ var i = middle - 1;
+ while (i >= 0 && this.isChildVisible(parentNode, parentNode.children[i])) {
+ nodes.splice(0, 0, parentNode.children[i]);
+ i -= 1;
+ }
+ i = middle + 1;
+ while (i < parentNode.children.length && this.isChildVisible(parentNode, parentNode.children[i])) {
+ nodes.push(parentNode.children[i]);
+ i += 1;
+ }
+ return nodes;
+ }
+ return null; // No visible found
+ }
+
+ isChildVisible(parentNode, childNode) {
+ const rect1 = parentNode.getBoundingClientRect();
+ const rect2 = childNode.getBoundingClientRect();
+ var overlap = !(
+ rect1.right <= rect2.left ||
+ rect1.left >= rect2.right ||
+ rect1.bottom <= rect2.top ||
+ rect1.top >= rect2.bottom
+ );
+ return overlap;
+ }
+
+ findOneVisibleElement(parentNode) {
+ let start = 0;
+ let end = parentNode && parentNode.children ? parentNode.children.length - 1 : -1;
+ while (start <= end) {
+ let middle = Math.floor((start + end) / 2);
+ let childNode = parentNode.children[middle];
+ if (this.isChildVisible(parentNode, childNode)) {
+ // found the key
+ return middle;
+ } else if (childNode.getBoundingClientRect().top <= parentNode.getBoundingClientRect().top) {
+ // continue searching to the right
+ start = middle + 1;
+ } else {
+ // search searching to the left
+ end = middle - 1;
+ }
+ }
+ // key wasn't found
+ return null;
+ }
+
+ _importAll(r) {
+ var images = [];
+ r.keys().forEach((res) => {
+ console.log("Avatar", res);
+ // // Remove"./"
+ var name = res.split("_")[1];
+ name = name.slice(0, name.indexOf("."));
+ name = name.charAt(0).toUpperCase() + name.slice(1);
+ const image = r(res);
+ const randomNumber = parseInt(this.randomString(4, "0123456789")).toFixed();
+ images.push({ id: res, image: image, name: "Guest " + name + " " + randomNumber });
+ });
+ return images;
+ }
+
+ getDefaultAvatars() {
+ var images = [];
+ const modules = import.meta.glob("@/assets/avatars/*.{jpeg,jpg,png}", {
+ query: "?url",
+ import: "default",
+ eager: true,
+ });
+ Object.keys(modules).map((path) => {
+ var name = path.split("_")[1];
+ name = name.slice(0, name.indexOf("."));
+ name = name.charAt(0).toUpperCase() + name.slice(1);
+ const image = modules[path];
+ const randomNumber = parseInt(this.randomString(4, "0123456789")).toFixed();
+ const title = "Guest " + name + " " + randomNumber;
+ images.push({ id: path, image: image, name: title, title: title });
+ });
+ return images;
+ }
+
+ setAvatar(matrix, file, onUploadProgress) {
+ return new Promise((resolve, reject) => {
+ axios
+ .get(file, { responseType: "arraybuffer" })
+ .then((response) => {
+ const opts = {
+ type: response.headers["content-type"].split(";")[0],
+ name: "Avatar",
+ progressHandler: onUploadProgress,
+ onlyContentUri: false,
+ };
+ var avatarUri;
+ matrix.matrixClient
+ .uploadContent(response.data, opts)
+ .then((response) => {
+ avatarUri = response.content_uri;
+ return matrix.matrixClient.setAvatarUrl(avatarUri);
+ })
+ .then((result) => {
+ matrix.userAvatar = avatarUri;
+ resolve(result);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ }
+
+ setRoomAvatar(matrixClient, roomId, file, onUploadProgress) {
+ return new Promise((resolve, reject) => {
+ var reader = new FileReader();
+ reader.onload = (e) => {
+ const fileContents = e.target.result;
+ var data = new Uint8Array(fileContents);
+
+ const info = {
+ mimetype: file.type,
+ size: file.size,
+ };
+
+ const opts = {
+ type: file.type,
+ name: "Room Avatar",
+ progressHandler: onUploadProgress,
+ onlyContentUri: false,
+ };
+
+ var messageContent = {
+ body: file.name,
+ info: info,
+ };
+
+ matrixClient
+ .uploadContent(data, opts)
+ .then((response) => {
+ messageContent.url = response.content_uri;
+ return matrixClient.sendStateEvent(roomId, "m.room.avatar", messageContent);
+ })
+ .then((result) => {
+ resolve(matrixClient.mxcUrlToHttp(messageContent.url, 80, 80, "scale", undefined, undefined, true));
+ // resolve(result);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ };
+ reader.onerror = (err) => {
+ reject(err);
+ };
+ reader.readAsArrayBuffer(file);
+ });
+ }
+
+ loadAvatarFromFile(event, onLoad) {
+ if (event.target.files && event.target.files[0]) {
+ var reader = new FileReader();
+ reader.onload = (e) => {
+ const file = event.target.files[0];
+ if (file.type.startsWith("image/")) {
+ try {
+ var image = e.target.result;
+
+ const buffer = Uint8Array.from(window.atob(e.target.result.replace(/^data[^,]+,/, "")), (v) =>
+ v.charCodeAt(0)
+ );
+ var dimens = imageSize(buffer);
+
+ // Need to resize?
+ const w = dimens.width;
+ const h = dimens.height;
+ if (w > 640 || h > 640) {
+ var aspect = w / h;
+ var newWidth = parseInt((w > h ? 640 : 640 * aspect).toFixed());
+ var newHeight = parseInt((w > h ? 640 / aspect : 640).toFixed());
+ imageResize(image, {
+ format: "png",
+ width: newWidth,
+ height: newHeight,
+ outputType: "blob",
+ })
+ .then((img) => {
+ var resizedImageFile = new File([img], file.name, {
+ type: img.type,
+ lastModified: Date.now(),
+ });
+ var reader2 = new FileReader();
+ reader2.onload = (e) => {
+ onLoad(e.target.result);
+ };
+ reader2.readAsDataURL(resizedImageFile);
+ })
+ .catch((err) => {
+ console.error("Resize failed:", err);
+ });
+ } else {
+ onLoad(image);
+ }
+ } catch (error) {
+ console.error("Failed to get image dimensions: " + error);
+ }
+ }
+ };
+ reader.readAsDataURL(event.target.files[0]);
+ }
+ }
+
+ /**
+ * Return number of whole days between the timestamps, at end of that day.
+ * @param {*} ts1
+ * @param {*} ts2
+ */
+ dayDiff(ts1, ts2) {
+ var t1 = dayjs(ts1).endOf("day");
+ var t2 = dayjs(ts2).endOf("day");
+ return t2.diff(t1, "day");
+ }
+
+ dayDiffToday(timestamp) {
+ var then = dayjs(timestamp).endOf("day");
+ var now = dayjs().endOf("day");
+ return now.diff(then, "day");
+ }
+
+ formatDay(timestamp) {
+ var then = dayjs(timestamp).endOf("day");
+ return then.format("L");
+ }
+
+ formatTime(time) {
+ const date = new Date();
+ date.setTime(time);
+
+ const today = new Date();
+ if (
+ date.getDate() == today.getDate() &&
+ date.getMonth() == today.getMonth() &&
+ date.getFullYear() == today.getFullYear()
+ ) {
+ // For today, skip the date part
+ return date.toLocaleTimeString();
+ }
+ return date.toLocaleString();
+ }
+
+ formatRecordDuration(ms) {
+ return dayjs.duration(ms).format("HH:mm:ss");
+ }
+
+ formatDuration(ms) {
+ if (ms >= 60 * 60000) {
+ return dayjs.duration(ms).format("H:mm:ss");
+ }
+ return dayjs.duration(ms).format("m:ss");
+ }
+
+ formatRecordStartTime(timestamp) {
+ var then = dayjs(timestamp);
+ return then.format("lll");
+ }
+
+ browserCanRecordAudio() {
+ return _browserCanRecordAudio;
+ }
+
+ getRoomNameFromAlias(alias) {
+ if (alias && alias.startsWith("#") && alias.indexOf(":") > 0) {
+ return alias.slice(1).split(":")[0];
+ }
+ return undefined;
+ }
+
+ getUniqueAliasForRoomName(matrixClient, roomName, defaultMatrixDomainPart, iterationCount) {
+ return new Promise((resolve, reject) => {
+ var preferredAlias = roomName.replace(/\s/g, "").toLowerCase();
+ var tryAlias = "#" + preferredAlias + ":" + defaultMatrixDomainPart;
+ matrixClient
+ .getRoomIdForAlias(tryAlias)
+ .then((ignoredid) => {
+ // We got a response, this means the tryAlias already exists.
+ // Try again, with appended random chars
+ if (iterationCount) {
+ // Not the first time around. Reached max tries?
+ if (iterationCount == 5) {
+ reject("Failed to get unique room alias");
+ return;
+ }
+ // Else, strip random chars from end so we can try again
+ roomName = roomName.substring(0, roomName.length - 5);
+ }
+ const randomChars = this.randomString(4, "abcdefghijklmnopqrstuvwxyz0123456789");
+ resolve(
+ this.getUniqueAliasForRoomName(
+ matrixClient,
+ roomName + "-" + randomChars,
+ defaultMatrixDomainPart,
+ (iterationCount || 0) + 1
+ )
+ );
+ })
+ .catch((err) => {
+ if (err.errcode == "M_NOT_FOUND") {
+ resolve(preferredAlias);
+ } else {
+ reject(err);
+ }
+ });
+ });
+ }
+
+ downloadableTypes() {
+ return ["m.video", "m.audio", "m.image", "m.file"];
+ }
+
+ download(matrixClient, useAuthedMedia, event) {
+ console.log("DOWNLOAD");
+ this.getAttachment(matrixClient, useAuthedMedia, event)
+ .then((url) => {
+ const link = document.createElement("a");
+ link.href = url;
+ link.target = "_blank";
+ if (!this.isFileTypePDF(event)) {
+ // PDFs are shown inline, not downloaded
+ link.download = event.getContent().body || this.$t("fallbacks.download_name");
+ }
+ console.log("LINK", link);
+ document.body.appendChild(link);
+ link.click();
+ setTimeout(function () {
+ document.body.removeChild(link);
+ URL.revokeObjectURL(url);
+ }, 200);
+ })
+ .catch((err) => {
+ console.log("Failed to fetch attachment: ", err);
+ });
+ }
+
+ getMatrixBaseUrl(user, config) {
+ if (user) {
+ const domain = User.domainPart(user.user_id);
+ if (domain) {
+ const endpoint = config.getMatrixDomainPartMapping(domain);
+ if (endpoint) {
+ console.log("Mapped to", endpoint);
+ return Promise.resolve(endpoint);
+ }
+ return AutoDiscovery.findClientConfig(domain)
+ .then((clientConfig) => {
+ const hs = clientConfig["m.homeserver"];
+ if (hs && !hs.error && hs.base_url) {
+ console.log("Use home server returned from well-known", hs.base_url);
+ return hs.base_url;
+ }
+ console.log("Fallback to default server");
+ return config.defaultBaseUrl;
+ })
+ .catch((err) => {
+ console.error("Failed well-known lookup", err);
+ return config.defaultBaseUrl;
+ });
+ }
+ }
+ return Promise.resolve(config.defaultBaseUrl);
+ }
+
+ getMimeType(event) {
+ const content = event.getContent();
+ return content.info && content.info.mimetype
+ ? content.info.mimetype
+ : content.file && content.file.mimetype
+ ? content.file.mimetype
+ : "";
+ }
+
+ getFileName(event) {
+ const content = event.getContent();
+ return (content.body || content.filename || "").toLowerCase();
+ }
+
+ getFileExtension(event) {
+ const fileName = this.getFileName(event);
+ const parts = fileName.split(".");
+ if (parts.length > 1) {
+ return "." + parts[parts.length - 1].toLowerCase();
+ }
+ return "";
+ }
+
+ getFileSize(event) {
+ const content = event.getContent();
+ if (content.info) {
+ return content.info.size;
+ }
+ return 0;
+ }
+
+ getFileSizeFormatted(event) {
+ const size = this.getFileSize(event);
+ const res = prettyBytes(size);
+ return res;
+ }
+
+ isFileTypeAPK(event) {
+ const mime = this.getMimeType(event);
+ if (mime === "application/vnd.android.package-archive" || this.getFileName(event).endsWith(".apk")) {
+ return true;
+ }
+ return false;
+ }
+
+ isFileTypeIPA(event) {
+ if (this.getFileName(event).endsWith(".ipa")) {
+ return true;
+ }
+ return false;
+ }
+
+ isFileTypePDF(event) {
+ const mime = this.getMimeType(event);
+ if (mime === "application/pdf" || this.getFileName(event).endsWith(".pdf")) {
+ return true;
+ }
+ return false;
+ }
+
+ isFileTypeZip(event) {
+ const mime = this.getMimeType(event);
+ if (
+ ["application/zip", "application/x-zip-compressed", "multipart/x-zip"].includes(mime) ||
+ this.getFileName(event).endsWith(".zip")
+ ) {
+ return true;
+ }
+ 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;
+ }
+
+ /**
+ * Possibly convert numerals to local representation (currently only for "bo" locale)
+ * @param str String in which to convert numerals [0-9]
+ * @returns converted string
+ */
+ toLocalNumbers = (str) => {
+ if (i18n.locale == "my") {
+ // Translate to burmese numerals
+ var result = "";
+ for (var i = 0; i < str.length; i++) {
+ var c = str.charCodeAt(i);
+ if (c >= 48 && c <= 57) {
+ result += String.fromCharCode(c + 0x1040 - 48);
+ } else {
+ result += String.fromCharCode(c);
+ }
+ }
+ return result;
+ } else if (i18n.locale == "bo") {
+ // Translate to tibetan numerals
+ result = "";
+ for (i = 0; i < str.length; i++) {
+ c = str.charCodeAt(i);
+ if (c >= 48 && c <= 57) {
+ result += String.fromCharCode(c + 0x0f20 - 48);
+ } else {
+ result += String.fromCharCode(c);
+ }
+ }
+ return result;
}
- 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);
- }
+ return str;
+ };
- 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
- }
-}
+ deepToRaw(sourceObj) {
+ const objectIterator = (input) => {
+ if (Array.isArray(input)) {
+ return input.map((item) => objectIterator(item));
+ }
+ if (isRef(input) || isReactive(input) || isProxy(input)) {
+ return objectIterator(toRaw(input));
+ }
+ if (input && typeof input === "object") {
+ return Object.keys(input).reduce((acc, key) => {
+ acc[key] = objectIterator(input[key]);
+ return acc;
+ }, {});
+ }
+ return input;
+ };
+ return objectIterator(sourceObj);
+ }
+};
export default new Util();
-
diff --git a/src/plugins/vuetify.js b/src/plugins/vuetify.js
index dc74d40..938e670 100644
--- a/src/plugins/vuetify.js
+++ b/src/plugins/vuetify.js
@@ -1,35 +1,78 @@
-import Vue from 'vue';
-import Vuetify from 'vuetify/lib';
+import { createVuetify } from "vuetify";
+import * as components from "vuetify/components";
+import * as directives from "vuetify/directives";
+import { aliases, md } from "vuetify/iconsets/md";
+import { h } from "vue";
+import 'vuetify/styles';
// Import all .vue icons and process them, so they can be used
// as $vuetify.icons.