IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add system console switch for enabling link previews (#5663)

Browse Source
This commit is contained in:
Joram Wilander
2017-03-06 21:13:12 -05:00
committed by Christopher Speller
parent f99658152a
commit e87f5c6cf9
12 changed files with 128 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/post.go
View File

@@ -452,6 +452,11 @@ func getFileInfosForPost(c *Context, w http.ResponseWriter, r *http.Request) {
}
func getOpenGraphMetadata(c *Context, w http.ResponseWriter, r *http.Request) {
if !*utils.Cfg.ServiceSettings.EnableLinkPreviews {
c.Err = model.NewAppError("getOpenGraphMetadata", "api.post.link_preview_disabled.app_error", nil, "", http.StatusNotImplemented)
return
}
props := model.StringInterfaceFromJson(r.Body)
ogJSONGeneric, ok := openGraphDataCache.Get(props["url"])

11
api/post_test.go
View File

@@ -1307,6 +1307,12 @@ func TestGetOpenGraphMetadata(t *testing.T) {
th := Setup().InitBasic()
Client := th.BasicClient
enableLinkPreviews := *utils.Cfg.ServiceSettings.EnableLinkPreviews
defer func() {
*utils.Cfg.ServiceSettings.EnableLinkPreviews = enableLinkPreviews
}()
*utils.Cfg.ServiceSettings.EnableLinkPreviews = true
ogDataCacheMissCount := 0
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -1355,4 +1361,9 @@ func TestGetOpenGraphMetadata(t *testing.T) {
))
}
}
*utils.Cfg.ServiceSettings.EnableLinkPreviews = false
if _, err := Client.DoApiPost("/get_opengraph_metadata", "{\"url\":\"/og-data/\"}"); err == nil || err.StatusCode != http.StatusNotImplemented {
t.Fatal("should have failed with 501 - disabled link previews")
}
}

1
config/config.json
View File

@@ -19,6 +19,7 @@
"EnableOnlyAdminIntegrations": true,
"EnablePostUsernameOverride": false,
"EnablePostIconOverride": false,
"EnableLinkPreviews": false,
"EnableTesting": false,
"EnableDeveloper": false,
"EnableSecurityFixAlert": true,

4
i18n/en.json
View File

