From 9f7e816b36ba96aef4a1818f0c0f4b8334097f56 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Thu, 30 Nov 2017 17:48:21 +0200 Subject: [PATCH] Use telegram-mtproto v3.2.7 to remove need for fix script --- README.md | 2 +- package-lock.json | 55 ++++++++++++++++++++++++++++++++-------- package.json | 3 +-- scripts/fix-auth-renewal | 30 ---------------------- 4 files changed, 47 insertions(+), 43 deletions(-) delete mode 100755 scripts/fix-auth-renewal diff --git a/README.md b/README.md index f5176057..3761db0d 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ A Telegram chat will be created once the bridge is stable enough. ## Usage ### Setup -0. Clone the repository and install packages with `npm install`. Also, you'll probably need to run `npm run fix-auth-renewal` to roll back telegram-mtproto to a version where server salt renewal works ([zerobias/telegram-mtproto#99](https://github.com/zerobias/telegram-mtproto/issues/99)) +0. Clone the repository and install packages with `npm install`. 1. Create a copy of `example-config.yaml` and fill out the fields. 2. Generate the appservice registration with `./mautrix-telegram -g`. You can use the `-c` and `-r` flags to change the location of the config and registration files. diff --git a/package-lock.json b/package-lock.json index f2c26b81..50dfe0e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,22 @@ "resolved": "https://registry.npmjs.org/@most/prelude/-/prelude-1.6.4.tgz", "integrity": "sha512-RsT1xRIEc+rCCTZPL3v/tAC+dX1qt1q00ZofEtCJEMEsVg7zT+WLXiVQdhcRqqh4baQTYmDPArXrQWyd7GkqAA==" }, + "@safareli/free": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@safareli/free/-/free-1.0.0.tgz", + "integrity": "sha1-bnPfLiLLy/x5y8rOCs+anEOp7Fo=", + "requires": { + "fantasy-land": "1.0.1", + "sanctuary-type-classes": "0.3.0" + }, + "dependencies": { + "sanctuary-type-classes": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/sanctuary-type-classes/-/sanctuary-type-classes-0.3.0.tgz", + "integrity": "sha1-SbknwDUzhna11G40jK07+/79MIc=" + } + } + }, "Base64": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz", @@ -116,11 +132,6 @@ "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", "dev": true }, - "apropos": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/apropos/-/apropos-0.6.2.tgz", - "integrity": "sha512-iz4Yk3iNe46RofpRq6vrAb+M66cwsnRLqkJHHNDxHsAl7ND4a7QCIx38Z0gd4LxOX/R8NOAcRh7VmOGTkYWU3g==" - }, "argparse": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", @@ -906,6 +917,11 @@ "es5-ext": "0.10.35" } }, + "daggy": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/daggy/-/daggy-0.0.1.tgz", + "integrity": "sha1-rpyTLJ9xNuZVoEr7Iei6rf0NNwc=" + }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -1617,6 +1633,20 @@ } } }, + "fantasy-combinators": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/fantasy-combinators/-/fantasy-combinators-0.0.1.tgz", + "integrity": "sha1-0YOIrtlL55CsQGkDH16gGDReM6E=" + }, + "fantasy-land": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fantasy-land/-/fantasy-land-1.0.1.tgz", + "integrity": "sha1-uc3W3KGJU5N3yE9HJPtyF64qZ3k=", + "requires": { + "daggy": "0.0.1", + "fantasy-combinators": "0.0.1" + } + }, "fast-deep-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", @@ -4157,15 +4187,15 @@ "dev": true }, "telegram-mtproto": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/telegram-mtproto/-/telegram-mtproto-3.2.11.tgz", - "integrity": "sha512-WZPC5TfZCtvBc+TQd6jX1WzcMEBn7w4EIKanusBP1nicFn6hIiUK2XXcmVnt+ObA6Aq1+GZht11qgTZb8JSPOQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/telegram-mtproto/-/telegram-mtproto-3.2.7.tgz", + "integrity": "sha512-hBuUqr10EPoa7oCS2MywqNhSJ7G+pjKkkjAOQg0Z+866MchW8at20QhvUupPGFaR0WpQ+eKbHw+Gfc1bbGsYOQ==", "requires": { "@goodmind/node-cryptojs-aes": "0.5.0", - "@most/prelude": "1.6.4", + "@safareli/free": "1.0.0", "ajv": "5.3.0", "ajv-keywords": "2.1.1", - "apropos": "0.6.2", + "apropos": "0.4.0", "axios": "0.16.2", "bluebird": "3.5.1", "detect-node": "2.0.3", @@ -4187,6 +4217,11 @@ "uuid": "3.1.0" }, "dependencies": { + "apropos": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/apropos/-/apropos-0.4.0.tgz", + "integrity": "sha512-S44zku+RHpZnlUUUVn/p+/12mgldrWuim1++Jf4RRR3YDvrfj+jUMSQhq1wHfK3PD6EwDUNAyiSo/uRh/VCK5g==" + }, "uuid": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", diff --git a/package.json b/package.json index 107a6cb7..b4e831a5 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "md5": "2.2.x", "sanitize-html": "1.16.x", "string-similarity": "1.2.x", - "telegram-mtproto": "3.x.x", + "telegram-mtproto": "3.2.7", "yamljs": "0.3.x" }, "devDependencies": { @@ -30,7 +30,6 @@ "jsdoc": "3.5.x" }, "scripts": { - "fix-auth-renewal": "./scripts/fix-auth-renewal", "gen-jsdoc": "./scripts/gen-jsdoc" } } diff --git a/scripts/fix-auth-renewal b/scripts/fix-auth-renewal deleted file mode 100755 index b1088d11..00000000 --- a/scripts/fix-auth-renewal +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -cd node_modules/ - -echo "=== Removing telegram-mtproto installed by npm ===" -rm -rf telegram-mtproto - -echo -echo "=== Cloning telegram-mtproto monorepo ===" -git clone https://github.com/zerobias/telegram-mtproto.git telegram-mtproto-monorepo - -cd telegram-mtproto-monorepo - -echo -echo "=== Checking out non-broken commit ===" -git checkout 083d8c4cd096502e9c347eb1f4a4191ca939842a - -cd packages/telegram-mtproto - -echo -echo "=== Installing npm dependencies ===" -npm install - -cd ../../.. - -echo -echo "=== Linking package from monorepo to node_modules ===" -ln -s telegram-mtproto-monorepo/packages/telegram-mtproto - -echo -echo "=== All done! Authentication should now be indefinitely persistent ==="