Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the matrix-bot-sdk for Matrix API calls #326

Merged
merged 27 commits into from
Aug 16, 2021
Merged

Use the matrix-bot-sdk for Matrix API calls #326

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
08bb8a4
Park changes for now
Half-Shot Mar 1, 2021
ebd8579
Merge remote-tracking branch 'origin/develop' into hs/bot-sdk
Half-Shot Apr 23, 2021
947c0a5
More intent.ts fiddling
Half-Shot Apr 23, 2021
a3dfda7
bits and bobs
Half-Shot May 3, 2021
fdab9c1
Merge remote-tracking branch 'origin/develop' into hs/bot-sdk
Half-Shot May 3, 2021
d10d15c
Make everything work with new intents
Half-Shot May 11, 2021
eecc972
More test bits
Half-Shot May 25, 2021
82a4365
More fiddling
Half-Shot Jun 9, 2021
e500a62
Merge branch 'hs/bot-sdk' of github.com:matrix-org/matrix-appservice-…
Half-Shot Jun 9, 2021
00dd7b7
Merge remote-tracking branch 'origin/develop' into hs/bot-sdk
Half-Shot Aug 3, 2021
ad35b00
Update to "matrix-bot-sdk": "^0.5.19"
Half-Shot Aug 3, 2021
f22c65f
Fixup more tests
Half-Shot Aug 3, 2021
89127bf
Unlock previous tests
Half-Shot Aug 3, 2021
ffa719a
Changes to make bridge work
Half-Shot Aug 9, 2021
77f02a3
Update tests
Half-Shot Aug 9, 2021
87d73f8
changelog
Half-Shot Aug 9, 2021
0f98f32
Update changelog.d/326.feature
Aug 9, 2021
afba818
Warn about legacy client once
Half-Shot Aug 10, 2021
0e0c8e0
Improve warning
Half-Shot Aug 10, 2021
fdcc71a
Make it warn noisly
Half-Shot Aug 10, 2021
cda7989
Merge branch 'hs/bot-sdk' of github.com:matrix-org/matrix-appservice-…
Half-Shot Aug 10, 2021
ffc62ed
Update src/bridge.ts
Half-Shot Aug 10, 2021
9f1e332
Merge remote-tracking branch 'origin/develop' into hs/bot-sdk
Half-Shot Aug 10, 2021
d98b3f6
Fix error codes
Half-Shot Aug 10, 2021
1d624d0
Fix getJoinedMembers response
Half-Shot Aug 10, 2021
b14eb77
Hook up prometheus metrics
Half-Shot Aug 10, 2021
263bfe7
more errcode cases
Half-Shot Aug 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelog.d/326.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()`.
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
392 changes: 170 additions & 222 deletions spec/integ/bridge.spec.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion spec/unit/app-service-bot.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe("AppServiceBot", function() {
}]
}
});
bot = new AppServiceBot(client, reg);
bot = new AppServiceBot(client, botUserId, reg);
});

describe("getMemberLists", function() {
Expand Down
199 changes: 92 additions & 107 deletions spec/unit/intent.spec.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading