Skip to content

Commit

Permalink
Merge pull request #44 from matrix-org/toml/longer_emails
Browse files Browse the repository at this point in the history
Longer invite emails bulked out with the same Riot/Matrix text to fix element-hq/element-web#2547
  • Loading branch information
dbkr authored Apr 24, 2017
2 parents bb9e3a3 + 7092412 commit 8ccd1af
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 10 deletions.
35 changes: 27 additions & 8 deletions res/invite_template.eml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,21 @@ link below to join via Riot (requires Chrome, Firefox, Safari, iOS or Android)
https://riot.im/app/#/room/%(room_id)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
Matrix.org is an 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.
thanks,
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
Expand Down Expand Up @@ -106,12 +116,21 @@ or iOS or Android on mobile.)</p>
href="https://riot.im/app/#/room/%(room_id)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>

<p>Matrix.org is an 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>
<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>Thanks,</p>

<p>Matrix</p>
</td>
Expand Down
47 changes: 45 additions & 2 deletions res/invite_template_vector.eml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,31 @@ 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,
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";
Expand Down Expand Up @@ -121,9 +142,31 @@ to other communication systems and much more.</p>
<a href="https://www.apple.com/safari">Safari</a> on the web,
or iOS or Android on mobile.</p>

<p>thanks,</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>
Expand Down

0 comments on commit 8ccd1af

Please sign in to comment.