From 418f64e06a56fdb0bf39bd42f022349d26df8fb3 Mon Sep 17 00:00:00 2001 From: RossyB Date: Fri, 27 Sep 2019 18:40:16 +0300 Subject: [PATCH 1/2] fix error in Timeline.module.js --- src/core/resource/timeline/modules/Timeline.module.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/resource/timeline/modules/Timeline.module.js b/src/core/resource/timeline/modules/Timeline.module.js index 0e3e137b2..1a4a4c4b1 100644 --- a/src/core/resource/timeline/modules/Timeline.module.js +++ b/src/core/resource/timeline/modules/Timeline.module.js @@ -65,7 +65,10 @@ const getMinTime = (setting) => { const addContacts = (contacts, users, showContactRequests, ignoredChats, showChatsOnMute, minTime, timeline) => { Object.values(users).forEach(u => { const { phone_id, created, names, surnames, nick, avatar } = u; - const { is_friend, is_authorized } = contacts[phone_id]['status']; + const { is_friend, is_authorized } = contacts[phone_id] && contacts[phone_id]['status']; + + console.log('[TEMP] is_friend', is_friend); + console.log('[TEMP] is_authorized', is_authorized); if (created && created >= minTime) { if (!is_friend && is_authorized && showContactRequests && !ignoredChats.includes(phone_id)) { -- GitLab From 8c3a0634ca7993551b5220e2d9ed6ad9e7ddd58d Mon Sep 17 00:00:00 2001 From: RossyB Date: Fri, 27 Sep 2019 18:42:22 +0300 Subject: [PATCH 2/2] fix error in Timeline.module.js --- src/core/resource/timeline/modules/Timeline.module.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/core/resource/timeline/modules/Timeline.module.js b/src/core/resource/timeline/modules/Timeline.module.js index 1a4a4c4b1..e97654e47 100644 --- a/src/core/resource/timeline/modules/Timeline.module.js +++ b/src/core/resource/timeline/modules/Timeline.module.js @@ -67,9 +67,6 @@ const addContacts = (contacts, users, showContactRequests, ignoredChats, showCha const { phone_id, created, names, surnames, nick, avatar } = u; const { is_friend, is_authorized } = contacts[phone_id] && contacts[phone_id]['status']; - console.log('[TEMP] is_friend', is_friend); - console.log('[TEMP] is_authorized', is_authorized); - if (created && created >= minTime) { if (!is_friend && is_authorized && showContactRequests && !ignoredChats.includes(phone_id)) { timeline.push({ -- GitLab