summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Kaye <1917473+michaelkaye@users.noreply.github.com>2018-07-10 15:59:26 +0100
committerGitHub <noreply@github.com>2018-07-10 15:59:26 +0100
commit261e4f2542a9d145cc1d37463ef6cef96bdd4cc4 (patch)
tree8e2745852897fceb5eac93f6040f67a17c8f484f
parentMerge pull request #3487 from matrix-org/matthew/dinsic-encrypt-for-invited-u... (diff)
parentimprove domain matches (diff)
downloadsynapse-261e4f2542a9d145cc1d37463ef6cef96bdd4cc4.tar.xz
Merge pull request #3502 from matrix-org/matthew/dinsic-tweak-display-names
tweak dinsic display names
-rw-r--r--synapse/rest/client/v2_alpha/register.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py

index fe9c02f305..97e4891f3f 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py
@@ -421,9 +421,17 @@ class RegisterRestServlet(RestServlet): # XXX: a nasty heuristic to turn an email address into # a displayname, as part of register_mxid_from_3pid parts = address.replace('.', ' ').split('@') + org_parts = parts[1].split(' ') + + if org_parts[-2] == "matrix" and org_parts[-1] == "org": + org = "Tchap Admin" + elif org_parts[-2] == "gouv" and org_parts[-1] == "fr": + org = org_parts[-3] if len(org_parts) > 2 else org_parts[-2] + else: + org = org_parts[-2] + desired_display_name = ( - capwords(parts[0]) + - " [" + capwords(parts[1].split(' ')[0]) + "]" + capwords(parts[0]) + " [" + capwords(org) + "]" ) elif ( self.hs.config.register_mxid_from_3pid == 'msisdn' and