From 588e812d3316c4f5bbbde980e096bd7d2c829cfd Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Thu, 9 Feb 2023 14:07:31 +1000
Subject: [PATCH] DEV: Add started by and avatar align and more specs

---
 plugins/chat/app/models/chat_message.rb            |  4 ++--
 plugins/chat/app/models/chat_thread.rb             |  6 ++++++
 .../chat_thread_original_message_serializer.rb     |  2 +-
 .../discourse/components/chat-thread.hbs           |  3 +++
 .../stylesheets/common/chat-thread-panel.scss      |  8 --------
 .../assets/stylesheets/common/chat-thread.scss     | 14 ++++++++++++++
 plugins/chat/config/locales/client.en.yml          |  1 +
 plugins/chat/plugin.rb                             |  1 -
 .../spec/system/page_objects/chat/chat_thread.rb   | 10 +++++++++-
 plugins/chat/spec/system/single_thread_spec.rb     |  9 ++++++++-
 10 files changed, 44 insertions(+), 14 deletions(-)
 delete mode 100644 plugins/chat/assets/stylesheets/common/chat-thread-panel.scss

diff --git a/plugins/chat/app/models/chat_message.rb b/plugins/chat/app/models/chat_message.rb
index 145144ad79..39d7c0ab98 100644
--- a/plugins/chat/app/models/chat_message.rb
+++ b/plugins/chat/app/models/chat_message.rb
@@ -82,7 +82,7 @@ class ChatMessage < ActiveRecord::Base
     UploadReference.insert_all!(ref_record_attrs)
   end
 
-  def excerpt
+  def excerpt(max_length: 50)
     # just show the URL if the whole message is a URL, because we cannot excerpt oneboxes
     return message if UrlHelper.relaxed_parse(message).is_a?(URI)
 
@@ -90,7 +90,7 @@ class ChatMessage < ActiveRecord::Base
     return uploads.first.original_filename if cooked.blank? && uploads.present?
 
     # this may return blank for some complex things like quotes, that is acceptable
-    PrettyText.excerpt(cooked, 50, { text_entities: true })
+    PrettyText.excerpt(cooked, max_length, { text_entities: true })
   end
 
   def cooked_for_excerpt
diff --git a/plugins/chat/app/models/chat_thread.rb b/plugins/chat/app/models/chat_thread.rb
index 53d685d98f..c320281728 100644
--- a/plugins/chat/app/models/chat_thread.rb
+++ b/plugins/chat/app/models/chat_thread.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class ChatThread < ActiveRecord::Base
+  EXCERPT_LENGTH = 150
+
   belongs_to :channel, foreign_key: "channel_id", class_name: "ChatChannel"
   belongs_to :original_message_user, foreign_key: "original_message_user_id", class_name: "User"
   belongs_to :original_message, foreign_key: "original_message_id", class_name: "ChatMessage"
@@ -19,6 +21,10 @@ class ChatThread < ActiveRecord::Base
   def relative_url
     "#{channel.relative_url}/t/#{self.id}"
   end
+
+  def excerpt
+    original_message.excerpt(max_length: EXCERPT_LENGTH)
+  end
 end
 
 # == Schema Information
diff --git a/plugins/chat/app/serializers/chat_thread_original_message_serializer.rb b/plugins/chat/app/serializers/chat_thread_original_message_serializer.rb
index eb773e19db..0cbf498bcc 100644
--- a/plugins/chat/app/serializers/chat_thread_original_message_serializer.rb
+++ b/plugins/chat/app/serializers/chat_thread_original_message_serializer.rb
@@ -6,6 +6,6 @@ class ChatThreadOriginalMessageSerializer < ApplicationSerializer
   has_one :chat_webhook_event, serializer: ChatWebhookEventSerializer, embed: :objects
 
   def excerpt
-    WordWatcher.censor(object.excerpt)
+    WordWatcher.censor(object.excerpt(max_length: ChatThread::EXCERPT_LENGTH))
   end
 end
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-thread.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-thread.hbs
index 7ae72eadba..9121044398 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-thread.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-thread.hbs
@@ -18,6 +18,9 @@
       </p>
 
       <div class="chat-thread__op">
+        <span class="chat-thread__op-started-by">{{i18n
+            "chat.threads.started_by"
+          }}</span>
         <ChatMessageAvatar
           class="chat-thread__op-avatar"
           @message={{this.thread.original_message}}
