0.5.17

0.5.17

.travis.yml

@@ -1,5 +1,6 @@
 sudo: required
 language: node_js
+dist: trusty
 node_js:
   - "8"
 

app/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "Rambox",
 	"productName": "Rambox",
-	"version": "0.5.16",
+	"version": "0.5.17",
 	"description": "Rambox",
 	"main": "electron/main.js",
 	"private": true,
@@ -30,14 +30,14 @@
 	"license": "GPL-3.0",
 	"dependencies": {
 		"@exponent/electron-cookies": "2.0.0",
-		"auth0-js": "^8.10.1",
+		"auth0-js": "^8.12.3",
 		"auth0-lock": "^10.22.0",
 		"auto-launch-patched": "5.0.2",
 		"electron-config": "0.2.1",
+		"electron-context-menu": "0.9.1",
 		"electron-is-dev": "^0.3.0",
 		"mime": "^1.4.0",
 		"rimraf": "2.6.1",
-		"tmp": "0.0.28",
+		"tmp": "0.0.28"
-		"electron-context-menu": "0.9.1"
 	}
 }

app/store/ServicesList.js

@@ -771,6 +771,15 @@ Ext.define('Rambox.store.ServicesList', {
 			,type: 'messaging'
 			,js_unread: 'function remove(e){var r=document.getElementById(e);return r.parentNode.removeChild(r)}remove("pagelet_bluebar"),remove("pages_manager_top_bar_container");'
 		},
+		{
+			 id: 'messengerbusiness'
+			,logo: 'messengerpages.png'
+			,name: 'Messenger for Business'
+			,description: 'Messenger can help facilitate communication with your customers.'
+			,url: 'https://business.facebook.com/___/inbox/'
+			,type: 'messaging'
+			,js_unread: 'function remove(e){var r=document.getElementById(e);return r.parentNode.removeChild(r)}remove("pagelet_bluebar"),remove("pages_manager_top_bar_container");'
+		},
 		{
 			 id: 'vk'
 			,logo: 'vk.png'

app/view/main/Main.js

@@ -25,6 +25,15 @@ Ext.define('Rambox.view.main.Main', {
 	,autoRender: true
 	,autoShow: true
 	,deferredRender: false
+	,tabBar: {
+		items: [{
+			 xtype: 'button'
+			,html: '<span class="fa fa-heart" style="color:red;font-size:16px;cursor:pointer;padding:0 5px;"></span>'
+			,baseCls: ''
+			,tooltip: locale['app.main[25]']
+			,href: 'https://fundraiseup.com/widget/FUNSGXPIJWQ/donate?key=KPCFEZKZ'
+		}]
+	}
 	,items: [
 		{
 			 icon: 'resources/[email protected]'
@@ -329,7 +338,7 @@ Ext.define('Rambox.view.main.Main', {
 						,{
 							 text: locale['app.main[25]']
 							,glyph: 'xf21e@FontAwesome'
-							,handler: 'showDonate'
+							,href: 'https://fundraiseup.com/widget/FUNSGXPIJWQ/donate?key=KPCFEZKZ'
 						}
 						,{
 							 text: 'Translation'

app/view/main/MainController.js

@@ -484,6 +484,6 @@ Ext.define('Rambox.view.main.MainController', {
 	}
 
 	,showDonate: function( btn ) {
-		Tooltip.API.show('zxzKWZfcmgRtHXgth');
+		Signalayer.API.show('tChaoq3PwSG9wswhn');
 	}
 });

appveyor.yml

@@ -1,4 +1,4 @@
-version: 0.5.16
+version: 0.5.17
 pull_requests:
   do_not_increment_build_number: true
 branches:

electron/main.js

@@ -277,6 +277,7 @@ function createMasterPasswordWindow() {
 function updateBadge(title) {
 	title = title.split(" - ")[0]; //Discard service name if present, could also contain digits
 	var messageCount = title.match(/\d+/g) ? parseInt(title.match(/\d+/g).join("")) : 0;
+	messageCount = isNaN(messageCount) ? 0 : messageCount;
 	
 	tray.setBadge(messageCount, config.get('systemtray_indicator'));
 

electron/tray.js

@@ -67,9 +67,9 @@ exports.setBadge = function(messageCount, showUnreadTray) {
 
 	let icon;
 	if (process.platform === 'linux') {
-		icon = messageCount && showUnreadTray ? 'IconTrayUnread.png' : 'IconTray.png';
+		icon = messageCount > 0 && showUnreadTray ? 'IconTrayUnread.png' : 'IconTray.png';
 	} else {
-		icon = messageCount && showUnreadTray ? 'IconTrayUnread.ico' : 'Icon.ico';
+		icon = messageCount > 0 && showUnreadTray ? 'IconTrayUnread.ico' : 'Icon.ico';
 	}
 
 	const iconPath = path.join(__dirname, `../resources/${icon}`);

index.html

@@ -44,16 +44,22 @@
 	</script>
 	<!--- Localization -->
 
-	<!--- Tooltip player -->
+	<!--- Signalayer player -->
 	<script type='text/javascript'>
-	    (function(d, s){
+	window.Signalayer||function(t,e){var o={
-			var t = d.createElement(s), e = d.getElementsByTagName(s)[0];
+		url:"https://cdn.signalayer.com/static/player.js",
-			t.type = "text/javascript"; e.parentNode.insertBefore(t, e);
+		key:"sEF8shc4KSuqtHMx0ztmTFdcrQO0cAVpszZ9Y8hLfQ2",
-			t.async = "async";
+		async:true
-			t.src = "https://cdn.tooltip.io/static/player.js?apiKey=sEF8shc4KSuqtHMx0ztmTFdcrQO0cAVpszZ9Y8hLfQ2";
+	};window.Signalayer={cs:[],_apiKey:o.key};for(
-		})(document, "script");
+	var r=["identify","goal","updateUserData","start","stop","refresh","show","hide","on"],
+	i={},n=0;n>r.length;n++){var a=r[n];i[a]=function(t){return function(){var
+	e=Array.prototype.slice.call(arguments);
+	window.Signalayer.cs.push({method:t,args:e})}}(a)}window.Signalayer.API=i;var
+	n=t.createElement(e),s=t.getElementsByTagName(e)[0];
+	n.type="text/javascript",
+	n.async=o.async,s.parentNode.insertBefore(n,s),n.src=o.url}(document,"script");
 	</script>
-	<!--- Tooltip player -->
+	<!--- Signalayer player -->
 </head>
 <body>
 	<div id="spinner" class="component" data-path-start="M280,466c0,0.13-0.001,0.26-0.003,0.39c-0.002,0.134-0.004,0.266-0.007,0.396

package.json

@@ -63,6 +63,7 @@
 		"win": {
 			"target": [
 				"squirrel",
+				"nsis",
 				"zip"
 			]
 		},
@@ -74,6 +75,7 @@
 				"Categories": "GTK;GNOME;Utility;Office;Email;Chat;InstantMessaging;"
 			},
 			"target": [
+				"snap",
 				"AppImage",
 				"deb",
 				"rpm",
@@ -96,8 +98,8 @@
 		"chai": "3.5.0",
 		"crowdin": "1.0.0",
 		"csvjson": "4.3.3",
-		"electron": "^1.8.3",
+		"electron": "^1.8.4",
-		"electron-builder": "^17.10.0",
+		"electron-builder": "^20.10.0",
 		"electron-builder-squirrel-windows": "15.0.0",
 		"electron-squirrel-startup": "^1.0.0",
 		"mocha": "3.2.0",
@@ -105,14 +107,14 @@
 	},
 	"dependencies": {
 		"@exponent/electron-cookies": "2.0.0",
-		"auth0-js": "^8.10.1",
+		"auth0-js": "^8.12.3",
 		"auth0-lock": "^10.22.0",
 		"auto-launch-patched": "5.0.2",
 		"electron-config": "0.2.1",
+		"electron-context-menu": "0.9.1",
 		"electron-is-dev": "^0.3.0",
 		"mime": "^1.4.0",
 		"rimraf": "2.6.1",
-		"tmp": "0.0.28",
+		"tmp": "0.0.28"
-		"electron-context-menu": "0.9.1"
 	}
 }