Browse Source

Riot -> Element (#308)

Fixes #306

This PR:

- Converts email templates from Windows line endings to Unix line endings (this confused me for a good 10m, as I thought I had accidentally added them)
- Converts instances of Riot to Element
- Converts riot.im/app links to app.element.io
- Replaces logos with those hosted on static.element.io
Andrew Morgan 3 years ago
parent
commit
fc20a96fe0

+ 1 - 0
changelog.d/308.misc

@@ -0,0 +1 @@
+Replace instances of Riot with Element.

+ 144 - 144
res/invite_template.eml

@@ -1,144 +1,144 @@
-Date: %(date)s
-From: %(from)s
-To: %(to)s
-Message-ID: %(messageid)s
-Subject: %(subject_header_value)s
-MIME-Version: 1.0
-Content-Type: multipart/alternative; 
-	boundary="7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ"
-
---7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
-Content-Type: text/plain; charset=UTF-8
-Content-Disposition: inline
-
-Hi,
-
-%(sender_display_name)s has invited you into a room %(bracketed_room_name)s on
-Matrix. To join the conversation, either pick a Matrix client from
-https://matrix.org/docs/projects/try-matrix-now.html or use the single-click
-link below to join via Riot (requires Chrome, Firefox, Safari, iOS or Android)
-
-https://riot.im/app/#/room/%(room_id_forurl)s?email=%(to_forurl)s&signurl=https%%3A%%2F%%2Fmatrix.org%%2F_matrix%%2Fidentity%%2Fapi%%2Fv1%%2Fsign-ed25519%%3Ftoken%%3D%(token)s%%26private_key%%3D%(ephemeral_private_key)s&room_name=%(room_name_forurl)s&room_avatar_url=%(room_avatar_url_forurl)s&inviter_name=%(sender_display_name_forurl)s&guest_access_token=%(guest_access_token_forurl)s&guest_user_id=%(guest_user_id_forurl)s
-
-
-About Matrix:
-
-Matrix.org is an open standard for interoperable, decentralised, real-time communication
-over IP, supporting group chat, file transfer, voice and video calling, integrations to
-other apps, bridges to other communication systems and much more. It can be used to power
-Instant Messaging, VoIP/WebRTC signalling, Internet of Things communication - or anywhere
-you need a standard HTTP API for publishing and subscribing to data whilst tracking the
-conversation history.
-
-Matrix defines the standard, and provides open source reference implementations of
-Matrix-compatible Servers, Clients, Client SDKs and Application Services to help you
-create new communication solutions or extend the capabilities and reach of existing ones.
-
-Thanks,
-
-Matrix
-
---7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
-Content-Type: multipart/related;
-	boundary="M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR";
-	type="text/html"
-
---M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR
-Content-Type: text/html; charset=UTF-8
-Content-Disposition: inline
-
-<!doctype html>
-<html lang="en">
-    <head>
-        <style type="text/css">
-body {
-    margin: 0px;
-}
-
-pre, code {
-    word-break: break-word;
-    white-space: pre-wrap;
-}
-
-#page {
-    font-family: 'Open Sans', Helvetica, Arial, Sans-Serif;
-    font-color: #454545;
-    font-size: 12pt;
-    width: 100%%;
-    padding: 20px;
-}
-
-#inner {
-    width: 640px;
-}
-
-.header {
-    width: 100%%;
-    height: 87px;
-    color: #454545;
-    border-bottom: 4px solid #e5e5e5;
-}
-
-.logo {
-    text-align: right;
-    margin-left: 20px;
-}
-        </style>
-    </head>
-    <body>
-        <table id="page">
-            <tr>
-                <td> </td>
-                <td id="inner">
-                    <table class="header">
-                        <tr>
-                            <td>
-                            </td>
-                            <td class="logo">
-                                    <img src="http://matrix.org/img/matrix-120x51.png" width="120" height="51" alt="[matrix]"/>
-                            </td>
-                        </tr>
-                    </table>
-
-<p>Hi,</p>
-
-<p>%(sender_display_name_forhtml)s has invited you into a room %(bracketed_room_name_forhtml)s on
-Matrix. To join the conversation, either <a href="https://matrix.org/docs/projects/try-matrix-now.html">pick a Matrix client</a> or use the single-click
-link below to join via Riot (requires
-<a href="https://www.google.com/chrome">Chrome</a>,
-<a href="https://www.getfirefox.com">Firefox</a> or
-<a href="https://www.apple.com/safari">Safari</a> on the web,
-or iOS or Android on mobile.)</p>
-</p>
-
-<p>
-    <a
-    href="https://riot.im/app/#/room/%(room_id_forurl)s?email=%(to_forurl)s&signurl=https%%3A%%2F%%2Fmatrix.org%%2F_matrix%%2Fidentity%%2Fapi%%2Fv1%%2Fsign-ed25519%%3Ftoken%%3D%(token)s%%26private_key%%3D%(ephemeral_private_key)s&room_name=%(room_name_forurl)s&room_avatar_url=%(room_avatar_url_forurl)s&inviter_name=%(sender_display_name_forurl)s&guest_access_token=%(guest_access_token_forurl)s&guest_user_id=%(guest_user_id_forurl)s">Join the conversation.</a>
-</p>
-
-<br>
-<p>About Matrix:</p>
-
-<p>Matrix.org is an open standard for interoperable, decentralised, real-time communication
-over IP, supporting group chat, file transfer, voice and video calling, integrations to
-other apps, bridges to other communication systems and much more. It can be used to power
-Instant Messaging, VoIP/WebRTC signalling, Internet of Things communication - or anywhere
-you need a standard HTTP API for publishing and subscribing to data whilst tracking the
-conversation history.</p>
-
-<p>Matrix defines the standard, and provides open source reference implementations of
-Matrix-compatible Servers, Clients, Client SDKs and Application Services to help you
-create new communication solutions or extend the capabilities and reach of existing ones.</p>
-
-<p>Thanks,</p>
-
-<p>Matrix</p>
-                </td>
-                <td> </td>
-            </tr>
-        </table>
-    </body>
-</html>
---M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR--
-
---7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ--
+Date: %(date)s
+From: %(from)s
+To: %(to)s
+Message-ID: %(messageid)s
+Subject: %(subject_header_value)s
+MIME-Version: 1.0
+Content-Type: multipart/alternative; 
+	boundary="7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ"
+
+--7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
+Content-Type: text/plain; charset=UTF-8
+Content-Disposition: inline
+
+Hi,
+
+%(sender_display_name)s has invited you into a room %(bracketed_room_name)s on
+Matrix. To join the conversation, either pick a Matrix client from
+https://matrix.org/docs/projects/try-matrix-now.html or use the single-click
+link below to join via Element (requires Chrome, Firefox, Safari, iOS or Android)
+
+https://app.element.io/#/room/%(room_id_forurl)s?email=%(to_forurl)s&signurl=https%%3A%%2F%%2Fmatrix.org%%2F_matrix%%2Fidentity%%2Fapi%%2Fv1%%2Fsign-ed25519%%3Ftoken%%3D%(token)s%%26private_key%%3D%(ephemeral_private_key)s&room_name=%(room_name_forurl)s&room_avatar_url=%(room_avatar_url_forurl)s&inviter_name=%(sender_display_name_forurl)s&guest_access_token=%(guest_access_token_forurl)s&guest_user_id=%(guest_user_id_forurl)s
+
+
+About Matrix:
+
+Matrix.org is an open standard for interoperable, decentralised, real-time communication
+over IP, supporting group chat, file transfer, voice and video calling, integrations to
+other apps, bridges to other communication systems and much more. It can be used to power
+Instant Messaging, VoIP/WebRTC signalling, Internet of Things communication - or anywhere
+you need a standard HTTP API for publishing and subscribing to data whilst tracking the
+conversation history.
+
+Matrix defines the standard, and provides open source reference implementations of
+Matrix-compatible Servers, Clients, Client SDKs and Application Services to help you
+create new communication solutions or extend the capabilities and reach of existing ones.
+
+Thanks,
+
+Matrix
+
+--7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
+Content-Type: multipart/related;
+	boundary="M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR";
+	type="text/html"
+
+--M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR
+Content-Type: text/html; charset=UTF-8
+Content-Disposition: inline
+
+<!doctype html>
+<html lang="en">
+    <head>
+        <style type="text/css">
+body {
+    margin: 0px;
+}
+
+pre, code {
+    word-break: break-word;
+    white-space: pre-wrap;
+}
+
+#page {
+    font-family: 'Open Sans', Helvetica, Arial, Sans-Serif;
+    font-color: #454545;
+    font-size: 12pt;
+    width: 100%%;
+    padding: 20px;
+}
+
+#inner {
+    width: 640px;
+}
+
+.header {
+    width: 100%%;
+    height: 87px;
+    color: #454545;
+    border-bottom: 4px solid #e5e5e5;
+}
+
+.logo {
+    text-align: right;
+    margin-left: 20px;
+}
+        </style>
+    </head>
+    <body>
+        <table id="page">
+            <tr>
+                <td> </td>
+                <td id="inner">
+                    <table class="header">
+                        <tr>
+                            <td>
+                            </td>
+                            <td class="logo">
+                                    <img src="http://matrix.org/img/matrix-120x51.png" width="120" height="51" alt="[matrix]"/>
+                            </td>
+                        </tr>
+                    </table>
+
+<p>Hi,</p>
+
+<p>%(sender_display_name_forhtml)s has invited you into a room %(bracketed_room_name_forhtml)s on
+Matrix. To join the conversation, either <a href="https://matrix.org/docs/projects/try-matrix-now.html">pick a Matrix client</a> or use the single-click
+link below to join via Element (requires
+<a href="https://www.google.com/chrome">Chrome</a>,
+<a href="https://www.getfirefox.com">Firefox</a> or
+<a href="https://www.apple.com/safari">Safari</a> on the web,
+or iOS or Android on mobile.)</p>
+</p>
+
+<p>
+    <a
+    href="https://app.element.io/#/room/%(room_id_forurl)s?email=%(to_forurl)s&signurl=https%%3A%%2F%%2Fmatrix.org%%2F_matrix%%2Fidentity%%2Fapi%%2Fv1%%2Fsign-ed25519%%3Ftoken%%3D%(token)s%%26private_key%%3D%(ephemeral_private_key)s&room_name=%(room_name_forurl)s&room_avatar_url=%(room_avatar_url_forurl)s&inviter_name=%(sender_display_name_forurl)s&guest_access_token=%(guest_access_token_forurl)s&guest_user_id=%(guest_user_id_forurl)s">Join the conversation.</a>
+</p>
+
+<br>
+<p>About Matrix:</p>
+
+<p>Matrix.org is an open standard for interoperable, decentralised, real-time communication
+over IP, supporting group chat, file transfer, voice and video calling, integrations to
+other apps, bridges to other communication systems and much more. It can be used to power
+Instant Messaging, VoIP/WebRTC signalling, Internet of Things communication - or anywhere
+you need a standard HTTP API for publishing and subscribing to data whilst tracking the
+conversation history.</p>
+
+<p>Matrix defines the standard, and provides open source reference implementations of
+Matrix-compatible Servers, Clients, Client SDKs and Application Services to help you
+create new communication solutions or extend the capabilities and reach of existing ones.</p>
+
+<p>Thanks,</p>
+
+<p>Matrix</p>
+                </td>
+                <td> </td>
+            </tr>
+        </table>
+    </body>
+</html>
+--M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR--
+
+--7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ--

