v1.2.3

Change update URL to match new host

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+patreon: matrixdotorg
+liberapay: matrixdotorg

.gitignore

@@ -6,6 +6,7 @@
 /node_modules
 /electron_app/node_modules
 /electron_app/dist
+/electron_app/pub
 /packages/
 /webapp
 /.npmrc

CHANGELOG.md

@@ -1,3 +1,119 @@
+Changes in [1.2.3](https://github.com/vector-im/riot-web/releases/tag/v1.2.3) (2019-07-08)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.3-rc.1...v1.2.3)
+
+ * Upgrade to React SDK 1.3.0 and JS SDK 2.1.0
+ * JS SDK 2.1.0 includes a fix for an exception whilst syncing
+
+Changes in [1.2.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.3-rc.1) (2019-07-03)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.2...v1.2.3-rc.1)
+
+ * Change update URL to match new host
+   [\#10247](https://github.com/vector-im/riot-web/pull/10247)
+ * Update from Weblate
+   [\#10219](https://github.com/vector-im/riot-web/pull/10219)
+ * Extract configuration docs to separate file
+   [\#10195](https://github.com/vector-im/riot-web/pull/10195)
+ * Add e2e/warning.svg to preload
+   [\#10197](https://github.com/vector-im/riot-web/pull/10197)
+ * Fix Electron vector: links
+   [\#10196](https://github.com/vector-im/riot-web/pull/10196)
+ * Display a red box of anger for config syntax errors
+   [\#10193](https://github.com/vector-im/riot-web/pull/10193)
+ * Move config-getting to VectorBasePlatform
+   [\#10181](https://github.com/vector-im/riot-web/pull/10181)
+ * Update from Weblate
+   [\#10124](https://github.com/vector-im/riot-web/pull/10124)
+ * Fix default Electron window and tray icons
+   [\#10097](https://github.com/vector-im/riot-web/pull/10097)
+
+Changes in [1.2.2](https://github.com/vector-im/riot-web/releases/tag/v1.2.2) (2019-06-19)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.2-rc.2...v1.2.2)
+
+ No changes since rc.2
+
+Changes in [1.2.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.2.2-rc.2) (2019-06-18)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.2-rc.1...v1.2.2-rc.2)
+
+ * Update to react-sdk and js-sdk rc.2 for registration fixes,
+   redaction local echo fix and removing unnecessary calls
+   to the integration manager.
+
+Changes in [1.2.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.2-rc.1) (2019-06-12)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.1...v1.2.2-rc.1)
+
+ * Update from Weblate
+   [\#10012](https://github.com/vector-im/riot-web/pull/10012)
+ * Add funding details for GitHub sponsor button
+   [\#9982](https://github.com/vector-im/riot-web/pull/9982)
+ * Do not fail on server liveliness checks during startup
+   [\#9960](https://github.com/vector-im/riot-web/pull/9960)
+ * Hide guest functions on the welcome page if not logged in
+   [\#9957](https://github.com/vector-im/riot-web/pull/9957)
+ * Add Albanian and West Flemish languages
+   [\#9953](https://github.com/vector-im/riot-web/pull/9953)
+ * Update from Weblate
+   [\#9951](https://github.com/vector-im/riot-web/pull/9951)
+ * Add docs for defaultCountryCode
+   [\#9927](https://github.com/vector-im/riot-web/pull/9927)
+ * Use the user's pre-existing HS when config validation fails
+   [\#9892](https://github.com/vector-im/riot-web/pull/9892)
+ * Low bandwidth mode
+   [\#9909](https://github.com/vector-im/riot-web/pull/9909)
+ * Fix Twemoji loading on Windows dev machines
+   [\#9869](https://github.com/vector-im/riot-web/pull/9869)
+ * Base Docker image on nginx:alpine, not the larger nginx:latest
+   [\#9848](https://github.com/vector-im/riot-web/pull/9848)
+ * Validate homeserver configuration prior to loading the app
+   [\#9779](https://github.com/vector-im/riot-web/pull/9779)
+ * Show resolved homeserver configuration on the mobile guide
+   [\#9726](https://github.com/vector-im/riot-web/pull/9726)
+ * Flag the validated config as the default config
+   [\#9721](https://github.com/vector-im/riot-web/pull/9721)
+ * Clarify comment on is_url and hs_url handling
+   [\#9719](https://github.com/vector-im/riot-web/pull/9719)
+ * Validate default homeserver config before loading the app
+   [\#9496](https://github.com/vector-im/riot-web/pull/9496)
+
+Changes in [1.2.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.1) (2019-05-31)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.0...v1.2.1)
+
+ * Upgrade JS SDK to 2.0.0 and React SDK to 1.2.1 to fix key backup and native emoji height
+
+Changes in [1.2.0](https://github.com/vector-im/riot-web/releases/tag/v1.2.0) (2019-05-29)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.0-rc.1...v1.2.0)
+
+ * Upgrade to JS SDK v1.2.0 and React SDK v1.2.0 to fix some regressions
+
+Changes in [1.2.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.0-rc.1) (2019-05-23)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.2...v1.2.0-rc.1)
+
+ * Update from Weblate
+   [\#9802](https://github.com/vector-im/riot-web/pull/9802)
+ * remove emojione
+   [\#9766](https://github.com/vector-im/riot-web/pull/9766)
+ * Make Dockerfile work for develop and other branches
+   [\#9736](https://github.com/vector-im/riot-web/pull/9736)
+ * add description of new labs feature for message editing
+   [\#9728](https://github.com/vector-im/riot-web/pull/9728)
+ * Remove karma junit output
+   [\#9628](https://github.com/vector-im/riot-web/pull/9628)
+ * yarn upgrade
+   [\#9626](https://github.com/vector-im/riot-web/pull/9626)
+ * Respond quickly to buildkite pokes
+   [\#9617](https://github.com/vector-im/riot-web/pull/9617)
+ * Delay creating the `Favico` instance
+   [\#9616](https://github.com/vector-im/riot-web/pull/9616)
+ * Add reactions feature to config sample
+   [\#9598](https://github.com/vector-im/riot-web/pull/9598)
+
 Changes in [1.1.2](https://github.com/vector-im/riot-web/releases/tag/v1.1.2) (2019-05-15)
 ==========================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.1...v1.1.2)

Dockerfile

@@ -23,7 +23,7 @@ RUN cp /src/config.sample.json /src/webapp/config.json
 
 
 # App
-FROM nginx:latest
+FROM nginx:alpine
 
 COPY --from=builder /src/webapp /app
 

README.md

@@ -21,7 +21,7 @@ released version of Riot:
 1. Untar the tarball on your web server
 1. Move (or symlink) the `riot-x.x.x` directory to an appropriate name
 1. If desired, copy `config.sample.json` to `config.json` and edit it
-   as desired. See below for details.
+   as desired. See the [configuration docs](docs/config.md) for details.
 1. Enter the URL into your browser and log into Riot!
 
 Releases are signed using gpg and the OpenPGP standard, and can be checked against the public key located
@@ -52,9 +52,9 @@ on the client, Riot needs a way to supply the decrypted content from a separate
 origin to the one Riot is hosted on. This currently done with a 'cross origin
 renderer' which is a small piece of javascript hosted on a different domain.
 To avoid all Riot installs needing one of these to be set up, riot.im hosts
-one on usercontent.riot.im which is used by default. See 'config.json' if you'd
-like to host your own. https://github.com/vector-im/riot-web/issues/6173 tracks
-progress on replacing this with something better.
+one on usercontent.riot.im which is used by default.
+https://github.com/vector-im/riot-web/issues/6173 tracks progress on replacing
+this with something better.
 
 Building From Source
 ====================
@@ -91,7 +91,7 @@ guide](https://yarnpkg.com/docs/install/) if you do not have it already.
    develop branch. (Note that we don't reference the develop versions in git directly
    due to https://github.com/npm/npm/issues/3055.)
 1. Configure the app by copying `config.sample.json` to `config.json` and
-   modifying it (see below for details).
+   modifying it. See the [configuration docs](docs/config.md) for details.
 1. `yarn dist` to build a tarball to deploy. Untaring this file will give
    a version-specific directory containing all the files that need to go on your
    web server.
@@ -101,94 +101,10 @@ which will build all the necessary files into the `webapp` directory. The versio
 will not appear in Settings without using the dist script. You can then mount the
 `webapp` directory on your webserver to actually serve up the app, which is entirely static content.
 
-config.json
-===========
-
-You can configure the app by copying `config.sample.json` to
-`config.json` and customising it:
-
-For a good example, see https://riot.im/develop/config.json.
-
-1. `default_server_name` sets the default server name to use for authentication.
-   This will trigger Riot to ask
-   `https://<server_name>/.well-known/matrix/client` for the homeserver and
-   identity server URLs to use. This is the recommended approach for setting a
-   default server. However, it is also possible to use the following to directly
-   configure each of the URLs:
-   * `default_hs_url` sets the default homeserver URL.
-   * `default_is_url` sets the default identity server URL (this is the server used
-      for verifying third party identifiers like email addresses). If this is blank,
-      registering with an email address, adding an email address to your account,
-      or inviting users via email address will not work.  Matrix identity servers are
-      very simple web services which map third party identifiers (currently only email
-      addresses) to matrix IDs: see http://matrix.org/docs/spec/identity_service/unstable.html
-      for more details.  Currently the only public matrix identity servers are https://matrix.org
-      and https://vector.im.  In the future, identity servers will be decentralised.
-   * Riot will report an error if you accidentally configure both `default_server_name` _and_ `default_hs_url` since it's unclear which should take priority.
-1. `features`: Lookup of optional features that may be `enable`d, `disable`d, or exposed to the user
-   in the `labs` section of settings.  The available optional experimental features vary from
-   release to release.
-1. `brand`: String to pass to your homeserver when configuring email notifications, to let the
-   homeserver know what email template to use when talking to you.
-1. `branding`: Configures various branding and logo details, such as:
-    1. `welcomeBackgroundUrl`: An image to use as a wallpaper outside the app
-       during authentication flows
-    1. `authHeaderLogoUrl`: An logo image that is shown in the header during
-       authentication flows
-    1. `authFooterLinks`: a list of links to show in the authentication page footer:
-      `[{"text": "Link text", "url": "https://link.target"}, {"text": "Other link", ...}]`
-1. `integrations_ui_url`: URL to the web interface for the integrations server. The integrations
-   server is not Riot and normally not your homeserver either. The integration server settings
-   may be left blank to disable integrations.
-1. `integrations_rest_url`: URL to the REST interface for the integrations server.
-1. `integrations_widgets_urls`: list of URLs to the REST interface for the widget integrations server.
-1. `bug_report_endpoint_url`: endpoint to send bug reports to (must be running a
-   https://github.com/matrix-org/rageshake server). Bug reports are sent when a user clicks
-   "Send Logs" within the application. Bug reports can be disabled by leaving the
-   `bug_report_endpoint_url` out of your config file.
-1. `roomDirectory`: config for the public room directory. This section is optional.
-1. `roomDirectory.servers`: List of other homeservers' directories to include in the drop
-   down list. Optional.
-1. `default_theme`: name of theme to use by default (e.g. 'light')
-1. `update_base_url` (electron app only): HTTPS URL to a web server to download
-   updates from. This should be the path to the directory containing `macos`
-   and `win32` (for update packages, not installer packages).
-1. `cross_origin_renderer_url`: URL to a static HTML page hosting code to help display
-   encrypted file attachments. This MUST be hosted on a completely separate domain to
-   anything else since it is used to isolate the privileges of file attachments to this
-   domain. Default: `https://usercontent.riot.im/v1.html`. This needs to contain v1.html from
-   https://github.com/matrix-org/usercontent/blob/master/v1.html
-1. `piwik`: Analytics can be disabled by setting `piwik: false` or by leaving the piwik config
-   option out of your config file. If you want to enable analytics, set `piwik` to be an object
-   containing the following properties:
-    1. `url`: The URL of the Piwik instance to use for collecting analytics
-    1. `whitelistedHSUrls`: a list of HS URLs to not redact from the analytics
-    1. `whitelistedISUrls`: a list of IS URLs to not redact from the analytics
-    1. `siteId`: The Piwik Site ID to use when sending analytics to the Piwik server configured above
-1. `welcomeUserId`: the user ID of a bot to invite whenever users register that can give them a tour
-1. `embeddedPages`: Configures the pages displayed in portions of Riot that
-   embed static files, such as:
-    1. `welcomeUrl`: Initial content shown on the outside of the app when not
-       logged in. Defaults to `welcome.html` supplied with Riot.
-    1. `homeUrl`: Content shown on the inside of the app when a specific room is
-       not selected. By default, no home page is configured. If one is set, a
-       button to access it will be shown in the top left menu.
-
-
-Note that `index.html` also has an og:image meta tag that is set to an image
-hosted on riot.im. This is the image used if links to your copy of Riot
-appear in some websites like Facebook, and indeed Riot itself. This has to be
-static in the HTML and an absolute URL (and HTTP rather than HTTPS), so it's
-not possible for this to be an option in config.json. If you'd like to change
-it, you can build Riot as above, but run
-`RIOT_OG_IMAGE_URL="http://example.com/logo.png" yarn build`.
-Alternatively, you can edit the `og:image` meta tag in `index.html` directly
-each time you download a new version of Riot.
-
 Running as a Desktop app
 ========================
 
-Riot can also be run as a desktop app, wrapped in electron. You can download a
+Riot can also be run as a desktop app, wrapped in Electron. You can download a
 pre-built version from https://riot.im/download/desktop/ or, if you prefer,
 build it yourself.
 
@@ -196,13 +112,13 @@ To build it yourself, follow the instructions below.
 
 1. Follow the instructions in 'Building From Source' above, but run
    `yarn build` instead of `yarn dist` (since we don't need the tarball).
-2. Install electron and run it:
+2. Install Electron and run it:
 
    ```bash
    yarn electron
    ```
 
-To build packages, use electron-builder. This is configured to output:
+To build packages, use `electron-builder`. This is configured to output:
  * `dmg` + `zip` for macOS
  * `exe` + `nupkg` for Windows
  * `deb` for Linux
@@ -214,22 +130,20 @@ for dependencies required for building packages for various platforms.
 
 The only platform that can build packages for all three platforms is macOS:
 ```bash
-brew install wine --without-x11
 brew install mono
-brew install gnu-tar
 yarn install
 yarn build:electron
 ```
 
-For other packages, use electron-builder manually. For example, to build a package
-for 64 bit Linux:
+For other packages, use `electron-builder` manually. For example, to build a
+package for 64 bit Linux:
 
  1. Follow the instructions in 'Building From Source' above
  2. `node_modules/.bin/build -l --x64`
 
-All electron packages go into `electron_app/dist/`
+All Electron packages go into `electron_app/dist/`
 
-Many thanks to @aviraldg for the initial work on the electron integration.
+Many thanks to @aviraldg for the initial work on the Electron integration.
 
 Other options for running as a desktop app:
  * @asdf:matrix.org points out that you can use nativefier and it just works(tm)
@@ -239,19 +153,8 @@ yarn global add nativefier
 nativefier https://riot.im/app/
 ```
 
-Desktop app configuration
-=========================
-
-To run multiple instances of the desktop app for different accounts, you can launch the executable with the `--profile` argument followed by a unique identifier, e.g `riot-web --profile Work` for it to run a separate profile and not interfere with the default one.
-
-Alternatively, a custom location for the profile data can be specified using the `--profile-dir` flag followed by the desired path.
-
-To change the config.json for the desktop app, create a config file which will be used to override values in the config which ships in the package:
-+ `%APPDATA%\$NAME\config.json` on Windows
-+ `$XDG_CONFIG_HOME\$NAME\config.json` or `~/.config/$NAME/config.json` on Linux
-+ `~Library/Application Support/$NAME/config.json` on macOS
-
-In the paths above, `$NAME` is typically `Riot`, unless you use `--profile $PROFILE` in which case it becomes `Riot-$PROFILE`.
+The [configuration docs](docs/config.md#desktop-app-configuration) show how to
+override the desktop app's default settings if desired.
 
 Running from Docker
 ===================
@@ -289,6 +192,12 @@ docker build -t vectorim/riot-web:develop \
     .
 ```
 
+config.json
+===========
+
+Riot supports a variety of settings to configure default servers, behaviour, themes, etc.
+See the [configuration docs](docs/config.md) for more details.
+
 Labs Features
 =============
 

config.sample.json

@@ -1,6 +1,14 @@
 {
-    "default_hs_url": "https://matrix.org",
-    "default_is_url": "https://vector.im",
+    "default_server_config": {
+        "m.homeserver": {
+            "base_url": "https://matrix.org",
+            "server_name": "matrix.org"
+        },
+        "m.identity_server": {
+            "base_url": "https://vector.im"
+        }
+    },
+    "disable_identity_server": false,
     "disable_custom_urls": false,
     "disable_guests": false,
     "disable_login_language_selector": false,
@@ -10,6 +18,8 @@
     "integrations_rest_url": "https://scalar.vector.im/api",
     "integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html",
     "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
+    "defaultCountryCode": "GB",
+    "showLabsSettings": false,
     "features": {
         "feature_groups": "labs",
         "feature_pinning": "labs",

docs/config.md

@@ -0,0 +1,111 @@
+Configuration
+=============
+
+You can configure the app by copying `config.sample.json` to
+`config.json` and customising it:
+
+For a good example, see https://riot.im/develop/config.json.
+
+1. `default_server_config` sets the default homeserver and identity server URL for
+   Riot to use. The object is the same as returned by [https://<server_name>/.well-known/matrix/client](https://matrix.org/docs/spec/client_server/latest.html#get-well-known-matrix-client),
+   with added support for a `server_name` under the `m.homeserver` section to display
+   a custom homeserver name. Alternatively, the config can contain a `default_server_name`
+   instead which is where Riot will go to get that same object, although this option is
+   deprecated - see the `.well-known` link above for more information on using this option.
+   Note that the `default_server_name` is used to get a complete server configuration
+   whereas the `server_name` in the `default_server_config` is for display purposes only.
+   * *Note*: The URLs can also be individually specified as `default_hs_url` and
+     `default_is_url`, however these are deprecated. They are maintained for backwards
+     compatibility with older configurations. `default_is_url` is respected only
+     if `default_hs_url` is used.
+   * The identity server is used for verifying third party identifiers like emails
+     and phone numbers. It is not used to store your password or account information.
+     If not provided, the identity server defaults to vector.im unless `disable_identity_server`
+     is set to true in the config. Currently the only two public identity servers
+     are https://matrix.org and https://vector.im, however in future identity servers
+     will be decentralised.
+   * Riot will fail to load if a mix of `default_server_config`, `default_server_name`, or
+     `default_hs_url` is specified. When multiple sources are specified, it is unclear
+     which should take priority and therefore the application cannot continue.
+1. `features`: Lookup of optional features that may be `enable`d, `disable`d, or exposed to the user
+   in the `labs` section of settings.  The available optional experimental features vary from
+   release to release. Some of the available features are described in the Labs Feature section
+   of this README.
+1. `showLabsSettings`: Shows the "labs" tab of user settings even when no `features` are enabled
+   or present. Useful for getting at settings which may be otherwise hidden.
+1. `brand`: String to pass to your homeserver when configuring email notifications, to let the
+   homeserver know what email template to use when talking to you.
+1. `branding`: Configures various branding and logo details, such as:
+    1. `welcomeBackgroundUrl`: An image to use as a wallpaper outside the app
+       during authentication flows
+    1. `authHeaderLogoUrl`: An logo image that is shown in the header during
+       authentication flows
+    1. `authFooterLinks`: a list of links to show in the authentication page footer:
+      `[{"text": "Link text", "url": "https://link.target"}, {"text": "Other link", ...}]`
+1. `integrations_ui_url`: URL to the web interface for the integrations server. The integrations
+   server is not Riot and normally not your homeserver either. The integration server settings
+   may be left blank to disable integrations.
+1. `integrations_rest_url`: URL to the REST interface for the integrations server.
+1. `integrations_widgets_urls`: list of URLs to the REST interface for the widget integrations server.
+1. `bug_report_endpoint_url`: endpoint to send bug reports to (must be running a
+   https://github.com/matrix-org/rageshake server). Bug reports are sent when a user clicks
+   "Send Logs" within the application. Bug reports can be disabled by leaving the
+   `bug_report_endpoint_url` out of your config file.
+1. `roomDirectory`: config for the public room directory. This section is optional.
+1. `roomDirectory.servers`: List of other homeservers' directories to include in the drop
+   down list. Optional.
+1. `default_theme`: name of theme to use by default (e.g. 'light')
+1. `update_base_url` (electron app only): HTTPS URL to a web server to download
+   updates from. This should be the path to the directory containing `macos`
+   and `win32` (for update packages, not installer packages).
+1. `cross_origin_renderer_url`: URL to a static HTML page hosting code to help display
+   encrypted file attachments. This MUST be hosted on a completely separate domain to
+   anything else since it is used to isolate the privileges of file attachments to this
+   domain. Default: `https://usercontent.riot.im/v1.html`. This needs to contain v1.html from
+   https://github.com/matrix-org/usercontent/blob/master/v1.html
+1. `piwik`: Analytics can be disabled by setting `piwik: false` or by leaving the piwik config
+   option out of your config file. If you want to enable analytics, set `piwik` to be an object
+   containing the following properties:
+    1. `url`: The URL of the Piwik instance to use for collecting analytics
+    1. `whitelistedHSUrls`: a list of HS URLs to not redact from the analytics
+    1. `whitelistedISUrls`: a list of IS URLs to not redact from the analytics
+    1. `siteId`: The Piwik Site ID to use when sending analytics to the Piwik server configured above
+1. `welcomeUserId`: the user ID of a bot to invite whenever users register that can give them a tour
+1. `embeddedPages`: Configures the pages displayed in portions of Riot that
+   embed static files, such as:
+    1. `welcomeUrl`: Initial content shown on the outside of the app when not
+       logged in. Defaults to `welcome.html` supplied with Riot.
+    1. `homeUrl`: Content shown on the inside of the app when a specific room is
+       not selected. By default, no home page is configured. If one is set, a
+       button to access it will be shown in the top left menu.
+1. `defaultCountryCode`: The ISO 3166 alpha2 country code to use when showing
+   country selectors, like the phone number input on the registration page.
+   Defaults to `GB` if the given code is unknown or not provided.
+
+Note that `index.html` also has an og:image meta tag that is set to an image
+hosted on riot.im. This is the image used if links to your copy of Riot
+appear in some websites like Facebook, and indeed Riot itself. This has to be
+static in the HTML and an absolute URL (and HTTP rather than HTTPS), so it's
+not possible for this to be an option in config.json. If you'd like to change
+it, you can build Riot, but run
+`RIOT_OG_IMAGE_URL="http://example.com/logo.png" yarn build`.
+Alternatively, you can edit the `og:image` meta tag in `index.html` directly
+each time you download a new version of Riot.
+
+Desktop app configuration
+=========================
+
+To run multiple instances of the desktop app for different accounts, you can
+launch the executable with the `--profile` argument followed by a unique
+identifier, e.g `riot-web --profile Work` for it to run a separate profile and
+not interfere with the default one.
+
+Alternatively, a custom location for the profile data can be specified using the
+`--profile-dir` flag followed by the desired path.
+
++ `%APPDATA%\$NAME\config.json` on Windows
++ `$XDG_CONFIG_HOME\$NAME\config.json` or `~/.config/$NAME/config.json` on Linux
++ `~Library/Application Support/$NAME/config.json` on macOS
+
+In the paths above, `$NAME` is typically `Riot`, unless you use `--profile
+$PROFILE` in which case it becomes `Riot-$PROFILE`.

electron_app/package.json

@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "1.1.2",
+  "version": "1.2.3",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "dependencies": {

electron_app/riot.im/config.json

@@ -1,5 +1,5 @@
 {
-    "update_base_url": "https://riot.im/download/desktop/update/",
+    "update_base_url": "https://packages.riot.im/desktop/update/",
     "default_hs_url": "https://matrix.org",
     "default_is_url": "https://vector.im",
     "brand": "Riot",

electron_app/src/electron-main.js

@@ -1,8 +1,8 @@
 /*
 Copyright 2016 Aviral Dasgupta
 Copyright 2016 OpenMarket Ltd
-Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
 Copyright 2018 New Vector Ltd
+Copyright 2017, 2019 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -173,6 +173,9 @@ ipcMain.on('ipcCall', async function(ev, payload) {
             await migrateFromOldOrigin();
             migratingOrigin = false;
             break;
+        case 'getConfig':
+            ret = vectorConfig;
+            break;
         default:
             mainWindow.webContents.send('ipcReply', {
                 id: payload.id,
@@ -295,7 +298,10 @@ app.on('ready', () => {
         console.log('No update_base_url is defined: auto update is disabled');
     }
 
-    const iconPath = `${__dirname}/../img/riot.${process.platform === 'win32' ? 'ico' : 'png'}`;
+    // It's important to call `path.join` so we don't end up with the packaged
+    // asar in the final path.
+    const iconFile = `riot.${process.platform === 'win32' ? 'ico' : 'png'}`;
+    const iconPath = path.join(__dirname, "..", "..", "img", iconFile);
 
     // Load the previous window state with fallback to defaults
     const mainWindowState = windowStateKeeper({

electron_app/src/tray.js

@@ -65,7 +65,7 @@ exports.create = function(config) {
     global.mainWindow.webContents.on('page-favicon-updated', async function(ev, favicons) {
         if (!favicons || favicons.length <= 0 || !favicons[0].startsWith('data:')) {
             if (lastFavicon !== null) {
-                win.setIcon(defaultIcon);
+                global.mainWindow.setIcon(defaultIcon);
                 trayIcon.setImage(defaultIcon);
                 lastFavicon = null;
             }

electron_app/src/webcontents-handler.js

@@ -36,7 +36,11 @@ function onWindowOrNavigate(ev, target) {
 }
 
 function onLinkContextMenu(ev, params) {
-    const url = params.linkURL || params.srcURL;
+    let url = params.linkURL || params.srcURL;
+
+    if (url.startsWith('vector://vector/webapp')) {
+        url = "https://riot.im/app/" + url.substring(23);
+    }
 
     const popupMenu = new Menu();
     // No point trying to open blob: URLs in an external browser: it ain't gonna work.

package.json

@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "1.1.2",
+  "version": "1.2.3",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -73,8 +73,8 @@
     "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
     "gfm.css": "^1.1.2",
     "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "1.1.0",
-    "matrix-react-sdk": "1.1.2",
+    "matrix-js-sdk": "2.1.0",
+    "matrix-react-sdk": "1.3.0",
     "modernizr": "^3.6.0",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
     "prop-types": "^15.6.2",
@@ -107,8 +107,8 @@
     "cpx": "^1.3.2",
     "cross-env": "^4.0.0",
     "css-loader": "^2.1.0",
-    "electron-builder": "^20.38.5",
-    "electron-builder-squirrel-windows": "^20.38.5",
+    "electron-builder": "^20.44.4",
+    "electron-builder-squirrel-windows": "^21.0.6",
     "electron-devtools-installer": "^2.2.4",
     "eslint": "^5.8.0",
     "eslint-config-google": "^0.7.1",
@@ -153,13 +153,16 @@
   },
   "build": {
     "appId": "im.riot.app",
-    "electronVersion": "4.1.5",
+    "electronVersion": "4.2.6",
     "files": [
       "node_modules/**",
-      "src/**",
-      "img/**"
+      "src/**"
     ],
     "extraResources": [
+      {
+        "from": "electron_app/img",
+        "to": "img"
+      },
       "webapp/**/*",
       "origin_migrator/**/*"
     ],

res/welcome.html

@@ -149,6 +149,15 @@ h1::after {
     background-image: url('welcome/images/icon-room-directory.svg');
 }
 
+/*
+.mx_WelcomePage_loggedIn is applied by EmbeddedPage from the Welcome component
+If it is set on the page, we should show the buttons. Otherwise, we have to assume
+we don't have an account and should hide them. No account == no guest account either.
+ */
+.mx_WelcomePage:not(.mx_WelcomePage_loggedIn) .mx_WelcomePage_guestFunctions {
+    display: none;
+}
+
 </style>
 
 <div class="mx_Parent">
@@ -169,9 +178,9 @@ h1::after {
         <!-- The comments below are meant to be used by Ansible as a quick way
              to strip out the marked content when desired.
              See https://github.com/vector-im/riot-web/issues/8622.
-             TODO: Convert to config option if possible. -->
+             TODO: Strip out these comments and rely on the guest flag -->
         <!-- BEGIN Ansible: Remove these lines when guest access is disabled -->
-        <div class="mx_ButtonRow">
+        <div class="mx_ButtonRow mx_WelcomePage_guestFunctions">
             <div>
                 <div class="mx_ButtonWrapperText">_t("Need help?")</div>
                 <a href="#/user/@riot-bot:matrix.org?action=chat" class="mx_ButtonParent mx_SecondaryButton mx_Button_iconHelp">

scripts/copy-res.js

@@ -38,11 +38,13 @@ const INCLUDE_LANGS = [
     {'value': 'pt_BR', 'label': 'Português do Brasil'},
     {'value': 'ru', 'label': 'Русский'},
     {'value': 'sk', 'label': 'Slovenčina'},
+    {'value': 'sq', 'label': 'Shqip'},
     {'value': 'sr', 'label': 'српски'},
     {'value': 'sv', 'label': 'Svenska'},
     {'value': 'te', 'label': 'తెలుగు'},
     {'value': 'th', 'label': 'ไทย'},
     {'value': 'tr', 'label': 'Türk'},
+    {'value': 'vls', 'label': 'West-Vlaams'},
     {'value': 'zh_Hans', 'label': '简体中文'}, // simplified chinese
     {'value': 'zh_Hant', 'label': '繁體中文'}, // traditional chinese
 ];

src/i18n/strings/bg.json

@@ -9,7 +9,7 @@
     "Dismiss": "Затвори",
     "powered by Matrix": "базирано на Matrix",
     "Welcome to Riot.im": "Добре дошли в Riot.im",
-    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Децентрализиран, шифрован чат и колаборация базирани на [matrix]",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Децентрализиран, шифрован чат и съвместна работа, базирани на [matrix]",
     "Search the room directory": "Търсене в директорията със стаи",
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "В Matrix съществуват много стаи, свързани към вече съществуващи мрежи (Slack, IRC, Gitter и т.н.) или независими такива. Разгледайте директорията!",
     "Chat with Riot Bot": "Чати с Riot Bot",
@@ -37,10 +37,15 @@
     "Dev chat for the Dendrite dev team": "Чат за разработващия екип на Dendrite",
     "Co-ordination for Riot translators": "Координация за преводачи на Riot",
     "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Може да настроите и собствен сървър за самоличност, но така няма да можете да каните потребители по имейл адрес или да бъдете поканени посредством вашия имейл адрес.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Може да използвате настройките за собствен сървър за да влезете в друг Matrix сървър, чрез указване на адреса му. Това Ви позволява да използвате Riot със съществуващ Matrix акаунт принадлежащ към друг сървър.",
-    "Sign In": "Вход",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Може да използвате настройките за собствен сървър за да влезете в друг Matrix сървър, чрез указване на адреса му. Това ви позволява да използвате Riot със съществуващ Matrix акаунт, принадлежащ към друг сървър.",
+    "Sign In": "Вписване",
     "Create Account": "Създай акаунт",
     "Need help?": "Нужда от помощ?",
     "Explore rooms": "Открий стаи",
-    "Room Directory": "Директория със стаи"
+    "Room Directory": "Директория със стаи",
+    "Unexpected error preparing the app. See console for details.": "Неочаквана грешка при подготвянето на приложението. Вижте конзолата за подробности.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Невалидна конфигурация: може да е указано само едно от: default_server_config, default_server_name, или default_hs_url.",
+    "Invalid configuration: no default server specified.": "Невалидна конфигурация: не е указан сървър по подразбиране.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Тази инсталация на Riot изглежда няма валидна конфигурация за сървър. Ако сте администраторът, моля поправете грешката по-долу",
+    "Your Riot is misconfigured": "Riot не е конфигуриран правилно"
 }

src/i18n/strings/ca.json

@@ -42,5 +42,6 @@
     "Room Directory": "Directori de sales",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Podeu emprar les opcions personalitzades del servidor per iniciar la sessió en altres servidors de Matrix especificant un URL de servidor personal diferent. Això us permet emprar el Riot amb un compte de Matrix existent en un servidor personal diferent.",
     "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "També podeu establir un servidor d'identitat personalitzat, però no podreu convidar usuaris o ser convidats vosaltres mateixos per adreça de correu electrònic.",
-    "Sign In": "Inicia la sessió"
+    "Sign In": "Inicia la sessió",
+    "Invalid configuration: no default server specified.": "Configuració no vàlida: no s'ha especificat cap servidor per defecte."
 }

src/i18n/strings/de_DE.json

@@ -37,10 +37,15 @@
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Die benutzerdefinierten Server-Einstellungen kannst du verwenden, um dich auf anderen Matrix-Servern anzumelden, indem du eine abweichende Heimserver-URL eingibst.<br/>Somit ist es möglich, Riot mit einem bereits bestehendem Matrix-Benutzerkonto auf einem anderen Heimserver zu verwenden.<br/><br/>Außerdem kannst du einen benutzerdefinierten Identitätsserver eingeben. Allerdings kannst du in diesem Fall Benutzer nicht mehr per E-Mail-Adresse einladen und auch selbst nicht mehr per E-Mail-Adresse eingeladen werden.",
     "Co-ordination for Riot translators": "Koordination für Riot-Übersetzer",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Du kannst die erweiterte Serveroption nutzen um dich an einem anderen Matrixserver anzumelden, indem du eine andere Heimserver-URL angibst. Dies erlaubt dir, Riot mit einem existierenden Matrix-Konto auf einem anderen Heimserver zu nutzen.",
-    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Du kannst auch einen anderen Identitätsserver einstellen, allerdings kannst du dann andere Benutzer nicht mehr per E-Mail-Adresse einladen, ebenso wirst du selbst nicht mehr per E-Mail-Adresse eingeladen werden können.",
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Sie können auch einen benutzerdefinierten Identitätsserver festlegen, aber Sie können keine Benutzer per E-Mail-Adresse einladen oder selbst per E-Mail-Adresse eingeladen werden.",
     "Sign In": "Anmelden",
     "Create Account": "Konto erstellen",
     "Need help?": "Brauchst du Hilfe?",
     "Explore rooms": "Räume erkunden",
-    "Room Directory": "Raumverzeichnis"
+    "Room Directory": "Raumverzeichnis",
+    "Unexpected error preparing the app. See console for details.": "Unerwarteter Fehler bei der Vorbereitung der App. Siehe Konsole für Details.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ungültige Konfiguration: Es kann nur eine der Optionen default_server_config, default_server_name oder default_hs_url angegeben werden.",
+    "Invalid configuration: no default server specified.": "Ungültige Konfiguration: Es wurde kein Standardserver angegeben.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Diese Installation von Riot scheint eine ungültige Serverkonfiguration zu haben. Wenn Sie der Administrator sind, korrigieren Sie bitte den folgenden Fehler",
+    "Your Riot is misconfigured": "Dein Riot ist falsch konfiguriert"
 }

src/i18n/strings/en_EN.json

@@ -1,4 +1,11 @@
 {
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.",
+    "The message from the parser is: %(message)s": "The message from the parser is: %(message)s",
+    "Invalid JSON": "Invalid JSON",
+    "Your Riot is misconfigured": "Your Riot is misconfigured",
+    "Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.",
+    "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified.",
     "Riot Desktop on %(platformName)s": "Riot Desktop on %(platformName)s",
     "Unknown device": "Unknown device",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s on %(osName)s",
@@ -15,7 +22,5 @@
     "Need help?": "Need help?",
     "Chat with Riot Bot": "Chat with Riot Bot",
     "Explore rooms": "Explore rooms",
-    "Room Directory": "Room Directory",
-    "Search the room directory": "Search the room directory",
-    "Get started with some tips from Riot Bot!": "Get started with some tips from Riot Bot!"
+    "Room Directory": "Room Directory"
 }

src/i18n/strings/en_US.json

@@ -42,5 +42,12 @@
     "Create Account": "Create Account",
     "Need help?": "Need help?",
     "Explore rooms": "Explore rooms",
-    "Room Directory": "Room Directory"
+    "Room Directory": "Room Directory",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.",
+    "The message from the parser is: %(message)s": "The message from the parser is: %(message)s",
+    "Invalid JSON": "Invalid JSON",
+    "Your Riot is misconfigured": "Your Riot is misconfigured",
+    "Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.",
+    "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified."
 }

src/i18n/strings/eo.json

@@ -36,10 +36,18 @@
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s per %(browserName)s je %(osName)s",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Vi povas uzi proprajn servilajn elektojn por saluti aliajn servilojn de Matrix, per specifo de alia hejmservila URL.<br/>Tio permesas al vi uzi klienton Riot kun jama konto de Matrix en alia hejmservilo.<br/><br/>Vi ankaŭ povas agordi propran identigan servilon, sed vi ne povos inviti uzantojn per retpoŝtadreso, aŭ esti invitata per retpoŝtadreso mem.",
     "Co-ordination for Riot translators": "Kunordigo por tradukantoj de Riot",
-    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Vi povas ankaŭ agordi propran identigan servilon, sed vi ne eblos inviti uzantojn per retpoŝtadresoj, nek eblos esti invitita per retpoŝtadreso.",
-    "Sign In": "Saluti",
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Vi povas ankaŭ agordi propran identigan servilon, sed vi ne eblos inviti uzantojn per retpoŝtadresoj, nek tiel invitiĝi.",
+    "Sign In": "Ensaluti",
     "Create Account": "Krei konton",
     "Need help?": "Ĉu vi bezonas helpon?",
     "Explore rooms": "Esplori ĉambrojn",
-    "Room Directory": "Ĉambra dosierujo"
+    "Room Directory": "Ĉambra dosierujo",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Vi povas uzi proprajn servilajn elekteblojn por ensaluti al aliaj serviloj de Matrix per doni alian hejmeservilan URL-on. Tio povigos vin uzi Riot kun jama konto de Matrix en alia hejmservilo.",
+    "Unexpected error preparing the app. See console for details.": "Neatendita eraro okazis dum la preparado de la aplikaĵo. Rigardu la konzolon por detaloj.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Nevalida agordo: vi povas specifi nur unu elekteblon el « default_server_config », « default_server_name », aŭ « default_hs_url ».",
+    "Invalid configuration: no default server specified.": "Nevalida agordo: neniu implicita servilo estas specifita.",
+    "Your Riot is misconfigured": "Via kliento Riot estas misagordita",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Viaj Riot-agordoj enhavas nevalidan JSON-on. Bonvolu korekti la problemon kaj reŝarĝi la paĝon.",
+    "The message from the parser is: %(message)s": "La mesaĝo el la analizilo estas: %(message)s",
+    "Invalid JSON": "Nevalida JSON"
 }

src/i18n/strings/es.json

@@ -8,7 +8,7 @@
     "Riot is not supported on mobile web. Install the app?": "Riot no está soportado en navegadores Web móviles. ¿Quieres instalar la aplicación?",
     "You need to be using HTTPS to place a screen-sharing call.": "Debes usar HTTPS para hacer una llamada con pantalla compartida.",
     "Welcome to Riot.im": "Bienvenido a Riot.im",
-    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas &  colaboración con el poder de [matrix]",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas y colaboración con el poder de [matrix]",
     "Search the room directory": "Buscar en el directorio de salas",
     "Chat with Riot Bot": "Hablar con Riot Bot",
     "Get started with some tips from Riot Bot!": "¡Comenzar con algunos consejos de Riot Bot!",
@@ -42,5 +42,9 @@
     "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "También puedes definir un servidor de identidad personalizado,  pero no podrás invitar a usuarios o ser inivitado usando direcciones de correo.",
     "Explore rooms": "Explorar salas",
     "Room Directory": "Directorio de salas",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Puedes usar la opción de servidor personalizado para iniciar sesión en otros servidores Matrix, especificando la dirección URL del servidor. Esto te permite usar una cuenta Matrix en un servidor diferente."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Puedes usar la opción de servidor personalizado para iniciar sesión en otros servidores Matrix, especificando la dirección URL del servidor. Esto te permite usar una cuenta Matrix en un servidor diferente.",
+    "Unexpected error preparing the app. See console for details.": "Error inesperado preparando la aplicación. Vea la consola para más detalles.",
+    "Your Riot is misconfigured": "Riot tiene un error de configuración",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuración errónea: sólo puede especificar uno de default_server_config, default_server_name, o default_hs_url.",
+    "Invalid configuration: no default server specified.": "Configuración errónea: no se ha especificado servidor."
 }

src/i18n/strings/eu.json

@@ -42,5 +42,12 @@
     "Create Account": "Sortu kontua",
     "Need help?": "Laguntza behar?",
     "Explore rooms": "Arakatu gelak",
-    "Room Directory": "Gelen direktorioa"
+    "Room Directory": "Gelen direktorioa",
+    "Unexpected error preparing the app. See console for details.": "Ustekabeko errorea aplikazioa prestatzean. Ikusi xehetasunak kontsolan.",
+    "Your Riot is misconfigured": "Zure Riot gaizki konfiguratuta dago",
+    "Invalid configuration: no default server specified.": "Konfigurazio baliogabea: Ez da lehenetsitako zerbitzaririk zehaztu.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Konfigurazio baliogabea: default_server_config, default_server_name, edo default_hs_url bat bakarra zehaztu daiteke.",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Zure Riot konfigurazioak baliogabeko JSON kodea du. Zuzendu arazoa eta kargatu orria berriro.",
+    "The message from the parser is: %(message)s": "Prozesatzailearen mezua hau da: %(message)s",
+    "Invalid JSON": "JSON baliogabea"
 }

src/i18n/strings/fi.json

@@ -28,7 +28,7 @@
     "Dev chat for the Riot/Web dev team": "Kehittäjäkeskustelu Riot/Web kehitystiimille",
     "Dev chat for the Dendrite dev team": "Kehittäjäkeskustelu Dendrite kehitystiimille",
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrixissa on olemassa monia huoneita, jotka on linkitetty olemassa oleviin verkkoihin (Slack, IRC, Gitter yms.). Tutustu hakemistoon!",
-    "powered by Matrix": "Matrix",
+    "powered by Matrix": "moottorina Matrix",
     "Riot is not supported on mobile web. Install the app?": "Riot ei tue laitettasi. Asenna mobiilisovellus?",
     "Design and implementation of E2E in Matrix": "Matrix päästä-päähän salauksen suunnittelu ja implementointi",
     "Contributing code to Matrix and Riot": "Osallistu kehitystyöhön",
@@ -37,9 +37,16 @@
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Voit käyttää edistyksellisiä asetuksia kirjautuaksesi muille Matrix palvelimille, määrittelemällä kotipalvelimen URL-osoitteen.<br/>Tämän avulla voit käyttää Riot:ia olemassa olevalla toisen Matrix palvelimen käyttäjätilillä.<br/><br/>Voit myös asettaa valinnaisen identiteettipalvelimen, mutta et voi kutsua käyttäjiä sähköpostiosoitteella tai tulla kutsutuksi.",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Voit käyttää mukautettuja palvelinasetuksia kirjautuaksesi muihin Matrix-palvelimiin. Tämä mahdollistaa Riotin käyttämisen toisella kotipalvelimella olevalla Matrix-tilillä.",
     "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Voit myös määrittää toisen identiteettipalvelimen, mutta et voi kutsua muita käyttäjiä sähköpostin perusteella tai saada itse kutsua sähköpostin perusteella.",
-    "Sign In": "Kirjaudu sisään",
+    "Sign In": "Kirjaudu",
     "Create Account": "Luo tili",
     "Need help?": "Tarvitsetko apua?",
     "Explore rooms": "Etsi huoneita",
-    "Room Directory": "Huoneluettelo"
+    "Room Directory": "Huoneluettelo",
+    "Unexpected error preparing the app. See console for details.": "Odottamaton virhe sovellusta valmisteltaessa. Katso konsolista lisätietoja.",
+    "Your Riot is misconfigured": "Riotin asetukset ovat pielessä",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Virheellinen asetus. Vain yhden seuraavista voi määrittää: default_server_config, default_server_name, tai default_hs_url.",
+    "Invalid configuration: no default server specified.": "Virheellinen asetus: oletuspalvelinta ei ole määritetty.",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riot-asetuksissasi on virheellistä JSONia. Korjaa ongelma ja lataa sivu uudelleen.",
+    "The message from the parser is: %(message)s": "Viesti jäsentimeltä: %(message)s",
+    "Invalid JSON": "Virheellinen JSON"
 }

src/i18n/strings/fr.json

@@ -42,5 +42,13 @@
     "Create Account": "Créer un compte",
     "Need help?": "Besoin d'aide ?",
     "Explore rooms": "Explorer les salons",
-    "Room Directory": "Répertoire de salons"
+    "Room Directory": "Répertoire de salons",
+    "Unexpected error preparing the app. See console for details.": "Une erreur inattendue est survenue pendant la préparation de l’application. Consultez la console pour avoir des détails.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuration invalide : il ne faut spécifier qu’un des trois champs entre default_server_config, default_server_name et default_hs_url.",
+    "Invalid configuration: no default server specified.": "Configuration invalide : aucun serveur par défaut spécifié.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Cette installation de Riot semble avoir une configuration de serveur non valide. Si vous êtes l’administrateur, corrigez l’erreur ci-dessous",
+    "Your Riot is misconfigured": "Votre Riot est mal configuré",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Votre configuration de Riot contient du JSON non valide. Corrigez ce problème et rechargez la page.",
+    "The message from the parser is: %(message)s": "Le message de l’analyseur est : %(message)s",
+    "Invalid JSON": "JSON non valide"
 }

src/i18n/strings/hu.json

@@ -42,5 +42,13 @@
     "Create Account": "Fiók készítés",
     "Need help?": "Segíthetünk?",
     "Explore rooms": "Szobák felfedezése",
-    "Room Directory": "Szoba lista"
+    "Room Directory": "Szoba lista",
+    "Unexpected error preparing the app. See console for details.": "Váratlan hiba történt az alkalmazás előkészítésénél. A részletekért nézd meg a konzolt.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Érvénytelen konfiguráció: csak egyet lehet megadni a default_server_config, default_server_name és default_hs_url közül.",
+    "Invalid configuration: no default server specified.": "Érvénytelen konfiguráció: nincs megadva alapértelmezett szerver.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "A telepített Riotnak úgy tűnik hibás a szerver beállítása. Ha te vagy az adminisztrátor, kérlek javítsd az alábbi hibát",
+    "Your Riot is misconfigured": "A Riotod hibásan van beállítva",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "A Riot beállításod érvénytelen JSON szöveget tartalmaz. Kérlek javítsd és töltsd újra az oldalt.",
+    "The message from the parser is: %(message)s": "A feldolgozó algoritmus üzenete: %(message)s",
+    "Invalid JSON": "Érvénytelen JSON"
 }

src/i18n/strings/it.json

@@ -42,5 +42,10 @@
     "Create Account": "Crea account",
     "Need help?": "Serve aiuto?",
     "Explore rooms": "Esplora stanze",
-    "Room Directory": "Elenco stanze"
+    "Room Directory": "Elenco stanze",
+    "Unexpected error preparing the app. See console for details.": "Errore inaspettato preparando l'app. Vedi la console per i dettagli.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configurazione non valida: specificare solo uno di default_server_config, default_server_name, o default_hs_url.",
+    "Invalid configuration: no default server specified.": "Configurazione non valida: nessun server predefinito specificato.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Questa installazione di Riot sembra avere una configurazione server non valida. Se sei l'amministratore, correggi l'errore sottostante",
+    "Your Riot is misconfigured": "Il tuo Riot è configurato male"
 }

src/i18n/strings/ja.json

@@ -7,7 +7,7 @@
     "Custom Server Options": "カスタムサーバのオプション",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "他のホームサーバのURLを指定することで、他のMatrixサーバにサインインするためにカスタムサーバのオプションを利用できます。<br/>これにより、他のホームサーバ上で既存のMatrixアカウントを用いてRiotを利用できます。<br/><br/>カスタムアイデンティティサーバを立てることもできますが、メールアドレスでユーザを招待する、または自身が招待されることはできません。",
     "Dismiss": "やめる",
-    "powered by Matrix": "Matrixによって動作しています",
+    "powered by Matrix": "Matrix の支援により活動しています。",
     "Riot Desktop on %(platformName)s": "%(platformName)s向けデスクトップ版Riot",
     "You need to be using HTTPS to place a screen-sharing call.": "画面共有通話を行うにはHTTPS通信を使う必要があります。",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "分散型の、暗号化された会話とコラボレーション。[matrix]で動作しています",
@@ -35,5 +35,13 @@
     "Contributing code to Matrix and Riot": "MatrixとRiotにコードを提供する",
     "Dev chat for the Riot/Web dev team": "Riot/Web開発者チームのための開発者チャット",
     "Dev chat for the Dendrite dev team": "Dendrite開発者チームのための開発者チャット",
-    "Co-ordination for Riot translators": "Riot 翻訳者による共同作業"
+    "Co-ordination for Riot translators": "Riot 翻訳者による共同作業",
+    "Unexpected error preparing the app. See console for details.": "アプリケーションの準備中に予期しないエラーが発生しました。詳細はコンソールを参照してください。",
+    "Your Riot is misconfigured": "あなたの Riot は間違って設定されています。",
+    "Invalid configuration: no default server specified.": "不正な設定です：デフォルトのサーバーが設定されていません。",
+    "Sign In": "サインイン",
+    "Create Account": "アカウントを作成する",
+    "Need help?": "助けが必要ですか？",
+    "Explore rooms": "部屋を探索する",
+    "Room Directory": "部屋のディレクトリー"
 }

src/i18n/strings/lv.json

@@ -34,5 +34,16 @@
     "Dev chat for the Riot/Web dev team": "Riot/Web izstrādātāju komandas čats",
     "Dev chat for the Dendrite dev team": "Dendrite izstrādatāju komandas čats",
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix-ā pastāv daudzas neatkarīgas un/vai eksistējošiem tīmekļa resursiem (Slack, IRC, Gitter u.tml.) piesaistītas istabas. Ieskaties katalogā!",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Tu vari lietot \"custom\" servera opcijas, lai ielogotos citos Matrix serveros, norādot citu Bāzes servera URL.<br> Tas atļaus tev lietot Riot ar esošo Matrix kontu uz cita Bāzes servera.<br/><br/>Tu arī vari uzstādīt atsevišķu Identitāšu serveri, taču tad Tev nebūs iespēju uzaicināt lietotājus, izmantojot epasta adresi, vai pašam tikt uzaicinātam, izmantojot epasta adresi."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Tu vari lietot \"custom\" servera opcijas, lai ielogotos citos Matrix serveros, norādot citu Bāzes servera URL.<br> Tas atļaus tev lietot Riot ar esošo Matrix kontu uz cita Bāzes servera.<br/><br/>Tu arī vari uzstādīt atsevišķu Identitāšu serveri, taču tad Tev nebūs iespēju uzaicināt lietotājus, izmantojot epasta adresi, vai pašam tikt uzaicinātam, izmantojot epasta adresi.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Varat izmantot pielāgotās servera opcijas, lai pierakstītos citos Matrix serveros, norādot citu mājas servera URL. Tas ļauj jums izmantot Riot ar esošu Matrix kontu citā mājas serverī.",
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Varat arī iestatīt pielāgotu identitātes serveri, bet jūs nevarēsiet uzaicināt lietotājus izmantojot e-pasta adresi, kā arī tikt uzaicināts pēc e-pasta adreses.",
+    "Sign In": "Ienākt",
+    "Create Account": "Izveidot kontu",
+    "Need help?": "Nepieciešama palīdzība?",
+    "Explore rooms": "Atklāt istabas",
+    "Room Directory": "Istabu Katalogs",
+    "Unexpected error preparing the app. See console for details.": "Negaidīta kļūda, sagatavojot lietotni. Sīkāku informāciju skatiet konsolē.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Šai Riot instalācijai ir nekorekta servera konfigurācija. Ja esat administrators, lūdzu, izlabojiet tālāk norādīto kļūdu",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Nederīga konfigurācija: var norādīt tikai vienu no default_server_config, default_server_name, vai default_hs_url.",
+    "Invalid configuration: no default server specified.": "Nekorekta konfigurācija: nav norādīts noklusējuma serveris."
 }

src/i18n/strings/nl.json

@@ -41,6 +41,14 @@
     "Sign In": "Aanmelden",
     "Create Account": "Account aanmaken",
     "Need help?": "Hulp nodig?",
-    "Explore rooms": "Kamers ontdekken",
-    "Room Directory": "Gesprekscatalogus"
+    "Explore rooms": "Gesprekken ontdekken",
+    "Room Directory": "Gesprekscatalogus",
+    "Unexpected error preparing the app. See console for details.": "Er is een onverwachte fout opgetreden bij het voorbereiden van de app. Bekijk de console voor details.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ongeldige configuratie: kan slechts één van default_server_config, default_server_name, of default_hs_url opgeven.",
+    "Invalid configuration: no default server specified.": "Ongeldige configuratie: geen standaardserver opgegeven.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "De serverconfiguratie van deze Riot-instantie lijkt ongeldig. Als u de beheerder bent, gelieve dan de fout hieronder te corrigeren",
+    "Your Riot is misconfigured": "Uw Riot is verkeerd geconfigureerd",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Uw Riot-configuratie bevat ongeldige JSON. Corrigeer het probleem en herlaad de pagina.",
+    "The message from the parser is: %(message)s": "Het bericht van de verwerker is: %(message)s",
+    "Invalid JSON": "Ongeldige JSON"
 }

src/i18n/strings/pl.json

@@ -39,5 +39,6 @@
     "Create Account": "Stwórz konto",
     "Sign In": "Zaloguj",
     "Need help?": "Potrzebujesz pomocy?",
-    "Room Directory": "Katalog pokojów"
+    "Room Directory": "Katalog pokojów",
+    "Explore rooms": "Przeglądaj pokoje"
 }

src/i18n/strings/ru.json

@@ -1,5 +1,5 @@
 {
-    "Custom Server Options": "Выбор другого сервера",
+    "Custom Server Options": "Параметры другого сервера",
     "Dismiss": "Отклонить",
     "powered by Matrix": "основано на Matrix",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s с %(browserName)s на %(osName)s",
@@ -38,9 +38,14 @@
     "Co-ordination for Riot translators": "Координационный чат для переводчиков Riot",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Вы можете изменить параметры для входа на другие Matrix серверы, указав другой URL.\nЭто позволит использовать Riot с учетной записью Matrix, существующей на другом сервере.",
     "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Также можно изменить сервер идентификации, но без возможности приглашать (или быть приглашённым) по адресу электронной почты.",
-    "Sign In": "Вход",
+    "Sign In": "Войти в систему",
     "Create Account": "Создать аккаунт",
     "Need help?": "Помочь?",
     "Room Directory": "Каталог комнат",
-    "Explore rooms": "Исследовать комнаты"
+    "Explore rooms": "Исследовать комнаты",
+    "Unexpected error preparing the app. See console for details.": "Неожиданная ошибка при подготовке приложения. Подробности см. в консоли.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Неверная конфигурация: может указывать только один из следующих параметров: default_server_config, default_server_name или default_hs_url.",
+    "Invalid configuration: no default server specified.": "Неверная конфигурация: сервер по умолчанию не указан.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Эта установка Riot, кажется, имеет неверную конфигурацию сервера. Если вы являетесь администратором, пожалуйста, исправьте ошибку ниже",
+    "Your Riot is misconfigured": "Ваш Riot неправильно настроен"
 }

src/i18n/strings/sco.json

@@ -0,0 +1,3 @@
+{
+    "Unexpected error preparing the app. See console for details.": "Unexpectit error came up gittin the app set up. See the console? Mair details ur thare."
+}

src/i18n/strings/sl.json

@@ -1 +1,21 @@
-{}
+{
+    "Riot Desktop on %(platformName)s": "Namizni Riot za %(platformName)s",
+    "Unknown device": "Neznana naprava",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s s %(browserName)s na %(osName)s",
+    "You need to be using HTTPS to place a screen-sharing call.": "Za klic s skupno rabo zaslona potrebujete HTTPS.",
+    "powered by Matrix": "poganja Matrix",
+    "Custom Server Options": "Možnosti strežnika po meri",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Možnosti strežnika po meri lahko uporabite za prijavo v druge Matrix strežnike, s tem da podate drug URL domačega strežnika. To vam omogoča, da uporabljate Riot z obstoječim Matrix računom na drugem strežniku.",
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Nastavite lahko tudi strežnik za identiteto po meri, vendar ne boste mogli povabiti uporabnikov prek e-pošte, prav tako pa vas ne bodo mogli povabiti drugi.",
+    "Dismiss": "Opusti",
+    "Welcome to Riot.im": "Dobrodošli v Riot.im",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentralizirano šifrirano sporočanje & sodelovanje s pomočjo [matrix]",
+    "Sign In": "Prijava",
+    "Create Account": "Registracija",
+    "Need help?": "Potrebujete pomoč?",
+    "Chat with Riot Bot": "Klepetajte z Riot Botom",
+    "Explore rooms": "Raziščite sobe",
+    "Room Directory": "Imenik sob",
+    "Search the room directory": "Preiščite imenik sob",
+    "Get started with some tips from Riot Bot!": "Začnite z nekaterimi nasveti Riot Bota!"
+}

src/i18n/strings/sq.json

@@ -42,5 +42,13 @@
     "Create Account": "Krijoni Llogari",
     "Need help?": "Ju duhet ndihmë?",
     "Explore rooms": "Eksploroni dhoma",
-    "Room Directory": "Listë Dhomash"
+    "Room Directory": "Listë Dhomash",
+    "Unexpected error preparing the app. See console for details.": "Gabim i papritur gjatë përgatitjes së aplikacionit. Për hollësi, shihni konsolën.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Formësim i pavlefshëm: mund të caktohet vetëm një prej default_server_config, default_server_name, ose default_hs_url.",
+    "Invalid configuration: no default server specified.": "Formësim i pavlefshëm: s’është caktuar shërbyes parazgjedhje.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Ky instalim i Riot-it duket se ka një formësim të pavlefshëm për shërbyesin. Nëse jeni një përgjegjës, ju lutemi, ndreqni gabimin më poshtë",
+    "Your Riot is misconfigured": "Riot-i juaj është i keqformësuar",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Formësimi juaj i Riot-it përmban JSON. Ju lutemi, ndreqeni problemin dhe ringarkoni faqen.",
+    "The message from the parser is: %(message)s": "Mesazhi prej procesit është: %(message)s",
+    "Invalid JSON": "JSON i pavlefshëm"
 }

src/i18n/strings/uk.json

@@ -37,10 +37,13 @@
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Ви можете використовувати параметри користувача сервера для входа на другі сервера Matrix, вказав другий URL-адресу домашнього сервера. <br/>Це дозволяє використовувати Riot з обліковим записом Matrix який існує на другому домашньому сервері.<br/><br/>Окрім цього, можливо встановити ідентифікаційний сервер користувача, але ви не зможете запросити других користувачів та бути запрошенному  використовуючи адресу електронної пошти.",
     "Co-ordination for Riot translators": "Координаційний чат для перекладачів Riot",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Ви можете використати власні параметри сервера для входу в інші Matrix сервери, вказавши інший URL. Це дозволить використовувати Riot з наявним обліковим записом Matrix на іншому сервері.",
-    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Ви також можете встановити власний сервер ідентифікації, але Ви не зможете запрошувати користувачів або бути запрошеним за адресою електронної пошти.",
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Ви також можете встановити власний сервер ідентифікації, але Ви не зможете запрошувати користувачів (або бути запрошеним самому) за адресою електронної пошти.",
     "Need help?": "Допомогти?",
     "Sign In": "Вхід",
     "Create Account": "Створити аккаунт",
     "Explore rooms": "Дослідити кімнати",
-    "Room Directory": "Каталог кімнат"
+    "Room Directory": "Каталог кімнат",
+    "Unexpected error preparing the app. See console for details.": "Неочікувана помилка при підготовці програми. Дивіться деталі у виводі консолі.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Невірна конфігурація: можна вказати лише default_server_config, default_server_name або default_hs_url.",
+    "Invalid configuration: no default server specified.": "Невірна конфігурація: не вказано сервер за замовчуванням."
 }

src/i18n/strings/vi.json

@@ -16,5 +16,7 @@
     "Get started with some tips from Riot Bot!": "Bắt đầu với các hướng dẫn từ Riot Bot!",
     "General discussion about Matrix and Riot": "Thảo luận chung về Matrix và Riot",
     "Discussion of all things Matrix!": "Thào luận về mọi vấn đề liên quan đến Matrix!",
-    "Riot/Web & Desktop chat": "Riot/Web & Desktop chat"
+    "Riot/Web & Desktop chat": "Riot/Web & Desktop chat",
+    "Unexpected error preparing the app. See console for details.": "Lỗi xảy ra trong lúc chuẩn bị app. Xem console log để biết chi tiết.",
+    "Your Riot is misconfigured": "Riot của bạn bị cấu hình sai"
 }

src/i18n/strings/vls.json

@@ -0,0 +1,27 @@
+{
+    "Unexpected error preparing the app. See console for details.": "’t Is een onverwachte foute ipgetreedn by ’t voorbereidn van den app. Bekykt de console vo details.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "De serverconfiguroatie van deze Riot-instantie lykt oungeldig. A je gy den beheerder zyt, gelieve ton de foute hierounder te corrigeern",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Oungeldige configuroatie: ku moar één van default_server_config, default_server_name, of default_hs_url ipgeevn.",
+    "Invalid configuration: no default server specified.": "Oungeldige configuroatie: geen standoardserver ipgegeevn.",
+    "Riot Desktop on %(platformName)s": "Riot Desktop ip %(platformName)s",
+    "Unknown device": "Ounbekend toestel",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s ip %(osName)s",
+    "You need to be using HTTPS to place a screen-sharing call.": "Je moet HTTPS gebruukn vo een iproep me schermdeeln te kunn startn.",
+    "powered by Matrix": "meuglik gemakt deur Matrix",
+    "Custom Server Options": "Angepaste serverinstelliengn",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Je kut d’angepaste serverinstelliengn gebruukn vo jen eigen an te melden by andere Matrix-servers, deur een andere thuusserver-URL in te geevn. Dit lat je toe van Riot te gebruukn met e bestoande Matrix-account by een andere thuusserver.",
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Je kut ook een angepasten identiteitsserver instelln, ma je goa geen gebruukers kunn uutnodign via e-mail, of zelve via e-mail uutgenodigd wirden.",
+    "Dismiss": "Afwyzn",
+    "Welcome to Riot.im": "Welgekommn by Riot.im",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Gedecentraliseerd en versleuteld chattn & soamenwerkn meuglik gemakt deur [matrix]",
+    "Sign In": "Anmeldn",
+    "Create Account": "Account anmoakn",
+    "Need help?": "Hulp nodig?",
+    "Chat with Riot Bot": "Chattn me Riot-robot",
+    "Explore rooms": "Gesprekkn ountdekkn",
+    "Room Directory": "Gesprekscataloog",
+    "Your Riot is misconfigured": "Je Riot is verkeerd geconfigureerd gewist",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Je Riot-configuroatie bevat oungeldigen JSON. Corrigeer ’t probleem en herload ’t blad.",
+    "The message from the parser is: %(message)s": "’t Bericht van de verwerker is: %(message)s",
+    "Invalid JSON": "Oungeldigen JSON"
+}

src/i18n/strings/zh_Hant.json

@@ -42,5 +42,13 @@
     "Create Account": "建立帳號",
     "Need help?": "需要協助？",
     "Explore rooms": "探索聊天室",
-    "Room Directory": "聊天室目錄"
+    "Room Directory": "聊天室目錄",
+    "Unexpected error preparing the app. See console for details.": "準備應用程式時發生未預期的錯誤。請見主控台以取得更多資訊。",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "無效的設定：只能指定 default_server_config、default_server_name 或 default_hs_url 其中之一。",
+    "Invalid configuration: no default server specified.": "無效設定：未指定預設的伺服器。",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "這個 Riot 安裝似乎有無效的伺服器設定。如果您是管理員，請在下方更正錯誤",
+    "Your Riot is misconfigured": "您的 Riot 沒有設定好",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "您的 Riot 包含無效的 JSON。請修正問題並重新整理頁面。",
+    "The message from the parser is: %(message)s": "從解析器而來的訊息為：%(message)s",
+    "Invalid JSON": "無效的 JSON"
 }

src/vector/getconfig.js

@@ -17,6 +17,8 @@ limitations under the License.
 import Promise from 'bluebird';
 import request from 'browser-request';
 
+// Load the config file. First try to load up a domain-specific config of the
+// form "config.$domain.json" and if that fails, fall back to config.json.
 export async function getVectorConfig(relativeLocation) {
     if (relativeLocation === undefined) relativeLocation = '';
     if (relativeLocation !== '' && !relativeLocation.endsWith('/')) relativeLocation += '/';
@@ -37,28 +39,32 @@ function getConfig(configJsonFilename) {
         request(
             { method: "GET", url: configJsonFilename },
             (err, response, body) => {
-                if (err || response.status < 200 || response.status >= 300) {
-                    // Lack of a config isn't an error, we should
-                    // just use the defaults.
-                    // Also treat a blank config as no config, assuming
-                    // the status code is 0, because we don't get 404s
-                    // from file: URIs so this is the only way we can
-                    // not fail if the file doesn't exist when loading
-                    // from a file:// URI.
-                    if (response) {
-                        if (response.status == 404 || (response.status == 0 && body == '')) {
-                            resolve({});
+                try {
+                    if (err || response.status < 200 || response.status >= 300) {
+                        // Lack of a config isn't an error, we should
+                        // just use the defaults.
+                        // Also treat a blank config as no config, assuming
+                        // the status code is 0, because we don't get 404s
+                        // from file: URIs so this is the only way we can
+                        // not fail if the file doesn't exist when loading
+                        // from a file:// URI.
+                        if (response) {
+                            if (response.status == 404 || (response.status == 0 && body == '')) {
+                                resolve({});
+                            }
                         }
+                        reject({err: err, response: response});
+                        return;
                     }
-                    reject({err: err, response: response});
-                    return;
-                }
 
-                // We parse the JSON ourselves rather than use the JSON
-                // parameter, since this throws a parse error on empty
-                // which breaks if there's no config.json and we're
-                // loading from the filesystem (see above).
-                resolve(JSON.parse(body));
+                    // We parse the JSON ourselves rather than use the JSON
+                    // parameter, since this throws a parse error on empty
+                    // which breaks if there's no config.json and we're
+                    // loading from the filesystem (see above).
+                    resolve(JSON.parse(body));
+                } catch (e) {
+                    reject({err: e});
+                }
             },
         );
     });

src/vector/index.html

@@ -41,6 +41,7 @@
     </script>
     <script src="<%= htmlWebpackPlugin.files.chunks['bundle'].entry %>"></script>
     <img src="<%= require('matrix-react-sdk/res/img/warning.svg') %>" width="24" height="23" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
+    <img src="<%= require('matrix-react-sdk/res/img/e2e/warning.svg') %>" width="24" height="23" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
     <audio id="messageAudio">
         <source src="media/message.ogg" type="audio/ogg" />
         <source src="media/message.mp3" type="audio/mpeg" />

src/vector/index.js

@@ -1,7 +1,8 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
-Copyright 2018 New Vector Ltd
+Copyright 2018, 2019 New Vector Ltd
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -43,8 +44,11 @@ import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
 sdk.loadSkin(require('../component-index'));
 import VectorConferenceHandler from 'matrix-react-sdk/lib/VectorConferenceHandler';
 import Promise from 'bluebird';
-import request from 'browser-request';
 import * as languageHandler from 'matrix-react-sdk/lib/languageHandler';
+import {_t, _td, newTranslatableError} from 'matrix-react-sdk/lib/languageHandler';
+import AutoDiscoveryUtils from 'matrix-react-sdk/lib/utils/AutoDiscoveryUtils';
+import {AutoDiscovery} from "matrix-js-sdk/lib/autodiscovery";
+import * as Lifecycle from "matrix-react-sdk/lib/Lifecycle";
 
 import url from 'url';
 
@@ -62,8 +66,6 @@ import Olm from 'olm';
 
 import CallHandler from 'matrix-react-sdk/lib/CallHandler';
 
-import {getVectorConfig} from './getconfig';
-
 let lastLocationHashSet = null;
 
 // Disable warnings for now: we use deprecated bluebird functions
@@ -115,7 +117,7 @@ function routeUrl(location) {
 }
 
 function onHashChange(ev) {
-    if (decodeURIComponent(window.location.hash) == lastLocationHashSet) {
+    if (decodeURIComponent(window.location.hash) === lastLocationHashSet) {
         // we just set this: no need to route it!
         return;
     }
@@ -155,7 +157,7 @@ function makeRegistrationUrl(params) {
 
     const keys = Object.keys(params);
     for (let i = 0; i < keys.length; ++i) {
-        if (i == 0) {
+        if (i === 0) {
             url += '?';
         } else {
             url += '&';
@@ -166,38 +168,6 @@ function makeRegistrationUrl(params) {
     return url;
 }
 
-export function getConfig(configJsonFilename) {
-    return new Promise(function(resolve, reject) {
-        request(
-            { method: "GET", url: configJsonFilename },
-            (err, response, body) => {
-                if (err || response.status < 200 || response.status >= 300) {
-                    // Lack of a config isn't an error, we should
-                    // just use the defaults.
-                    // Also treat a blank config as no config, assuming
-                    // the status code is 0, because we don't get 404s
-                    // from file: URIs so this is the only way we can
-                    // not fail if the file doesn't exist when loading
-                    // from a file:// URI.
-                    if (response) {
-                        if (response.status == 404 || (response.status == 0 && body == '')) {
-                            resolve({});
-                        }
-                    }
-                    reject({err: err, response: response});
-                    return;
-                }
-
-                // We parse the JSON ourselves rather than use the JSON
-                // parameter, since this throws a parse error on empty
-                // which breaks if there's no config.json and we're
-                // loading from the filesystem (see above).
-                resolve(JSON.parse(body));
-            },
-        );
-    });
-}
-
 function onTokenLoginCompleted() {
     // if we did a token login, we're now left with the token, hs and is
     // url as query params in the url; a little nasty but let's redirect to
@@ -248,14 +218,21 @@ async function loadApp() {
         PlatformPeg.set(new WebPlatform());
     }
 
-    // Load the config file. First try to load up a domain-specific config of the
-    // form "config.$domain.json" and if that fails, fall back to config.json.
+    const platform = PlatformPeg.get();
+
     let configJson;
     let configError;
+    let configSyntaxError = false;
     try {
-        configJson = await getVectorConfig();
+        configJson = await platform.getConfig();
     } catch (e) {
         configError = e;
+
+        if (e && e.err && e.err instanceof SyntaxError) {
+            console.error("SyntaxError loading config:", e);
+            configSyntaxError = true;
+            configJson = {}; // to prevent errors between here and loading CSS for the error box
+        }
     }
 
     // XXX: We call this twice, once here and once in MatrixChat as a prop. We call it here to ensure
@@ -325,6 +302,33 @@ async function loadApp() {
         }
     }
 
+    // Now that we've loaded the theme (CSS), display the config syntax error if needed.
+    if (configSyntaxError) {
+        const errorMessage = (
+            <div>
+                <p>
+                    {_t(
+                        "Your Riot configuration contains invalid JSON. Please correct the problem " +
+                        "and reload the page.",
+                    )}
+                </p>
+                <p>
+                    {_t(
+                        "The message from the parser is: %(message)s",
+                        {message: configError.err.message || _t("Invalid JSON")},
+                    )}
+                </p>
+            </div>
+        );
+
+        const GenericErrorPage = sdk.getComponent("structures.GenericErrorPage");
+        window.matrixChat = ReactDOM.render(
+            <GenericErrorPage message={errorMessage} title={_t("Your Riot is misconfigured")} />,
+            document.getElementById('matrixchat'),
+        );
+        return;
+    }
+
     const validBrowser = checkBrowserFeatures([
         "displaytable", "flexbox", "es5object", "es5function", "localstorage",
         "objectfit", "indexeddb", "webworkers",
@@ -338,25 +342,40 @@ async function loadApp() {
             Unable to load config file: please refresh the page to try again.
         </div>, document.getElementById('matrixchat'));
     } else if (validBrowser || acceptInvalidBrowser) {
-        const platform = PlatformPeg.get();
         platform.startUpdater();
 
-        const MatrixChat = sdk.getComponent('structures.MatrixChat');
-        window.matrixChat = ReactDOM.render(
-            <MatrixChat
-                onNewScreen={onNewScreen}
-                makeRegistrationUrl={makeRegistrationUrl}
-                ConferenceHandler={VectorConferenceHandler}
-                config={configJson}
-                realQueryParams={params}
-                startingFragmentQueryParams={fragparts.params}
-                enableGuest={!configJson.disable_guests}
-                onTokenLoginCompleted={onTokenLoginCompleted}
-                initialScreenAfterLogin={getScreenFromLocation(window.location)}
-                defaultDeviceDisplayName={platform.getDefaultDeviceDisplayName()}
-            />,
-            document.getElementById('matrixchat'),
-        );
+        // Don't bother loading the app until the config is verified
+        verifyServerConfig().then((newConfig) => {
+            const MatrixChat = sdk.getComponent('structures.MatrixChat');
+            window.matrixChat = ReactDOM.render(
+                <MatrixChat
+                    onNewScreen={onNewScreen}
+                    makeRegistrationUrl={makeRegistrationUrl}
+                    ConferenceHandler={VectorConferenceHandler}
+                    config={newConfig}
+                    realQueryParams={params}
+                    startingFragmentQueryParams={fragparts.params}
+                    enableGuest={!configJson.disable_guests}
+                    onTokenLoginCompleted={onTokenLoginCompleted}
+                    initialScreenAfterLogin={getScreenFromLocation(window.location)}
+                    defaultDeviceDisplayName={platform.getDefaultDeviceDisplayName()}
+                />,
+                document.getElementById('matrixchat'),
+            );
+        }).catch(err => {
+            console.error(err);
+
+            let errorMessage = err.translatedMessage
+                || _t("Unexpected error preparing the app. See console for details.");
+            errorMessage = <span>{errorMessage}</span>;
+
+            // Like the compatibility page, AWOOOOOGA at the user
+            const GenericErrorPage = sdk.getComponent("structures.GenericErrorPage");
+            window.matrixChat = ReactDOM.render(
+                <GenericErrorPage message={errorMessage} title={_t("Your Riot is misconfigured")} />,
+                document.getElementById('matrixchat'),
+            );
+        });
     } else {
         console.error("Browser is missing required features.");
         // take to a different landing page to AWOOOOOGA at the user
@@ -390,7 +409,7 @@ function loadOlm() {
     }).then(() => {
         console.log("Using WebAssembly Olm");
     }).catch((e) => {
-        console.log("Failed to load Olm: trying legacy version");
+        console.log("Failed to load Olm: trying legacy version", e);
         return new Promise((resolve, reject) => {
             const s = document.createElement('script');
             s.src = 'olm_legacy.js'; // XXX: This should be cache-busted too
@@ -428,4 +447,99 @@ async function loadLanguage() {
     }
 }
 
+async function verifyServerConfig() {
+    let validatedConfig;
+    try {
+        console.log("Verifying homeserver configuration");
+
+        // Note: the query string may include is_url and hs_url - we only respect these in the
+        // context of email validation. Because we don't respect them otherwise, we do not need
+        // to parse or consider them here.
+
+        // Note: Although we throw all 3 possible configuration options through a .well-known-style
+        // verification, we do not care if the servers are online at this point. We do moderately
+        // care if they are syntactically correct though, so we shove them through the .well-known
+        // validators for that purpose.
+
+        const config = SdkConfig.get();
+        let wkConfig = config['default_server_config']; // overwritten later under some conditions
+        const serverName = config['default_server_name'];
+        const hsUrl = config['default_hs_url'];
+        const isUrl = config['default_is_url'];
+
+        const incompatibleOptions = [wkConfig, serverName, hsUrl].filter(i => !!i);
+        if (incompatibleOptions.length > 1) {
+            // noinspection ExceptionCaughtLocallyJS
+            throw newTranslatableError(_td(
+                "Invalid configuration: can only specify one of default_server_config, default_server_name, " +
+                "or default_hs_url.",
+            ));
+        }
+        if (incompatibleOptions.length < 1) {
+            // noinspection ExceptionCaughtLocallyJS
+            throw newTranslatableError(_td("Invalid configuration: no default server specified."));
+        }
+
+        if (hsUrl) {
+            console.log("Config uses a default_hs_url - constructing a default_server_config using this information");
+            console.warn(
+                "DEPRECATED CONFIG OPTION: In the future, default_hs_url will not be accepted. Please use " +
+                "default_server_config instead.",
+            );
+
+            wkConfig = {
+                "m.homeserver": {
+                    "base_url": hsUrl,
+                },
+            };
+            if (isUrl) {
+                wkConfig["m.identity_server"] = {
+                    "base_url": isUrl,
+                };
+            }
+        }
+
+        let discoveryResult = null;
+        if (wkConfig) {
+            console.log("Config uses a default_server_config - validating object");
+            discoveryResult = await AutoDiscovery.fromDiscoveryConfig(wkConfig);
+        }
+
+        if (serverName) {
+            console.log("Config uses a default_server_name - doing .well-known lookup");
+            console.warn(
+                "DEPRECATED CONFIG OPTION: In the future, default_server_name will not be accepted. Please " +
+                "use default_server_config instead.",
+            );
+            discoveryResult = await AutoDiscovery.findClientConfig(serverName);
+        }
+
+        validatedConfig = AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, discoveryResult, true);
+    } catch (e) {
+        const {hsUrl, isUrl, userId} = Lifecycle.getLocalStorageSessionVars();
+        if (hsUrl && userId) {
+            console.error(e);
+            console.warn("A session was found - suppressing config error and using the session's homeserver");
+
+            console.log("Using pre-existing hsUrl and isUrl: ", {hsUrl, isUrl});
+            validatedConfig = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl, true);
+        } else {
+            // the user is not logged in, so scream
+            throw e;
+        }
+    }
+
+
+    validatedConfig.isDefault = true;
+
+    // Just in case we ever have to debug this
+    console.log("Using homeserver config:", validatedConfig);
+
+    // Add the newly built config to the actual config for use by the app
+    console.log("Updating SdkConfig with validated discovery information");
+    SdkConfig.add({"validated_server_config": validatedConfig});
+
+    return SdkConfig.get();
+}
+
 loadApp();

src/vector/mobile_guide/index.html

@@ -4,6 +4,11 @@
 
 <style type="text/css">
 
+/* By default, hide the custom IS stuff - enabled in JS */
+#custom_is, #is_url {
+    display: none;
+}
+
 body {
     background: #c5e0f7;
     background: -moz-linear-gradient(top, #c5e0f7 0%, #ffffff 100%);
@@ -109,6 +114,14 @@ body {
     margin: 20px;
 }
 
+.mx_HomePage_errorContainer {
+    display: none; /* shown in JS if needed */
+    margin: 20px;
+    border: 1px solid red;
+    background-color: #ffb9b9;
+    padding: 5px;
+}
+
 .mx_HomePage_container h1,
 .mx_HomePage_container h2,
 .mx_HomePage_container h3,
@@ -152,6 +165,10 @@ body {
 
 <body>
 
+  <div class="mx_HomePage_errorContainer">
+    <!-- populated by JS if needed -->
+  </div>
+
   <div class="mx_HomePage_container">
       <div class="mx_HomePage_col mx_HomePage_header">
           <a href="https://riot.im">
@@ -365,7 +382,9 @@ body {
               <p>Launch the app, and enable <strong>Use custom server options (advanced)</strong>.</p>
               <p class="mx_Spacer">In the homeserver field, enter:</p>
               <p><strong id="hs_url"></strong></p>
-              <p class="mx_Spacer"><em>Note: You shouldn&apos;t need to modify the identity server field, which by default is set to https://vector.im.</em></p>
+              <p class="mx_Spacer" id="default_is"><em>Note: You shouldn&apos;t need to modify the identity server field, which by default is set to https://vector.im.</em></p>
+              <p class="mx_Spacer" id="custom_is">In the identity server field, enter:</p>
+              <p><strong id="is_url"></strong></p>
           </div>
         </div>
       </div>

src/vector/mobile_guide/index.js

@@ -6,19 +6,102 @@ function onBackToRiotClick() {
     window.location.href = '../';
 }
 
+// NEVER pass user-controlled content to this function! Hardcoded strings only please.
+function renderConfigError(message) {
+    const contactMsg = "If this is unexpected, please contact your system administrator " +
+        "or technical support representative.";
+    message = `<h2>Error loading Riot</h2><p>${message}</p><p>${contactMsg}</p>`;
+
+    const toHide = document.getElementsByClassName("mx_HomePage_container");
+    const errorContainers = document.getElementsByClassName("mx_HomePage_errorContainer");
+
+    for (const e of toHide) {
+        // We have to clear the content because .style.display='none'; doesn't work
+        // due to an !important in the CSS.
+        e.innerHTML = '';
+    }
+    for (const e of errorContainers) {
+        e.style.display = 'block';
+        e.innerHTML = message;
+    }
+}
+
 async function initPage() {
     document.getElementById('back_to_riot_button').onclick = onBackToRiotClick;
 
-    const config = await getVectorConfig('..');
-    let hsUrl;
-    if (config && config['default_hs_url']) {
-        hsUrl = config['default_hs_url'];
+    let config = await getVectorConfig('..');
+
+    // We manually parse the config similar to how validateServerConfig works because
+    // calling that function pulls in roughly 4mb of JS we don't use.
+
+    const wkConfig = config['default_server_config']; // overwritten later under some conditions
+    const serverName = config['default_server_name'];
+    const defaultHsUrl = config['default_hs_url'];
+    const defaultIsUrl = config['default_is_url'];
+
+    const incompatibleOptions = [wkConfig, serverName, defaultHsUrl].filter(i => !!i);
+    if (incompatibleOptions.length > 1) {
+        return renderConfigError(
+            "Invalid configuration: can only specify one of default_server_config, default_server_name, " +
+            "or default_hs_url.",
+        );
     }
+    if (incompatibleOptions.length < 1) {
+        return renderConfigError("Invalid configuration: no default server specified.");
+    }
+
+    let hsUrl = '';
+    let isUrl = '';
+
+    if (wkConfig && wkConfig['m.homeserver']) {
+        hsUrl = wkConfig['m.homeserver']['base_url'];
+
+        if (wkConfig['m.identity_server']) {
+            isUrl = wkConfig['m.identity_server']['base_url'];
+        }
+    }
+
+    if (serverName) {
+        // We also do our own minimal .well-known validation to avoid pulling in the js-sdk
+        try {
+            const result = await fetch(`https://${serverName}/.well-known/matrix/client`);
+            const wkConfig = await result.json();
+            if (wkConfig && wkConfig['m.homeserver']) {
+                hsUrl = wkConfig['m.homeserver']['base_url'];
+
+                if (wkConfig['m.identity_server']) {
+                    isUrl = wkConfig['m.identity_server']['base_url'];
+                }
+            }
+        } catch (e) {
+            console.error(e);
+            return renderConfigError("Unable to fetch homeserver configuration");
+        }
+    }
+
+    if (defaultHsUrl) {
+        hsUrl = defaultHsUrl;
+        isUrl = defaultIsUrl;
+    }
+
+    if (!hsUrl) {
+        return renderConfigError("Unable to locate homeserver");
+    }
+
     if (hsUrl && !hsUrl.endsWith('/')) hsUrl += '/';
-    if (hsUrl && hsUrl !== 'https://matrix.org/') {
+    if (isUrl && !isUrl.endsWith('/')) isUrl += '/';
+
+    if (hsUrl !== 'https://matrix.org/') {
         document.getElementById('step2_container').style.display = 'block';
-        document.getElementById('hs_url').innerHTML = hsUrl;
+        document.getElementById('hs_url').innerText = hsUrl;
         document.getElementById('step_login_header').innerHTML= 'Step 3: Register or Log in';
+
+        if (isUrl && isUrl !== "https://vector.im/") {
+            document.getElementById('default_is').style.display = 'none';
+            document.getElementById('custom_is').style.display = 'block';
+            document.getElementById('is_url').style.display = 'block';
+            document.getElementById('is_url').innerText = isUrl;
+        }
     }
 }
 

src/vector/platform/ElectronPlatform.js

@@ -4,6 +4,7 @@
 Copyright 2016 Aviral Dasgupta
 Copyright 2016 OpenMarket Ltd
 Copyright 2018 New Vector Ltd
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -101,6 +102,10 @@ export default class ElectronPlatform extends VectorBasePlatform {
         this.stopUpdateCheck = this.stopUpdateCheck.bind(this);
     }
 
+    async getConfig(): Promise<{}> {
+        return this._ipcCall('getConfig');
+    }
+
     async onUpdateDownloaded(ev, updateInfo) {
         dis.dispatch({
             action: 'new_version',
@@ -141,14 +146,12 @@ export default class ElectronPlatform extends VectorBasePlatform {
         }
 
         // Notifications in Electron use the HTML5 notification API
-        const notification = new global.Notification(
-            title,
-            {
-                body: msg,
-                icon: avatarUrl,
-                silent: true, // we play our own sounds
-            },
-        );
+        const notifBody = {
+            body: msg,
+            silent: true, // we play our own sounds
+        };
+        if (avatarUrl) notifBody['icon'] = avatarUrl;
+        const notification = new global.Notification(title, notifBody);
 
         notification.onclick = () => {
             dis.dispatch({

src/vector/platform/VectorBasePlatform.js

@@ -4,6 +4,7 @@
 Copyright 2016 Aviral Dasgupta
 Copyright 2016 OpenMarket Ltd
 Copyright 2018 New Vector Ltd
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,6 +22,7 @@ limitations under the License.
 import BasePlatform from 'matrix-react-sdk/lib/BasePlatform';
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
 import dis from 'matrix-react-sdk/lib/dispatcher';
+import {getVectorConfig} from "../getconfig";
 
 import Favico from 'favico.js';
 
@@ -44,6 +46,10 @@ export default class VectorBasePlatform extends BasePlatform {
         this.stopUpdateCheck = this.stopUpdateCheck.bind(this);
     }
 
+    async getConfig(): Promise<{}> {
+        return getVectorConfig();
+    }
+
     getHumanReadableName(): string {
         return 'Vector Base Platform'; // no translation required: only used for analytics
     }

src/vector/platform/WebPlatform.js

@@ -76,15 +76,13 @@ export default class WebPlatform extends VectorBasePlatform {
     }
 
     displayNotification(title: string, msg: string, avatarUrl: string, room: Object) {
-        const notification = new global.Notification(
-            title,
-            {
-                body: msg,
-                icon: avatarUrl,
-                tag: "vector",
-                silent: true, // we play our own sounds
-            },
-        );
+        const notifBody = {
+            body: msg,
+            tag: "vector",
+            silent: true, // we play our own sounds
+        };
+        if (avatarUrl) notifBody['icon'] = avatarUrl;
+        const notification = new global.Notification(title, notifBody);
 
         notification.onclick = function() {
             dis.dispatch({

test/app-tests/joining.js

@@ -37,6 +37,8 @@ const ReactDOM = require('react-dom');
 const ReactTestUtils = require('react-addons-test-utils');
 const expect = require('expect');
 import Promise from 'bluebird';
+import {makeType} from "matrix-react-sdk/lib/utils/TypeUtils";
+import {ValidatedServerConfig} from "matrix-react-sdk/lib/utils/AutoDiscoveryUtils";
 
 const test_utils = require('../test-utils');
 const MockHttpBackend = require('matrix-mock-request');
@@ -96,8 +98,20 @@ describe('joining a room', function() {
 
             PlatformPeg.set(new WebPlatform());
 
+            const config = {
+                validated_server_config: makeType(ValidatedServerConfig, {
+                    hsUrl: HS_URL,
+                    hsName: "TEST_ENVIRONMENT",
+                    hsNameIsDifferent: false, // yes, we lie
+                    isUrl: IS_URL,
+                    identityEnabled: true,
+                }),
+            };
+
             const mc = (
-                <MatrixChat config={{}}
+                <MatrixChat
+                    config={config}
+                    serverConfig={config.validated_server_config}
                     makeRegistrationUrl={()=>{throw new Error("unimplemented");}}
                     initialScreenAfterLogin={{
                         screen: 'directory',

test/app-tests/loading.js

@@ -39,6 +39,8 @@ import dis from 'matrix-react-sdk/lib/dispatcher';
 import * as test_utils from '../test-utils';
 import MockHttpBackend from 'matrix-mock-request';
 import {parseQs, parseQsFromFragment} from '../../src/vector/url_utils';
+import {makeType} from "matrix-react-sdk/lib/utils/TypeUtils";
+import {ValidatedServerConfig} from "matrix-react-sdk/lib/utils/AutoDiscoveryUtils";
 
 const DEFAULT_HS_URL='http://my_server';
 const DEFAULT_IS_URL='http://my_is';
@@ -146,6 +148,13 @@ describe('loading:', function() {
         const config = Object.assign({
             default_hs_url: DEFAULT_HS_URL,
             default_is_url: DEFAULT_IS_URL,
+            validated_server_config: makeType(ValidatedServerConfig, {
+                hsUrl: DEFAULT_HS_URL,
+                hsName: "TEST_ENVIRONMENT",
+                hsNameIsDifferent: false, // yes, we lie
+                isUrl: DEFAULT_IS_URL,
+                identityEnabled: true,
+            }),
             embeddedPages: {
                 homeUrl: 'data:text/html;charset=utf-8;base64,PGh0bWw+PC9odG1sPg==',
             },
@@ -160,6 +169,7 @@ describe('loading:', function() {
                 <MatrixChat
                     onNewScreen={onNewScreen}
                     config={config}
+                    serverConfig={config.validated_server_config}
                     realQueryParams={params}
                     startingFragmentQueryParams={fragParts.params}
                     enableGuest={true}
@@ -230,6 +240,10 @@ describe('loading:', function() {
                 uriFragment: "#/room/!room:id",
             });
 
+            // Pass the liveliness checks
+            httpBackend.when("GET", "/versions").respond(200, {versions: ["r0.4.0"]});
+            httpBackend.when("GET", "/api/v1").respond(200, {});
+
             Promise.delay(1).then(() => {
                 // at this point, we're trying to do a guest registration;
                 // we expect a spinner
@@ -267,6 +281,10 @@ describe('loading:', function() {
                 uriFragment: "#/login",
             });
 
+            // Pass the liveliness checks
+            httpBackend.when("GET", "/versions").respond(200, {versions: ["r0.4.0"]});
+            httpBackend.when("GET", "/api/v1").respond(200, {});
+
             return awaitLoginComponent(matrixChat).then(() => {
                 // we expect a single <Login> component
                 ReactTestUtils.findRenderedComponentWithType(
@@ -275,8 +293,13 @@ describe('loading:', function() {
                 // the only outstanding request should be a GET /login
                 // (in particular there should be no /register request for
                 // guest registration).
+                const allowedRequests = [
+                    "/_matrix/client/r0/login",
+                    "/versions",
+                    "/api/v1",
+                ];
                 for (const req of httpBackend.requests) {
-                    if (req.method === 'GET' && req.path.endsWith('/_matrix/client/r0/login')) {
+                    if (req.method === 'GET' && allowedRequests.find(p => req.path.endsWith(p))) {
                         continue;
                     }
 
@@ -377,6 +400,10 @@ describe('loading:', function() {
             });
 
             it('shows a login view', function() {
+                // Pass the liveliness checks
+                httpBackend.when("GET", "/versions").respond(200, {versions: ["r0.4.0"]});
+                httpBackend.when("GET", "/api/v1").respond(200, {});
+
                 // we expect a single <Login> component
                 ReactTestUtils.findRenderedComponentWithType(
                     matrixChat, sdk.getComponent('structures.auth.Login'),
@@ -385,8 +412,13 @@ describe('loading:', function() {
                 // the only outstanding request should be a GET /login
                 // (in particular there should be no /register request for
                 // guest registration, nor /sync, etc).
+                const allowedRequests = [
+                    "/_matrix/client/r0/login",
+                    "/versions",
+                    "/api/v1",
+                ];
                 for (const req of httpBackend.requests) {
-                    if (req.method === 'GET' && req.path.endsWith('/_matrix/client/r0/login')) {
+                    if (req.method === 'GET' && allowedRequests.find(p => req.path.endsWith(p))) {
                         continue;
                     }
 
@@ -395,6 +427,10 @@ describe('loading:', function() {
             });
 
             it('shows the homepage after login', function() {
+                // Pass the liveliness checks
+                httpBackend.when("GET", "/versions").respond(200, {versions: ["r0.4.0"]});
+                httpBackend.when("GET", "/api/v1").respond(200, {});
+
                 return completeLogin(matrixChat).then(() => {
                     // we should see a home page, even though we previously had
                     // a stored mx_last_room_id
@@ -616,11 +652,21 @@ describe('loading:', function() {
 
     // check that we have a Login component, send a 'user:pass' login,
     // and await the HTTP requests.
-    function completeLogin(matrixChat) {
+    async function completeLogin(matrixChat) {
         // we expect a single <Login> component
         const login = ReactTestUtils.findRenderedComponentWithType(
             matrixChat, sdk.getComponent('structures.auth.Login'));
 
+        // When we switch to the login component, it'll hit the login endpoint
+        // for proof of life and to get flows. We'll only give it one option.
+        httpBackend.when('GET', '/login')
+            .respond(200, {"flows": [{"type": "m.login.password"}]});
+        httpBackend.flush(); // We already would have tried the GET /login request
+
+        // Give the component some time to finish processing the login flows before
+        // continuing.
+        await Promise.delay(100);
+
         httpBackend.when('POST', '/login').check(function(req) {
             expect(req.data.type).toEqual('m.login.password');
             expect(req.data.identifier.type).toEqual('m.id.user');

webpack.config.js

@@ -18,10 +18,6 @@ module.exports = {
         // CSS themes
         "theme-light": "./node_modules/matrix-react-sdk/res/themes/light/css/light.scss",
         "theme-dark": "./node_modules/matrix-react-sdk/res/themes/dark/css/dark.scss",
-
-        // twemoji fonts which need to be dynamically loaded
-        "twemoji-colr": "./node_modules/matrix-react-sdk/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2",
-        "twemoji-sbix": "./node_modules/matrix-react-sdk/res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2",
     },
     module: {
         rules: [
@@ -80,16 +76,7 @@ module.exports = {
                 // lifetime for assets while still delivering changes quickly.
                 oneOf: [
                     {
-                        // allow runtime loading of twemoji (at the expense of cachebusting).
-                        resource: /TwemojiMozilla.*\.woff2$/,
-                        loader: 'file-loader',
-                        options: {
-                            name: 'fonts/[name].[ext]',
-                            outputPath: getImgOutputPath,
-                        },
-                    },
-                    {
-                        // Images referenced in CSS files
+                        // Assets referenced in CSS files
                         issuer: /\.(scss|css)$/,
                         loader: 'file-loader',
                         options: {
@@ -105,11 +92,15 @@ module.exports = {
                         },
                     },
                     {
-                        // Images referenced in HTML and JS files
+                        // Assets referenced in HTML and JS files
                         loader: 'file-loader',
                         options: {
                             name: '[name].[hash:7].[ext]',
                             outputPath: getImgOutputPath,
+                            publicPath: function(url, resourcePath) {
+                                const outputPath = getImgOutputPath(url, resourcePath);
+                                return toPublicPath(outputPath);
+                            },
                         },
                     },
                 ],