From 72d0a221cd36e0b5d39795f6a135ac166f5e003c Mon Sep 17 00:00:00 2001
From: Ali <>
Date: Fri, 12 Mar 2021 16:59:51 +0400
Subject: [PATCH] Fix peer photo merge

---
 submodules/TelegramCore/Sources/TelegramUser.swift | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/submodules/TelegramCore/Sources/TelegramUser.swift b/submodules/TelegramCore/Sources/TelegramUser.swift
index ede6ff0844..c4225bb235 100644
--- a/submodules/TelegramCore/Sources/TelegramUser.swift
+++ b/submodules/TelegramCore/Sources/TelegramUser.swift
@@ -87,7 +87,15 @@ extension TelegramUser {
                 if !isMin {
                     return TelegramUser(user: rhs)
                 } else {
-                    let telegramPhoto = photo.flatMap(parsedTelegramProfilePhoto) ?? []
+                    let telegramPhoto: [TelegramMediaImageRepresentation]
+                    if let photo = photo {
+                        telegramPhoto = parsedTelegramProfilePhoto(photo)
+                    } else if let currentPhoto = lhs?.photo {
+                        telegramPhoto = currentPhoto
+                    } else {
+                        telegramPhoto = []
+                    }
+
                     if let lhs = lhs {
                         var userFlags: UserInfoFlags = []
                         if (flags & (1 << 17)) != 0 {