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

Fix room avatars

Browse source
This commit is contained in:
N-Pex 2025-03-31 17:30:12 +02:00
parent b6f7f75fdd
commit 8e7e6cf3f7
3 changed files with 39 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/components/AuthedImage.vue
View file

@ -15,30 +15,16 @@ export default {
},
},
},
mounted() {
if (this.src) {
console.error("GOT URL", this.src);
if (this.$matrix.useAuthedMedia) {
axios
.get(this.src, { responseType: "blob", headers: {
Authorization: `Bearer ${this.$matrix.matrixClient.getAccessToken()}`,
}})
.then((response) => {
this.imageSrc = URL.createObjectURL(response.data);
})
.catch((err) => {
console.log("Download error: ", err);
});
} else {
this.imageSrc = this.src;
}
}
},
destroyed() {
if (this.imageSrc && this.src != this.imageSrc) {
const url = this.imageSrc;
this.imageSrc = null;
URL.revokeObjectURL(url);
this.unloadSrc();
},
watch: {
src: {
immediate: true,
handler(newValue) {
this.unloadSrc();
this.loadSrc();
}
}
},
data() {
@ -47,6 +33,33 @@ export default {
}
},
methods: {
loadSrc() {
if (this.src) {
if (this.$matrix.useAuthedMedia) {
axios
.get(this.src, {
responseType: "blob", headers: {
Authorization: `Bearer ${this.$matrix.matrixClient.getAccessToken()}`,
}
})
.then((response) => {
this.imageSrc = URL.createObjectURL(response.data);
})
.catch((err) => {
console.log("Download error: ", err);
});
} else {
this.imageSrc = this.src;
}
}
},
unloadSrc() {
if (this.imageSrc && this.src != this.imageSrc) {
const url = this.imageSrc;
this.imageSrc = null;
URL.revokeObjectURL(url);
}
}
}
};
</script>

5
src/components/RoomAvatarPicker.vue
View file

@ -58,10 +58,7 @@ export default {
self.isRoomAvatarLoaded = true;
}
}
).then((url) => {
console.error("UPDATE AVATAR", url);
this.room.avatar = url;
})
)
},
handleRoomPickedAvatar(event) {
if (event.target.files && event.target.files[0]) {

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

@ -524,9 +524,7 @@ export default {
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, this.useAuthedMedia));
}
Vue.set(room, "avatar", room.getAvatarUrl(this.matrixClient.getHomeserverUrl(), 80, 80, "scale", true, this.useAuthedMedia));
});
Vue.set(this, "rooms", updatedRooms);
@ -1236,7 +1234,7 @@ export default {
(roomId.startsWith("!") && room.room_id == roomId)
) {
if (room.avatar_url) {
room.avatar = client.mxcUrlToHttp(room.avatar_url, 80, 80, "scale", true, undefined, useAuthedMedia);
Vue.set(room, "avatar", client.mxcUrlToHttp(room.avatar_url, 80, 80, "scale", false, undefined, useAuthedMedia));
}
return Promise.resolve(room);
}