- 
+
+
{{ $t("project.name") }}
@@ -131,7 +107,7 @@ import SelectLanguageDialog from "./SelectLanguageDialog.vue";
export default {
name: "Join",
- mixins: [LanguageMixin,rememberMeMixin],
+ mixins: [LanguageMixin, rememberMeMixin],
components: {
SelectLanguageDialog,
},
@@ -185,40 +161,23 @@ 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);
},
userAvatarLetter() {
if (!this.currentUser || !this.currentUser.userId) {
return null;
}
- return (
- this.currentUserDisplayName || this.currentUser.userId.substring(1)
- )
- .substring(0, 1)
- .toUpperCase();
+ return (this.currentUserDisplayName || this.currentUser.userId.substring(1)).substring(0, 1).toUpperCase();
},
getDisplayLanguage() {
let displayLanguages = [...this.getLanguages()];
- return displayLanguages.filter(lang => lang.display && lang.value !== this.$i18n.locale);
+ return displayLanguages.filter((lang) => lang.display && lang.value !== this.$i18n.locale);
},
activeLanguage() {
- let activeLanguages = [...this.getLanguages()]
- return activeLanguages.filter(lang => lang.value === this.$i18n.locale);
- }
- },
- filters: {
- removeHomeServer(roomName) {
- let lastIndexDash = roomName.lastIndexOf("-");
- let lastIndex = lastIndexDash > 0 ? lastIndexDash : roomName.lastIndexOf(":");
- return roomName ? roomName.substring(roomName.indexOf("#") + 1, lastIndex) : '';
- }
+ let activeLanguages = [...this.getLanguages()];
+ return activeLanguages.filter((lang) => lang.value === this.$i18n.locale);
+ },
},
watch: {
roomId: {
@@ -227,10 +186,8 @@ export default {
if (!value || (value && value == oldVal)) {
return; // No change.
}
- console.log(
- "Join: Current room changed to " + (value ? value : "null")
- );
- this.roomName = this.roomId;
+ console.log("Join: Current room changed to " + (value ? value : "null"));
+ this.roomName = this.removeHomeServer(this.roomId);
this.waitingForInfo = true;
const self = this;
@@ -243,10 +200,7 @@ export default {
const room = self.$matrix.getRoom(self.roomAliasOrId);
// Already joined?
- if (
- room &&
- room.hasMembershipState(self.currentUser.user_id, "join")
- ) {
+ if (room && room.hasMembershipState(self.currentUser.user_id, "join")) {
// Yes, go to room
self.$navigation.push(
{
@@ -274,16 +228,21 @@ 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: {
+ removeHomeServer(roomName) {
+ let lastIndexDash = roomName.lastIndexOf("-");
+ let lastIndex = lastIndexDash > 0 ? lastIndexDash : roomName.lastIndexOf(":");
+ return roomName ? roomName.substring(roomName.indexOf("#") + 1, lastIndex) : "";
+ },
getRoomInfo() {
if (this.roomId.startsWith("#")) {
this.$matrix
.getPublicRoomInfo(this.roomId)
.then((room) => {
console.log("Found room:", room);
- this.roomName = room.name;
+ this.roomName = this.removeHomeServer(room.name);
this.roomAvatar = room.avatar;
})
.catch((err) => {
@@ -292,11 +251,26 @@ export default {
.finally(() => {
this.waitingForInfo = false;
});
+ } else if (this.roomId.startsWith("@")) {
+ // Direct chat with user
+ this.$matrix
+ .getPublicUserInfo(this.roomId)
+ .then((info) => {
+ console.log("Got user info:", info);
+ this.roomName = info.displayname;
+ this.roomAvatar = info.avatar;
+ })
+ .catch((err) => {
+ console.log("Failed to get user info: ", err);
+ })
+ .finally(() => {
+ this.waitingForInfo = false;
+ });
} else {
// Private room, try to get name
const room = this.$matrix.getRoom(this.roomId);
if (room) {
- this.roomName = room.name || this.roomName;
+ this.roomName = this.removeHomeServer(room.name || this.roomName);
}
this.waitingForInfo = false;
}
@@ -336,28 +310,16 @@ export default {
setProfileData = true;
// Set display name and avatar directly on the matrix object.
- if (
- this.selectedProfile.name &&
- this.selectedProfile.name.length > 0
- ) {
+ if (this.selectedProfile.name && this.selectedProfile.name.length > 0) {
this.$matrix.userDisplayName = this.selectedProfile.name;
}
}
- if (
- !setProfileData ||
- !this.selectedProfile.name ||
- this.selectedProfile.name.length == 0
- ) {
+ if (!setProfileData || !this.selectedProfile.name || this.selectedProfile.name.length == 0) {
return Promise.resolve(user);
} else {
- console.log(
- "Join: Set display name to: " + this.selectedProfile.name
- );
- return this.$matrix.matrixClient.setDisplayName(
- this.selectedProfile.name,
- undefined
- );
+ console.log("Join: Set display name to: " + this.selectedProfile.name);
+ return this.$matrix.matrixClient.setDisplayName(this.selectedProfile.name, undefined);
}
}.bind(this)
)
@@ -368,24 +330,26 @@ export default {
return Promise.resolve("no avatar");
} else {
console.log("Join: Updating avatar");
- return util.setAvatar(
- this.$matrix,
- this.selectedProfile.image,
- function (progress) {
- console.log("Progress: " + JSON.stringify(progress));
- }
- );
+ return util.setAvatar(this.$matrix, this.selectedProfile.image, function (progress) {
+ console.log("Progress: " + JSON.stringify(progress));
+ });
}
}.bind(this)
)
- .then(
- function (ignoreduser) {
+ .then((ignoreduser) => {
+ if (this.roomId.startsWith("@")) {
+ // start direct chat with user
+ return this.$matrix.getOrCreatePrivateChat(this.roomId).then((room) => {
+ this.$matrix.setCurrentRoomId(room.roomId);
+ return room;
+ });
+ } else {
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)
- )
+ }
+ })
.then((ignoredRoom) => {
this.loading = false;
this.loadingMessage = null;
@@ -418,11 +382,7 @@ export default {
mounted() {
this.$matrix.on("Room.myMembership", this.onMyMembership);
this.availableAvatars = util.getDefaultAvatars();
- this.selectAvatar(
- this.availableAvatars[
- Math.floor(Math.random() * this.availableAvatars.length)
- ]
- );
+ this.selectAvatar(this.availableAvatars[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"
@@ -431,10 +391,10 @@ export default {
},
destroyed() {
this.$matrix.off("Room.myMembership", this.onMyMembership);
- }
+ },
};
\ No newline at end of file
+@import "@/assets/css/join.scss";
+
diff --git a/src/plugins/utils.js b/src/plugins/utils.js
index a054390..79a8e0e 100644
--- a/src/plugins/utils.js
+++ b/src/plugins/utils.js
@@ -431,6 +431,13 @@ class Util {
return null;
}
+ sanitizeUserId(userId) {
+ if (userId && userId.match(/^@.+$/)) {
+ return userId;
+ }
+ return null;
+ }
+
getFirstVisibleElement(parentNode) {
const visible = this.findVisibleElements(parentNode);
if (visible && visible.length > 0) {
diff --git a/src/router/index.js b/src/router/index.js
index 4ec0a32..ca115f5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -65,6 +65,11 @@ const routes = [
name: 'Join',
component: Join
},
+ {
+ path: '/user/:userId?',
+ name: 'User',
+ component: Join
+ },
{
path: '/invite/:roomId?',
name: 'Invite',
@@ -113,6 +118,11 @@ router.beforeEach((to, from, next) => {
//Invite to public room
authRequired = false;
}
+ } else if (to.name == 'User') {
+ if (to.params.userId) {
+ const roomId = util.sanitizeUserId(to.params.userId);
+ router.app.$matrix.setCurrentRoomId(roomId);
+ }
} else if (to.name == 'Invite') {
if (to.params.roomId) {
const roomId = util.sanitizeRoomId(to.params.roomId);
diff --git a/src/services/matrix.service.js b/src/services/matrix.service.js
index 065b914..158c971 100644
--- a/src/services/matrix.service.js
+++ b/src/services/matrix.service.js
@@ -378,7 +378,6 @@ export default {
},
onRoom(ignoredroom) {
- console.log("Got room", ignoredroom);
this.reloadRooms();
this.updateNotificationCount();
},
@@ -453,7 +452,6 @@ export default {
);
}
});
- console.log("Reload rooms", updatedRooms);
Vue.set(this, "rooms", updatedRooms);
const currentRoom = this.getRoom(this.$store.state.currentRoomId);
if (this.currentRoom != currentRoom) {
@@ -819,17 +817,12 @@ export default {
return this.matrixClient.uploadContent(file, opts);
},
- 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];
-
+ /**
+ * Get a matrix client that can be used for public queries. If we are logged in, this is the normal
+ * matrix client. If not, we create a temp one with a temp password.
+ * @returns A MatrixClient that can be used for public queries
+ */
+ getPublicQueryMatrixClient() {
var clientPromise;
if (this.matrixClient) {
clientPromise = this.getMatrixClient().then(() => {
@@ -896,6 +889,55 @@ export default {
return matrixClient;
});
}
+ return clientPromise;
+ },
+
+ getPublicUserInfo(userId) {
+ if (!userId) {
+ return Promise.reject("Invalid parameters");
+ }
+
+ const parts = userId.split(":");
+ if (parts.length != 2) {
+ return Promise.reject("Unknown home server");
+ }
+
+ 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);
+ });
+ },
+
+ 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) {