diff --git a/app/controllers/login-controller.js b/app/controllers/login-controller.js index 462ef0a..1f5c9e6 100644 --- a/app/controllers/login-controller.js +++ b/app/controllers/login-controller.js @@ -1,6 +1,6 @@ let angApp = require(__dirname+'/../init') -angApp.controller('LoginController', function($scope, ChimeVerseService, CredentialsServise) { +angApp.controller('LoginController', function($scope, DesktopService, CredentialsServise) { $scope.help = {} @@ -13,7 +13,7 @@ angApp.controller('LoginController', function($scope, ChimeVerseService, Credent $scope.credentials.login, $scope.credentials.password ) - ChimeVerseService.getCredentialsAndLogin() + DesktopService.getCredentialsAndLogin() $scope.accountForm.$setPristine() $scope.accountForm.$setUntouched() $scope.credentials = {} diff --git a/app/services/chimeverse-service.js b/app/services/desktop-service.js similarity index 72% rename from app/services/chimeverse-service.js rename to app/services/desktop-service.js index 8c9381d..a35456e 100644 --- a/app/services/chimeverse-service.js +++ b/app/services/desktop-service.js @@ -1,24 +1,24 @@ let angApp = require(__dirname + '/../init') -const chimeversePlugin = require(__dirname +'/../../libs/converse.js/converse-desktop/chimeverse-plugin') +const desktopPlugin = require(__dirname +'/../../libs/converse.js/converse-desktop/desktop-plugin') -angApp.factory('ChimeVerseService', ( +angApp.factory('DesktopService', ( $window, $timeout, CredentialsServise, SystemService, AppStateService, SettingsService, XmppHelperService ) => { - let chimeverseService = {} + let desktopService = {} - chimeverseService._notifyMessage = () => { + desktopService._notifyMessage = () => { SystemService.playAudio() SystemService.showEnvelope() } - chimeverseService._hideNotifyMessage = () => { + desktopService._hideNotifyMessage = () => { SystemService.hideEnvelope() } - chimeverseService.logout = () => { + desktopService.logout = () => { let credentials = CredentialsServise.getCredentials() credentials.then((result) => { let remove = CredentialsServise.removeCredentials(result.login) @@ -29,16 +29,16 @@ angApp.factory('ChimeVerseService', ( }) } - chimeverseService.initConverse = (connectionManager, login, password) => { + desktopService.initConverse = (connectionManager, login, password) => { AppStateService.set(AppStateService.APP_STATE_DEFAULT) // Always set to default state before init - chimeversePlugin.register(login) + desktopPlugin.register(login) let lang = navigator.language let allowBookmarks = SettingsService.get('allowBookmarks') let omemoDefault = SettingsService.get('omemoDefault') let xmppResource = XmppHelperService.getResourceFromJid(login) if (!xmppResource) { xmppResource = '.' + (Math.random().toString(36)+'00000000000000000').slice(2, 7) // Generate 5 char unique str - login = login + '/Chimeverse'+xmppResource + login = login + '/converseDesktop'+xmppResource } let conversejsParams = { assets_path: './node_modules/converse.js/dist/', @@ -53,7 +53,7 @@ angApp.factory('ChimeVerseService', ( play_sounds: false, priority: 50, view_mode: 'embedded', - whitelisted_plugins: ['chimeVerse'], + whitelisted_plugins: ['converseDesktop'], } if (connectionManager.startsWith('ws')) { conversejsParams.websocket_url = connectionManager @@ -65,32 +65,32 @@ angApp.factory('ChimeVerseService', ( }, 50) } - chimeverseService.getCredentialsAndLogin = () => { + desktopService.getCredentialsAndLogin = () => { let credentials = CredentialsServise.getCredentials() credentials.then((result) => { - chimeverseService.initConverse(result.connectionManager, result.login, result.password) + desktopService.initConverse(result.connectionManager, result.login, result.password) }, (error) => { AppStateService.set(AppStateService.APP_STATE_LOGIN) }) } - chimeverseService.chatToOpen = null + desktopService.chatToOpen = null $window.document.addEventListener('conversejs-logout', function (e) { - chimeverseService.logout() + desktopService.logout() }) $window.document.addEventListener('conversejs-unread', function (e) { let sender = e.detail - chimeverseService.chatToOpen = sender - chimeverseService._notifyMessage() + desktopService.chatToOpen = sender + desktopService._notifyMessage() }) $window.document.addEventListener('conversejs-no-unread', function (e) { - chimeverseService._hideNotifyMessage() + desktopService._hideNotifyMessage() }) - return chimeverseService + return desktopService }) \ No newline at end of file diff --git a/app/services/settings-service.js b/app/services/settings-service.js index 3a9ca39..6033ec0 100644 --- a/app/services/settings-service.js +++ b/app/services/settings-service.js @@ -7,16 +7,16 @@ angApp.factory('SettingsService', () => { const electronSettings = require('electron-settings') const settings = { - chimeverse: { + converseDesktop: { runMinimized: { default: false, title: 'Run minimized', - hint: 'Default: false. Whether run Chimeverse minimized to tray or not.' + hint: 'Default: false. Whether run Converse Desktop minimized to tray or not.' }, minimizeOnClose: { default: false, title: 'Minimize on close', - hint: 'Default: false. Minimize or close Chimeverse window.' + hint: 'Default: false. Minimize or close Converse Desktop window.' }, preserveWindowSize: { default: true, diff --git a/app/views/login/page.html b/app/views/login/page.html index 859f2a0..e7e0525 100644 --- a/app/views/login/page.html +++ b/app/views/login/page.html @@ -1,5 +1,5 @@
-

Welcome to Chimeverse

+

Welcome to Converse Desktop

Jabber/XMPP client based on Converse.js and Electron
diff --git a/app/views/settings/page.html b/app/views/settings/page.html index 3940b95..9595e03 100644 --- a/app/views/settings/page.html +++ b/app/views/settings/page.html @@ -1,7 +1,7 @@

Chimeverse settings

-
+
diff --git a/index.html b/index.html index 1581821..931266a 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - Chimeverse + Converse Desktop diff --git a/libs/converse.js/converse-desktop/chimeverse-plugin.js b/libs/converse.js/converse-desktop/desktop-plugin.js similarity index 95% rename from libs/converse.js/converse-desktop/chimeverse-plugin.js rename to libs/converse.js/converse-desktop/desktop-plugin.js index 17525c1..931f59a 100644 --- a/libs/converse.js/converse-desktop/chimeverse-plugin.js +++ b/libs/converse.js/converse-desktop/desktop-plugin.js @@ -1,7 +1,7 @@ -let chimeversePlugin = {} +let desktopPlugin = {} -chimeversePlugin.register = (login) => { - converse.plugins.add('chimeVerse', { +desktopPlugin.register = (login) => { + converse.plugins.add('converseDesktop', { initialize: (event) => { let _converse = event.properties._converse let Strophe = converse.env.Strophe @@ -64,4 +64,4 @@ chimeversePlugin.register = (login) => { }) } -module.exports = chimeversePlugin \ No newline at end of file +module.exports = desktopPlugin \ No newline at end of file diff --git a/main.js b/main.js index 1032961..08d01d9 100644 --- a/main.js +++ b/main.js @@ -17,7 +17,7 @@ function initApp() { createWindow() // Set Windows platform notifications if (isWin) { - app.setAppUserModelId("com.denry.chimeverse") + app.setAppUserModelId("com.denry.converseDesktop") } } @@ -67,7 +67,7 @@ function createWindow () { menuService.createMenu() // Open the DevTools. - // mainWindow.webContents.openDevTools() + mainWindow.webContents.openDevTools() // Before close let minimizeOnClose = settingsService.get('minimizeOnClose') diff --git a/modules/menu-service.js b/modules/menu-service.js index 453a650..55f0280 100644 --- a/modules/menu-service.js +++ b/modules/menu-service.js @@ -12,7 +12,7 @@ menuService.createMenu = () => { const isMac = process.platform === 'darwin' const about = { - label: 'About Chimeverse', + label: 'About Converse Desktop', click: () => { // @see https://github.com/electron/electron/issues/16558#issuecomment-484460276 // let activeWindow = BrowserWindow.getFocusedWindow() @@ -23,7 +23,7 @@ menuService.createMenu = () => { } const application = { - label: 'Chimeverse', + label: 'Converse Desktop', submenu: [ ... isMac ? [about] : [], { diff --git a/modules/tray-service.js b/modules/tray-service.js index 7200c41..4c7aabd 100644 --- a/modules/tray-service.js +++ b/modules/tray-service.js @@ -29,7 +29,7 @@ trayService.initTray = (window) => { trayServiceWindow = window let iconPath = getTrayServiceIcon() tray = new Tray(iconPath) - tray.setToolTip('Chimeverse') + tray.setToolTip('Converse Desktop') tray.on('click', function() { // Sent open-related-chat event only on click let activeWindow = BrowserWindow.getAllWindows()[0] diff --git a/renderer.js b/renderer.js index 7bbac6c..ccb308d 100644 --- a/renderer.js +++ b/renderer.js @@ -9,20 +9,20 @@ require('./app/services/settings-service') require('./app/services/system-service') require('./app/services/app-state-service') require('./app/services/xmpp-helper-service') -require('./app/services/chimeverse-service') +require('./app/services/desktop-service') require('./app/controllers/settings-controller') require('./app/controllers/login-controller') require('./app/controllers/default-controller') require('./app/controllers/about-controller') require('./app/controllers/footer-controller') -angApp.controller('AppController', function ($scope, $timeout, ChimeVerseService, SettingsService, AppStateService) { +angApp.controller('AppController', function ($scope, $timeout, DesktopService, SettingsService, AppStateService) { const { ipcRenderer } = require('electron') // Menu force logout event ipcRenderer.on('force-logout-event', () => { - ChimeVerseService.logout() + DesktopService.logout() let event = new CustomEvent("converse-force-logout") // Dispatch to the plugin document.dispatchEvent(event) }) @@ -39,7 +39,7 @@ angApp.controller('AppController', function ($scope, $timeout, ChimeVerseService // Menu about event ipcRenderer.on('open-unread-chat', () => { - let event = new CustomEvent('conversejs-open-chat', {detail: ChimeVerseService.chatToOpen}) + let event = new CustomEvent('conversejs-open-chat', {detail: DesktopService.chatToOpen}) document.dispatchEvent(event) }) @@ -59,6 +59,6 @@ angApp.controller('AppController', function ($scope, $timeout, ChimeVerseService SettingsService.initDefaults() - ChimeVerseService.getCredentialsAndLogin() + DesktopService.getCredentialsAndLogin() })