+ 178 - 178
res/invite_template_vector.eml

@@ -1,178 +1,178 @@
-Date: %(date)s
-From: %(from)s
-To: %(to)s
-Message-ID: %(messageid)s
-Subject: %(subject_header_value)s
-MIME-Version: 1.0
-Content-Type: multipart/alternative; 
-	boundary="7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ"
-
---7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
-Content-Type: text/plain; charset=UTF-8
-Content-Disposition: inline
-
-Hi,
-
-%(sender_display_name)s has invited you into a room %(bracketed_room_name)s on
-Riot. To join the conversation please follow the link below.
-
-https://riot.im/app/#/room/%(room_id_forurl)s?email=%(to_forurl)s&signurl=https%%3A%%2F%%2Fvector.im%%2F_matrix%%2Fidentity%%2Fapi%%2Fv1%%2Fsign-ed25519%%3Ftoken%%3D%(token)s%%26private_key%%3D%(ephemeral_private_key)s&room_name=%(room_name_forurl)s&room_avatar_url=%(room_avatar_url_forurl)s&inviter_name=%(sender_display_name_forurl)s&guest_access_token=%(guest_access_token_forurl)s&guest_user_id=%(guest_user_id_forurl)s
-
-Riot is an open source collaboration app built on the Matrix.org
-open standard for interoperable communication: supporting group chat,
-file transfer, voice and video calling, integrations to other apps, bridges
-to other communication systems and much more.
-
-Please note that you will need to use Chrome, Firefox or Safari on the web, or
-iOS or Android on mobile.
-
-Thanks,
-
-Riot
-
-
-About Riot:
-
-Break through - Riot allows teams to communicate across a wide range of collaboration
-apps. If some team members use Riot while others use IRC, Slack or Gitter, Riot will
-allow these team members to seamlessly work together. Riot offers the richest
-network of communication bridges.
-
-Own Your Own Data - No one should control your communication and data but you. Riot
-lets you run your own server, and provides users and teams with the most advanced
-crypto ratchet technology available today for a decentralized secure Internet.
-
-Open Source - Riot is entirely open source: all the code is published on GitHub
-(Apache License) for anyone to see and extend. This means teams can customize or
-contribute to the code and everyone can benefit from the speed of community innovation.
-
-Made on Matrix - Riot is built on top of Matrix. Matrix is an open network for secure,
-decentralized communication delivering a community of users, bridged networks,
-integrated bots and applications plus full end-to-end encryption. To learn more about
-Matrix visit https://matrix.org.
-
---7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
-Content-Type: multipart/related;
-	boundary="M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR";
-	type="text/html"
-
---M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR
-Content-Type: text/html; charset=UTF-8
-Content-Disposition: inline
-
-<!doctype html>
-<html lang="en">
-    <head>
-        <style type="text/css">
-body {
-    margin: 0px;
-}
-
-pre, code {
-    word-break: break-word;
-    white-space: pre-wrap;
-}
-
-#page {
-    font-family: 'Open Sans', Helvetica, Arial, Sans-Serif;
-    font-color: #454545;
-    font-size: 12pt;
-    width: 100%%;
-    padding: 20px;
-}
-
-#inner {
-    width: 640px;
-}
-
-.header {
-    width: 100%%;
-    height: 87px;
-    color: #454545;
-    border-bottom: 4px solid #e5e5e5;
-}
-
-.logo {
-    text-align: right;
-    margin-left: 20px;
-}
-
-.header {
-    border-bottom: 4px solid #e4f7ed ! important;
-}
-
-.notif_link a, .footer a {
-    color: #76CFA6 ! important;
-}
-        </style>
-    </head>
-    <body>
-        <table id="page">
-            <tr>
-                <td> </td>
-                <td id="inner">
-                    <table class="header">
-                        <tr>
-                            <td>
-                            </td>
-                            <td class="logo">
-                                    <img src="https://riot.im/img/external/riot-logo-email-small.png" width="64" height="64" alt="Riot"/>
-                            </td>
-                        </tr>
-                    </table>
-
-<p>Hi,</p>
-
-<p>%(sender_display_name_forhtml)s has invited you into a room %(bracketed_room_name_forhtml)s on
-Riot.</p>
-
-<p>
-    <a
-    href="https://riot.im/app/#/room/%(room_id_forurl)s?email=%(to_forurl)s&signurl=https%%3A%%2F%%2Fvector.im%%2F_matrix%%2Fidentity%%2Fapi%%2Fv1%%2Fsign-ed25519%%3Ftoken%%3D%(token)s%%26private_key%%3D%(ephemeral_private_key)s&room_name=%(room_name_forurl)s&room_avatar_url=%(room_avatar_url_forurl)s&inviter_name=%(sender_display_name_forurl)s&guest_access_token=%(guest_access_token_forurl)s&guest_user_id=%(guest_user_id_forurl)s">Join the conversation.</a>
-</p>
-
-<p>Riot is an open source collaboration app built on the Matrix.org
-open standard for interoperable communication: supporting group chat, file
-transfer, voice and video calling, integrations to other apps, bridges
-to other communication systems and much more.</p>
-
-<p>Please note that Riot requires
-<a href="https://www.google.com/chrome">Chrome</a>,
-<a href="https://www.getfirefox.com">Firefox</a> or
-<a href="https://www.apple.com/safari">Safari</a> on the web,
-or iOS or Android on mobile.</p>
-
-<p>Thanks,</p>
-
-<p>Riot</p>
-
-<br>
-<p>About Riot:</p>
-
-<p><em>Break through</em> - Riot allows teams to communicate across a wide range of collaboration
-apps. If some team members use Riot while others use IRC, Slack or Gitter, Riot will
-allow these team members to seamlessly work together. Riot offers the richest
-network of communication bridges.</p>
-
-<p><em>Own Your Own Data</em> - No one should control your communication and data but you. Riot
-lets you run your own server, and provides users and teams with the most advanced
-crypto ratchet technology available today for a decentralized secure Internet.</p>
-
-<p><em>Open Source</em> - Riot is entirely open source: all the code is published on GitHub
-(Apache License) for anyone to see and extend. This means teams can customize or
-contribute to the code and everyone can benefit from the speed of community innovation.</p>
-
-<p><em>Made on Matrix</em> - Riot is built on top of Matrix. Matrix is an open network for secure,
-decentralized communication delivering a community of users, bridged networks,
-integrated bots and applications plus full end-to-end encryption. To learn more about
-Matrix visit https://matrix.org.</p>
-
-                </td>
-                <td> </td>
-            </tr>
-        </table>
-    </body>
-</html>
---M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR--
-
---7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ--
+Date: %(date)s
+From: %(from)s
+To: %(to)s
+Message-ID: %(messageid)s
+Subject: %(subject_header_value)s
+MIME-Version: 1.0
+Content-Type: multipart/alternative; 
+	boundary="7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ"
+
+--7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
+Content-Type: text/plain; charset=UTF-8
+Content-Disposition: inline
+
+Hi,
+
+%(sender_display_name)s has invited you into a room %(bracketed_room_name)s on
+Element. To join the conversation please follow the link below.
+
+https://app.element.io/#/room/%(room_id_forurl)s?email=%(to_forurl)s&signurl=https%%3A%%2F%%2Fvector.im%%2F_matrix%%2Fidentity%%2Fapi%%2Fv1%%2Fsign-ed25519%%3Ftoken%%3D%(token)s%%26private_key%%3D%(ephemeral_private_key)s&room_name=%(room_name_forurl)s&room_avatar_url=%(room_avatar_url_forurl)s&inviter_name=%(sender_display_name_forurl)s&guest_access_token=%(guest_access_token_forurl)s&guest_user_id=%(guest_user_id_forurl)s
+
+Element is an open source collaboration app built on the Matrix.org
+open standard for interoperable communication: supporting group chat,
+file transfer, voice and video calling, integrations to other apps, bridges
+to other communication systems and much more.
+
+Please note that you will need to use Chrome, Firefox or Safari on the web, or
+iOS or Android on mobile.
+
+Thanks,
+
+Element
+
+
+About Element:
+
+Break through - Element allows teams to communicate across a wide range of collaboration
+apps. If some team members use Element while others use IRC, Slack or Gitter, Element will
+allow these team members to seamlessly work together. Element offers the richest
+network of communication bridges.
+
+Own Your Own Data - No one should control your communication and data but you. Element
+lets you run your own server, and provides users and teams with the most advanced
+crypto ratchet technology available today for a decentralized secure Internet.
+
+Open Source - Element is entirely open source: all the code is published on GitHub
+(Apache License) for anyone to see and extend. This means teams can customize or
+contribute to the code and everyone can benefit from the speed of community innovation.
+
+Made on Matrix - Element is built on top of Matrix. Matrix is an open network for secure,
+decentralized communication delivering a community of users, bridged networks,
+integrated bots and applications plus full end-to-end encryption. To learn more about
+Matrix visit https://matrix.org.
+
+--7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
+Content-Type: multipart/related;
+	boundary="M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR";
+	type="text/html"
+
+--M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR
+Content-Type: text/html; charset=UTF-8
+Content-Disposition: inline
+
+<!doctype html>
+<html lang="en">
+    <head>
+        <style type="text/css">
+body {
+    margin: 0px;
+}
+
+pre, code {
+    word-break: break-word;
+    white-space: pre-wrap;
+}
+
+#page {
+    font-family: 'Open Sans', Helvetica, Arial, Sans-Serif;
+    font-color: #454545;
+    font-size: 12pt;
+    width: 100%%;
+    padding: 20px;
+}
+
+#inner {
+    width: 640px;
+}
+
+.header {
+    width: 100%%;
+    height: 87px;
+    color: #454545;
+    border-bottom: 4px solid #e5e5e5;
+}
+
+.logo {
+    text-align: right;
+    margin-left: 20px;
+}
+
+.header {
+    border-bottom: 4px solid #e4f7ed ! important;
+}
+
+.notif_link a, .footer a {
+    color: #76CFA6 ! important;
+}
+        </style>
+    </head>
+    <body>
+        <table id="page">
+            <tr>
+                <td> </td>
+                <td id="inner">
+                    <table class="header">
+                        <tr>
+                            <td>
+                            </td>
+                            <td class="logo">
+                                    <img src="https://static.element.io/images/email-logo.png" width="64" height="64" alt="Element"/>
+                            </td>
+                        </tr>
+                    </table>
+
+<p>Hi,</p>
+
+<p>%(sender_display_name_forhtml)s has invited you into a room %(bracketed_room_name_forhtml)s on
+Element.</p>
+
+<p>
+    <a
+    href="https://app.element.io/#/room/%(room_id_forurl)s?email=%(to_forurl)s&signurl=https%%3A%%2F%%2Fvector.im%%2F_matrix%%2Fidentity%%2Fapi%%2Fv1%%2Fsign-ed25519%%3Ftoken%%3D%(token)s%%26private_key%%3D%(ephemeral_private_key)s&room_name=%(room_name_forurl)s&room_avatar_url=%(room_avatar_url_forurl)s&inviter_name=%(sender_display_name_forurl)s&guest_access_token=%(guest_access_token_forurl)s&guest_user_id=%(guest_user_id_forurl)s">Join the conversation.</a>
+</p>
+
+<p>Element is an open source collaboration app built on the Matrix.org
+open standard for interoperable communication: supporting group chat, file
+transfer, voice and video calling, integrations to other apps, bridges
+to other communication systems and much more.</p>
+
+<p>Please note that Element requires
+<a href="https://www.google.com/chrome">Chrome</a>,
+<a href="https://www.getfirefox.com">Firefox</a> or
+<a href="https://www.apple.com/safari">Safari</a> on the web,
+or iOS or Android on mobile.</p>
+
+<p>Thanks,</p>
+
+<p>Element</p>
+
+<br>
+<p>About Element:</p>
+
+<p><em>Break through</em> - Element allows teams to communicate across a wide range of collaboration
+apps. If some team members use Element while others use IRC, Slack or Gitter, Element will
+allow these team members to seamlessly work together. Element offers the richest
+network of communication bridges.</p>
+
+<p><em>Own Your Own Data</em> - No one should control your communication and data but you. Element
+lets you run your own server, and provides users and teams with the most advanced
+crypto ratchet technology available today for a decentralized secure Internet.</p>
+
+<p><em>Open Source</em> - Element is entirely open source: all the code is published on GitHub
+(Apache License) for anyone to see and extend. This means teams can customize or
+contribute to the code and everyone can benefit from the speed of community innovation.</p>
+
+<p><em>Made on Matrix</em> - Element is built on top of Matrix. Matrix is an open network for secure,
+decentralized communication delivering a community of users, bridged networks,
+integrated bots and applications plus full end-to-end encryption. To learn more about
+Matrix visit https://matrix.org.</p>
+
+                </td>
+                <td> </td>
+            </tr>
+        </table>
+    </body>
+</html>
+--M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR--
+
+--7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ--

