From 11961247f749161d6b1516ef8b06710ff6762b35 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Wed, 21 Sep 2016 10:03:57 +0100 Subject: [PATCH] Miscellaneous doc fixes Fix some egregious lies and oldthings in the getting-involved and faq pages. --- .../guides/2015-08-14-getting_involved.md | 92 +++++++++++-------- supporting-docs/guides/2015-08-19-faq.md | 16 ++-- 2 files changed, 60 insertions(+), 48 deletions(-) diff --git a/supporting-docs/guides/2015-08-14-getting_involved.md b/supporting-docs/guides/2015-08-14-getting_involved.md index 7583239d..ff6637c7 100644 --- a/supporting-docs/guides/2015-08-14-getting_involved.md +++ b/supporting-docs/guides/2015-08-14-getting_involved.md @@ -21,17 +21,10 @@ We very much welcome [contributions](https://github.com/matrix-org/synapse/blob/ ## Access Matrix via a public webclient/server -The easiest thing to do if you want to just have a play, is to use our reference webclient and create a user on the matrix.org homeserver. You do that by visiting http://matrix.org/beta/, selecting "Create account" and choosing your userID and password on the next page. You can also add your email, but this is optional (adding it will make it easier for your friends to find your Matrix user in the future). - -| - -At the bottom of the account creation page, you can pick the homeserver and identity server you want to use. In this case, we are using matrix.org's homeserver, so just leave it as-is. Your full Matrix-userID will be formed partly from the hostname your server is running as, and partly from an userID you specify when you create the account. For example, if you put bob as your userID, your full Matrix-userID will be @bob:matrix.org ("bob on matrix.org"). - -| - -You can use multiple clients with the same user, so you might want to also look at our [Android](https://github.com/matrix-org/matrix-android-console) or [iOS](https://github.com/matrix-org/matrix-ios-console) clients for your mobile phone! - -| +The easiest thing to do if you want to just have a play, is to use the [Riot.im +webclient](https://riot.im). You can use it as a guest, or register for an +account. For details of other clients, see +[https://matrix.org/blog/try-matrix-now](https://matrix.org/blog/try-matrix-now). @@ -41,9 +34,10 @@ You can clone our open source projects and run clients and servers yourself. Her ### Running your own client: -You can run your own Matrix client; there are [numerous clients available](https://matrix.org/blog/try-matrix-now/). You can take Matrix.org's [reference client](https://github.com/matrix-org/matrix-angular-sdk) and use it as-is - or modify it any way you want! Since it's written in JavaScript, running a client is [really easy](https://github.com/matrix-org/matrix-angular-sdk#running)! - -| +You can run your own Matrix client; there are [numerous clients +available](https://matrix.org/blog/try-matrix-now/). You can easily [run your +own copy](https://github.com/vector-im/vector-web#getting-started) of the +Riot.im web client. ### Running your own homeserver: @@ -69,16 +63,23 @@ You can also implement your own client or server - after all, Matrix is at its c ### Write your own client: -The [client-server API spec](http://matrix.org/docs/howtos/client-server.html) describes what API calls are available to clients, but a quick step-by-step guide would include: +The [client-server API +spec](http://matrix.org/docs/spec/client_server/latest.html) describes what API +calls are available to clients, and there is a [HOWTO +guide](http://matrix.org/docs/guides/client-server.html) which provides an +introduction to using the API along with some common operations. A quick +step-by-step guide would include: | 1. Get a user either by registering your user in an existing client or running the [new-user script](https://github.com/matrix-org/synapse/blob/master/scripts/register_new_matrix_user) if you are running your own Synapse homeserver. -2. Assuming the homeserver you are using allows logins by password, log in via the login API: -``` -curl -XPOST -d '{"type":"m.login.password", "user":"example", "password":"wordpass"}' "http://localhost:8008/_matrix/client/api/v1/login" -``` +2. Assuming the homeserver you are using allows logins by password, log in via the login API: + + ``` + curl -XPOST -d '{"type":"m.login.password", "user":"example", "password":"wordpass"}' "http://localhost:8008/_matrix/client/api/v1/login" + ``` + 3. If successful, this returns the following, including an `access_token`: { @@ -87,38 +88,49 @@ curl -XPOST -d '{"type":"m.login.password", "user":"example", "password":"wordpa "user_id": "@example:localhost" } -4. This ``access_token`` will be used for authentication for the rest of your API calls. Potentially the next step you want is to make a call to the initialSync API and get the last x events from each room your user is in (via the limit parameter): -``` -curl -XGET "http://localhost:8008/_matrix/client/api/v1/initialSync?limit=1&access_token=YOUR_ACCESS_TOKEN" -``` +4. This ``access_token`` will be used for authentication for the rest of your API calls. Potentially the next step you want is to make a call to the sync API and get the last few events from each room your user is in: -5. In addition to the last x events for all the rooms the user is interested in, this returns all the presences relevant for these rooms. Once you know which rooms the client has previously interacted with, you need to listen for incoming events. This can be done like so: -``` -curl -XGET "http://localhost:8008/_matrix/client/api/v1/events?access_token=YOUR_ACCESS_TOKEN" -``` + ``` + curl -XGET "http://localhost:8008/_matrix/client/r0/sync?access_token=YOUR_ACCESS_TOKEN" + ``` -6. This request will block waiting for an incoming event, timing out after several seconds if there is no event, returning something like this: +5. The above will return something like this: { - "chunk": [], - "end": "s39_18_0", - "start": "s39_18_0" + "next_batch": "s72595_4483_1934", + "rooms": { + "join": { + "!726s6s6q:example.com": { + "state": { + "events": [ + ... + ] + }, + "timeline": { + "events": [ + ... + ] + } + }, + ... + } + } } -7. Even if there are no new events (as in the example above), there will be some pagination stream response keys. The client should make subsequent requests using the value of the "end" key (in this case s39_18_0) as the from query parameter e.g. -``` -http://localhost:8008/_matrix/client/api/v1/events?access _token=YOUR_ACCESS_TOKEN&from=s39_18_0 -``` -8. This ensures that you only get new events. Now you have initial rooms and presence, and a stream of events - a good client should be able to process all these events and present them to the user. And potentially you might want to add functionality to generate events as well (such as messages from the user, for example) - again please consult the [client-server API spec](http://matrix.org/docs/howtos/client-server.html)! + You can then use the "next_batch" token to start listening for new events like so: + + ``` + curl -XGET "http://localhost:8008/_matrix/client/r0/sync?access_token=YOUR_ACCESS_TOKEN&since=s72595_4483_1934" + ``` -| +6. This request will block waiting for an incoming event, timing out after several seconds if there is no event. This ensures that you only get new events. Now you have the initial room states, and a stream of events - a good client should be able to process all these events and present them to the user. And potentially you might want to add functionality to generate events as well (such as messages from the user, for example)! ### Write your own server: -We are still working on the server-server spec, so the best thing to do if you are interested in writing a server, is to come talk to us in [#matrix:matrix.org](https://matrix.org/beta/#/room/%23matrix:matrix.org). - -If you are interested in how federation works, please see the [federation API chapter in the spec](http://matrix.org/docs/spec/#federation-api). +We are still working on the server-server spec, so the best thing to do if you are interested in writing a server, is to come talk to us in [#matrix:matrix.org](https://matrix.to/#/#matrix:matrix.org). + +If you are interested in how federation works, please see the [Server-Server API spec](http://matrix.org/docs/spec/server_server/unstable.html). | diff --git a/supporting-docs/guides/2015-08-19-faq.md b/supporting-docs/guides/2015-08-19-faq.md index 94b5acf5..bc6ffb17 100644 --- a/supporting-docs/guides/2015-08-19-faq.md +++ b/supporting-docs/guides/2015-08-19-faq.md @@ -40,7 +40,7 @@ FAQ Content 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 +you need a standard HTTP API for publishing and subscribing to data whilst tracking the conversation history. | @@ -282,7 +282,7 @@ conversation history rather than just decentralised chat servers. On the other hand, Matrix doesn't provide the metadata protection guarantees that GNUnet/PSYC aims for. -| +| See [http://about.psyc.eu/Matrix](http://about.psyc.eu/Matrix) for PSYC's views on Matrix. @@ -426,7 +426,7 @@ let us know on #matrix-dev:matrix.org. We started working on Matrix in July 2014, and opened it to the public in September 2014. We got all the core features in place in December 2014 -and entered beta, and since then have been iterating away on the beta refining the +and entered beta, and since then have been iterating away on the beta refining the architecture and APIs, fixing bugs and scalability, and adding new features, clients, bridges etc. @@ -549,7 +549,7 @@ For better performance, one should back Synapse with a Postgres database rather ##### Why is Synapse in Python/Twisted? -This is because both provide a mature and well known event-driven async IO framework for writing serverside code. Whilst this has been okay for our initial experimentation and proof of concept, it's likely that future homeserver work will be written in a more strongly typed language (e.g. Go). +This is because both provide a mature and well known event-driven async IO framework for writing serverside code. Whilst this has been okay for our initial experimentation and proof of concept, it's likely that future homeserver work will be written in a more strongly typed language (e.g. Go). ##### Why aren't you using an ORM layer like SqlAlchemy in Synapse? @@ -569,7 +569,7 @@ The iOS version can be downloaded from the [Apple store](https://itunes.apple.co The Android version can be downloaded from the [Google Play store](https://play.google.com/store/apps/details?id=im.vector.alpha) or [F-Droid](https://f-droid.org/repository/browse/?fdid=im.vector.alpha). If you are not sure which one to choose, install Vector from the [Google Play store](https://play.google.com/store/apps/details?id=im.vector.alpha). -For the Android app, you can also install the latest development version +For the Android app, you can also install the latest development version built by [Jenkins](http://matrix.org/jenkins/job/VectorAndroidDevelop). Use it at your own risk and only if you know what you are doing. ##### I installed Vector via F-Droid, why is it draining my battery? @@ -601,8 +601,8 @@ This FAQ is a constant work in progress - patches and pull requests are *very* w * How do I maintain my synapse's DB (e.g. prune old conversations)? * How do I maintain my synapse's content repository (e.g. prune old content)? * What are redactions? - * Why is the spec so big, especially relative to the XMPP baseline spec? - * How do I contribute to the spec? + * Why is the spec so big, especially relative to the XMPP baseline spec? + * How do I contribute to the spec? * What is the privacy policy on Matrix.org? * How precisely does E2E work? * How does Matrix actually work architecturally? @@ -619,4 +619,4 @@ This FAQ is a constant work in progress - patches and pull requests are *very* w | Any other questions? Please contact us in -[\#matrix:matrix.org](https://matrix.org/beta/#/room/%23matrix:matrix.org). +[\#matrix:matrix.org](https://matrix.to/#/#matrix:matrix.org).