Merge branch 'develop' into t3chguy/hide_notification_body

2017-10-14 23:10:01 +01:00
parent d1af424b3f dfc3dcff9d
commit d63a25a183
243 changed files with 10174 additions and 5206 deletions
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -84,6 +84,10 @@ const Notifier = {
            msg = '';
        }

+        const avatarUrl = ev.sender ? Avatar.avatarUrlForMember(
+            ev.sender, 40, 40, 'crop',
+        ) : null;
+
        const avatarUrl = ev.sender ? Avatar.avatarUrlForMember(ev.sender, 40, 40, 'crop') : null;
        const notif = plaf.displayNotification(title, msg, avatarUrl, room);