diff --git a/plugins/chat/assets/stylesheets/common/chat-thread-panel.scss b/plugins/chat/assets/stylesheets/common/chat-thread-panel.scss
deleted file mode 100644
index e3d5222989..0000000000
--- a/plugins/chat/assets/stylesheets/common/chat-thread-panel.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.chat-thread-pane {
-  background-color: #aee6bd;
-  display: none;
-
-  &--active-thread {
-    display: block;
-  }
-}
diff --git a/plugins/chat/assets/stylesheets/common/chat-thread.scss b/plugins/chat/assets/stylesheets/common/chat-thread.scss
index 9aeac51427..8fcaddd3be 100644
--- a/plugins/chat/assets/stylesheets/common/chat-thread.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-thread.scss
@@ -25,6 +25,20 @@
     margin-top: 0;
   }
 
+  &__op {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    &-started-by {
+      margin-right: 0.5rem;
+    }
+
+    .chat-message-avatar {
+      width: var(--message-left-width);
+    }
+  }
+
   &__title {
     display: flex;
     align-items: center;
diff --git a/plugins/chat/config/locales/client.en.yml b/plugins/chat/config/locales/client.en.yml
index a72cfde032..f23bc9d8d9 100644
--- a/plugins/chat/config/locales/client.en.yml
+++ b/plugins/chat/config/locales/client.en.yml
@@ -444,6 +444,7 @@ en:
 
       threads:
         op_said: "OP said:"
+        started_by: "Started by"
         open: "Open Thread"
 
       draft_channel_screen:
diff --git a/plugins/chat/plugin.rb b/plugins/chat/plugin.rb
index 25a2aa4eda..67aee958b4 100644
--- a/plugins/chat/plugin.rb
+++ b/plugins/chat/plugin.rb
@@ -26,7 +26,6 @@ register_asset "stylesheets/common/chat-channel-preview-card.scss"
 register_asset "stylesheets/common/chat-channel-info.scss"
 register_asset "stylesheets/common/chat-draft-channel.scss"
 register_asset "stylesheets/common/chat-tabs.scss"
-register_asset "stylesheets/common/chat-thread-panel.scss"
 register_asset "stylesheets/common/chat-form.scss"
 register_asset "stylesheets/common/d-progress-bar.scss"
 register_asset "stylesheets/common/incoming-chat-webhooks.scss"
diff --git a/plugins/chat/spec/system/page_objects/chat/chat_thread.rb b/plugins/chat/spec/system/page_objects/chat/chat_thread.rb
index 7835e0721e..3b1fbe3e6f 100644
--- a/plugins/chat/spec/system/page_objects/chat/chat_thread.rb
+++ b/plugins/chat/spec/system/page_objects/chat/chat_thread.rb
@@ -3,8 +3,16 @@
 module PageObjects
   module Pages
     class ChatThread < PageObjects::Pages::Base
+      def header
+        find(".chat-thread__header")
+      end
+
+      def op
+        header.find(".chat-thread__op")
+      end
+
       def has_header_content?(content)
-        find(".chat-thread__header").has_content?(content)
+        header.has_content?(content)
       end
     end
   end
diff --git a/plugins/chat/spec/system/single_thread_spec.rb b/plugins/chat/spec/system/single_thread_spec.rb
index 6a3a774469..67aebaaa07 100644
--- a/plugins/chat/spec/system/single_thread_spec.rb
+++ b/plugins/chat/spec/system/single_thread_spec.rb
@@ -58,7 +58,14 @@ describe "Single thread in side panel", type: :system, js: true do
     it "shows the excerpt of the thread original message" do
       chat_page.visit_channel(channel)
       channel_page.open_message_thread(thread.original_message)
-      expect(open_thread).to have_header_content(thread.original_message.excerpt)
+      expect(open_thread).to have_header_content(thread.excerpt)
+    end
+
+    it "shows the avatar and username of the original message user" do
+      chat_page.visit_channel(channel)
+      channel_page.open_message_thread(thread.original_message)
+      expect(open_thread.op).to have_css(".chat-user-avatar img.avatar")
+      expect(open_thread.op).to have_content(thread.original_message_user.username)
     end
   end
 end