-
{{ $t("message.replying_to", { user: replyToEvent.sender.name }) }}
+ {{ $t("message.replying_to", { user: senderDisplayName }) }}
{{ $t("message.reply_image") }}
{{ $t("message.reply_audio_message") }}
{{ $t("message.reply_video") }}
+ {{ $t("message.reply_poll") }}
- ![]()
+ ![]()
$vuetify.icons.poll
{{ $t("new_room.room_topic") }}
{{roomCreationErrorMsg}}
{{ status }}
@@ -298,7 +300,12 @@ export default {
name: ""
},
enterRoomDialog: false,
- roomNamerules: [v => v.length <= 50 || this.$t("new_room.room_name_limit_error_msg")],
+ roomNamerules: [
+ v => v.length <= 50 || this.$t("new_room.room_name_limit_error_msg"),
+ v => !v.includes(':') || this.$t("new_room.colon_not_allowed")
+ ],
+ roomNameHasError: false,
+ roomCreationErrorMsg: ""
};
},
@@ -318,6 +325,9 @@ export default {
},
},
computed: {
+ isDisabled() {
+ return this.status ? true : this.roomName.length === 0 || this.roomName.length > 50 || this.roomNameHasError
+ },
roomAvatarLetter() {
if (!this.roomName) {
return null;
@@ -337,6 +347,9 @@ export default {
},
methods: {
+ updateErrorState(errorState) {
+ this.roomNameHasError = errorState
+ },
goBack() {
if (this.step == steps.NAME_SET) {
this.step = steps.INITIAL;
@@ -578,10 +591,8 @@ export default {
return roomId;
})
.catch((error) => {
- this.status =
- (error.data && error.data.error) ||
- error.message ||
- error.toString();
+ this.status = ""
+ this.roomCreationErrorMsg = (error.data && error.data.error) || error.message || error.toString();
this.step = steps.INITIAL; // revert
return null;
});
diff --git a/src/components/Join.vue b/src/components/Join.vue
index ceed40f..0a9a762 100644
--- a/src/components/Join.vue
+++ b/src/components/Join.vue
@@ -381,6 +381,7 @@ export default {
.then(
function (ignoreduser) {
console.log("Join: joining room");
+ this.$analytics.event("Invitations", "Room Joined");
this.loadingMessage = this.$t("join.status_joining");
return this.$matrix.matrixClient.joinRoom(this.roomId);
}.bind(this)
@@ -422,6 +423,11 @@ export default {
Math.floor(Math.random() * this.availableAvatars.length)
]
);
+ // mounted() is called more than once, so multiple instances of this event
+ // do not necessarily indicate a user was shown the join page more than once.
+ // To analyze this data, segment users into those who have an "Invitations"
+ // action and set up conversion tracking triggered by Room Joined (once per visit).
+ this.$analytics.event("Invitations", "Join Page Shown");
},
destroyed() {
this.$matrix.off("Room.myMembership", this.onMyMembership);
diff --git a/src/components/Profile.vue b/src/components/Profile.vue
index daa30cf..69f2435 100644
--- a/src/components/Profile.vue
+++ b/src/components/Profile.vue
@@ -103,13 +103,25 @@
/>
{{ passwordErrorMessage }}
@@ -134,7 +146,7 @@
newPassword1
)
"
- >{{ $t("menu.ok") }}{{ $t("global.save") }}
@@ -149,7 +161,11 @@
{{ $t("profile.display_name") }}
-
@@ -165,7 +181,8 @@
updateDisplayName(editValue);
showEditDisplaynameDialog = false;
"
- >{{ $t("menu.ok") }}{{ $t("global.save") }}
@@ -205,12 +222,16 @@ export default {
showLogoutPopup: false,
editValue: null,
password: null,
+ showPassword1: false,
+ showPassword2: false,
+ passwordValidation: /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{12,20}$/,
newPassword1: null,
newPassword2: null,
settingPassword: false,
passwordErrorMessage: null,
isAvatarLoaded: true,
- loadValue: 0
+ loadValue: 0,
+ newPasswordHasError: false
};
},
@@ -253,6 +274,7 @@ export default {
passwordsMatch() {
return (
+ !this.newPasswordHasError &&
this.newPassword1 &&
this.newPassword2 &&
this.newPassword1 == this.newPassword2
@@ -261,6 +283,9 @@ export default {
},
methods: {
+ updateErrorState(errorState) {
+ this.newPasswordHasError = errorState
+ },
setPassword(oldPassword, newPassword) {
this.settingPassword = true;
this.passwordErrorMessage = null;
diff --git a/src/components/RoomInfo.vue b/src/components/RoomInfo.vue
index 3b44fc8..52fb29a 100644
--- a/src/components/RoomInfo.vue
+++ b/src/components/RoomInfo.vue
@@ -27,12 +27,13 @@
{{ roomName }}
- {{ roomTopic }}
+
+
+ {{ roomTopic }}
+
+
+
+
{{ $t("room_info.created_by", { user: creator }) }}
diff --git a/src/components/RoomInfoBottomSheet.vue b/src/components/RoomInfoBottomSheet.vue
index 12ed076..bc529c7 100644
--- a/src/components/RoomInfoBottomSheet.vue
+++ b/src/components/RoomInfoBottomSheet.vue
@@ -10,7 +10,7 @@
{{$t('room_info_sheet.this_room')}}
{{ roomName }}
@@ -26,7 +26,7 @@
counter="50"
background-color="white"
autofocus
- v-if="isEditMode"
+ v-if="isRoomNameEditMode"
maxlength="50"
@blur="updateRoomName()"
@keyup.enter="updateRoomName()"
diff --git a/src/components/chatMixin.js b/src/components/chatMixin.js
index c8d5356..970fe16 100644
--- a/src/components/chatMixin.js
+++ b/src/components/chatMixin.js
@@ -111,7 +111,7 @@ export default {
dateForEvent(event) {
return util.formatDay(event.getTs());
},
-
+
componentForEvent(event, isForExport = false) {
switch (event.getType()) {
case "m.room.member":
@@ -240,6 +240,9 @@ export default {
}
}
}
+ break;
+ case "m.room.encrypted":
+ return event.getSender() != this.$matrix.currentUserId ? MessageIncomingText : MessageOutgoingText
}
return this.debugging ? DebugEvent : null;
},
diff --git a/src/components/messages/MessageIncoming.vue b/src/components/messages/MessageIncoming.vue
index a345132..9c31eb3 100644
--- a/src/components/messages/MessageIncoming.vue
+++ b/src/components/messages/MessageIncoming.vue
@@ -15,10 +15,10 @@
diff --git a/src/components/messages/MessageOutgoing.vue b/src/components/messages/MessageOutgoing.vue
index 11b4000..d2495eb 100644
--- a/src/components/messages/MessageOutgoing.vue
+++ b/src/components/messages/MessageOutgoing.vue
@@ -9,10 +9,10 @@
{{ pollQuestion }}
diff --git a/src/components/messages/MessageIncomingText.vue b/src/components/messages/MessageIncomingText.vue
index bb5b8cf..2a38e8d 100644
--- a/src/components/messages/MessageIncomingText.vue
+++ b/src/components/messages/MessageIncomingText.vue
@@ -11,10 +11,14 @@
/>