Compare commits

..

No commits in common. "2bcb2e042ddd6d4fc49d3115d730d73c7e83d4b2" and "800f51958da9be73433fa6301d1d70c7ab431af1" have entirely different histories.

4 changed files with 15 additions and 12 deletions

View File

@ -4,7 +4,7 @@
#/e2be #/e2be
python-olm>=3,<4 python-olm>=3,<4
pycryptodome>=3,<4 pycryptodome>=3,<4
unpaddedbase64>=1,<3 unpaddedbase64>=1,<2
#/metrics #/metrics
prometheus_client>=0.6,<0.18 prometheus_client>=0.6,<0.11

View File

@ -1705,7 +1705,7 @@ class MautrixController {
this.emailAppearObserver = new MutationObserver(changes => { this.emailAppearObserver = new MutationObserver(changes => {
for (const change of changes) { for (const change of changes) {
for (const node of change.addedNodes) { for (const node of change.addedNodes) {
const emailArea = node.querySelector("[class*='login_form_area']") const emailArea = node.querySelector("#login_email_area")
if (emailArea && !emailArea.classList.contains("MdNonDisp")) { if (emailArea && !emailArea.classList.contains("MdNonDisp")) {
window.__mautrixSendEmailCredentials() window.__mautrixSendEmailCredentials()
return return

View File

@ -210,7 +210,7 @@ export default class MessagesPuppeteer {
this.loginRunning = true this.loginRunning = true
await this.page.bringToFront() await this.page.bringToFront()
const loginContentArea = await this.page.waitForSelector("[class*='page_login']") const loginContentArea = await this.page.waitForSelector("#login_content")
switch (login_type) { switch (login_type) {
case "qr": { case "qr": {
@ -236,7 +236,10 @@ export default class MessagesPuppeteer {
return return
} }
await this.page.waitForSelector("[class*='login_form_area']", {visible: true}) const emailButton = await this.page.waitForSelector("#login_email_btn")
await emailButton.click()
await this.page.waitForSelector("#login_email_area", {visible: true})
this.login_email = login_data["email"] this.login_email = login_data["email"]
this.login_password = login_data["password"] this.login_password = login_data["password"]
await this._sendEmailCredentials() await this._sendEmailCredentials()
@ -1260,9 +1263,9 @@ export default class MessagesPuppeteer {
async _sendEmailCredentials() { async _sendEmailCredentials() {
this.log("Inputting login credentials") this.log("Inputting login credentials")
await this._enterText(await this.page.$("input[name='email']"), this.login_email) await this._enterText(await this.page.$("#line_login_email"), this.login_email)
await this._enterText(await this.page.$("input[name='password']"), this.login_password) await this._enterText(await this.page.$("#line_login_pwd"), this.login_password)
await this.page.click("button[class*='button_login']") await this.page.click("button#login_btn")
} }
_receiveQRChange(url) { _receiveQRChange(url) {

View File

@ -1,10 +1,10 @@
ruamel.yaml>=0.15.94,<0.18 ruamel.yaml>=0.15.35,<0.18
python-magic>=0.4,<0.5 python-magic>=0.4,<0.5
commonmark>=0.8,<0.10 commonmark>=0.8,<0.10
aiohttp>=3,<4 aiohttp>=3,<4
yarl>=1,<2 yarl>=1,<2
attrs>=19.1 attrs>=19.1
mautrix>=0.20.0,<0.21 mautrix>=0.9.2,<0.10
asyncpg>=0.20,<0.28 asyncpg>=0.20,<0.23
pillow>=4,<10 pillow>=4,<9
qrcode>=6,<7 qrcode>=6,<7