stuff and things

This commit is contained in:
Sorunome 2020-04-01 18:09:21 +02:00
parent 7a4cc6b3bf
commit eb63cf4cdf
No known key found for this signature in database
GPG Key ID: B19471D07FC9BE9C
4 changed files with 14 additions and 8 deletions

10
package-lock.json generated
View File

@ -231,9 +231,9 @@
} }
}, },
"@types/tough-cookie": { "@types/tough-cookie": {
"version": "2.3.6", "version": "2.3.7",
"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.6.tgz", "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.7.tgz",
"integrity": "sha512-wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ==" "integrity": "sha512-rMQbgMGxnLsdn8e9aPVyuN+zMQLrZ2QW8xlv7eWS1mydfGXN+tsTKffcIzd8rGCcLdmi3xvQw2MDaZI1bBNTaw=="
}, },
"@types/undertaker": { "@types/undertaker": {
"version": "1.2.2", "version": "1.2.2",
@ -3619,8 +3619,8 @@
} }
}, },
"skype-http": { "skype-http": {
"version": "git://github.com/Sorunome/skype-http.git#3ee89d05d3ff78d7adae17fcba544cdb9b2c8966", "version": "git://github.com/Sorunome/skype-http.git#8f1c71e7654ac5e04c31c552eff847f4ff63b8fa",
"from": "git://github.com/Sorunome/skype-http.git#3ee89d05d3ff78d7adae17fcba544cdb9b2c8966", "from": "git://github.com/Sorunome/skype-http.git#8f1c71e7654ac5e04c31c552eff847f4ff63b8fa",
"requires": { "requires": {
"@types/cheerio": "^0.22.12", "@types/cheerio": "^0.22.12",
"@types/escape-html": "0.0.20", "@types/escape-html": "0.0.20",

View File

@ -21,7 +21,7 @@
"mx-puppet-bridge": "0.0.35-1", "mx-puppet-bridge": "0.0.35-1",
"node-emoji": "^1.10.0", "node-emoji": "^1.10.0",
"node-html-parser": "^1.2.13", "node-html-parser": "^1.2.13",
"skype-http": "git://github.com/Sorunome/skype-http#3ee89d05d3ff78d7adae17fcba544cdb9b2c8966", "skype-http": "git://github.com/Sorunome/skype-http#8f1c71e7654ac5e04c31c552eff847f4ff63b8fa",
"tslint": "^5.17.0", "tslint": "^5.17.0",
"typescript": "^3.7.4" "typescript": "^3.7.4"
}, },

View File

@ -222,7 +222,10 @@ export class Client extends EventEmitter {
} }
return await Util.DownloadFile(url, { return await Util.DownloadFile(url, {
cookies: this.api.context.cookies, cookies: this.api.context.cookies,
headers: { Authorization: "skype_token " + this.api.context.skypeToken.value }, headers: {
Authorization: "skypetoken=" + this.api.context.skypeToken.value,
RegistrationToken: this.api.context.registrationToken.raw,
},
}); });
} }

View File

@ -206,8 +206,11 @@ export class Skype {
}, MINUTE); }, MINUTE);
} else { } else {
log.error("baaaad error"); log.error("baaaad error");
await this.puppet.sendStatusMessage(puppetId, "Super bad error, stopping puppet. Please restart the service to start it up again. This is for debugging purposes and will not be needed in the future"); await this.puppet.sendStatusMessage(puppetId, "Super bad error, restarting in a minute. This is stupid. And will hopefully be fixed in the future.");
await this.stopClient(puppetId); await this.stopClient(puppetId);
setTimeout(async () => {
await this.startClient(puppetId);
}, MINUTE);
} }
}); });
try { try {