fair/matrix-puppeteer-line
fair
/
matrix-puppeteer-line
3
0
Fork 3
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

Fix image/file sending

This commit is contained in:
Andrew Ferrazzutti 2021-05-06 00:43:26 -04:00
parent 2117685df7
commit a2a21927cd
1 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
puppet/src/contentscript.js
View File

@ -324,10 +324,9 @@ class MautrixController {
this.promiseOwnMsgResolve = resolve this.promiseOwnMsgResolve = resolve
this.promiseOwnMsgReject = reject this.promiseOwnMsgReject = reject
setTimeout(() => { setTimeout(() => {
if (observer) { if (this.promiseOwnMsgReject) {
console.log("Timeout!") console.log("Timeout!")
this._promiseOwnMsgReset() this._rejectOwnMessage()
reject()
} }
}, timeoutLimitMillis) }, timeoutLimitMillis)
}) })
@ -745,33 +744,29 @@ class MautrixController {
} }
_observeOwnMessage(msgList) { _observeOwnMessage(msgList) {
if (!this.promiseOwnMsgSuccessSelector && !this.promiseOwnMsgFailureSelector) { if (!this.promiseOwnMsgSuccessSelector) {
// Not waiting for a pending sent message // Not waiting for a pending sent message
return false return false
} }
if (this.visibleSuccessObserver || this.visibleFailureObserver) { if (this.visibleSuccessObserver) {
// Already found a element that we're waiting on becoming visible // Already found a element that we're waiting on becoming visible
return true return true
} }
for (const ownMsg of msgList.filter(msg => msg.classList.contains("mdRGT07Own"))) { for (const ownMsg of msgList.filter(msg => msg.classList.contains("mdRGT07Own"))) {
const successElement = const successElement =
this.promiseOwnMsgSuccessSelector &&
ownMsg.querySelector(this.promiseOwnMsgSuccessSelector) ownMsg.querySelector(this.promiseOwnMsgSuccessSelector)
if (successElement) { if (successElement) {
if (successElement.classList.contains("MdNonDisp")) { if (successElement.classList.contains("MdNonDisp")) {
console.log("Invisible success, wait") console.log("Invisible success")
console.log(successElement) console.log(successElement)
const msgID = +ownMsg.getAttribute("data-local-id")
this.visibleSuccessObserver = new MutationObserver(
this._getOwnVisibleCallback(msgID))
this.visibleSuccessObserver.observe(
successElement,
{ attributes: true, attributeFilter: ["class"] })
} else { } else {
console.debug("Already visible success, must not be it") console.debug("Already visible success, must not be it")
console.debug(successElement) console.debug(successElement)
continue
} }
} else {
continue
} }
const failureElement = const failureElement =
@ -779,22 +774,34 @@ class MautrixController {
ownMsg.querySelector(this.promiseOwnMsgFailureSelector) ownMsg.querySelector(this.promiseOwnMsgFailureSelector)
if (failureElement) { if (failureElement) {
if (failureElement.classList.contains("MdNonDisp")) { if (failureElement.classList.contains("MdNonDisp")) {
console.log("Invisible failure, wait") console.log("Invisible failure")
console.log(failureElement) console.log(failureElement)
this.visibleFailureObserver = new MutationObserver(
this._getOwnVisibleCallback())
this.visibleFailureObserver.observe(
failureElement,
{ attributes: true, attributeFilter: ["class"] })
} else { } else {
console.debug("Already visible failure, must not be it") console.debug("Already visible failure, must not be it")
console.log(failureElement) console.log(failureElement)
continue
} }
} else if (this.promiseOwnMsgFailureSelector) {
continue
} }
if (this.visibleSuccessObserver || this.visibleFailureObserver) { console.log("Found invisible element, wait")
return true const msgID = +ownMsg.getAttribute("data-local-id")
this.visibleSuccessObserver = new MutationObserver(
this._getOwnVisibleCallback(msgID))
this.visibleSuccessObserver.observe(
successElement,
{ attributes: true, attributeFilter: ["class"] })
if (this.promiseOwnMsgFailureSelector) {
this.visibleFailureObserver = new MutationObserver(
this._getOwnVisibleCallback())
this.visibleFailureObserver.observe(
failureElement,
{ attributes: true, attributeFilter: ["class"] })
} }
return true
} }
return false return false
} }
@ -814,6 +821,7 @@ class MautrixController {
} }
_resolveOwnMessage(msgID) { _resolveOwnMessage(msgID) {
if (!this.promiseOwnMsgResolve) return
const resolve = this.promiseOwnMsgResolve const resolve = this.promiseOwnMsgResolve
this._promiseOwnMsgReset() this._promiseOwnMsgReset()
@ -821,7 +829,8 @@ class MautrixController {
() => resolve(msgID)) () => resolve(msgID))
} }
_rejectOwnMessage(failureElement) { _rejectOwnMessage(failureElement = null) {
if (!this.promiseOwnMsgReject) return
const reject = this.promiseOwnMsgReject const reject = this.promiseOwnMsgReject
this._promiseOwnMsgReset() this._promiseOwnMsgReset()