blaxpot
/
matrix-puppeteer-line
forked from fair/matrix-puppeteer-line
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Formatting fixes

This commit is contained in:
Tulir Asokan 2020-08-24 22:24:19 +03:00
parent 0480fcdf3b
commit ac3b47657e
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
puppet/src/contentscript.js
View File

@ -21,18 +21,17 @@
* @param {{[forwardDate]: boolean}} [option] - Extra options for parser * @param {{[forwardDate]: boolean}} [option] - Extra options for parser
* @return {Promise<Date>} * @return {Promise<Date>}
*/ */
window.__chronoParseDate = function (text, ref, option) { window.__chronoParseDate = function (text, ref, option) {}
}
/** /**
* @param {Set<string>} changes - The hrefs of the chats that changed. * @param {Set<string>} changes - The hrefs of the chats that changed.
* @return {Promise<void>}
*/ */
window.__mautrixReceiveChanges = function (changes) { window.__mautrixReceiveChanges = function (changes) {}
}
/** /**
* @param {string} url - The URL for the QR code. * @param {string} url - The URL for the QR code.
* @return {Promise<void>}
*/ */
window.__mautrixReceiveQR = function (url) { window.__mautrixReceiveQR = function (url) {}
}
class MautrixController { class MautrixController {
constructor() { constructor() {
@ -128,8 +127,10 @@ class MautrixController {
messages.push(this._parseMessage(messageDate, child)) messages.push(this._parseMessage(messageDate, child))
break break
case "mws-tombstone-message-wrapper": case "mws-tombstone-message-wrapper":
const dateText = child.querySelector("mws-relative-timestamp")?.innerText messageDate = await this._parseDate(
messageDate = await this._parseDate(dateText, messageDate) || messageDate child.querySelector("mws-relative-timestamp")?.innerText,
messageDate
) || messageDate
break break
} }
} }
@ -214,8 +215,10 @@ class MautrixController {
* @return {boolean} - Whether or not the image has been downloaded * @return {boolean} - Whether or not the image has been downloaded
*/ */
imageExists(id) { imageExists(id) {
const imageElement = document.querySelector(`mws-message-wrapper[msg-id="${id}"] mws-image-message-part .image-msg`) const imageElement = document.querySelector(
return !imageElement.classList.contains("not-rendered") && imageElement.getAttribute("src") !== "" `mws-message-wrapper[msg-id="${id}"] mws-image-message-part .image-msg`)
return !imageElement.classList.contains("not-rendered")
&& imageElement.getAttribute("src") !== ""
} }
/** /**
@ -226,8 +229,9 @@ class MautrixController {
* @return {Promise<string>} - The data URL (containing the mime type and base64 data) * @return {Promise<string>} - The data URL (containing the mime type and base64 data)
*/ */
async readImage(id) { async readImage(id) {
const imageElement = document.querySelector(`mws-message-wrapper[msg-id="${id}"] mws-image-message-part .image-msg`) const imageElement = document.querySelector(
const resp = await fetch(imageElement.getAttribute(src)) `mws-message-wrapper[msg-id="${id}"] mws-image-message-part .image-msg`)
const resp = await fetch(imageElement.getAttribute("src"))
const reader = new FileReader() const reader = new FileReader()
const promise = new Promise((resolve, reject) => { const promise = new Promise((resolve, reject) => {
reader.onload = () => resolve(reader.result) reader.onload = () => resolve(reader.result)

7
puppet/src/main.js
View File

@ -33,7 +33,7 @@ const configPath = args["--config"] || "config.json"
MessagesPuppeteer.executablePath = args["--browser"] || MessagesPuppeteer.executablePath MessagesPuppeteer.executablePath = args["--browser"] || MessagesPuppeteer.executablePath
MessagesPuppeteer.noSandbox = args["--no-sandbox"] MessagesPuppeteer.noSandbox = args["--no-sandbox"]
console.log("Reading config from", configPath) console.log("[Main] Reading config from", configPath)
const config = JSON.parse(fs.readFileSync(configPath).toString()) const config = JSON.parse(fs.readFileSync(configPath).toString())
MessagesPuppeteer.profileDir = config.profile_dir || MessagesPuppeteer.profileDir MessagesPuppeteer.profileDir = config.profile_dir || MessagesPuppeteer.profileDir
MessagesPuppeteer.disableDebug = !!config.disable_debug MessagesPuppeteer.disableDebug = !!config.disable_debug
@ -42,7 +42,10 @@ MessagesPuppeteer.url = config.url || MessagesPuppeteer.url
const api = new PuppetAPI(config.listen) const api = new PuppetAPI(config.listen)
function stop() { function stop() {
api.stop().then(() => process.exit(0), err => { api.stop().then(() => {
console.log("[Main] Everything stopped")
process.exit(0)
}, err => {
console.error("[Main] Error stopping:", err) console.error("[Main] Error stopping:", err)
process.exit(3) process.exit(3)
}) })