@@ -3,6 +3,10 @@
"id": "April",
"translation": "April"
},
{
"id": "api.post.link_preview_disabled.app_error",
"translation": "Link previews have been disabled by the system administrator."
},
{
"id": "August",
"translation": "August"

6
model/config.go
View File

@@ -129,6 +129,7 @@ type ServiceSettings struct {
EnableOnlyAdminIntegrations *bool
EnablePostUsernameOverride bool
EnablePostIconOverride bool
EnableLinkPreviews *bool
EnableTesting bool
EnableDeveloper *bool
EnableSecurityFixAlert *bool
@@ -495,6 +496,11 @@ func (o *Config) SetDefaults() {
*o.ServiceSettings.SiteURL = SERVICE_SETTINGS_DEFAULT_SITE_URL
}
if o.ServiceSettings.EnableLinkPreviews == nil {
o.ServiceSettings.EnableLinkPreviews = new(bool)
*o.ServiceSettings.EnableLinkPreviews = false
}
if o.ServiceSettings.EnableDeveloper == nil {
o.ServiceSettings.EnableDeveloper = new(bool)
*o.ServiceSettings.EnableDeveloper = false

1
utils/config.go
View File

@@ -267,6 +267,7 @@ func getClientConfig(c *model.Config) map[string]string {
props["EnableOnlyAdminIntegrations"] = strconv.FormatBool(*c.ServiceSettings.EnableOnlyAdminIntegrations)
props["EnablePostUsernameOverride"] = strconv.FormatBool(c.ServiceSettings.EnablePostUsernameOverride)
props["EnablePostIconOverride"] = strconv.FormatBool(c.ServiceSettings.EnablePostIconOverride)
props["EnableLinkPreviews"] = strconv.FormatBool(*c.ServiceSettings.EnableLinkPreviews)
props["EnableTesting"] = strconv.FormatBool(c.ServiceSettings.EnableTesting)
props["EnableDeveloper"] = strconv.FormatBool(*c.ServiceSettings.EnableDeveloper)
props["EnableDiagnostics"] = strconv.FormatBool(*c.LogSettings.EnableDiagnostics)

4
webapp/actions/global_actions.jsx
View File

@@ -623,6 +623,10 @@ export function redirectUserToDefaultTeam() {
requestOpenGraphMetadata.openGraphMetadataOnGoingRequests = {}; // Format: {<url>: true}
export function requestOpenGraphMetadata(url) {
if (global.mm_config.EnableLinkPreviews !== 'true') {
return;
}
const onself = requestOpenGraphMetadata;
if (!onself.openGraphMetadataOnGoingRequests[url]) {

10
webapp/components/admin_console/admin_sidebar.jsx
View File

@@ -689,6 +689,16 @@ export default class AdminSidebar extends React.Component {
}
/>
<AdminSidebarSection
name='link_previews'
title={
<FormattedMessage
id='admin.sidebar.linkPreviews'
defaultMessage='Link Previews'
/>
}
/>
<AdminSidebarSection
name='legal_and_support'
title={

66
webapp/components/admin_console/link_previews_settings.jsx Normal file
View File

@@ -0,0 +1,66 @@
// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
import React from 'react';
import AdminSettings from './admin_settings.jsx';
import BooleanSetting from './boolean_setting.jsx';
import {FormattedMessage} from 'react-intl';
import SettingsGroup from './settings_group.jsx';
export default class LinkPreviewsSettings extends AdminSettings {
constructor(props) {
super(props);
this.getConfigFromState = this.getConfigFromState.bind(this);
this.renderSettings = this.renderSettings.bind(this);
}
getConfigFromState(config) {
config.ServiceSettings.EnableLinkPreviews = this.state.enableLinkPreviews;
return config;
}
getStateFromConfig(config) {
return {
enableLinkPreviews: config.ServiceSettings.EnableLinkPreviews
};
}
renderTitle() {
return (
<h3>
<FormattedMessage
id='admin.customization.linkPreviews'
defaultMessage='Link Previews'
/>
</h3>
);
}
renderSettings() {
return (
<SettingsGroup>
<BooleanSetting
id='enableLinkPreviews'
label={
<FormattedMessage
id='admin.customization.enableLinkPreviewsTitle'
defaultMessage='Enable Link Previews:'
/>
}
helpText={
<FormattedMessage
id='admin.customization.enableLinkPreviewsDesc'
defaultMessage='Enable users to display a preview of website content below the message, if available. When true, website previews can be enabled from Account Settings > Advanced > Preview pre-release features.'
/>
}
value={this.state.enableLinkPreviews}
onChange={this.handleChange}
/>
</SettingsGroup>
);
}
}

17
webapp/components/user_settings/user_settings_advanced.jsx
View File

@@ -53,14 +53,19 @@ export default class AdvancedSettingsDisplay extends React.Component {
)
};
const webrtcEnabled = global.mm_config.EnableWebrtc === 'true';
const linkPreviewsEnabled = global.mm_config.EnableLinkPreviews === 'true';
if (!webrtcEnabled) {
preReleaseFeaturesKeys = preReleaseFeaturesKeys.filter((f) => f !== 'WEBRTC_PREVIEW');
}
if (!linkPreviewsEnabled) {
preReleaseFeaturesKeys = preReleaseFeaturesKeys.filter((f) => f !== 'EMBED_PREVIEW');
}
let enabledFeatures = 0;
for (const [name, value] of advancedSettings) {
const webrtcEnabled = global.mm_config.EnableWebrtc === 'true';
if (!webrtcEnabled) {
preReleaseFeaturesKeys = preReleaseFeaturesKeys.filter((f) => f !== 'WEBRTC_PREVIEW');
}
for (const key of preReleaseFeaturesKeys) {
const feature = PreReleaseFeatures[key];

4
webapp/i18n/en.json
View File

@@ -1,4 +1,8 @@
{
"admin.customization.enableLinkPreviewsDesc": "Enable users to display a preview of website content below the message, if available. When true, website previews can be enabled from Account Settings > Advanced > Preview pre-release features.",
"admin.customization.enableLinkPreviewsTitle": "Enable Link Previews:",
"admin.customization.linkPreviews": "Link Previews",
"admin.sidebar.linkPreviews": "Link Previews",
"multiselect.go": "Go",
"multiselect.instructions": "Use up/down arrows to navigate and enter to select",
"multiselect.placeholder": "Search and add members",

5
webapp/routes/route_admin_console.jsx
View File

@@ -35,6 +35,7 @@ import StorageSettings from 'components/admin_console/storage_settings.jsx';
import ImageSettings from 'components/admin_console/image_settings.jsx';
import CustomBrandSettings from 'components/admin_console/custom_brand_settings.jsx';
import CustomEmojiSettings from 'components/admin_console/custom_emoji_settings.jsx';
import LinkPreviewsSettings from 'components/admin_console/link_previews_settings.jsx';
import LegalAndSupportSettings from 'components/admin_console/legal_and_support_settings.jsx';
import NativeAppLinkSettings from 'components/admin_console/native_app_link_settings.jsx';
import ComplianceSettings from 'components/admin_console/compliance_settings.jsx';
@@ -180,6 +181,10 @@ export default (
path='custom_emoji'
component={CustomEmojiSettings}
/>
<Route
path='link_previews'
component={LinkPreviewsSettings}
/>
<Route
path='legal_and_support'
component={LegalAndSupportSettings}