Skip to content
This repository was archived by the owner on Jun 24, 2022. It is now read-only.

Some more fixes for the chat page #2012

Merged
merged 10 commits into from
Aug 13, 2020
Merged

Some more fixes for the chat page #2012

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e696c87
Fix fragmented sentence
dngray Aug 5, 2020
d48f834
Mnetion code of conduct.
dngray Aug 5, 2020
585eccd
One parahraph
dngray Aug 5, 2020
309ff43
Update homeserver to correct address
dngray Aug 5, 2020
3605ab1
Remove mention of RiotX, it no longer exists
dngray Aug 8, 2020
786632c
Update name of git repo
dngray Aug 8, 2020
b501e31
replace privacytoolsIO to privacytools for github
dngray Aug 8, 2020
68abe89
Fix synapse letter.
dngray Aug 8, 2020
9419e08
Don't link to same page
jonaharagon Aug 11, 2020
0d32dc1
Correct HTML Syntax
jonaharagon Aug 11, 2020
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
2 changes: 1 addition & 1 deletion _includes/sections/instant-messenger.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ <h2 id="federated" class="anchor">
website="https://element.io"
privacy-policy="https://element.io/privacy"
forum="https://forum.privacytools.io/t/discussion-element-io/665"
github="https://github.com/vector-im/riot-web/"
github="https://github.com/vector-im/element-web"
windows="https://element.io/get-started"
mac="https://element.io/get-started"
linux="https://element.io/get-started"
Expand Down
2 changes: 1 addition & 1 deletion _includes/sections/teamchat.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h1 id="teamchat" class="anchor">
website="https://element.io"
privacy-policy="https://element.io/privacy"
forum="https://forum.privacytools.io/t/discussion-element-io/665"
github="https://github.com/vector-im/riot-web/"
github="https://github.com/vector-im/element-web"
windows="https://element.io/get-started"
mac="https://element.io/get-started"
linux="https://element.io/get-started"
Expand Down
13 changes: 6 additions & 7 deletions pages/services/chat.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1 class="display-4">Matrix</h1>
</div>

<h2 class="pt-4" id="homeserverinfo">Connection Information</h2>
<p><strong>To register on or connect to our homeserver, simply use <code>https://chat.privacytools.io</code> as the homeserver in your Matrix client.</strong></p>
<p><strong>To register on or connect to our homeserver, simply use <code>https://chat.privacytools.io</code> as the homeserver in your Matrix client. <p><strong>Please see our community <a href="https://wiki.privacytools.io/view/PrivacyTools:Code_of_Conduct">code of conduct</a> before joining our rooms or using our services.</strong></p>

{%
include cardv2.html
Expand All @@ -30,7 +30,7 @@ <h2 class="pt-4" id="homeserverinfo">Connection Information</h2>
website="https://element.io"
privacy-policy="https://element.io/privacy"
forum="https://forum.privacytools.io/t/discussion-element-io/665"
github="https://github.com/vector-im/riot-web/"
github="https://github.com/vector-im/element-web"
windows="https://element.io/get-started"
mac="https://element.io/get-started"
linux="https://element.io/get-started"
Expand All @@ -50,15 +50,15 @@ <h4>Is #general:privacytools.io or #privacy:privacytools.io chat end-to-end encr
<p><strong>No.</strong> Messages sent to the #general chat are encrypted from with client-to-server encryption, i.e. HTTPS. This means that your messages can't be viewed by an attacker on your network, or your ISP, etc. <strong>However</strong>, because this is a public chat room anybody can view your messages if they are a member, and newcomers will be able to see all message history. Do not say anything in rooms that don't use End-to-End (E2E) encryption that you wouldn't want tied to you personally.</p>

<h4>Isn't Matrix behind Cloudflare?</h4>
<p>Matrix.org is, chat.privacytools.io isn't. If you use our homeserver and our Element install, you should be good.</p>
<p>The default matrix.org homeserver is behind Cloudflare. The PrivacyTools homeserver (<a href="https://chat.privacytools.io/">chat.privacytools.io</a> is not.

<h4>Isn't Matrix slow?</h4>
<p>It can be, for some! Due to the trememdous amount of people registering on the matrix.org homeserver, it is often overloaded and occasionally slow to respond. Therefore, users on that homeserver occasionally report a less than ideal chat experience. If that's you, you can fix this problem by switching to another homeserver. Good alternatives include...
<ul>
<li>ours of course, at <mark><strong>chat.privacytools.io</strong></mark>, you're here right?</li>
<li>feneas.org, tchncs.de, weho.st, pine64.org, kde.org, halogen.city...</li>
<li>purchasing an instance from <a href="https://element.io/matrix-services">Element Matrix Services</a></li>
<li>running your own by installing <a href="https://github.com/matrix-org/synapse">synapse</a> — certainly the best option for the technically inclined!</li>
<li>running your own by installing <a href="https://github.com/matrix-org/synapse">Synapse</a> — certainly the best option for the technically inclined!</li>
</ul>
<p>Note that at time of writing, switching homeservers requires re-registering with another account at that server, as nomadic identities haven't been implemented yet.</p>

Expand All @@ -72,10 +72,10 @@ <h2 class="pt-4">Rooms</h2>
<p>To join a room, just type <code>/join [room address]</code> in any room. You can run this command from any server, not just ours!</p>
<p>The PrivacyTools administration operates the following channels:</p>
<ul>
<li><code>#dev:privacytools.io</code>: Discussions relating to <a href="https://github.com/privacytoolsIO/privacytools.io/">building</a> www.privacytools.io.</li>
<li><code>#dev:privacytools.io</code>: Discussions relating to <a href="https://github.com/privacytools/privacytools.io/">building</a> www.privacytools.io.</li>
<li><code>#forum:privacytools.io</code>: All PrivacyTools Forum updates (Automated).</li>
<li><strong><code>#general:privacytools.io</code>: Main discussion room.</strong></li>
<li><code>#github:privacytools.io</code>: GitHub updates for @privacytoolsIO (Automated).</li>
<li><code>#github:privacytools.io</code>: GitHub updates for @privacytools (Automated).</li>
<li><code>#guides:privacytools.io</code>: Privacy Guides development work.</li>
<li><strong><code>#privacy:privacytools.io</code>: On-topic privacy, security, opsec discussion and support.</strong></li>
<li><code>#wiki:privacytools.io</code>: <a href="https://wiki.privacytools.io/view/Main_Page">Wiki</a>-building discussion room.</li>
Expand All @@ -90,7 +90,6 @@ <h2 class="pt-4">Rooms</h2>
<li><code>#plume:disroot.org</code>: Discussion for Plume: Federated blogging.</li>
<li><code>#element-android:matrix.org</code>: Element Android discussion and support.</li>
<li><code>#element-ios:matrix.org</code>: Element iOS discussion and support.</li>
<li><code>#riotx:matrix.org</code>: RiotX (soon to be: Element Android) discussion and support.</li>
<li><code>#element-web:matrix.org</code>: Element Web/Desktop discussion and support.</li>
</ul>
<p>If you are a room operator and want your room listed here, feel free to contact us. Especially if you operate a large room and/or are a member of our homeserver!</p>
Expand Down