From bff88e9f6a3e3da7b88edf414e5e64f7bf82737b Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Fri, 2 Dec 2022 09:09:30 +0100
Subject: [PATCH] Avatars use text or colored silhouette as defaults

---
 plugins/avatars/avatars.js               |  36 ++++++++++++++++++++++-
 plugins/avatars/identicon.js             |   2 ++
 plugins/avatars/images/empty-contact.png | Bin 665 -> 0 bytes
 plugins/avatars/index.php                |  19 ++++--------
 4 files changed, 43 insertions(+), 14 deletions(-)
 delete mode 100644 plugins/avatars/images/empty-contact.png

diff --git a/plugins/avatars/avatars.js b/plugins/avatars/avatars.js
index 501fdfae8..81a16b460 100644
--- a/plugins/avatars/avatars.js
+++ b/plugins/avatars/avatars.js
@@ -1,5 +1,39 @@
 (rl => {
 
+	const size = 50;
+
+	window.identiconSvg = (hash, txt) => {
+		// color defaults to last 7 chars as hue at 70% saturation, 50% brightness
+		// hsl2rgb adapted from: https://gist.github.com/aemkei/1325937
+		let h = (parseInt(hash.substr(-7), 16) / 0xfffffff) * 6, s = 0.7, l = 0.5,
+			v = [
+				l += s *= l < .5 ? l : 1 - l,
+				l - h % 1 * s * 2,
+				l -= s *= 2,
+				l,
+				l + h % 1 * s,
+				l + s
+			],
+			m = txt ? 128 : 200,
+			color = 'rgb(' + [
+				v[ ~~h % 6 ] * m, // red
+				v[ (h | 16) % 6 ] * m, // green
+				v[ (h |  8) % 6 ] * m // blue
+			].map(Math.round).join(',') + ')';
+
+		if (txt) {
+			return `<svg xmlns="http://www.w3.org/2000/svg" width="${size}px" height="${size}px" viewBox="0 0 ${size} ${size}" version="1.1">
+				<circle fill="${color}" width="${size}" height="${size}" cx="${size/2}" cy="${size/2}" r="${size/2}"/>
+				<text x="${size}%" y="${size}%" style="color:#FFF" alignment-baseline="middle" text-anchor="middle"
+					 font-weight="bold" font-size="${Math.round(size*0.5)}"
+					 dy=".1em" dominant-baseline="middle" fill="#FFF">${txt}</text>
+				</svg>`;
+		}
+		return `<svg version="1.1" width="412" height="412" viewBox="0 0 412 412" xmlns="http://www.w3.org/2000/svg">
+			<path fill="${color}" d="m 404.4267,343.325 c -5.439,-16.32 -15.298,-32.782 -29.839,-42.362 -27.979,-18.572 -60.578,-28.479 -92.099,-39.085 -7.604,-2.664 -15.33,-5.568 -22.279,-9.7 -6.204,-3.686 -8.533,-11.246 -9.974,-17.886 -0.636,-3.512 -1.026,-7.116 -1.228,-10.661 22.857,-31.267 38.019,-82.295 38.019,-124.136 0,-65.298 -36.896,-83.495 -82.402,-83.495 -45.515,0 -82.403,18.17 -82.403,83.468 0,43.338 16.255,96.5 40.489,127.383 -0.221,2.438 -0.511,4.876 -0.95,7.303 -1.444,6.639 -3.77,14.058 -9.97,17.743 -6.957,4.133 -14.682,6.756 -22.287,9.42 -31.520996,10.605 -64.118996,19.957 -92.090996,38.529 -14.549,9.58 -24.403,27.159 -29.838,43.479 -5.597,16.938 -7.88600003,37.917 -7.54100003,54.917 H 205.9917 411.9657 c 0.348,-16.999 -1.946,-37.978 -7.539,-54.917 z"/>
+		</svg>`;
+	};
+
 	const
 		queue = [],
 		avatars = new Map,
@@ -26,7 +60,7 @@
 			(from.name?.split(/[^\p{L}]+/gu) || []).reduce((a, s) => a + (s[0] || ''), '')
 			.slice(0,2)
 			.toUpperCase(),
-		setIdenticon = (from, fn) => window.identiconSvg && hash(from.email).then(hash =>
+		setIdenticon = (from, fn) => hash(from.email).then(hash =>
 			fn('data:image/svg+xml;base64,' + btoa(window.identiconSvg(hash, fromChars(from))))
 		),
 		addQueue = (msg, fn) => {
diff --git a/plugins/avatars/identicon.js b/plugins/avatars/identicon.js
index 59664ccbb..237c2e574 100644
--- a/plugins/avatars/identicon.js
+++ b/plugins/avatars/identicon.js
@@ -31,6 +31,8 @@ window.identiconSvg = (hash, txt) => {
 				 dy=".1em" dominant-baseline="middle" fill="#FFF">${txt}</text>
 			</svg>`;
 	} else {
+		txt = `<path fill="${color}" d="m 404.4267,343.325 c -5.439,-16.32 -15.298,-32.782 -29.839,-42.362 -27.979,-18.572 -60.578,-28.479 -92.099,-39.085 -7.604,-2.664 -15.33,-5.568 -22.279,-9.7 -6.204,-3.686 -8.533,-11.246 -9.974,-17.886 -0.636,-3.512 -1.026,-7.116 -1.228,-10.661 22.857,-31.267 38.019,-82.295 38.019,-124.136 0,-65.298 -36.896,-83.495 -82.402,-83.495 -45.515,0 -82.403,18.17 -82.403,83.468 0,43.338 16.255,96.5 40.489,127.383 -0.221,2.438 -0.511,4.876 -0.95,7.303 -1.444,6.639 -3.77,14.058 -9.97,17.743 -6.957,4.133 -14.682,6.756 -22.287,9.42 -31.520996,10.605 -64.118996,19.957 -92.090996,38.529 -14.549,9.58 -24.403,27.159 -29.838,43.479 -5.597,16.938 -7.88600003,37.917 -7.54100003,54.917 H 205.9917 411.9657 c 0.348,-16.999 -1.946,-37.978 -7.539,-54.917 z"/>`;
+
 		const cell = Math.floor((size - ((Math.floor(size * margin)) * 2)) / 5),
 			imargin = Math.floor((size - cell * 5) / 2),
 			rectangles = [],
diff --git a/plugins/avatars/images/empty-contact.png b/plugins/avatars/images/empty-contact.png
deleted file mode 100644
index 4418810b82e90b24e9ffb514ec673e25c76b964e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 665
zcmV;K0%rY*P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0007DNkl<ZXx{DF
zOQ_9J6vy$;|J<8L$c#v&q)aF=VRFcb5(5SdO=RFTQpn0HqbmlIV&IV^-BL;noQc%U
z%wxh(+>n9y>$(Q_Z{U>NbN-usPo3X*Kh}4zwbx$%^{1<@Dyc}hSVYXidMw9mjKdJ#
z;W_T2KO$a^DS(KWilf+q@qZcq0Vi=VB0gsah=^&pg+(n+y@Rz8@xIFbJr#}bK|hwY
zF?}xP)a&*BMx)WT4Yi66*oajX=5NA^DhAXloPL4b2|{>h7JxF#EKZOERz<{=902nY
zgdj}7%p3rd6Q=TsIRKJAf;j+&6527G1K@i?<G<wq_?plISpdEy1o)Bz;B&$d$^!7V
z%H?ZH1|M?(3|5KVrh~`=@D7g>01QOL(0>Prh+$k#0B|YSLk1VBxW5d;{%imdF^DS_
zmN**`A9H#Dj<@+LzsISZwa_mwJixU!rk;t2=h*>D?Z>AU#=pX`6dU)XSftTtys6jg
zuyT|y@3x4zm%E&9)_FV~#kl*poodsfLhRSD1RJm#^U>Qv_4x!hakYHRe*71Jh?s=U
z*oK7(zRZU4u*^soTWxd|Ef_upTgx`cO#enN(1+8b1t~^h_;@2d&%OW9@Mb;35uA&N
zuWbR8ZNqgqgaw(t*&kycuK%gvEB<gf*Oa+^sj;B}9LA02%U(1YzqBk3mW`FRNz-M&
zhg}gd@EbsR>U(g&$WMu}tZz7oqY?3=D4Vo>DmGa&=md848u=x(L+5Eb?$*j%UUVQp
zfxR`%(7Bpk)8Xm@<W_H42@ZCs{jYV^RW<ztEXbpeRaZ<?00000NkvXXu0mjfg;hHe

diff --git a/plugins/avatars/index.php b/plugins/avatars/index.php
index 7e7eda1d6..f42c468f2 100644
--- a/plugins/avatars/index.php
+++ b/plugins/avatars/index.php
@@ -19,13 +19,9 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 		$this->addJs('avatars.js');
 		$this->addJsonHook('Avatar', 'DoAvatar');
 		$this->addPartHook('Avatar', 'ServiceAvatar');
-		$identicon = $this->Config()->Get('plugin', 'identicon', 'identicon');
-		if ('none' != $identicon) {
-			if ('jdenticon' === $this->Config()->Get('plugin', 'identicon', 'identicon')) {
-				$this->addJs('jdenticon.js');
-			} else {
-				$this->addJs('identicon.js');
-			}
+		$identicon = $this->Config()->Get('plugin', 'identicon', '');
+		if ($identicon && \is_file(__DIR__ . "/{$identicon}.js")) {
+			$this->addJs("{$identicon}.js");
 		}
 		// https://github.com/the-djmaze/snappymail/issues/714
 		$this->Config()->Get('plugin', 'delay', true) || $this->addHook('filter.json-response', 'FilterJsonResponse');
@@ -93,9 +89,9 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECT)
 //				->SetAllowedInJs(true)
 				->SetDefaultValue([
-					['id' => 'identicon', 'name' => 'Name characters or squares'],
-					['id' => 'jdenticon', 'name' => 'Triangles shape'],
-					['id' => 'none', 'name' => 'none']
+					['id' => '', 'name' => 'Name characters else silhouette'],
+					['id' => 'identicon', 'name' => 'Name characters else squares'],
+					['id' => 'jdenticon', 'name' => 'Triangles shape']
 				])
 				->SetDescription('https://wikipedia.org/wiki/Identicon'),
 			\RainLoop\Plugins\Property::NewInstance('bimi')->SetLabel('Lookup BIMI')
@@ -212,9 +208,6 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 				'services/' . \preg_replace('/^.+\\.([^.]+\\.[^.]+)$/D', '$1', $sDomain),
 				'services/' . \preg_replace('/^(.+\\.)?(paypal\\.[a-z][a-z])$/D', 'paypal.com', $sDomain)
 			];
-			if (!$this->Config()->Get('plugin', 'identicon', false)) {
-				$aServices[] = 'empty-contact'; // DATA_IMAGE_USER_DOT_PIC
-			}
 			foreach ($aServices as $service) {
 				$file = __DIR__ . "/images/{$service}.png";
 				if (\file_exists($file)) {