+ 88 - 88
res/verification_template.eml

@@ -1,88 +1,88 @@
-Date: %(date)s
-From: %(from)s
-To: %(to)s
-Message-ID: %(messageid)s
-Subject: Confirm your email address for Matrix
-MIME-Version: 1.0
-Content-Type: multipart/alternative; 
-	boundary="7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ"
-
---7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
-Content-Type: text/plain; charset=UTF-8
-Content-Disposition: inline
-
-Hello,
-
-We have received a request to use this email address with a matrix.org identity
-server. If this was you who made this request, you may use the following link
-to complete the verification of your email address:
-
-%(link)s
-
-If your client requires a code, the code is %(token)s
-
-If you aren't aware of making such a request, please disregard this email.
-
-
-About Matrix:
-
-Matrix is an open standard for interoperable, decentralised, real-time communication
-over IP. It can be used to power Instant Messaging, VoIP/WebRTC signalling, Internet
-of Things communication - or anywhere you need a standard HTTP API for publishing and
-subscribing to data whilst tracking the conversation history.
-
-Matrix defines the standard, and provides open source reference implementations of
-Matrix-compatible Servers, Clients, Client SDKs and Application Services to help you
-create new communication solutions or extend the capabilities and reach of existing ones.
-
---7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
-Content-Type: text/html; charset=UTF-8
-Content-Disposition: inline
-
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8" />
-<title></title>
-<style>
-body {
-    font-family: "Myriad Pro", "Myriad", Helvetica, Arial, sans-serif;
-    font-size: 12pt;
-    margin: 0px;
-}
-</style>
-</head>
-<body>
-<p>Hello,</p>
-
-<p>We have received a request to use this email address with a matrix.org
-identity server. If this was you who made this request, you may use the
-following link to complete the verification of your email address:</p>
-
-<p><a href="%(link)s">Complete email verification</a></p>
-
-<p>...or copy this link into your web browser:</p>
-
-<p>%(link)s</p>
-
-<p>If your client requires a code, the code is %(token)s</p>
-
-<p>If you aren't aware of making such a request, please disregard this
-email.</p>
-
-<br>
-<p>About Matrix:</p>
-
-<p>Matrix is an open standard for interoperable, decentralised, real-time communication
-over IP. It can be used to power Instant Messaging, VoIP/WebRTC signalling, Internet
-of Things communication - or anywhere you need a standard HTTP API for publishing and
-subscribing to data whilst tracking the conversation history.</p>
-
-<p>Matrix defines the standard, and provides open source reference implementations of
-Matrix-compatible Servers, Clients, Client SDKs and Application Services to help you
-create new communication solutions or extend the capabilities and reach of existing ones.</p>
-
-</body>
-</html>
-
---7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ--
+Date: %(date)s
+From: %(from)s
+To: %(to)s
+Message-ID: %(messageid)s
+Subject: Confirm your email address for Matrix
+MIME-Version: 1.0
+Content-Type: multipart/alternative; 
+	boundary="7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ"
+
+--7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
+Content-Type: text/plain; charset=UTF-8
+Content-Disposition: inline
+
+Hello,
+
+We have received a request to use this email address with a matrix.org identity
+server. If this was you who made this request, you may use the following link
+to complete the verification of your email address:
+
+%(link)s
+
+If your client requires a code, the code is %(token)s
+
+If you aren't aware of making such a request, please disregard this email.
+
+
+About Matrix:
+
+Matrix is an open standard for interoperable, decentralised, real-time communication
+over IP. It can be used to power Instant Messaging, VoIP/WebRTC signalling, Internet
+of Things communication - or anywhere you need a standard HTTP API for publishing and
+subscribing to data whilst tracking the conversation history.
+
+Matrix defines the standard, and provides open source reference implementations of
+Matrix-compatible Servers, Clients, Client SDKs and Application Services to help you
+create new communication solutions or extend the capabilities and reach of existing ones.
+
+--7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
+Content-Type: text/html; charset=UTF-8
+Content-Disposition: inline
+
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8" />
+<title></title>
+<style>
+body {
+    font-family: "Myriad Pro", "Myriad", Helvetica, Arial, sans-serif;
+    font-size: 12pt;
+    margin: 0px;
+}
+</style>
+</head>
+<body>
+<p>Hello,</p>
+
+<p>We have received a request to use this email address with a matrix.org
+identity server. If this was you who made this request, you may use the
+following link to complete the verification of your email address:</p>
+
+<p><a href="%(link)s">Complete email verification</a></p>
+
+<p>...or copy this link into your web browser:</p>
+
+<p>%(link)s</p>
+
+<p>If your client requires a code, the code is %(token)s</p>
+
+<p>If you aren't aware of making such a request, please disregard this
+email.</p>
+
+<br>
+<p>About Matrix:</p>
+
+<p>Matrix is an open standard for interoperable, decentralised, real-time communication
+over IP. It can be used to power Instant Messaging, VoIP/WebRTC signalling, Internet
+of Things communication - or anywhere you need a standard HTTP API for publishing and
+subscribing to data whilst tracking the conversation history.</p>
+
+<p>Matrix defines the standard, and provides open source reference implementations of
+Matrix-compatible Servers, Clients, Client SDKs and Application Services to help you
+create new communication solutions or extend the capabilities and reach of existing ones.</p>
+
+</body>
+</html>
+
+--7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ--

