Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-08 08:57:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve #1395 and #1394

Browse source
This commit is contained in:
the-djmaze 2024-01-22 14:30:53 +01:00
parent 69d92ee184
commit aca3490331
2 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/avatars/avatars.js
View file

@ -45,11 +45,9 @@
bimiSelector = bimiSelector ? bimiSelector.match(/;.*s=([^\s;]+)/)[1] : ''; bimiSelector = bimiSelector ? bimiSelector.match(/;.*s=([^\s;]+)/)[1] : '';
return bimiSelector || ''; return bimiSelector || '';
}, },
getAvatarUid = msg => { getBimiId = msg => ('pass' == msg.from[0].dkimStatus ? 1 : 0) + '-' + getBimiSelector(msg),
let from = msg.from[0], getAvatarUrl = msg => `?Avatar/${getBimiId(msg)}/${msg.avatar}`,
bimi = ('pass' == from.dkimStatus ? 1 : 0) + '-' + getBimiSelector(msg); getAvatarUid = msg => `${getBimiId(msg)}/${msg.from[0].email.toLowerCase()}`,
return `${bimi}/${from.email.toLowerCase()}`;
},
getAvatar = msg => ncAvatars.get(msg.from[0].email.toLowerCase()) || avatars.get(getAvatarUid(msg)), getAvatar = msg => ncAvatars.get(msg.from[0].email.toLowerCase()) || avatars.get(getAvatarUid(msg)),
hash = async txt => { hash = async txt => {
if (/^[0-9a-f]{15,}$/i.test(txt)) { if (/^[0-9a-f]{15,}$/i.test(txt)) {
@ -181,7 +179,7 @@
fn(msg.avatar); fn(msg.avatar);
} else { } else {
element.onerror = () => setIdenticon(from, fn); element.onerror = () => setIdenticon(from, fn);
fn(`?Avatar/${'pass' == from.dkimStatus ? 1 : 0}/${msg.avatar}`); fn(getAvatarUrl(msg));
} }
} else { } else {
addQueue(msg, fn); addQueue(msg, fn);
@ -221,8 +219,7 @@
if (url) { if (url) {
fn(url); fn(url);
} else if (msg.avatar) { } else if (msg.avatar) {
fn(msg.avatar.startsWith('data:') ? msg.avatar fn(msg.avatar.startsWith('data:') ? msg.avatar : getAvatarUrl(msg));
: `?Avatar/${'pass' == msg.from[0].dkimStatus ? 1 : 0}/${msg.avatar}`);
} else { } else {
// let from = msg.from[0]; // let from = msg.from[0];
// view.viewUserPic(`?Avatar/${'pass' == from.dkimStatus ? 1 : 0}/${encodeURIComponent(from.email)}`); // view.viewUserPic(`?Avatar/${'pass' == from.dkimStatus ? 1 : 0}/${encodeURIComponent(from.email)}`);

12
plugins/avatars/index.php
View file

@ -10,8 +10,8 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
NAME = 'Avatars', NAME = 'Avatars',
AUTHOR = 'SnappyMail', AUTHOR = 'SnappyMail',
URL = 'https://snappymail.eu/', URL = 'https://snappymail.eu/',
VERSION = '1.15', VERSION = '1.14',
RELEASE = '2024-01-22', RELEASE = '2024-01-17',
REQUIRED = '2.25.0', REQUIRED = '2.25.0',
CATEGORY = 'Contacts', CATEGORY = 'Contacts',
LICENSE = 'MIT', LICENSE = 'MIT',
@ -69,10 +69,6 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
$mFrom = $mFrom->jsonSerialize(); $mFrom = $mFrom->jsonSerialize();
} }
if (\is_array($mFrom)) { if (\is_array($mFrom)) {
if ('pass' == $mFrom['dkimStatus'] && $this->Config()->Get('plugin', 'service', true)) {
// 'data:image/png;base64,[a-zA-Z0-9+/=]'
return static::getServiceIcon($mFrom['email']);
}
if (!$this->Config()->Get('plugin', 'delay', true) if (!$this->Config()->Get('plugin', 'delay', true)
&& ($this->Config()->Get('plugin', 'gravatar', false) && ($this->Config()->Get('plugin', 'gravatar', false)
|| ($this->Config()->Get('plugin', 'bimi', false) && 'pass' == $mFrom['dkimStatus']) || ($this->Config()->Get('plugin', 'bimi', false) && 'pass' == $mFrom['dkimStatus'])
@ -84,6 +80,10 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
} catch (\Throwable $e) { } catch (\Throwable $e) {
\SnappyMail\Log::error('Crypt', $e->getMessage()); \SnappyMail\Log::error('Crypt', $e->getMessage());
} }
if ('pass' == $mFrom['dkimStatus'] && $this->Config()->Get('plugin', 'service', true)) {
// 'data:image/png;base64,[a-zA-Z0-9+/=]'
return static::getServiceIcon($mFrom['email']);
}
} }
return null; return null;
} }