mirror of https://github.com/vector-im/riot-web
Merge remote-tracking branch 'origin/develop' into develop
commit
ceb7bfc863
|
@ -190,6 +190,7 @@ class Analytics {
|
|||
}
|
||||
|
||||
_setVisitVariable(key, value) {
|
||||
if (this.disabled) return;
|
||||
this._paq.push(['setCustomVariable', customVariables[key].id, key, value, 'visit']);
|
||||
}
|
||||
|
||||
|
@ -199,8 +200,8 @@ class Analytics {
|
|||
const config = SdkConfig.get();
|
||||
if (!config.piwik) return;
|
||||
|
||||
const whitelistedHSUrls = config.piwik.whitelistedHSUrls;
|
||||
const whitelistedISUrls = config.piwik.whitelistedISUrls;
|
||||
const whitelistedHSUrls = config.piwik.whitelistedHSUrls || [];
|
||||
const whitelistedISUrls = config.piwik.whitelistedISUrls || [];
|
||||
|
||||
this._setVisitVariable('User Type', isGuest ? 'Guest' : 'Logged In');
|
||||
this._setVisitVariable('Homeserver URL', whitelistRedact(whitelistedHSUrls, homeserverUrl));
|
||||
|
|
|
@ -352,7 +352,7 @@ export default React.createClass({
|
|||
defaultDeviceDisplayName: this.props.defaultDeviceDisplayName,
|
||||
});
|
||||
}).catch((e) => {
|
||||
console.error(`Error attempting to load session: ${e}`);
|
||||
console.error('Error attempting to load session', e);
|
||||
return false;
|
||||
}).then((loadedSession) => {
|
||||
if (!loadedSession) {
|
||||
|
|
Loading…
Reference in New Issue