From 3bad65cbe5f843e768a70265d738c66b5e7cdd1c Mon Sep 17 00:00:00 2001
From: TheGoddessInari <thegoddessinari@gmail.com>
Date: Wed, 27 Jan 2021 15:15:27 -0800
Subject: [PATCH] Fix IconLoader to properly set title. No more duplicate icons
 (rambox bug).

Fixes #225 again.
---
 app/util/IconLoader.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/util/IconLoader.js b/app/util/IconLoader.js
index 41a8cccf..1880afca 100644
--- a/app/util/IconLoader.js
+++ b/app/util/IconLoader.js
@@ -18,8 +18,9 @@ Ext.define('Hamsket.util.IconLoader', {
 		this.loadServiceIconUrl = function (service, webview) {
 			switch (service.type) {
 				case 'slack':
-					setTimeout( () =>
-						webview.executeJavaScript(
+					setTimeout( () => {
+					const service_name = Ext.String.htmlEncode(service.record.get('name'));
+					webview.executeJavaScript(
 						`(() => {
 							let icon = document.querySelector('.c-team_icon');
 							if (!icon) {
@@ -39,12 +40,14 @@ Ext.define('Hamsket.util.IconLoader', {
 							return bg.slice(5, -2);
 						})();`).then(function (backgroundImage) {
 							if (backgroundImage) {
-								service.setTitle(`<img src="${backgroundImage}" width="" style="background-color: white;border-radius: 50%;position: absolute;left: 18px;top: 17px;width: 12px;">${Ext.String.htmlEncode(service.title)}`);
+								service.setTitle(`<img src="${backgroundImage}" width="" style="background-color: white;border-radius: 50%;position: absolute;left: 18px;top: 17px;width: 12px;">${service_name}`);
 								service.fireEvent('iconchange', service, backgroundImage, service.icon);
 							}
 							return true;
 						}
-					).finally({}), 1000);
+					).catch(err => {
+						console.error(`Slack IconLoader - ${service_name}: ${err}`);
+					});}, 1000);
 					break;
 				default:
 					break;