3 files changed, 18 insertions, 78 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 4aa2edaba..7af1b36cb 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -3,12 +3,11 @@ import { observable, autorun } from 'mobx';
 import { defineMessages } from 'react-intl';
 
 import { isMac, ctrlKey, cmdKey } from '../environment';
-import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../features/workspaces/index';
+import { workspaceStore } from '../features/workspaces/index';
 import { workspaceActions } from '../features/workspaces/actions';
-import { gaEvent } from './analytics';
 import { announcementActions } from '../features/announcements/actions';
 import { announcementsStore } from '../features/announcements';
-import { GA_CATEGORY_TODOS, todosStore } from '../features/todos';
+import { todosStore } from '../features/todos';
 import { todoActions } from '../features/todos/actions';
 
 const { app, Menu, dialog } = remote;
@@ -112,7 +111,7 @@ const menuItems = defineMessages({
   },
   reloadFranz: {
     id: 'menu.view.reloadFranz',
-    defaultMessage: '!!!Reload Franz',
+    defaultMessage: '!!!Reload Ferdi',
   },
   minimize: {
     id: 'menu.window.minimize',
@@ -140,7 +139,7 @@ const menuItems = defineMessages({
   },
   debugInfoCopiedHeadline: {
     id: 'menu.help.debugInfoCopiedHeadline',
-    defaultMessage: '!!!Franz Debug Information',
+    defaultMessage: '!!!Ferdi Debug Information',
   },
   debugInfoCopiedBody: {
     id: 'menu.help.debugInfoCopiedBody',
@@ -176,7 +175,7 @@ const menuItems = defineMessages({
   },
   about: {
     id: 'menu.app.about',
-    defaultMessage: '!!!About Franz',
+    defaultMessage: '!!!About Ferdi',
   },
   announcement: {
     id: 'menu.app.announcement',
@@ -265,7 +264,7 @@ const menuItems = defineMessages({
 });
 
 function getActiveWebview() {
-  return window.franz.stores.services.active.webview;
+  return window.ferdi.stores.services.active.webview;
 }
 
 const _templateFactory = intl => [
@@ -401,7 +400,7 @@ const _templateFactory = intl => [
         click: () => {
           announcementActions.show();
         },
-        visible: window.franz.stores.user.isLoggedIn && announcementsStore.areNewsAvailable,
+        visible: window.ferdi.stores.user.isLoggedIn && announcementsStore.areNewsAvailable,
       },
       {
         type: 'separator',
@@ -623,11 +622,11 @@ export default class FranzMenu {
     // need to clone object so we don't modify computed (cached) object
     const serviceTpl = Object.assign([], this.serviceTpl());
 
-    if (window.franz === undefined) {
+    if (window.ferdi === undefined) {
       return;
     }
 
-    const { intl } = window.franz;
+    const { intl } = window.ferdi;
     const tpl = isMac ? _templateFactory(intl) : _titleBarTemplateFactory(intl);
 
     tpl[1].submenu.push({
@@ -743,8 +742,8 @@ export default class FranzMenu {
       click: () => {
         dialog.showMessageBox({
           type: 'info',
-          title: 'Franz',
-          message: 'Franz',
+          title: 'Franz Ferdinand',
+          message: 'Ferdi',
           detail: `Version: ${remote.app.getVersion()}\nRelease: ${process.versions.electron} / ${process.platform} / ${process.arch}`,
         });
       },
@@ -824,7 +823,7 @@ export default class FranzMenu {
   }
 
   serviceTpl() {
-    const { intl } = window.franz;
+    const { intl } = window.ferdi;
     const { user, services, settings } = this.stores;
     if (!user.isLoggedIn) return [];
     const menu = [];
@@ -870,7 +869,7 @@ export default class FranzMenu {
 
   workspacesMenu() {
     const { workspaces, activeWorkspace, isWorkspaceDrawerOpen } = workspaceStore;
-    const { intl } = window.franz;
+    const { intl } = window.ferdi;
     const menu = [];
 
     // Add new workspace item:
@@ -892,7 +891,6 @@ export default class FranzMenu {
       accelerator: `${cmdKey}+D`,
       click: () => {
         workspaceActions.toggleWorkspaceDrawer();
-        gaEvent(GA_CATEGORY_WORKSPACES, 'toggleDrawer', 'menu');
       },
       enabled: this.stores.user.isLoggedIn,
     }, {
@@ -907,7 +905,6 @@ export default class FranzMenu {
       checked: !activeWorkspace,
       click: () => {
         workspaceActions.deactivate();
-        gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'menu');
       },
     });
 
@@ -920,7 +917,6 @@ export default class FranzMenu {
         checked: activeWorkspace ? workspace.id === activeWorkspace.id : false,
         click: () => {
           workspaceActions.activate({ workspace });
-          gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'menu');
         },
       }));
     }
@@ -940,7 +936,6 @@ export default class FranzMenu {
       accelerator: `${cmdKey}+T`,
       click: () => {
         todoActions.toggleTodosPanel();
-        gaEvent(GA_CATEGORY_TODOS, 'toggleDrawer', 'menu');
       },
       enabled: this.stores.user.isLoggedIn && isFeatureEnabledByUser,
     }, {
@@ -962,7 +957,7 @@ export default class FranzMenu {
 
 
   debugMenu() {
-    const { intl } = window.franz;
+    const { intl } = window.ferdi;
 
     return {
       label: intl.formatMessage(menuItems.debugInfo),
@@ -988,7 +983,7 @@ export default class FranzMenu {
       return service.name;
     }
 
-    let name = service.recipe.name;
+    let { name } = service.recipe;
 
     if (service.team) {
       name = `${name} (${service.team})`;
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 192e24796..90974de3f 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -20,7 +20,7 @@ export default class TrayIcon {
     this.trayIcon = new Tray(this._getAsset('tray', INDICATOR_TRAY_PLAIN));
     const trayMenuTemplate = [
       {
-        label: 'Show Franz',
+        label: 'Show Ferdi',
         click() {
           if (app.mainWindow.isMinimized()) {
             app.mainWindow.restore();
@@ -29,7 +29,7 @@ export default class TrayIcon {
           app.mainWindow.focus();
         },
       }, {
-        label: 'Quit Franz',
+        label: 'Quit Ferdi',
         click() {
           app.quit();
         },
@@ -84,7 +84,7 @@ export default class TrayIcon {
   }
 
   _getAsset(type, asset) {
-    let platform = process.platform;
+    let { platform } = process;
 
     if (platform === 'darwin' && systemPreferences.isDarkMode()) {
       platform = `${platform}-dark`;
diff --git a/src/lib/analytics.js b/src/lib/analytics.js
deleted file mode 100644
index c305fdb00..000000000
--- a/src/lib/analytics.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import { remote } from 'electron';
-import querystring from 'querystring';
-
-import { GA_ID, STATS_API } from '../config';
-import { isDevMode } from '../environment';
-
-const debug = require('debug')('Franz:Analytics');
-
-const { app } = remote;
-
-/* eslint-disable */
-(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-/* eslint-enable */
-
-const GA_LOCAL_STORAGE_KEY = 'gaUid';
-
-ga('create', GA_ID, {
-  storage: 'none',
-  clientId: localStorage.getItem(GA_LOCAL_STORAGE_KEY),
-});
-
-ga((tracker) => {
-  localStorage.setItem(GA_LOCAL_STORAGE_KEY, tracker.get('clientId'));
-});
-ga('set', 'checkProtocolTask', null);
-ga('set', 'version', app.getVersion());
-ga('send', 'App');
-
-export function gaPage(page) {
-  ga('send', 'pageview', page);
-  debug('GA track page', page);
-}
-
-export function gaEvent(category, action, label) {
-  ga('send', 'event', category, action, label);
-  debug('GA track event', category, action, label);
-}
-
-export function statsEvent(key, value) {
-  const params = {
-    key,
-    value: value || key,
-    platform: process.platform,
-    version: remote.app.getVersion(),
-  };
-
-  debug('Send Franz stats event', params);
-
-  if (!isDevMode) {
-    window.fetch(`${STATS_API}/event/?${querystring.stringify(params)}`);
-  }
-}