+ 176 - 176
res/verification_template_vector.eml

@@ -1,176 +1,176 @@
-Date: %(date)s
-From: %(from)s
-To: %(to)s
-Message-ID: %(messageid)s
-Subject: Confirm your email address for Riot
-MIME-Version: 1.0
-Content-Type: multipart/alternative; 
-	boundary="7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ"
-
---7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
-Content-Type: text/plain; charset=UTF-8
-Content-Disposition: inline
-
-Hello there!
-
-You have asked us to register this email address with riot.im - the open source,
-distributed and secure shared workspace for the web that's built on Matrix.
-
-If it was really you who made this request, you can click on the following link to
-complete the verification of your email address:
-
-%(link)s
-
-Please note that you will need to use Chrome, Firefox or Safari on the web, or
-iOS or Android on mobile.
-
-If you didn't make this request, you can safely disregard this email.
-
-Thanks!
-
-Riot
-
-
-About Riot:
-
-Break through - Riot allows teams to communicate across a wide range of collaboration
-apps. If some team members use Riot while others use IRC, Slack or Gitter, Riot will
-allow these team members to seamlessly work together. Riot offers the richest
-network of communication bridges.
-
-Own Your Own Data - No one should control your communication and data but you. Riot
-lets you run your own server, and provides users and teams with the most advanced
-crypto ratchet technology available today for a decentralized secure Internet.
-
-Open Source - Riot is entirely open source: all the code is published on GitHub
-(Apache License) for anyone to see and extend. This means teams can customize or
-contribute to the code and everyone can benefit from the speed of community innovation.
-
-Made on Matrix - Riot is built on top of Matrix. Matrix is an open network for secure,
-decentralized communication delivering a community of users, bridged networks,
-integrated bots and applications plus full end-to-end encryption. To learn more about
-Matrix visit https://matrix.org.
-
---7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
-Content-Type: multipart/related;
-	boundary="M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR";
-	type="text/html"
-
---M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR
-Content-Type: text/html; charset=UTF-8
-Content-Disposition: inline
-
-<!doctype html>
-<html lang="en">
-    <head>
-        <style type="text/css">
-body {
-    margin: 0px;
-}
-
-pre, code {
-    word-break: break-word;
-    white-space: pre-wrap;
-}
-
-#page {
-    font-family: 'Open Sans', Helvetica, Arial, Sans-Serif;
-    font-color: #454545;
-    font-size: 12pt;
-    width: 100%%;
-    padding: 20px;
-}
-
-#inner {
-    width: 640px;
-}
-
-.header {
-    width: 100%%;
-    height: 87px;
-    color: #454545;
-    border-bottom: 4px solid #e5e5e5;
-}
-
-.logo {
-    text-align: right;
-    margin-left: 20px;
-}
-
-.header {
-    border-bottom: 4px solid #e4f7ed ! important;
-}
-
-
-.notif_link a, .footer a {
-    color: #76CFA6 ! important;
-}
-        </style>
-    </head>
-    <body>
-        <table id="page">
-            <tr>
-                <td> </td>
-                <td id="inner">
-                    <table class="header">
-                        <tr>
-                            <td>
-                            </td>
-                            <td class="logo">
-                                    <img src="https://riot.im/img/external/riot-logo-email-small.png" width="64" height="64" alt="Riot"/>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <p>Hello there!</p>
-
-                    <p>You have asked us to register this email address with riot.im - the open source,
-                    distributed and secure shared workspace for the web that's built on Matrix.</p>
-
-                    <p>If it was really you who made this request, you can click on the following link to
-                    complete the verification of your email address:</p>
-
-                    <p><a href="%(link)s">Complete email verification</a></p>
-
-                    <p>Please note that Riot requires
-                    <a href="https://www.google.com/chrome">Chrome</a>,
-                    <a href="https://www.getfirefox.com">Firefox</a> or
-                    <a href="https://www.apple.com/safari">Safari</a> on the web,
-                    or iOS or Android on mobile.</p>
-
-                    <p>If you didn't make this request, you can safely disregard this email.</p>
-
-                    <p>Thanks!</p>
-
-                    <p>Riot</p>
-
-                    <br>
-                    <p>About Riot:</p>
-
-                    <p><em>Break through</em> - Riot allows teams to communicate across a wide range of collaboration
-                    apps. If some team members use Riot while others use IRC, Slack or Gitter, Riot will
-                    allow these team members to seamlessly work together. Riot offers the richest
-                    network of communication bridges.</p>
-
-                    <p><em>Own Your Own Data</em> - No one should control your communication and data but you. Riot
-                    lets you run your own server, and provides users and teams with the most advanced
-                    crypto ratchet technology available today for a decentralized secure Internet.</p>
-
-                    <p><em>Open Source</em> - Riot is entirely open source: all the code is published on GitHub
-                    (Apache License) for anyone to see and extend. This means teams can customize or
-                    contribute to the code and everyone can benefit from the speed of community innovation.</p>
-
-                    <p><em>Made on Matrix</em> - Riot is built on top of Matrix. Matrix is an open network for secure,
-                    decentralized communication delivering a community of users, bridged networks,
-                    integrated bots and applications plus full end-to-end encryption. To learn more about
-                    Matrix visit https://matrix.org.</p>
-
-                </td>
-                <td> </td>
-            </tr>
-        </table>
-    </body>
-</html>
---M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR--
-
---7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ--
+Date: %(date)s
+From: %(from)s
+To: %(to)s
+Message-ID: %(messageid)s
+Subject: Confirm your email address for Element
+MIME-Version: 1.0
+Content-Type: multipart/alternative; 
+	boundary="7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ"
+
+--7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
+Content-Type: text/plain; charset=UTF-8
+Content-Disposition: inline
+
+Hello there!
+
+You have asked us to register this email address with element.io - the open source,
+distributed and secure shared workspace for the web that's built on Matrix.
+
+If it was really you who made this request, you can click on the following link to
+complete the verification of your email address:
+
+%(link)s
+
+Please note that you will need to use Chrome, Firefox or Safari on the web, or
+iOS or Android on mobile.
+
+If you didn't make this request, you can safely disregard this email.
+
+Thanks!
+
+Element
+
+
+About Element:
+
+Break through - Element allows teams to communicate across a wide range of collaboration
+apps. If some team members use Element while others use IRC, Slack or Gitter, Element will
+allow these team members to seamlessly work together. Element offers the richest
+network of communication bridges.
+
+Own Your Own Data - No one should control your communication and data but you. Element
+lets you run your own server, and provides users and teams with the most advanced
+crypto ratchet technology available today for a decentralized secure Internet.
+
+Open Source - Element is entirely open source: all the code is published on GitHub
+(Apache License) for anyone to see and extend. This means teams can customize or
+contribute to the code and everyone can benefit from the speed of community innovation.
+
+Made on Matrix - Element is built on top of Matrix. Matrix is an open network for secure,
+decentralized communication delivering a community of users, bridged networks,
+integrated bots and applications plus full end-to-end encryption. To learn more about
+Matrix visit https://matrix.org.
+
+--7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
+Content-Type: multipart/related;
+	boundary="M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR";
+	type="text/html"
+
+--M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR
+Content-Type: text/html; charset=UTF-8
+Content-Disposition: inline
+
+<!doctype html>
+<html lang="en">
+    <head>
+        <style type="text/css">
+body {
+    margin: 0px;
+}
+
+pre, code {
+    word-break: break-word;
+    white-space: pre-wrap;
+}
+
+#page {
+    font-family: 'Open Sans', Helvetica, Arial, Sans-Serif;
+    font-color: #454545;
+    font-size: 12pt;
+    width: 100%%;
+    padding: 20px;
+}
+
+#inner {
+    width: 640px;
+}
+
+.header {
+    width: 100%%;
+    height: 87px;
+    color: #454545;
+    border-bottom: 4px solid #e5e5e5;
+}
+
+.logo {
+    text-align: right;
+    margin-left: 20px;
+}
+
+.header {
+    border-bottom: 4px solid #e4f7ed ! important;
+}
+
+
+.notif_link a, .footer a {
+    color: #76CFA6 ! important;
+}
+        </style>
+    </head>
+    <body>
+        <table id="page">
+            <tr>
+                <td> </td>
+                <td id="inner">
+                    <table class="header">
+                        <tr>
+                            <td>
+                            </td>
+                            <td class="logo">
+                                    <img src="https://static.element.io/images/email-logo.png" width="64" height="64" alt="Element"/>
+                            </td>
+                        </tr>
+                    </table>
+
+                    <p>Hello there!</p>
+
+                    <p>You have asked us to register this email address with element.io - the open source,
+                    distributed and secure shared workspace for the web that's built on Matrix.</p>
+
+                    <p>If it was really you who made this request, you can click on the following link to
+                    complete the verification of your email address:</p>
+
+                    <p><a href="%(link)s">Complete email verification</a></p>
+
+                    <p>Please note that Element requires
+                    <a href="https://www.google.com/chrome">Chrome</a>,
+                    <a href="https://www.getfirefox.com">Firefox</a> or
+                    <a href="https://www.apple.com/safari">Safari</a> on the web,
+                    or iOS or Android on mobile.</p>
+
+                    <p>If you didn't make this request, you can safely disregard this email.</p>
+
+                    <p>Thanks!</p>
+
+                    <p>Element</p>
+
+                    <br>
+                    <p>About Element:</p>
+
+                    <p><em>Break through</em> - Element allows teams to communicate across a wide range of collaboration
+                    apps. If some team members use Element while others use IRC, Slack or Gitter, Element will
+                    allow these team members to seamlessly work together. Element offers the richest
+                    network of communication bridges.</p>
+
+                    <p><em>Own Your Own Data</em> - No one should control your communication and data but you. Element
+                    lets you run your own server, and provides users and teams with the most advanced
+                    crypto ratchet technology available today for a decentralized secure Internet.</p>
+
+                    <p><em>Open Source</em> - Element is entirely open source: all the code is published on GitHub
+                    (Apache License) for anyone to see and extend. This means teams can customize or
+                    contribute to the code and everyone can benefit from the speed of community innovation.</p>
+
+                    <p><em>Made on Matrix</em> - Element is built on top of Matrix. Matrix is an open network for secure,
+                    decentralized communication delivering a community of users, bridged networks,
+                    integrated bots and applications plus full end-to-end encryption. To learn more about
+                    Matrix visit https://matrix.org.</p>
+
+                </td>
+                <td> </td>
+            </tr>
+        </table>
+    </body>
+</html>
+--M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR--
+
+--7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ--

