+
{{#if loadImage}}
{{> lazyloadImage src=image_url preview=image_preview height=(getImageHeight image_dimensions.height) class="gallery-item" title=title description=description}}
diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 362af719c35d0..6f0e0c49e5703 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -3162,7 +3162,6 @@
& .inline-image {
display: inline-block;
- overflow: hidden;
border-radius: 3px;
background-repeat: no-repeat;
@@ -3175,6 +3174,7 @@
& img {
max-width: 100%;
max-height: 200px;
+ object-fit: contain;
cursor: pointer;
}
@@ -3295,7 +3295,7 @@
}
.rc-old .attachment-description {
- margin-top: 10px;
+ margin: 6px;
line-height: 1;
}
diff --git a/packages/rocketchat-ui-flextab/client/flexTabBar.js b/packages/rocketchat-ui-flextab/client/flexTabBar.js
index f034b8da124ab..51d75d175eefa 100644
--- a/packages/rocketchat-ui-flextab/client/flexTabBar.js
+++ b/packages/rocketchat-ui-flextab/client/flexTabBar.js
@@ -55,7 +55,9 @@ Template.flexTabBar.helpers({
},
...commonHelpers,
buttons() {
- return RocketChat.TabBar.getButtons().filter(button => filterButtons(button, this.anonymous, this.data.rid));
+ return RocketChat.TabBar.getButtons().filter(button =>
+ filterButtons(button, this.anonymous, this.data && this.data.rid)
+ );
},
opened() {
return Template.instance().tabBar.getState();
diff --git a/packages/rocketchat-wordpress/common.js b/packages/rocketchat-wordpress/common.js
index c1e2bd5fa3bea..3bb2550e18bd1 100644
--- a/packages/rocketchat-wordpress/common.js
+++ b/packages/rocketchat-wordpress/common.js
@@ -13,7 +13,7 @@ const config = {
const WordPress = new CustomOAuth('wordpress', config);
-const fillSettings = _.debounce(() => {
+const fillSettings = _.debounce(Meteor.bindEnvironment(() => {
config.serverURL = RocketChat.settings.get('API_Wordpress_URL');
delete config.identityPath;
@@ -46,18 +46,34 @@ const fillSettings = _.debounce(() => {
}
break;
case 'wordpress-com':
- config.identityPath = '/rest/v1/me';
+ config.identityPath = 'https://public-api.wordpress.com/rest/v1/me';
config.identityTokenSentVia = 'header';
- config.authorizePath = '/oauth2/authorize';
- config.tokenPath = '/oauth2/token';
+ config.authorizePath = 'https://public-api.wordpress.com/oauth2/authorize';
+ config.tokenPath = 'https://public-api.wordpress.com/oauth2/token';
config.scope = 'auth';
break;
default:
config.identityPath = '/oauth/me';
break;
}
- return WordPress.configure(config);
-}, 1000);
+
+ const result = WordPress.configure(config);
+
+ const enabled = RocketChat.settings.get('Accounts_OAuth_Wordpress');
+ if (enabled) {
+ ServiceConfiguration.configurations.upsert({
+ service: 'wordpress'
+ }, {
+ $set: config
+ });
+ } else {
+ ServiceConfiguration.configurations.remove({
+ service: 'wordpress'
+ });
+ }
+
+ return result;
+}), 1000);
if (Meteor.isServer) {
Meteor.startup(function() {
diff --git a/packages/rocketchat-wordpress/startup.js b/packages/rocketchat-wordpress/startup.js
index 39f520505ec70..80e2043756689 100644
--- a/packages/rocketchat-wordpress/startup.js
+++ b/packages/rocketchat-wordpress/startup.js
@@ -39,7 +39,8 @@ RocketChat.settings.addGroup('OAuth', function() {
key: 'custom',
i18nLabel: 'Accounts_OAuth_Wordpress_server_type_custom'
}
- ]
+ ],
+ i18nLabel: 'Server_Type'
});
const customOAuthQuery = [{