butter/keanu-weblite
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'dev'

Browse source
This commit is contained in:
n8fr8 2022-05-02 16:05:27 -04:00
commit 4f1dd68810
18 changed files with 478 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/App.vue
View file

@ -63,6 +63,13 @@ export default {
})
.catch((error) => {
console.log("Error creating client", 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);
}
})
.finally(() => {
this.loading = false;
@ -87,16 +94,19 @@ export default {
// Assigns available language for ex 'zh_Hans' when browser header language is 'zh' or 'zh-HK'
this.availableJsonTranslation= LocalesArr[LocalesArr.findIndex(locale => locale.includes(lang))];
if (this.$i18n.messages[this.browserLanguage]) {
this.$store.commit("setLanguage", this.browserLanguage);
} else if (this.browserLanguage.includes("-")) {
if (this.$i18n.messages[lang]) {
this.$store.commit("setLanguage", lang);
if (!this.$store.state.language) {
// Set default language if not set already
if (this.$i18n.messages[this.browserLanguage]) {
this.$store.commit("setLanguage", this.browserLanguage);
} else if (this.browserLanguage.includes("-")) {
if (this.$i18n.messages[lang]) {
this.$store.commit("setLanguage", lang);
} else {
this.$store.commit("setLanguage", this.availableJsonTranslation);
}
} else {
this.$store.commit("setLanguage", this.availableJsonTranslation);
}
} else {
this.$store.commit("setLanguage", this.availableJsonTranslation);
}
// Set language

6
src/assets/css/_utilities.scss
View file

@ -18,3 +18,9 @@
.white-space-pre {
white-space: pre;
}
.v-visible {
visibility: visible;
}
.v-hidden {
visibility: hidden;
}

17
src/assets/css/chat.scss
View file

@ -115,6 +115,11 @@ $admin-fg: white;
background-color: $chat-background;
overflow: hidden;
.chat-room-invitations {
padding: 10px;
background-color: #f2f2f2;
}
.chat-content {
margin: 0;
padding-top: $chat-standard-padding-s;
@ -818,7 +823,9 @@ $admin-fg: white;
}
.filled-button {
min-width: 180px !important;
@media #{map-get($display-breakpoints, 'sm-and-up')} {
min-width: 180px !important;
}
}
.v-card {
@ -826,6 +833,14 @@ $admin-fg: white;
border-radius: 20px;
}
.member .user-name {
margin-left: 6px;
}
.member .start-private-chat {
margin-left: 38px;
}
.member::after {
content: " ";
display: block;

4
src/assets/css/join.scss
View file

@ -161,4 +161,8 @@
@media #{map-get($display-breakpoints, 'sm-and-down')} {
margin: 10px;
}
@media #{map-get($display-breakpoints, 'md-and-up')} {
width: $main-desktop-width;
margin: 0 auto;
}
}

468
src/assets/translations/en.json
View file

@ -1,235 +1,237 @@
{
"language_display_name": "English",
"project": {
"name": "Convene",
"tag_line": "Simply connect"
},
"menu": {
"start_private_chat": "Private chat with this user",
"reply": "Reply",
"edit": "Edit",
"delete": "Delete",
"download": "Download",
"ok": "Ok",
"done": "Done",
"cancel": "Cancel",
"send": "Send",
"back": "BACK",
"login": "Login",
"logout": "Logout",
"new_room": "New Room",
"undo": "Undo",
"join": "Join",
"ignore": "Ignore",
"loading": "Loading {appName}"
},
"message": {
"you": "You",
"user_created_room": "{user} created the room",
"user_aliased_room": "{user} made the room alias {alias}",
"user_changed_display_name": "{user} changed display name to {displayName}",
"user_changed_avatar": "{user} changed the avatar",
"user_changed_room_avatar": "{user} changed the room avatar",
"user_encrypted_room": "{user} made the room encrypted",
"user_was_invited": "{user} was invited to the chat...",
"user_joined": "{user} joined the chat",
"user_left": "{user} left the chat",
"user_said": "{user} said:",
"file_prefix": "File: ",
"edited": "(edited)",
"download_progress": "{percentage}% downloaded",
"upload_progress": "Uploaded {count}",
"upload_progress_with_total": "Uploaded {count} of {total}",
"user_changed_room_history": "{user} made room history {type}",
"room_history_world_readable": "readable by anyone",
"room_history_shared": "readable to all members in the room",
"room_history_invited": "readable to members from when they were invited",
"room_history_joined": "readable to members from when they joined",
"user_changed_join_rules": "{user} made the room {type}",
"room_joinrule_invite": "invite only",
"room_joinrule_public": "public",
"user_changed_room_name": "{user} changed room name to {name}",
"user_changed_room_topic": "{user} changed room topic to {topic}",
"unread_messages": "Unread messages",
"replying_to": "Replying to {user}",
"your_message": "Your message...",
"scale_image": "Scale image",
"user_is_typing": "{user} is typing",
"users_are_typing": "{count} members are typing",
"room_powerlevel_change": "{user} changed powerlevel of {changes}",
"user_powerlevel_change_from_to": "{user} from {powerOld} to {powerNew}",
"user_changed_guest_access_closed": "{user} disallowed guests to join the room",
"user_changed_guest_access_open": "{user} allowed guests to join the room",
"reply_image": "Image",
"reply_audio_message": "Audio message",
"reply_video": "Video"
},
"room": {
"members": "no members | 1 member | {count} members",
"leave": "Leave",
"purge_set_room_state": "Setting room state",
"purge_redacting_events": "Redacting events",
"purge_removing_members": "Removing members",
"purge_failed": "Failed to purge room!",
"room_list_invites": "Invites",
"room_list_rooms": "Rooms"
},
"room_welcome": {
"info": "Welcome! Here are a few things to know about your room:",
"encrypted": "Messages are end-to-end encrypted.",
"room_history_is": "Room history is {type}.",
"room_history_joined": "People can only see the messages sent after they join.",
"join_public": "Anyone can join by opening this link: {link}.",
"join_invite": "Only people you invite can join.",
"info_permissions": "You can change ‘join permissions’ at any time in the room settings.",
"got_it": "Got it"
},
"new_room": {
"new_room": "New Room",
"create": "Create",
"next": "Next",
"name_room": "Name room",
"room_topic": "Add a description if you like",
"join_permissions": "Join permissions",
"set_join_permissions": "Set Join Permissions",
"join_permissions_info": "These permissions determine how people can join the room and how easily others can be invited. They can be changed anytime.",
"get_link": "Get link",
"add_people": "Add people",
"link_copied": "Link copied!",
"public_info": "Anyone with a link",
"public_description": "Get a link to share",
"invite_info": "Only people added",
"invite_description": "Choose from a list or search by account ID",
"status_creating": "Creating room",
"status_avatar_total": "Uploading avatar: {count} of {total}",
"status_avatar": "Uploading avatar: {count}"
},
"device_list": {
"title": "DEVICES",
"blocked": "Blocked",
"verified": "Verified",
"not_verified": "Not verified"
},
"login": {
"title": "Login",
"username": "Username (ex: marta)",
"password": "Enter Password",
"username_required": "Username is required",
"password_required": "Password is required",
"login": "Login",
"create_room": "Register & Create Room",
"or": "OR",
"invalid_message": "Invalid username or password"
},
"profile": {
"title": "My Profile",
"temporary_identity": "This identity is temporary. Set a password to use it again",
"set_password": "Set password",
"change_name": "Change name",
"change_password": "Change password",
"select_language": "Language",
"set_language": "Set your language",
"language_description": "Convene is available in many languages.",
"dont_see_yours": "Don't see yours?",
"tell_us": "Tell us.",
"password_old": "Old password",
"password_new": "New password",
"password_repeat": "Repeat new password",
"display_name": "Display name"
},
"profile_info_popup": {
"you_are": "You are",
"identity": "{displayName}",
"identity_temporary": "{displayName}",
"edit_profile": "Edit profile",
"logout": "Logout",
"want_more": "Want more?",
"powered_by": "This room is powered by {product}. Learn more at {productLink} or go ahead and create another room!",
"new_room": "+ New room"
},
"join": {
"title": "Welcome you have been invited to join",
"user_name_label": "User name",
"remember_me": "Remember me",
"joining_as": "You are joining as:",
"join": "Join room",
"enter_room": "Enter room",
"status_logging_in": "Logging in...",
"status_joining": "Joining room...",
"join_failed": "Failed to join room."
},
"invite": {
"title": "Add Friends",
"done": "Done",
"send_invites_to": "Send invites to",
"status_inviting": "Inviting friend {index} of {count}",
"status_error": "Failed to invite one or or more friends!"
},
"leave": {
"title_public": "Goodbye, {user}",
"text_public": "You can always join this room again if you know the link.",
"text_public_lastroom": "If you want to join this room again, you can join under a new identity. To keep {user}, {action}.",
"title_invite": "Are you sure you want to leave?",
"text_invite": "This room is locked. You cannot rejoin without a special permission.",
"create_account": "create an account",
"go_back": "Go back",
"leave": "Leave"
},
"purge_room": {
"title": "Delete room?",
"info": "All members and messages will be removed. This action cannot be undone.",
"button": "Delete",
"n_seconds": "{seconds} seconds",
"self_destruct": "Room will self destruct in seconds.",
"deleting": "Deleting room:",
"notified": "We've notified members.",
"room_deletion_notice": "Time to say goodbye! This room has been deleted by {user}. It will self destruct in seconds."
},
"goodbye": {
"room_deleted": "Room deleted.",
"close_tab": "Close browser tab",
"view_other_rooms": "View other rooms"
},
"room_info": {
"title": "Room Details",
"created_by": "Created by {user}",
"permissions": "Join Permissions",
"join_invite": "Only People Added",
"join_public": "Anyone with a link",
"copy_link": "Copy invite link",
"link_copied": "Link copied!",
"purge": "Delete room",
"members": "Members",
"user": "{user}",
"user_you": "{user} (you)",
"hide_all": "Hide",
"show_all": "Show all >",
"leave_room": "Leave",
"version_info": "Powered by Guardian Project. Version: {version}",
"scan_code": "Scan to join the room"
},
"room_info_sheet": {
"this_room": "This room",
"view_details": "View details"
},
"voice_recorder": {
"swipe_to_cancel": "Swipe to cancel",
"release_to_cancel": "Release to cancel",
"failed_to_record": "Failed to record audio",
"not_supported_title": "Not supported",
"not_supported_text": "Unfortunately, this browser does not support audio recording."
},
"power_level": {
"admin": "administrator",
"moderator": "moderator",
"default": "default",
"custom": "custom ({level})",
"restricted": "restricted"
},
"fallbacks": {
"audio_file": "Audio file",
"video_file": "Video file",
"original_text": "<original text>",
"download_name": "Download"
}
"language_display_name": "English",
"project": {
"name": "Convene",
"tag_line": "Simply connect"
},
"menu": {
"start_private_chat": "Private chat with this user",
"reply": "Reply",
"edit": "Edit",
"delete": "Delete",
"download": "Download",
"ok": "Ok",
"done": "Done",
"cancel": "Cancel",
"send": "Send",
"back": "BACK",
"login": "Login",
"logout": "Logout",
"new_room": "New Room",
"undo": "Undo",
"join": "Join",
"ignore": "Ignore",
"loading": "Loading {appName}"
},
"message": {
"you": "You",
"user_created_room": "{user} created the room",
"user_aliased_room": "{user} made the room alias {alias}",
"user_changed_display_name": "{user} changed display name to {displayName}",
"user_changed_avatar": "{user} changed the avatar",
"user_changed_room_avatar": "{user} changed the room avatar",
"user_encrypted_room": "{user} made the room encrypted",
"user_was_invited": "{user} was invited to the chat...",
"user_joined": "{user} joined the chat",
"user_left": "{user} left the chat",
"user_said": "{user} said:",
"file_prefix": "File: ",
"edited": "(edited)",
"download_progress": "{percentage}% downloaded",
"upload_progress": "Uploaded {count}",
"upload_progress_with_total": "Uploaded {count} of {total}",
"user_changed_room_history": "{user} made room history {type}",
"room_history_world_readable": "readable by anyone",
"room_history_shared": "readable to all members in the room",
"room_history_invited": "readable to members from when they were invited",
"room_history_joined": "readable to members from when they joined",
"user_changed_join_rules": "{user} made the room {type}",
"room_joinrule_invite": "invite only",
"room_joinrule_public": "public",
"user_changed_room_name": "{user} changed room name to {name}",
"user_changed_room_topic": "{user} changed room topic to {topic}",
"unread_messages": "Unread messages",
"replying_to": "Replying to {user}",
"your_message": "Your message...",
"scale_image": "Scale image",
"user_is_typing": "{user} is typing",
"users_are_typing": "{count} members are typing",
"room_powerlevel_change": "{user} changed powerlevel of {changes}",
"user_powerlevel_change_from_to": "{user} from {powerOld} to {powerNew}",
"user_changed_guest_access_closed": "{user} disallowed guests to join the room",
"user_changed_guest_access_open": "{user} allowed guests to join the room",
"reply_image": "Image",
"reply_audio_message": "Audio message",
"reply_video": "Video",
"time_ago": "Today | Yesterday | {count} days ago"
},
"room": {
"invitations": "You have no invitations | You have 1 invitation | You have {count} invitations",
"members": "no members | 1 member | {count} members",
"leave": "Leave",
"purge_set_room_state": "Setting room state",
"purge_redacting_events": "Redacting events",
"purge_removing_members": "Removing members",
"purge_failed": "Failed to purge room!",
"room_list_invites": "Invites",
"room_list_rooms": "Rooms"
},
"room_welcome": {
"info": "Welcome! Here are a few things to know about your room:",
"encrypted": "Messages are end-to-end encrypted.",
"room_history_is": "Room history is {type}.",
"room_history_joined": "People can only see the messages sent after they join.",
"join_public": "Anyone can join by opening this link: {link}.",
"join_invite": "Only people you invite can join.",
"info_permissions": "You can change ‘join permissions’ at any time in the room settings.",
"got_it": "Got it"
},
"new_room": {
"new_room": "New Room",
"create": "Create",
"next": "Next",
"name_room": "Name room",
"room_topic": "Add a description if you like",
"join_permissions": "Join permissions",
"set_join_permissions": "Set Join Permissions",
"join_permissions_info": "These permissions determine how people can join the room and how easily others can be invited. They can be changed anytime.",
"get_link": "Get link",
"add_people": "Add people",
"link_copied": "Link copied!",
"public_info": "Anyone with a link",
"public_description": "Get a link to share",
"invite_info": "Only people added",
"invite_description": "Choose from a list or search by account ID",
"status_creating": "Creating room",
"status_avatar_total": "Uploading avatar: {count} of {total}",
"status_avatar": "Uploading avatar: {count}"
},
"device_list": {
"title": "DEVICES",
"blocked": "Blocked",
"verified": "Verified",
"not_verified": "Not verified"
},
"login": {
"title": "Login",
"username": "Username (ex: marta)",
"password": "Enter Password",
"username_required": "Username is required",
"password_required": "Password is required",
"login": "Login",
"create_room": "Register & Create Room",
"or": "OR",
"invalid_message": "Invalid username or password"
},
"profile": {
"title": "My Profile",
"temporary_identity": "This identity is temporary. Set a password to use it again",
"set_password": "Set password",
"change_name": "Change name",
"change_password": "Change password",
"select_language": "Language",
"set_language": "Set your language",
"language_description": "Convene is available in many languages.",
"dont_see_yours": "Don't see yours?",
"tell_us": "Tell us.",
"password_old": "Old password",
"password_new": "New password",
"password_repeat": "Repeat new password",
"display_name": "Display name"
},
"profile_info_popup": {
"you_are": "You are",
"identity": "{displayName}",
"identity_temporary": "{displayName}",
"edit_profile": "Edit profile",
"logout": "Logout",
"want_more": "Want more?",
"powered_by": "This room is powered by {product}. Learn more at {productLink} or go ahead and create another room!",
"new_room": "+ New room"
},
"join": {
"title": "Welcome you have been invited to join",
"user_name_label": "User name",
"remember_me": "Remember me",
"joining_as": "You are joining as:",
"join": "Join room",
"enter_room": "Enter room",
"status_logging_in": "Logging in...",
"status_joining": "Joining room...",
"join_failed": "Failed to join room."
},
"invite": {
"title": "Add Friends",
"done": "Done",
"send_invites_to": "Send invites to",
"status_inviting": "Inviting friend {index} of {count}",
"status_error": "Failed to invite one or or more friends!"
},
"leave": {
"title_public": "Goodbye, {user}",
"text_public": "You can always join this room again if you know the link.",
"text_public_lastroom": "If you want to join this room again, you can join under a new identity. To keep {user}, {action}.",
"title_invite": "Are you sure you want to leave?",
"text_invite": "This room is locked. You cannot rejoin without a special permission.",
"create_account": "create an account",
"go_back": "Go back",
"leave": "Leave"
},
"purge_room": {
"title": "Delete room?",
"info": "All members and messages will be removed. This action cannot be undone.",
"button": "Delete",
"n_seconds": "{seconds} seconds",
"self_destruct": "Room will self destruct in seconds.",
"deleting": "Deleting room:",
"notified": "We've notified members.",
"room_deletion_notice": "Time to say goodbye! This room has been deleted by {user}. It will self destruct in seconds."
},
"goodbye": {
"room_deleted": "Room deleted.",
"close_tab": "Close browser tab",
"view_other_rooms": "View other rooms"
},
"room_info": {
"title": "Room Details",
"created_by": "Created by {user}",
"permissions": "Join Permissions",
"join_invite": "Only People Added",
"join_public": "Anyone with a link",
"copy_link": "Copy invite link",
"link_copied": "Link copied!",
"purge": "Delete room",
"members": "Members",
"user": "{user}",
"user_you": "{user} (you)",
"hide_all": "Hide",
"show_all": "Show all >",
"leave_room": "Leave",
"version_info": "Powered by Guardian Project. Version: {version}",
"scan_code": "Scan to join the room"
},
"room_info_sheet": {
"this_room": "This room",
"view_details": "View details"
},
"voice_recorder": {
"swipe_to_cancel": "Swipe to cancel",
"release_to_cancel": "Release to cancel",
"failed_to_record": "Failed to record audio",
"not_supported_title": "Not supported",
"not_supported_text": "Unfortunately, this browser does not support audio recording."
},
"power_level": {
"admin": "administrator",
"moderator": "moderator",
"default": "default",
"custom": "custom ({level})",
"restricted": "restricted"
},
"fallbacks": {
"audio_file": "Audio file",
"video_file": "Video file",
"original_text": "<original text>",
"download_name": "Download"
}
}

9
src/components/BottomSheet.vue
View file

@ -48,6 +48,7 @@ export default {
mc: null,
y: 0,
startY: 0,
startYCoord: 0,
isMove: false,
state: this.defaultState,
rect: {},
@ -65,14 +66,20 @@ export default {
const self = this;
this.mc.on("panup pandown", (evt) => {
self.y = evt.center.y - 16;
self.y = self.startYCoord - (self.startY - evt.center.y);
});
this.mc.on("panstart", (evt) => {
self.startY = evt.center.y;
self.startYCoord = this.calcY();
self.isMove = true;
});
this.mc.on("pancancel", (ignoredEvt) => {
self.y = self.startYCoord;
self.isMove = false;
});
this.mc.on("panend", (evt) => {
self.isMove = false;

39
src/components/Chat.vue
View file

@ -1,5 +1,8 @@
<template>
<div class="chat-root fill-height d-flex flex-column">
<div class="chat-room-invitations clickable" v-if="invitationCount > 0" @click.stop="onInvitationsClick">
{{ $tc("room.invitations", invitationCount)}}
</div>
<ChatHeader
class="chat-header flex-grow-0 flex-shrink-0"
v-on:header-click="onHeaderClick"
@ -137,7 +140,7 @@
<div v-if="replyToEvent" class="row">
<div class="col">
<div class="font-weight-medium">{{ $t("message.replying_to", { user: replyToEvent.sender.name }) }}</div>
<div v-if="replyToContentType === 'm.text'" class="reply-text" :title="replyToEvent.getContent().body"> {{ replyToEvent.getContent().body }} </div>
<div v-if="replyToContentType === 'm.text'" class="reply-text" :title="replyToEvent.getContent().body"> {{ replyToEvent.getContent().body | latestReply }} </div>
<div v-if="replyToContentType === 'm.image'"> {{ $t("message.reply_image") }} </div>
<div v-if="replyToContentType === 'm.audio'"> {{ $t("message.reply_audio_message") }} </div>
<div v-if="replyToContentType === 'm.video'"> {{ $t("message.reply_video") }} </div>
@ -643,6 +646,16 @@ export default {
};
},
filters: {
latestReply(contents) {
const contentArr = contents.split('\n').reverse();
if (contentArr[0] === '') {
contentArr.shift();
}
return contentArr[0].replace(/^> (<.*> )?/g, '');
}
},
mounted() {
const container = this.$refs.chatContainer;
this.scrollPosition = new ScrollPosition(container);
@ -750,6 +763,9 @@ export default {
debugging() {
return (window.location.host || "").startsWith("localhost");
},
invitationCount() {
return this.$matrix.invites.length;
}
},
watch: {
@ -771,6 +787,7 @@ export default {
this.timelineWindow = null;
this.typingMembers = [];
this.initialLoadDone = false;
this.showCreatedRoomWelcomeHeader = false;
// Stop RR timer
this.stopRRTimer();
@ -814,8 +831,8 @@ export default {
this.$refs.messageOperationsStrut.getBoundingClientRect();
var rectOps =
this.$refs.messageOperations.$el.getBoundingClientRect();
top = rectAnchor.top - rectChat.top;
left = rectAnchor.left - rectChat.left;
top = rectAnchor.top - rectChat.top - 50;
left = rectAnchor.left - rectChat.left - 30;
if (left + rectOps.width >= rectChat.right) {
left = rectChat.right - rectOps.width - 10; // No overflow
}
@ -1581,7 +1598,7 @@ export default {
const event = e.event;
this.selectedEvent = event;
this.updateRecentEmojis();
this.showContextMenu = true;
this.showContextMenu = !this.showContextMenu;
this.showContextMenuAnchor = e.anchor;
},
@ -1597,6 +1614,7 @@ export default {
},
startPrivateChat(e) {
this.loading = true;
this.$matrix
.getOrCreatePrivateChat(e.event.getSender())
.then((room) => {
@ -1616,6 +1634,9 @@ export default {
})
.catch((err) => {
console.error(err);
})
.finally(() => {
this.loading = false;
});
},
@ -1718,7 +1739,12 @@ export default {
},
dayForEvent(event) {
return util.formatDay(event.getTs());
let dayDiff = util.dayDiffToday(event.getTs());
if (dayDiff < 7) {
return this.$tc("message.time_ago", dayDiff);
} else {
return util.formatDay(event.getTs());
}
},
showRecordingUI() {
@ -1787,6 +1813,9 @@ export default {
}
this.$refs.roomInfoSheet.open();
},
onInvitationsClick() {
this.$navigation.push({ name: "Home" }, -1);
}
},
};
</script>

35
src/components/ChatHeader.vue
View file

@ -22,9 +22,25 @@
<div class="num-members">{{ $tc("room.members", memberCount) }}</div>
</v-col>
<v-col cols="auto" class="text-end ma-0 pa-0">
<v-btn id="btn-leave-room" text class="leave-button" @click.stop="leaveRoom">{{
$t("room.leave")
}}</v-btn>
<v-btn
id="btn-purge-room"
v-if="userCanPurgeRoom"
color="red"
depressed
class="filled-button"
@click.stop="showPurgeConfirmation = true"
>
{{ $t("room_info.purge") }}
</v-btn>
<v-btn
id="btn-leave-room"
text
class="leave-button"
@click.stop="leaveRoom"
v-else
>
{{ $t("room.leave") }}
</v-btn>
</v-col>
<v-col cols="auto" class="text-end ma-0 pa-0 ms-2">
<v-avatar
@ -51,6 +67,12 @@
:show="showProfileInfo"
@close="showProfileInfo = false"
/>
<!-- PURGE ROOM POPUP -->
<PurgeRoomDialog
:show="showPurgeConfirmation"
:room="room"
@close="showPurgeConfirmation = false"
/>
</v-container>
</template>
@ -58,19 +80,24 @@
import LeaveRoomDialog from "../components/LeaveRoomDialog";
import ProfileInfoPopup from "../components/ProfileInfoPopup";
import profileInfoMixin from "../components/profileInfoMixin";
import PurgeRoomDialog from "../components/PurgeRoomDialog";
import roomInfoMixin from "./roomInfoMixin";
export default {
name: "ChatHeader",
mixins: [profileInfoMixin],
mixins: [profileInfoMixin, roomInfoMixin],
components: {
LeaveRoomDialog,
ProfileInfoPopup,
PurgeRoomDialog
},
data() {
return {
memberCount: null,
showLeaveConfirmation: false,
showProfileInfo: false,
showPurgeConfirmation: false
};
},
mounted() {

2
src/components/CreateRoom.vue
View file

@ -12,7 +12,7 @@
:disabled="step > steps.NAME_SET"
>
<v-icon>arrow_back</v-icon>
<span>{{ $t("menu.back") }}</span>
<span class="d-none d-sm-block">{{ $t("menu.back") }}</span>
</v-btn>
<!-- <v-btn
text

36
src/components/CreatedRoomWelcomeHeader.vue
View file

@ -4,7 +4,18 @@
<div class="mt-2" v-if="roomJoinRule == 'public'">
<i18n path="room_welcome.join_public" tag="span">
<template v-slot:link>
<a :href="publicRoomLink" class="text-break">{{ publicRoomLink }}</a>
<div style="position:relative;display:inline-block">
<a @click.stop="copyPublicLink" :href="publicRoomLink" class="text-break">{{ publicRoomLink }}</a>
<v-btn
v-if="publicRoomLinkCopied"
id="btn-copy-room-link"
color="#444444"
depressed
style="position:absolute;left:0;top:0"
class="filled-button link-copied-in-place"
>{{ $t("room_info.link_copied") }}</v-btn
>
</div>
</template>
</i18n>
</div>
@ -54,6 +65,29 @@ export default {
return null;
},
},
data() {
return {
publicRoomLinkCopied: false
}
},
methods: {
copyPublicLink() {
const self = this;
this.$copyText(this.publicRoomLink).then(
function (ignored) {
// Success!
self.publicRoomLinkCopied = true;
setInterval(() => {
// Hide again
self.publicRoomLinkCopied = false;
}, 3000);
},
function (e) {
console.log(e);
}
);
}
}
};
</script>

4
src/components/Join.vue
View file

@ -272,6 +272,10 @@ export default {
}
},
},
activeLanguage() {
// Null status on language change, we don't know what status we are in so we can't get the right string.
this.loadingMessage = null;
}
},
methods: {
getRoomInfo() {

64
src/components/RoomInfo.vue
View file

@ -1,23 +1,22 @@
<template>
<div v-if="room" class="room-info">
<div class="chat-header">
<v-container fluid>
<div class="room-name no-upper">{{ $t("room_info.title") }}</div>
<v-container fluid class="d-flex justify-space-between align-center">
<v-btn
id="btn-back"
text
class="header-button-left"
v-show="$navigation && $navigation.canPop()"
:class="$navigation && $navigation.canPop() ? 'v-visible' : 'v-hidden'"
@click.stop="$navigation.pop"
>
<v-icon>arrow_back</v-icon>
<span>{{ $t("menu.back") }}</span>
<span class="d-none d-sm-block">{{ $t("menu.back") }}</span>
</v-btn>
<div class="room-name no-upper">{{ $t("room_info.title") }}</div>
<v-btn
id="btn-leave-room"
color="black"
depressed
class="header-button-right filled-button me-3"
class="filled-button"
@click.stop="showLeaveConfirmation = true"
>👋 {{ $t("room_info.leave_room") }}</v-btn
>
@ -134,7 +133,7 @@
class="member ma-2"
v-for="(member, index) in joinedMembers"
:key="member.userId"
v-show="showAllMembers || index < 5"
v-show="showAllMembers || index < SHOW_MEMBER_LIMIT"
@click="toggleMemberExpanded(member)"
>
<v-avatar class="avatar" size="32" color="grey">
@ -143,6 +142,7 @@
member.name.substring(0, 1).toUpperCase()
}}</span>
</v-avatar>
<span class="user-name">
{{
member.userId == $matrix.currentUserId
? $t("room_info.user_you", {
@ -152,12 +152,14 @@
user: member.user ? member.user.displayName : member.name,
})
}}
</span>
<div v-if="member.userId != $matrix.currentUserId && !$matrix.isDirectRoomWith(room, member.userId) && expandedMembers.includes(member)" class="start-private-chat clickable" @click="startPrivateChat(member.userId)">Start private chat</div>
<DeviceList
v-if="expandedMembers.includes(member)"
:member="member"
/>
</div>
<div class="show-all" @click="showAllMembers = !showAllMembers">
<div class="show-all" @click="showAllMembers = !showAllMembers" v-if="joinedMembers.length > SHOW_MEMBER_LIMIT">
{{
showAllMembers ? $t("room_info.hide_all") : $t("room_info.show_all")
}}
@ -165,19 +167,6 @@
</v-card-text>
</v-card>
<!-- PURGE ROOM -->
<div class="members ma-3 pa-3 text-center">
<v-btn
id="btn-purge-room"
v-if="userCanPurgeRoom"
color="red"
depressed
class="filled-button"
@click.stop="showPurgeConfirmation = true"
>{{ $t("room_info.purge") }}</v-btn
>
</div>
<div class="build-version">
{{ $t("room_info.version_info", { version: buildVersion }) }}
</div>
@ -188,12 +177,6 @@
@close="showLeaveConfirmation = false"
/>
<PurgeRoomDialog
:show="showPurgeConfirmation"
:room="room"
@close="showPurgeConfirmation = false"
/>
<QRCodePopup :show="showFullScreenQR" :message="publicRoomLink" @close="showFullScreenQR = false" />
</div>
@ -201,18 +184,17 @@
<script>
import LeaveRoomDialog from "../components/LeaveRoomDialog";
import PurgeRoomDialog from "../components/PurgeRoomDialog";
import DeviceList from "../components/DeviceList";
import QRCode from "qrcode";
import roomInfoMixin from "./roomInfoMixin";
import QRCodePopup from './QRCodePopup.vue';
import util from "../plugins/utils";
export default {
name: "RoomInfo",
mixins: [roomInfoMixin],
components: {
LeaveRoomDialog,
PurgeRoomDialog,
DeviceList,
QRCodePopup,
},
@ -223,7 +205,6 @@ export default {
displayName: "",
showAllMembers: false,
showLeaveConfirmation: false,
showPurgeConfirmation: false,
showFullScreenQR: false,
expandedMembers: [],
buildVersion: "",
@ -241,6 +222,7 @@ export default {
icon: "person_add",
},
],
SHOW_MEMBER_LIMIT: 5
};
},
mounted() {
@ -439,6 +421,28 @@ export default {
this.updateQRCode();
});
},
startPrivateChat(userId) {
this.$matrix
.getOrCreatePrivateChat(userId)
.then((room) => {
this.$nextTick(() => {
this.$navigation.push(
{
name: "Chat",
params: {
roomId: util.sanitizeRoomId(
room.getCanonicalAlias() || room.roomId
),
},
},
-1
);
});
})
.catch((err) => {
console.error(err);
});
},
},
};
</script>

2
src/components/RoomList.vue
View file

@ -52,7 +52,7 @@
<v-list-item-avatar size="40" color="#e0e0e0">
<v-img :src="room.avatar" />
</v-list-item-avatar>
<div class="room-list-notification-count">
<div class="room-list-notification-count" v-if="notificationCount(room) > 0">
{{ notificationCount(room) }}
</div>
<v-list-item-content>

10
src/components/messages/AudioPlayer.vue
View file

@ -45,6 +45,7 @@ export default {
};
},
mounted() {
this.$root.$on('playback-start', this.onPlaybackStart);
this.player = this.$refs.player;
this.player.addEventListener("timeupdate", this.updateProgressBar);
this.player.addEventListener("play", () => {
@ -58,6 +59,9 @@ export default {
this.playing = false;
});
},
beforeDestroy() {
this.$root.$off('playback-start', this.onPlaybackStart);
},
computed: {
currentTime() {
return util.formatDuration(this.playTime);
@ -80,6 +84,7 @@ export default {
methods: {
play() {
if (this.player.src) {
this.$root.$emit("playback-start", this);
if (this.player.paused) {
this.player.play();
} else if (this.player.ended) {
@ -107,6 +112,11 @@ export default {
updateDuration() {
this.duration = 1000 * this.player.duration;
},
onPlaybackStart(item) {
if (item != this && this.playing) {
this.pause();
}
}
},
};
</script>

7
src/components/messages/messageMixin.js
View file

@ -88,10 +88,7 @@ export default {
while (lines.length && !lines[0].startsWith('> ')) lines.shift();
// Reply fallback has a blank line after it, so remove it to prevent leading newline
if (lines[0] === '') lines.shift();
const text = lines
.map((item) => { return item.replace(/^> (<.*> )?/g, ''); })
.reverse()
.join('\n');
const text = lines[0].replace(/^> (<.*> )?/g, '');
if (text) {
return text;
}
@ -126,7 +123,7 @@ export default {
/**
* Classes to set for the message. Currently only for "messageIn", TODO: - detect messageIn or messageOut.
*/
messageClasses() {
return {'messageIn':true,'from-admin':this.senderIsAdminOrModerator(this.event)}
},

2
src/components/profileInfoMixin.js
View file

@ -1,7 +1,7 @@
export default {
computed: {
user() {
if (!this.$matrix.matrixClient) {
if (!this.$matrix.ready) {
return null;
}
return this.$matrix.matrixClient.getUser(this.$matrix.currentUserId);

18
src/plugins/utils.js
View file

@ -546,19 +546,15 @@ class Util {
return t2.diff(t1, 'day');
}
formatDay(timestamp) {
dayDiffToday(timestamp) {
var then = dayjs(timestamp).endOf('day');
var now = dayjs().endOf('day');
const dayDiff = now.diff(then, 'day');
if (dayDiff < 1) {
return "Today";
} else if (dayDiff < 2) {
return "Yesterday";
} else if (dayDiff < 7) {
return "" + dayDiff + " days ago";
} else {
return then.format('L');
}
return now.diff(then, 'day');
}
formatDay(timestamp) {
var then = dayjs(timestamp).endOf('day');
return then.format('L');
}
formatRecordDuration(ms) {

54
src/services/matrix.service.js
View file

@ -391,8 +391,8 @@ export default {
// Invitation. Need to call "recalculate" to pick
// up room name, not sure why exactly.
room.recalculate();
this.reloadRooms();
}
this.reloadRooms();
},
onSessionLoggedOut() {
@ -409,12 +409,21 @@ export default {
// 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 = JSON.parse(this.$store.state.auth.user);
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);
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);
@ -688,10 +697,14 @@ export default {
for (const room of this.rooms) {
// Is the other member the one we are looking for?
if (this.isDirectRoomWith(room, userId)) {
var member = room.getMember(userId);
if (member && member.membership != "join") {
// Resend invite
this.matrixClient.invite(room.roomId, 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;
@ -703,6 +716,7 @@ export default {
const createRoomOptions = {
visibility: "private", // Not listed!
preset: "private_chat",
is_direct: true,
initial_state: [
{
type: "m.room.encryption",
@ -746,22 +760,18 @@ export default {
*/
isDirectRoomWith(room, userId) {
if (
room.selfMembership == "join" &&
room.getInvitedAndJoinedMemberCount() == 2
room.getJoinRule() == "invite" &&
room.getMembers().length == 2
) {
// Is the other member the one we are looking for?
if (
room
.getMembersWithMembership("join")
.some((item) => item.userId == userId)
) {
return true;
} else if (
room
.getMembersWithMembership("invite")
.some((item) => item.userId == userId)
) {
return true;
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;