forked from mautrix/imessage
-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Feat double puppeting #4
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… secret map as JSON string
jantomgid
force-pushed
the
feat-double-puppeting
branch
4 times, most recently
from
July 16, 2024 11:23
09586c7
to
3fd01d4
Compare
jantomgid
force-pushed
the
feat-double-puppeting
branch
from
July 16, 2024 12:17
3fd01d4
to
a57f327
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request includes significant changes to the
mautrix-imessage
bridge, focusing on improving the bridge's double puppeting capabilities, updating the Dockerfile, and adding a new configuration file. Double puppeting allows a user's Matrix and iMessage accounts to appear as the same user in a bridged room.Here are the most important changes:
Double Puppeting Improvements:
config/bridge.go
: AddedDoublePuppetConfig
to theBridgeConfig
struct to support double puppeting. Also addedGetDoublePuppetConfig()
method to return the double puppeting configuration. [1] [2]config/config.go
: AddedCanAutoDoublePuppet()
andGetDoublePuppetSecret()
methods to theConfig
struct. These methods check if automatic double puppeting is possible for a given user ID and retrieve the shared secret for double puppeting, respectively.config/upgrade.go
: Updated theDoUpgrade()
function to handle the migration of the double puppeting shared secret map.custompuppet.go
: Removed unnecessary imports related to double puppeting.Dockerfile Updates:
Dockerfile.ci
: Commented out the copying and execution ofdocker-run.sh
andexample-config.yaml
, and added a new entry point and command formautrix-imessage
.New Configuration File:
config.yaml
: Added a new configuration file for themautrix-imessage
bridge. This file includes various settings for the bridge, such as homeserver details, application service details, iMessage connection config, bridge config, and logging config.Minor Changes:
build.sh
: Added a line to print the exit status of thego build
command.