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

More receipt fixes

Browse source
This commit is contained in:
N-Pex 2021-03-04 12:48:32 +01:00
parent 6e38fe2b08
commit 902fa3a171
2 changed files with 78 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

153
src/components/Chat.vue
View file

@ -358,7 +358,7 @@ export default {
RoomHistoryVisibility,
DebugEvent,
MessageOperations,
VoiceRecorder
VoiceRecorder,
},
data() {
@ -563,56 +563,57 @@ export default {
{}
);
const self = this;
this.timelineWindow.load(initialEventId, 20)
.then(() => {
console.log("This is", self);
self.events = self.timelineWindow.getEvents();
this.timelineWindow
.load(initialEventId, 20)
.then(() => {
console.log("This is", self);
self.events = self.timelineWindow.getEvents();
const getMoreIfNeeded = function _getMoreIfNeeded() {
const container = self.$refs.chatContainer;
if (
container.scrollHeight <= container.clientHeight &&
self.timelineWindow &&
self.timelineWindow.canPaginate(EventTimeline.BACKWARDS)
) {
return self.timelineWindow
.paginate(EventTimeline.BACKWARDS, 10, true, 5)
.then((success) => {
self.events = self.timelineWindow.getEvents();
if (success) {
return _getMoreIfNeeded.call(self);
} else {
return Promise.reject("Failed to paginate");
}
});
} else {
return Promise.resolve("Done");
}
}.bind(self);
getMoreIfNeeded()
.catch((err) => {
console.log("ERROR " + err);
})
.finally(() => {
self.initialLoadDone = true;
if (initialEventId) {
self.scrollToEvent(initialEventId);
const getMoreIfNeeded = function _getMoreIfNeeded() {
const container = self.$refs.chatContainer;
if (
container.scrollHeight <= container.clientHeight &&
self.timelineWindow &&
self.timelineWindow.canPaginate(EventTimeline.BACKWARDS)
) {
return self.timelineWindow
.paginate(EventTimeline.BACKWARDS, 10, true, 5)
.then((success) => {
self.events = self.timelineWindow.getEvents();
if (success) {
return _getMoreIfNeeded.call(self);
} else {
return Promise.reject("Failed to paginate");
}
});
} else {
return Promise.resolve("Done");
}
self.restartRRTimer();
});
})
.catch(err => {
console.log("Error fetching events!", err, this);
if (err.errcode == 'M_UNKNOWN' && initialEventId) {
// Try again without initial event!
this.onRoomJoined(null);
} else {
// Error. Done loading.
this.events = this.timelineWindow.getEvents();
this.initialLoadDone = true;
}
})
}.bind(self);
getMoreIfNeeded()
.catch((err) => {
console.log("ERROR " + err);
})
.finally(() => {
self.initialLoadDone = true;
if (initialEventId) {
self.scrollToEvent(initialEventId);
}
self.restartRRTimer();
});
})
.catch((err) => {
console.log("Error fetching events!", err, this);
if (err.errcode == "M_UNKNOWN" && initialEventId) {
// Try again without initial event!
this.onRoomJoined(null);
} else {
// Error. Done loading.
this.events = this.timelineWindow.getEvents();
this.initialLoadDone = true;
}
});
},
onRoomNotJoined() {
@ -1108,27 +1109,27 @@ export default {
// Already sent this or too old...
break;
}
// Is it an incoming event?
if (event.getSender() !== this.$matrix.currentUserId) {
// Send read receipt
this.$matrix.matrixClient
.sendReadReceipt(event)
.then(() => {
this.$matrix.matrixClient.setRoomReadMarkers(
this.room.roomId,
event.getId()
);
})
.then(() => {
console.log("RR sent for event: " + event.getId());
this.lastRR = event;
})
.catch((err) => {
console.log("Failed to update read marker: ", err);
})
.finally(() => {
this.restartRRTimer();
});
// Make sure it's not a local echo event...
if (!event.getId().startsWith("~")) {
// Send read receipt
this.$matrix.matrixClient
.sendReadReceipt(event)
.then(() => {
this.$matrix.matrixClient.setRoomReadMarkers(
this.room.roomId,
event.getId()
);
})
.then(() => {
console.log("RR sent for event: " + event.getId());
this.lastRR = event;
})
.catch((err) => {
console.log("Failed to update read marker: ", err);
})
.finally(() => {
this.restartRRTimer();
});
return; // Bail out here
}
@ -1161,12 +1162,12 @@ export default {
onVoiceRecording(event) {
util.sendImage(
this.$matrix.matrixClient,
this.roomId,
event.file,
undefined
);
}
this.$matrix.matrixClient,
this.roomId,
event.file,
undefined
);
},
},
};
</script>

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

@ -143,7 +143,7 @@ export default {
if (!this.$matrix.currentUser) {
return null;
}
return (this.$matrix.userDisplayName || this.$matrix.currentUser.userId.substring(1)).substring(0, 1).toUpperCase();
return (this.$matrix.userDisplayName || this.$matrix.currentUserId.substring(1)).substring(0, 1).toUpperCase();
}
},
methods: {