aux/mx-puppet-xmpp
1
0
Fork 0
mirror of https://github.com/plantroon/mx-puppet-xmpp.git synced 2024-12-22 14:41:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

big update of dependency

Browse Source
This commit is contained in:
Sorunome 2020-04-13 16:00:19 +02:00
parent 49d0132f6f
commit ecda05d366
No known key found for this signature in database
GPG Key ID: B19471D07FC9BE9C
4 changed files with 50 additions and 2007 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2037
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -11,6 +11,7 @@
}, },
"author": "Sorunome", "author": "Sorunome",
"dependencies": { "dependencies": {
"@sorunome/skype-http": "^1.5.0",
"cheerio": "^1.0.0-rc.3", "cheerio": "^1.0.0-rc.3",
"command-line-args": "^5.1.1", "command-line-args": "^5.1.1",
"command-line-usage": "^5.0.5", "command-line-usage": "^5.0.5",
@ -22,7 +23,6 @@
"mx-puppet-bridge": "0.0.38-1", "mx-puppet-bridge": "0.0.38-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#8f1c71e7654ac5e04c31c552eff847f4ff63b8fa",
"tslint": "^5.17.0", "tslint": "^5.17.0",
"typescript": "^3.7.4" "typescript": "^3.7.4"
}, },

8
src/client.ts
View File

@ -13,10 +13,10 @@ limitations under the License.
import { Log, IRemoteRoom, Util } from "mx-puppet-bridge"; import { Log, IRemoteRoom, Util } from "mx-puppet-bridge";
import { EventEmitter } from "events"; import { EventEmitter } from "events";
import * as skypeHttp from "skype-http"; import * as skypeHttp from "@sorunome/skype-http";
import { Contact as SkypeContact } from "skype-http/dist/lib/types/contact"; import { Contact as SkypeContact } from "@sorunome/skype-http/dist/lib/types/contact";
import { NewMediaMessage as SkypeNewMediaMessage } from "skype-http/dist/lib/interfaces/api/api"; import { NewMediaMessage as SkypeNewMediaMessage } from "@sorunome/skype-http/dist/lib/interfaces/api/api";
import { Context as SkypeContext } from "skype-http/dist/lib/interfaces/api/context"; import { Context as SkypeContext } from "@sorunome/skype-http/dist/lib/interfaces/api/context";
import ExpireSet from "expire-set"; import ExpireSet from "expire-set";
const log = new Log("SkypePuppet:client"); const log = new Log("SkypePuppet:client");

10
src/skype.ts
View File

@ -16,10 +16,10 @@ import {
IRetList, IRetList,
} from "mx-puppet-bridge"; } from "mx-puppet-bridge";
import { Client } from "./client"; import { Client } from "./client";
import * as skypeHttp from "skype-http"; import * as skypeHttp from "@sorunome/skype-http";
import { Contact as SkypeContact } from "skype-http/dist/lib/types/contact"; import { Contact as SkypeContact } from "@sorunome/skype-http/dist/lib/types/contact";
import { NewMediaMessage as SkypeNewMediaMessage } from "skype-http/dist/lib/interfaces/api/api"; import { NewMediaMessage as SkypeNewMediaMessage } from "@sorunome/skype-http/dist/lib/interfaces/api/api";
import { UnexpectedHttpStatusError } from "skype-http/dist/lib/errors"; import { UnexpectedHttpStatusError } from "@sorunome/skype-http/dist/lib/errors";
import * as decodeHtml from "decode-html"; import * as decodeHtml from "decode-html";
import * as escapeHtml from "escape-html"; import * as escapeHtml from "escape-html";
import { MatrixMessageParser } from "./matrixmessageparser"; import { MatrixMessageParser } from "./matrixmessageparser";
@ -228,7 +228,7 @@ export class Skype {
await this.puppet.setPuppetData(puppetId, p.data); await this.puppet.setPuppetData(puppetId, p.data);
await this.puppet.sendStatusMessage(puppetId, "connected"); await this.puppet.sendStatusMessage(puppetId, "connected");
} catch (err) { } catch (err) {
log.error("Failed to connect", err); log.error("Failed to connect", err.body || err);
await this.puppet.sendStatusMessage(puppetId, "Failed to connect, reconnecting in a minute... " + err); await this.puppet.sendStatusMessage(puppetId, "Failed to connect, reconnecting in a minute... " + err);
setTimeout(async () => { setTimeout(async () => {
await this.startClient(puppetId); await this.startClient(puppetId);