From a6bb33f51a718cb0647eece71d94f1aaa619ba9c Mon Sep 17 00:00:00 2001 From: lk316 <51822928+lk316@users.noreply.github.com> Date: Thu, 10 Jul 2025 22:51:39 +0300 Subject: [PATCH 1/7] Fix conversation title --- .../chat/public/views/partials/inbox.liquid | 38 +++++++++++++++---- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/modules/chat/public/views/partials/inbox.liquid b/modules/chat/public/views/partials/inbox.liquid index 17272ef..34efdde 100644 --- a/modules/chat/public/views/partials/inbox.liquid +++ b/modules/chat/public/views/partials/inbox.liquid @@ -107,17 +107,41 @@ ← {% liquid - if other_participant - if other_participant.first_name - assign name = other_participant.first_name | append: ' ' | append: other_participant.last_name - else - assign name = other_participant.name + assign participants = current_conversation.participants + if participants + assign current_participants = participants | select: id: current_profile.id + assign other_participants = participants | subtract_array: current_participants + assign from_profile = other_participants | first + if from_profile + if from_profile.first_name + assign name = from_profile.first_name | append: ' ' | append: from_profile.last_name + else + assign name = from_profile.name + endif + + render 'modules/common-styling/user/avatar', size: 's', name: name, imageSrc: from_profile.avatar.photo.versions.sm endif + print name | raw_escape_string + else # conversation was just initiated + assign participants_ids = current_conversation.participant_ids + assign current_participants_ids = '[]' | parse_json + assign current_participants_ids = current_participants_ids | add_to_array: current_profile.id + assign other_participants_ids = participants_ids | subtract_array: current_participants_ids + assign from_profile = other_participants_ids | first + if from_profile + graphql from_profile = 'modules/profile/profiles/search', id: from_profile + assign from_profile = from_profile.records.results.first + if from_profile.first_name + assign name = from_profile.first_name | append: ' ' | append: from_profile.last_name + else + assign name = from_profile.name + endif - render 'modules/common-styling/user/avatar', size: 's', name: name, imageSrc: other_participant.avatar.photo.versions.sm + render 'modules/common-styling/user/avatar', size: 's', name: name, imageSrc: from_profile.avatar.photo.versions.sm + endif + print name | raw_escape_string endif %} - {{ name }}
From f68b2989222edcb51332ab2a5469b8b24967ebbf Mon Sep 17 00:00:00 2001 From: lk316 <51822928+lk316@users.noreply.github.com> Date: Tue, 15 Jul 2025 22:10:43 +0300 Subject: [PATCH 2/7] refactoring --- .../chat/public/views/pages/inbox.html.liquid | 5 +++++ .../chat/public/views/partials/inbox.liquid | 18 ------------------ 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/modules/chat/public/views/pages/inbox.html.liquid b/modules/chat/public/views/pages/inbox.html.liquid index 06b69a3..d36421d 100644 --- a/modules/chat/public/views/pages/inbox.html.liquid +++ b/modules/chat/public/views/pages/inbox.html.liquid @@ -29,6 +29,11 @@ slug: inbox function conversations = 'modules/chat/lib/queries/conversations/search_by_participant', participant_id: current_profile.id, limit: 20, page: 1 if conversations.total_entries > 0 + if current_conversation.participants == blank + graphql participants = 'modules/profile/profiles/search', ids: current_conversation.participant_ids + hash_assign current_conversation['participants'] = participants.records.results + endif + theme_render_rc 'inbox', current_conversation: current_conversation, conversations: conversations, current_profile: current_profile else render 'modules/chat/blank' diff --git a/modules/chat/public/views/partials/inbox.liquid b/modules/chat/public/views/partials/inbox.liquid index 34efdde..a0972fa 100644 --- a/modules/chat/public/views/partials/inbox.liquid +++ b/modules/chat/public/views/partials/inbox.liquid @@ -122,24 +122,6 @@ render 'modules/common-styling/user/avatar', size: 's', name: name, imageSrc: from_profile.avatar.photo.versions.sm endif print name | raw_escape_string - else # conversation was just initiated - assign participants_ids = current_conversation.participant_ids - assign current_participants_ids = '[]' | parse_json - assign current_participants_ids = current_participants_ids | add_to_array: current_profile.id - assign other_participants_ids = participants_ids | subtract_array: current_participants_ids - assign from_profile = other_participants_ids | first - if from_profile - graphql from_profile = 'modules/profile/profiles/search', id: from_profile - assign from_profile = from_profile.records.results.first - if from_profile.first_name - assign name = from_profile.first_name | append: ' ' | append: from_profile.last_name - else - assign name = from_profile.name - endif - - render 'modules/common-styling/user/avatar', size: 's', name: name, imageSrc: from_profile.avatar.photo.versions.sm - endif - print name | raw_escape_string endif %} From 24439f11d53885ae7aeb805187a2f1d39e7e0ec6 Mon Sep 17 00:00:00 2001 From: lk316 <51822928+lk316@users.noreply.github.com> Date: Mon, 21 Jul 2025 22:04:31 +0300 Subject: [PATCH 3/7] small security fix --- modules/chat/public/views/partials/inbox.liquid | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/chat/public/views/partials/inbox.liquid b/modules/chat/public/views/partials/inbox.liquid index a0972fa..2872d0b 100644 --- a/modules/chat/public/views/partials/inbox.liquid +++ b/modules/chat/public/views/partials/inbox.liquid @@ -118,12 +118,11 @@ else assign name = from_profile.name endif - render 'modules/common-styling/user/avatar', size: 's', name: name, imageSrc: from_profile.avatar.photo.versions.sm endif - print name | raw_escape_string endif %} + {{ name }}
From 50c6ea27259dcdbc050a6daa2330d5517b2e8c09 Mon Sep 17 00:00:00 2001 From: lk316 <51822928+lk316@users.noreply.github.com> Date: Wed, 6 Aug 2025 20:08:41 +0300 Subject: [PATCH 4/7] Fix user query --- modules/chat/public/views/pages/inbox.html.liquid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/chat/public/views/pages/inbox.html.liquid b/modules/chat/public/views/pages/inbox.html.liquid index d36421d..4fa422d 100644 --- a/modules/chat/public/views/pages/inbox.html.liquid +++ b/modules/chat/public/views/pages/inbox.html.liquid @@ -30,7 +30,7 @@ slug: inbox if conversations.total_entries > 0 if current_conversation.participants == blank - graphql participants = 'modules/profile/profiles/search', ids: current_conversation.participant_ids + graphql participants = 'modules/user/profiles/search', ids: current_conversation.participant_ids hash_assign current_conversation['participants'] = participants.records.results endif From 6e925a14658ffdefac0ec00caf22e215c1a05073 Mon Sep 17 00:00:00 2001 From: lk316 <51822928+lk316@users.noreply.github.com> Date: Wed, 6 Aug 2025 20:24:41 +0300 Subject: [PATCH 5/7] Guard against blank current_conversation --- modules/chat/public/views/pages/inbox.html.liquid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/chat/public/views/pages/inbox.html.liquid b/modules/chat/public/views/pages/inbox.html.liquid index 4fa422d..740d1c0 100644 --- a/modules/chat/public/views/pages/inbox.html.liquid +++ b/modules/chat/public/views/pages/inbox.html.liquid @@ -29,7 +29,7 @@ slug: inbox function conversations = 'modules/chat/lib/queries/conversations/search_by_participant', participant_id: current_profile.id, limit: 20, page: 1 if conversations.total_entries > 0 - if current_conversation.participants == blank + if current_conversation and current_conversation.participants == blank graphql participants = 'modules/user/profiles/search', ids: current_conversation.participant_ids hash_assign current_conversation['participants'] = participants.records.results endif From dde001555a6e8964683371c73f3fa7204c7f408a Mon Sep 17 00:00:00 2001 From: Maciej Krajowski-Kukiel Date: Tue, 30 Sep 2025 12:29:59 +0200 Subject: [PATCH 6/7] refactor --- app/views/layouts/application.liquid | 4 +- .../chat/public/views/pages/inbox.html.liquid | 4 +- .../public/views/partials/conversation.liquid | 4 +- .../chat/public/views/partials/inbox.liquid | 38 ++++++------------- .../chat/public/views/partials/message.liquid | 10 ++--- 5 files changed, 23 insertions(+), 37 deletions(-) diff --git a/app/views/layouts/application.liquid b/app/views/layouts/application.liquid index b974357..5a0d231 100644 --- a/app/views/layouts/application.liquid +++ b/app/views/layouts/application.liquid @@ -20,7 +20,7 @@ {% comment %} custom js specific for this app {% endcomment %} - +