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

Add distinguishers #112

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add distinguishers #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ca6423
Add distinguishers
MaximilianGaedig Jul 28, 2022
28ddb82
Fix getting config and config name
MaximilianGaedig Jul 28, 2022
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
1 change: 1 addition & 0 deletions mautrix/bridge/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ def do_update(self, helper: ConfigUpdateHelper) -> None:
copy("bridge.encryption.rotation.messages")

copy("bridge.relay.enabled")
copy("bridge.relay.user_distinguishers")
copy_dict("bridge.relay.message_formats", override_existing_map=False)

copy("manhole.enabled")
Expand Down
21 changes: 21 additions & 0 deletions mautrix/bridge/portal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ async def apply_relay_message_format(
"formatted_body": content["formatted_body"],
"body": content.body,
"message": content.body,
"distinguisher": self._get_distinguisher(sender.mxid),
}
content.body = Template(tpl).safe_substitute(tpl_args)
if self.relay_formatted_body and "formatted_body" in content:
Expand Down Expand Up @@ -420,6 +421,26 @@ async def schedule_disappearing(self) -> None:
await msg.update()
asyncio.create_task(self._disappear_event(msg))

@staticmethod
def hash_user_id(val: UserID) -> int:
"""
A simple Matrix user ID hashing algorithm that matches what Element does.
Args:
val: the Matrix user ID.
Returns:
A 32-bit hash of the user ID.
"""
out = 0
for char in val:
out = (out << 5) - out + ord(char)
# Emulate JS's 32-bit signed bitwise OR `hash |= 0`
out = (out & 2**31 - 1) - (out & 2**31)
return abs(out)

def _get_distinguisher(self, user_id: UserID) -> str:
ruds = self.config["bridge.relay.user_distinguishers"] or []
return ruds[self.hash_user_id(user_id) % len(ruds)] if ruds else ""

async def _send_message(
self,
intent: IntentAPI,
Expand Down