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

Jump to bottom

Encrypted Slack bridges #493

Merged
merged 44 commits into from
Sep 30, 2020
Merged

Encrypted Slack bridges #493

merged 44 commits into from
Sep 30, 2020

Conversation

Half-Shot
Copy link
Contributor

@Half-Shot Half-Shot commented Sep 17, 2020 •
edited
Loading

Depends on #491
Depends on matrix-org/matrix-appservice-bridge#231

TODO:

  • Encrypted DMs
  • Encrypted private rooms
  • Encrypted text
  • Encrypted images

@Half-Shot Half-Shot changed the title Encrypted Slack bridges WIP: Encrypted Slack bridges Sep 17, 2020
@Half-Shot Half-Shot mentioned this pull request Sep 17, 2020
Closed
@Half-Shot Half-Shot requested a review from jaller94 September 18, 2020 16:31
jaller94
jaller94 reviewed Sep 18, 2020
View reviewed changes
changelog.d/491.bugfix Outdated
@@ -0,0 +1 @@
Update `matrix-appservice-bridge` dependency to version `2.0`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Newsfile for this PR "493" is missing.

@Half-Shot
Copy link
Contributor Author

Tests pass locally. CI will continue to fail as it depends on a matrix-appservice-bridge PR

jaller94
jaller94 reviewed Sep 18, 2020
View reviewed changes
Copy link
Contributor

@jaller94 jaller94 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. I'm excited to try this out when it's ready for testing.

src/Main.ts Show resolved Hide resolved
src/BridgedRoom.ts Outdated Show resolved Hide resolved
src/BridgedRoom.ts Outdated Show resolved Hide resolved
@Half-Shot Half-Shot changed the title WIP: Encrypted Slack bridges Encrypted Slack bridges Sep 23, 2020
@Half-Shot Half-Shot requested a review from jaller94 September 29, 2020 14:08
jaller94
jaller94 approved these changes Sep 29, 2020
View reviewed changes
Copy link
Contributor

@jaller94 jaller94 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

.eslintrc.js Outdated Show resolved Hide resolved
@Half-Shot Half-Shot requested a review from jaller94 September 30, 2020 09:10
jaller94
jaller94 reviewed Sep 30, 2020
View reviewed changes
docs/bridge-encryption.md Outdated Show resolved Hide resolved
docs/bridge-encryption.md Outdated Show resolved Hide resolved
docs/bridge-encryption.md Outdated Show resolved Hide resolved
@Half-Shot
Wordsmith docs
fc42d62 
Co-authored-by: Christian Paul <[email protected]>
@Half-Shot Half-Shot merged commit 3a78c8f into develop Sep 30, 2020
@jaller94 jaller94 deleted the hs/encrypted-bridge branch September 30, 2020 10:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jaller94 jaller94 jaller94 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Half-Shot @jaller94