+ 10 - 10
res/verify_response_page_template

@@ -1,10 +1,10 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8" />
-<title></title>
-</head>
-<body>
-<p>%(message)s</p>
-</body>
-</html>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8" />
+<title></title>
+</head>
+<body>
+<p>%(message)s</p>
+</body>
+</html>

+ 49 - 49
res/verify_response_page_template_vector_im

@@ -1,49 +1,49 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8" />
-<title></title>
-<style>
-
-body {
-    font-family: 'Open Sans', Helvetica, Arial, Sans-Serif;
-    font-color: #454545;
-    font-size: 12pt;
-    margin: 1em;
-}
-#vectorlogo {
-    margin: auto;
-    text-align: center;
-    padding: 10px;
-}
-#message {
-    width: 300px;
-    text-align: left;
-    padding: 1em;
-    margin-bottom: 40px;
-    margin-left: auto;
-    margin-right: auto;
-    margin-top: 50px;
-
-    -webkit-border-radius: 10px;
-    -moz-border-radius: 10px;
-    border-radius: 10px;
-
-    -webkit-box-shadow: 0px 0px 20px 0px rgba(0,0,0,0.15);
-    -moz-box-shadow: 0px 0px 20px 0px rgba(0,0,0,0.15);
-    box-shadow: 0px 0px 20px 0px rgba(0,0,0,0.15);
-
-    background-color: #f8f8f8;
-    border: 1px #ccc solid;
-}
-</style>
-</head>
-<body>
-<div id="vectorlogo">
-<img src="//riot.im/img/external/riot-logo.svg" alt="riot.im" width="256" height="256" />
-</div>
-<div id="message">
-<p>%(message)s</p>
-</div>
-</body>
-</html>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8" />
+<title></title>
+<style>
+
+body {
+    font-family: 'Open Sans', Helvetica, Arial, Sans-Serif;
+    font-color: #454545;
+    font-size: 12pt;
+    margin: 1em;
+}
+#vectorlogo {
+    margin: auto;
+    text-align: center;
+    padding: 10px;
+}
+#message {
+    width: 300px;
+    text-align: left;
+    padding: 1em;
+    margin-bottom: 40px;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 50px;
+
+    -webkit-border-radius: 10px;
+    -moz-border-radius: 10px;
+    border-radius: 10px;
+
+    -webkit-box-shadow: 0px 0px 20px 0px rgba(0,0,0,0.15);
+    -moz-box-shadow: 0px 0px 20px 0px rgba(0,0,0,0.15);
+    box-shadow: 0px 0px 20px 0px rgba(0,0,0,0.15);
+
+    background-color: #f8f8f8;
+    border: 1px #ccc solid;
+}
+</style>
+</head>
+<body>
+<div id="vectorlogo">
+<img src="//static.element.io/images/email-logo.png" alt="Element" width="256" height="256" />
+</div>
+<div id="message">
+<p>%(message)s</p>
+</div>
+</body>
+</html>

+ 1 - 1
sydent/http/servlets/__init__.py

@@ -81,7 +81,7 @@ def get_args(request, args, required=True):
             raise MatrixRestError(400, 'M_BAD_JSON', 'Malformed JSON')
 
     # If we didn't get anything from that, and it's a v1 api path, try the request args
-    # (riot-web's usage of the ed25519 sign servlet currently involves
+    # (element-web's usage of the ed25519 sign servlet currently involves
     # sending the params in the query string with a json body of 'null')
     if request_args is None and (v1_path or request.method == b'GET'):
         request_args_bytes = copy.copy(request.args)