From 891070d001cd6570f6156b33d8d294704fb0995f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 Jun 2018 01:16:01 +0100
Subject: [PATCH 1/8] update UrlPreview settings to be more privacy-aware in
 e2ee rooms

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js         | 24 +++++-
 .../views/room_settings/UrlPreviewSettings.js | 74 ++++++++++++-------
 2 files changed, 68 insertions(+), 30 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 97e575ff4e..c465eff44b 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -618,10 +618,26 @@ module.exports = React.createClass({
         }
     },
 
-    _updatePreviewUrlVisibility: function(room) {
-        this.setState({
-            showUrlPreview: SettingsStore.getValue("urlPreviewsEnabled", room.roomId),
-        });
+    _updatePreviewUrlVisibility: function({roomId}) {
+        const levels = [
+            SettingLevel.ROOM_DEVICE,
+            SettingLevel.ROOM_ACCOUNT,
+        ];
+        let showUrlPreview;
+        if (MatrixClientPeg.get().isRoomEncrypted(roomId)) {
+            for (const level of levels) {
+                const value = SettingsStore.getValueAt(level, "urlPreviewsEnabled", roomId, true, true);
+                if (value === Boolean(value)) { // if is Boolean
+                    showUrlPreview = value;
+                    break;
+                }
+            }
+
+            showUrlPreview = showUrlPreview || false;
+        } else {
+            showUrlPreview = SettingsStore.getValue("urlPreviewsEnabled", roomId);
+        }
+        this.setState({showUrlPreview});
     },
 
     onRoom: function(room) {
diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index ed58d610aa..749167c0a5 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2016 OpenMarket Ltd
 Copyright 2017 Travis Ralston
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,6 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import {MatrixClient} from "matrix-js-sdk";
 const React = require('react');
 import PropTypes from 'prop-types';
 const sdk = require("../../../index");
@@ -29,6 +31,10 @@ module.exports = React.createClass({
         room: PropTypes.object,
     },
 
+    contextTypes: {
+        matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
+    },
+
     saveSettings: function() {
         const promises = [];
         if (this.refs.urlPreviewsRoom) promises.push(this.refs.urlPreviewsRoom.save());
@@ -39,36 +45,52 @@ module.exports = React.createClass({
     render: function() {
         const SettingsFlag = sdk.getComponent("elements.SettingsFlag");
         const roomId = this.props.room.roomId;
+        const isEncrypted = this.context.matrixClient.isRoomEncrypted(roomId);
 
         let previewsForAccount = null;
-        if (SettingsStore.getValueAt(SettingLevel.ACCOUNT, "urlPreviewsEnabled")) {
-            previewsForAccount = (
-                _t("You have <a>enabled</a> URL previews by default.", {}, { 'a': (sub)=><a href="#/settings">{ sub }</a> })
-            );
-        } else {
-            previewsForAccount = (
-                _t("You have <a>disabled</a> URL previews by default.", {}, { 'a': (sub)=><a href="#/settings">{ sub }</a> })
-            );
-        }
-
         let previewsForRoom = null;
-        if (SettingsStore.canSetValue("urlPreviewsEnabled", roomId, "room")) {
-            previewsForRoom = (
-                <label>
-                    <SettingsFlag name="urlPreviewsEnabled"
-                                  level={SettingLevel.ROOM}
-                                  roomId={this.props.room.roomId}
-                                  isExplicit={true}
-                                  manualSave={true}
-                                  ref="urlPreviewsRoom" />
-                </label>
-            );
-        } else {
-            let str = _td("URL previews are enabled by default for participants in this room.");
-            if (!SettingsStore.getValueAt(SettingLevel.ROOM, "urlPreviewsEnabled", roomId, /*explicit=*/true)) {
-                str = _td("URL previews are disabled by default for participants in this room.");
+
+
+        if (!isEncrypted) {
+            // Only show account setting state and room state setting state in non-e2ee rooms where they apply
+            const accountEnabled = SettingsStore.getValueAt(SettingLevel.ACCOUNT, "urlPreviewsEnabled");
+            if (accountEnabled) {
+                previewsForAccount = (
+                    _t("You have <a>enabled</a> URL previews by default.", {}, {
+                        'a': (sub)=><a href="#/settings">{ sub }</a>,
+                    })
+                );
+            } else if (accountEnabled) {
+                previewsForAccount = (
+                    _t("You have <a>disabled</a> URL previews by default.", {}, {
+                        'a': (sub)=><a href="#/settings">{ sub }</a>,
+                    })
+                );
             }
-            previewsForRoom = (<label>{ _t(str) }</label>);
+
+            if (SettingsStore.canSetValue("urlPreviewsEnabled", roomId, "room")) {
+                previewsForRoom = (
+                    <label>
+                        <SettingsFlag name="urlPreviewsEnabled"
+                                      level={SettingLevel.ROOM}
+                                      roomId={this.props.room.roomId}
+                                      isExplicit={true}
+                                      manualSave={true}
+                                      ref="urlPreviewsRoom" />
+                    </label>
+                );
+            } else {
+                let str = _td("URL previews are enabled by default for participants in this room.");
+                if (!SettingsStore.getValueAt(SettingLevel.ROOM, "urlPreviewsEnabled", roomId, /*explicit=*/true)) {
+                    str = _td("URL previews are disabled by default for participants in this room.");
+                }
+                previewsForRoom = (<label>{ _t(str) }</label>);
+            }
+        } else {
+            previewsForAccount = (
+                _t("URL Previews default to off in End-to-End Encrypted rooms to protect your privacy. " +
+                    "They are requested through your homeserver which could infer links which are otherwise encrypted")
+            );
         }
 
         const previewsForRoomAccount = (

From a45dc837b4f7649c42cb5a8db42c3492a9496981 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 Jun 2018 01:16:37 +0100
Subject: [PATCH 2/8] add copyright

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index c465eff44b..cf7d3f61e8 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From ed1f801254a85f2782b080740f516a9d675c49ac Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 Jun 2018 01:18:21 +0100
Subject: [PATCH 3/8] add comment

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index cf7d3f61e8..e2de91c035 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -625,6 +625,7 @@ module.exports = React.createClass({
             SettingLevel.ROOM_ACCOUNT,
         ];
         let showUrlPreview;
+        // in e2ee rooms only care about room-device and room-account, so that user has to explicitly enable previews
         if (MatrixClientPeg.get().isRoomEncrypted(roomId)) {
             for (const level of levels) {
                 const value = SettingsStore.getValueAt(level, "urlPreviewsEnabled", roomId, true, true);

From ed4b82f8fc4ed8a2017f4d03998faf4eb570822d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 Jun 2018 01:40:16 +0100
Subject: [PATCH 4/8] update wording and style it like text (text cursor)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/room_settings/UrlPreviewSettings.js      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index 749167c0a5..6d3c6317d9 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -88,8 +88,9 @@ module.exports = React.createClass({
             }
         } else {
             previewsForAccount = (
-                _t("URL Previews default to off in End-to-End Encrypted rooms to protect your privacy. " +
-                    "They are requested through your homeserver which could infer links which are otherwise encrypted")
+                _t("In encrypted rooms, like this one, URL previews are disabled by default to ensure that your " +
+                    "homeserver (where the previews are generated) cannot gather information about links you see in " +
+                    "this room.")
             );
         }
 
@@ -105,8 +106,13 @@ module.exports = React.createClass({
         return (
             <div className="mx_RoomSettings_toggles">
                 <h3>{ _t("URL Previews") }</h3>
-
-                <label>{ previewsForAccount }</label>
+                <div>
+                    { _t('When someone puts a URL in their message, a URL preview can be shown to give more ' +
+                        'information about that link such as the title, description, and an image from the website.') }
+                </div>
+                <div>
+                    { previewsForAccount }
+                </div>
                 { previewsForRoom }
                 <label>{ previewsForRoomAccount }</label>
             </div>

From acbc84a69c3374319d33fa6551597d36d8049aa9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 Jun 2018 18:44:54 +0100
Subject: [PATCH 5/8] switch to another settings key for e2e url previews to
 protect on change

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js         | 25 ++++---------------
 .../views/room_settings/UrlPreviewSettings.js |  9 +++----
 src/settings/Settings.js                      |  7 ++++++
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index e2de91c035..af994d298f 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -620,26 +620,11 @@ module.exports = React.createClass({
     },
 
     _updatePreviewUrlVisibility: function({roomId}) {
-        const levels = [
-            SettingLevel.ROOM_DEVICE,
-            SettingLevel.ROOM_ACCOUNT,
-        ];
-        let showUrlPreview;
-        // in e2ee rooms only care about room-device and room-account, so that user has to explicitly enable previews
-        if (MatrixClientPeg.get().isRoomEncrypted(roomId)) {
-            for (const level of levels) {
-                const value = SettingsStore.getValueAt(level, "urlPreviewsEnabled", roomId, true, true);
-                if (value === Boolean(value)) { // if is Boolean
-                    showUrlPreview = value;
-                    break;
-                }
-            }
-
-            showUrlPreview = showUrlPreview || false;
-        } else {
-            showUrlPreview = SettingsStore.getValue("urlPreviewsEnabled", roomId);
-        }
-        this.setState({showUrlPreview});
+        // URL Previews in E2EE rooms can be a privacy leak so use a different setting which is per-room explicit
+        const key = MatrixClientPeg.get().isRoomEncrypted(roomId) ? 'urlPreviewsEnabled_e2ee' : 'urlPreviewsEnabled';
+        this.setState({
+            showUrlPreview: SettingsStore.getValue(key, roomId),
+        });
     },
 
     onRoom: function(room) {
diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index 6d3c6317d9..fe2a2bacf4 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -50,7 +50,6 @@ module.exports = React.createClass({
         let previewsForAccount = null;
         let previewsForRoom = null;
 
-
         if (!isEncrypted) {
             // Only show account setting state and room state setting state in non-e2ee rooms where they apply
             const accountEnabled = SettingsStore.getValueAt(SettingLevel.ACCOUNT, "urlPreviewsEnabled");
@@ -73,7 +72,7 @@ module.exports = React.createClass({
                     <label>
                         <SettingsFlag name="urlPreviewsEnabled"
                                       level={SettingLevel.ROOM}
-                                      roomId={this.props.room.roomId}
+                                      roomId={roomId}
                                       isExplicit={true}
                                       manualSave={true}
                                       ref="urlPreviewsRoom" />
@@ -94,10 +93,10 @@ module.exports = React.createClass({
             );
         }
 
-        const previewsForRoomAccount = (
-            <SettingsFlag name="urlPreviewsEnabled"
+        const previewsForRoomAccount = ( // in an e2ee room we use a special key to enforce per-room opt-in
+            <SettingsFlag name={isEncrypted ? 'urlPreviewsEnabled_e2ee' : 'urlPreviewsEnabled'}
                           level={SettingLevel.ROOM_ACCOUNT}
-                          roomId={this.props.room.roomId}
+                          roomId={roomId}
                           manualSave={true}
                           ref="urlPreviewsSelf"
             />
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 40bb2dd57e..f9d258c6b8 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -238,6 +238,13 @@ export const SETTINGS = {
         },
         default: true,
     },
+    "urlPreviewsEnabled_e2ee": {
+        supportedLevels: ['room-device', 'room-account'],
+        displayName: {
+            "room-account": _td("Enable URL previews for this room (only affects you)"),
+        },
+        default: false,
+    },
     "roomColor": {
         supportedLevels: LEVELS_ROOM_SETTINGS_WITH_ROOM,
         displayName: _td("Room Colour"),

From d4f9fec7073401f2f4cf60d6493911ceae32f81f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 Jun 2018 18:48:48 +0100
Subject: [PATCH 6/8] run gen-i18n and prune-i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/el.json    |  1 -
 src/i18n/strings/en_EN.json | 96 +++++++++++++++++++------------------
 src/i18n/strings/gl.json    |  1 -
 src/i18n/strings/it.json    |  1 -
 4 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index f6264ce8b0..c4514f629b 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -810,7 +810,6 @@
     "%(widgetName)s widget removed by %(senderName)s": "Το widget %(widgetName)s αφαιρέθηκε από τον/την %(senderName)s",
     "%(names)s and %(count)s others are typing|other": "Ο/Η %(names)s και άλλοι/ες %(count)s πληκτρολογούν",
     "%(names)s and %(count)s others are typing|one": "Ο/Η %(names)s και άλλος ένας πληκτρολογούν",
-    "Message Replies": "Απαντήσεις",
     "Message Pinning": "Καρφίτσωμα Μηνυμάτων",
     "Hide avatar changes": "Απόκρυψη αλλαγών εικονιδίων χρηστών",
     "Hide display name changes": "Απόκρυψη αλλαγών εμφανιζόμενων ονομάτων",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6d39586c0a..722596d978 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -42,6 +42,10 @@
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -81,6 +85,7 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -114,19 +119,36 @@
     "Room %(roomId)s not visible": "Room %(roomId)s not visible",
     "Missing user_id in request": "Missing user_id in request",
     "Usage": "Usage",
+    "Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
     "/ddg is not a command": "/ddg is not a command",
     "To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.",
+    "Changes your display nickname": "Changes your display nickname",
+    "Changes colour scheme of current room": "Changes colour scheme of current room",
+    "Sets the room topic": "Sets the room topic",
+    "Invites user with given id to current room": "Invites user with given id to current room",
+    "Joins room with given alias": "Joins room with given alias",
+    "Leave room": "Leave room",
     "Unrecognised room alias:": "Unrecognised room alias:",
+    "Kicks user with given id": "Kicks user with given id",
+    "Bans user with given id": "Bans user with given id",
+    "Unbans user with given id": "Unbans user with given id",
+    "Ignores a user, hiding their messages from you": "Ignores a user, hiding their messages from you",
     "Ignored user": "Ignored user",
     "You are now ignoring %(userId)s": "You are now ignoring %(userId)s",
+    "Stops ignoring a user, showing their messages going forward": "Stops ignoring a user, showing their messages going forward",
     "Unignored user": "Unignored user",
     "You are no longer ignoring %(userId)s": "You are no longer ignoring %(userId)s",
+    "Define the power level of a user": "Define the power level of a user",
+    "Deops user with given id": "Deops user with given id",
+    "Opens the Developer Tools dialog": "Opens the Developer Tools dialog",
+    "Verifies a user, device, and pubkey tuple": "Verifies a user, device, and pubkey tuple",
     "Unknown (user, device) pair:": "Unknown (user, device) pair:",
     "Device already verified!": "Device already verified!",
     "WARNING: Device already verified, but keys do NOT MATCH!": "WARNING: Device already verified, but keys do NOT MATCH!",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!",
     "Verified key": "Verified key",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.",
+    "Displays action": "Displays action",
     "Unrecognised command:": "Unrecognised command:",
     "Reason": "Reason",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
@@ -177,11 +199,6 @@
     "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing",
     "%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing",
     "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
-    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -293,6 +310,31 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
+    "URL Previews": "URL Previews",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -392,11 +434,11 @@
     "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -497,7 +539,6 @@
     "Muted Users": "Muted Users",
     "Banned users": "Banned users",
     "This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
-    "Leave room": "Leave room",
     "Favourite": "Favourite",
     "Tagged as: ": "Tagged as: ",
     "To link to a room it must have <a>an address</a>.": "To link to a room it must have <a>an address</a>.",
@@ -530,29 +571,6 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "URL Previews": "URL Previews",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",
@@ -1142,22 +1160,6 @@
     "You need to enter a user name.": "You need to enter a user name.",
     "An unknown error occurred.": "An unknown error occurred.",
     "I already have an account": "I already have an account",
-    "Displays action": "Displays action",
-    "Bans user with given id": "Bans user with given id",
-    "Unbans user with given id": "Unbans user with given id",
-    "Define the power level of a user": "Define the power level of a user",
-    "Deops user with given id": "Deops user with given id",
-    "Invites user with given id to current room": "Invites user with given id to current room",
-    "Joins room with given alias": "Joins room with given alias",
-    "Sets the room topic": "Sets the room topic",
-    "Kicks user with given id": "Kicks user with given id",
-    "Changes your display nickname": "Changes your display nickname",
-    "Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
-    "Changes colour scheme of current room": "Changes colour scheme of current room",
-    "Verifies a user, device, and pubkey tuple": "Verifies a user, device, and pubkey tuple",
-    "Ignores a user, hiding their messages from you": "Ignores a user, hiding their messages from you",
-    "Stops ignoring a user, showing their messages going forward": "Stops ignoring a user, showing their messages going forward",
-    "Opens the Developer Tools dialog": "Opens the Developer Tools dialog",
     "Commands": "Commands",
     "Results from DuckDuckGo": "Results from DuckDuckGo",
     "Emoji": "Emoji",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 1080e66a26..57d8301df6 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -168,7 +168,6 @@
     "Authentication check failed: incorrect password?": "Fallou a comprobación de autenticación: contrasinal incorrecto?",
     "Failed to join room": "Non se puido unir a sala",
     "Message Pinning": "Fixando mensaxe",
-    "Tag Panel": "Panel de etiquetas",
     "Disable Emoji suggestions while typing": "Desactivar a suxestión de Emoji mentres escribe",
     "Use compact timeline layout": "Utilizar a disposición compacta da liña temporal",
     "Hide removed messages": "Ocultar mensaxes eliminadas",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index d3f93acec5..0957bc156d 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1175,7 +1175,6 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Per continuare a usare l'homeserver %(homeserverDomain)s devi leggere e accettare i nostri termini e condizioni.",
     "Review terms and conditions": "Leggi i termini e condizioni",
     "Muted Users": "Utenti silenziati",
-    "Message Replies": "Risposte",
     "Message Pinning": "Messaggi appuntati",
     "Mirror local video feed": "Feed video dai ripetitori locali",
     "Replying": "Rispondere",

From d1600bdacf78ca5643c89dd37ce119066a095f06 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 Jun 2018 19:17:31 +0100
Subject: [PATCH 7/8] fix event type which room-account settings were read from

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/settings/handlers/RoomAccountSettingsHandler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings/handlers/RoomAccountSettingsHandler.js b/src/settings/handlers/RoomAccountSettingsHandler.js
index 74dbf9eed0..d0dadc2de7 100644
--- a/src/settings/handlers/RoomAccountSettingsHandler.js
+++ b/src/settings/handlers/RoomAccountSettingsHandler.js
@@ -74,7 +74,7 @@ export default class RoomAccountSettingsHandler extends SettingsHandler {
         return cli !== undefined && cli !== null;
     }
 
-    _getSettings(roomId, eventType = "im.vector.settings") {
+    _getSettings(roomId, eventType = "im.vector.web.settings") {
         const room = MatrixClientPeg.get().getRoom(roomId);
         if (!room) return null;
 

From b7396c8ef00e9524b7d465dcd037c054f31353c9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 Jun 2018 19:17:55 +0100
Subject: [PATCH 8/8] trigger urlPreviews state update on {,room}AccountData
 changes of settings

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index af994d298f..c6dcc556be 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -648,19 +648,23 @@ module.exports = React.createClass({
     },
 
     onAccountData: function(event) {
-        if (event.getType() === "org.matrix.preview_urls" && this.state.room) {
+        const type = event.getType();
+        if ((type === "org.matrix.preview_urls" || type === "im.vector.web.settings") && this.state.room) {
+            // non-e2ee url previews are stored in legacy event type `org.matrix.room.preview_urls`
             this._updatePreviewUrlVisibility(this.state.room);
         }
     },
 
     onRoomAccountData: function(event, room) {
         if (room.roomId == this.state.roomId) {
-            if (event.getType() === "org.matrix.room.color_scheme") {
+            const type = event.getType();
+            if (type === "org.matrix.room.color_scheme") {
                 const color_scheme = event.getContent();
                 // XXX: we should validate the event
                 console.log("Tinter.tint from onRoomAccountData");
                 Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
-            } else if (event.getType() === "org.matrix.room.preview_urls") {
+            } else if (type === "org.matrix.room.preview_urls" || type === "im.vector.web.settings") {
+                // non-e2ee url previews are stored in legacy event type `org.matrix.room.preview_urls`
                 this._updatePreviewUrlVisibility(room);
             }
         }