From 414b153d285614f3784d4eba10c8941f4fe76e6e Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 31 Aug 2018 11:05:06 +0200
Subject: [PATCH] also fallback to getting avatar from user

---
 src/models/room.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/models/room.js b/src/models/room.js
index 7a26ac3f3..705e86bfc 100644
--- a/src/models/room.js
+++ b/src/models/room.js
@@ -22,6 +22,7 @@ const EventEmitter = require("events").EventEmitter;
 
 const EventStatus = require("./event").EventStatus;
 const RoomSummary = require("./room-summary");
+const RoomMember = require("./room-member");
 const MatrixEvent = require("./event").MatrixEvent;
 const utils = require("../utils");
 const ContentRepo = require("../content-repo");
@@ -352,6 +353,19 @@ Room.prototype.getAvatarFallbackMember = function() {
             return availableMember;
         }
     }
+    // if all else fails, try falling back to a user,
+    // and create a one-off member for it
+    if (hasHeroes) {
+        const availableUser = this._summaryHeroes.map((userId) => {
+            return this._client.getUser(userId);
+        }).find((user) => !!user);
+        if (availableUser) {
+            const member = new RoomMember(
+                this.roomId, availableUser.userId);
+            member.user = availableUser;
+            return member;
+        }
+    }
 };
 
 /**