Merge pull request #326 from matrix-org/hs/bot-sdk

Use the matrix-bot-sdk for Matrix API calls

changelog.d/326.feature

@@ -0,0 +1,2 @@
+**Breaking**: This library now uses the [matrix-bot-sdk](https://github.com/turt2live/matrix-bot-sdk) for Matrix requests. Previously, the bridge used the matrix-js-sdk which
+is now deprecated in this release, but can still be accessed via `Intent.getClient()`.

package.json

@@ -34,6 +34,7 @@
     "extend": "^3.0.2",
     "is-my-json-valid": "^2.20.5",
     "js-yaml": "^4.0.0",
+    "matrix-bot-sdk": "^0.5.19",
     "matrix-appservice": "^0.8.0",
     "matrix-js-sdk": "^9.9.0",
     "nedb": "^1.8.0",

spec/unit/app-service-bot.spec.js

@@ -24,7 +24,7 @@ describe("AppServiceBot", function() {
                 }]
             }
         });
-        bot = new AppServiceBot(client, reg);
+        bot = new AppServiceBot(client, botUserId, reg);
     });
 
     describe("getMemberLists", function() {

spec/unit/room-upgrade-handler.spec.js

@@ -35,7 +35,7 @@ describe("RoomUpgradeHandler", () => {
             let joined;
             const bridge = {
                 getIntent: () => ({
-                    join: (roomId) => { joined = roomId; return Promise.reject({errcode: "M_FORBIDDEN"}); },
+                    join: (roomId) => { joined = roomId; return Promise.reject({body: {errcode: "M_FORBIDDEN"}}); },
                 }),
             };
             const ruh = new RoomUpgradeHandler({}, bridge);
@@ -91,7 +91,7 @@ describe("RoomUpgradeHandler", () => {
             let joined;
             const bridge = {
                 getIntent: () => ({
-                    join: (roomId) => { joined = roomId; return Promise.reject({errcode: "M_FORBIDDEN"}); },
+                    join: (roomId) => { joined = roomId; return Promise.reject({body: {errcode: "M_FORBIDDEN"}}); },
                 }),
             };
             const ruh = new RoomUpgradeHandler({}, bridge);

spec/unit/state-lookup.spec.js

@@ -79,25 +79,25 @@ describe("StateLookup", function() {
         it("should fail the promise if the HTTP call returns 4xx", function(done) {
             cli.roomState.and.callFake(function(roomId) {
                 return Promise.reject({
-                    httpStatus: 403
+                    statusCode: 403
                 });
             });
 
             lookup.trackRoom("!foo:bar").catch(function(err) {
-                expect(err.httpStatus).toBe(403);
+                expect(err.statusCode).toBe(403);
                 done();
             });
         });
 
         it("should fail the promise if the HTTP call returns 5xx", function(done) {
             cli.roomState.and.callFake(function(roomId) {
                 return Promise.reject({
-                    httpStatus: 500
+                    statusCode: 500
                 });
             });
 
             lookup.trackRoom("!foo:bar").catch(function(err) {
-                expect(err.httpStatus).toBe(500);
+                expect(err.statusCode).toBe(500);
                 done();
             });
         });