@@ -55,4 +25,3 @@
{{{cooked}}}
-{{/cooked}}
diff --git a/plugins/chat/plugin.rb b/plugins/chat/plugin.rb
index 7beb2d8f812..335630c795c 100644
--- a/plugins/chat/plugin.rb
+++ b/plugins/chat/plugin.rb
@@ -71,62 +71,7 @@ after_initialize do
if Oneboxer.respond_to?(:register_local_handler)
Oneboxer.register_local_handler("chat/chat") do |url, route|
- if route[:message_id].present?
- message = Chat::Message.find_by(id: route[:message_id])
- next if !message
-
- chat_channel = message.chat_channel
- user = message.user
- next if !chat_channel || !user
- else
- chat_channel = Chat::Channel.find_by(id: route[:channel_id])
- next if !chat_channel
- end
-
- next if !Guardian.new.can_preview_chat_channel?(chat_channel)
-
- name = (chat_channel.name if chat_channel.name.present?)
-
- users =
- chat_channel
- .user_chat_channel_memberships
- .includes(:user)
- .where(user: User.activated.not_suspended.not_staged)
- .limit(10)
- .map do |membership|
- {
- username: membership.user.username,
- avatar_url: membership.user.avatar_template_url.gsub("{size}", "60"),
- }
- end
-
- remaining_user_count_str =
- if chat_channel.user_count > users.size
- I18n.t("chat.onebox.and_x_others", count: chat_channel.user_count - users.size)
- end
-
- args = {
- url: url,
- channel_id: chat_channel.id,
- channel_name: name,
- description: chat_channel.description,
- user_count_str: I18n.t("chat.onebox.x_members", count: chat_channel.user_count),
- users: users,
- remaining_user_count_str: remaining_user_count_str,
- is_category: chat_channel.chatable_type == "Category",
- color: chat_channel.chatable_type == "Category" ? chat_channel.chatable.color : nil,
- }
-
- if message.present?
- args[:message_id] = message.id
- args[:username] = message.user.username
- args[:avatar_url] = message.user.avatar_template_url.gsub("{size}", "20")
- args[:cooked] = message.cooked
- args[:created_at] = message.created_at
- args[:created_at_str] = message.created_at.iso8601
- end
-
- Mustache.render(Chat.onebox_template, args)
+ Chat::OneboxHandler.handle(url, route)
end
end
diff --git a/plugins/chat/spec/lib/chat/onebox_handler_spec.rb b/plugins/chat/spec/lib/chat/onebox_handler_spec.rb
new file mode 100644
index 00000000000..275be14d849
--- /dev/null
+++ b/plugins/chat/spec/lib/chat/onebox_handler_spec.rb
@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Chat::OneboxHandler do
+ fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }
+ fab!(:private_channel) { Fabricate(:category_channel, chatable: private_category) }
+ fab!(:public_channel) { Fabricate(:category_channel) }
+ fab!(:user) { Fabricate(:user) }
+ fab!(:user_2) { Fabricate(:user, active: false) }
+ fab!(:user_3) { Fabricate(:user, staged: true) }
+ fab!(:user_4) { Fabricate(:user, suspended_till: 3.weeks.from_now) }
+
+ let(:public_chat_url) { "#{Discourse.base_url}/chat/c/-/#{public_channel.id}" }
+ let(:private_chat_url) { "#{Discourse.base_url}/chat/c/-/#{private_channel.id}" }
+ let(:invalid_chat_url) { "#{Discourse.base_url}/chat/c/-/999" }
+
+ describe "chat channel" do
+ context "when valid" do
+ it "renders channel onebox, excluding inactive, staged, and suspended users" do
+ public_channel.add(user)
+ public_channel.add(user_2)
+ public_channel.add(user_3)
+ public_channel.add(user_4)
+ Chat::Channel.ensure_consistency!
+
+ onebox_html = Chat::OneboxHandler.handle(public_chat_url, { channel_id: public_channel.id })
+
+ expect(onebox_html).to match_html <<~HTML
+
+
+ HTML
+ end
+ end
+
+ context "when channel is private" do
+ it "does not create a onebox" do
+ onebox_html =
+ Chat::OneboxHandler.handle(private_chat_url, { channel_id: private_channel.id })
+
+ expect(onebox_html).to be_nil
+ end
+ end
+
+ context "when channel does not exists" do
+ it "does not raise an error" do
+ onebox_html = Chat::OneboxHandler.handle(invalid_chat_url, { channel_id: 999 })
+
+ expect(onebox_html).to be_nil
+ end
+ end
+ end
+
+ describe "chat message" do
+ fab!(:public_message) do
+ Fabricate(:chat_message, chat_channel: public_channel, user: user, message: "Hello world!")
+ end
+ fab!(:private_message) do
+ Fabricate(:chat_message, chat_channel: private_channel, user: user, message: "Hello world!")
+ end
+
+ context "when valid" do
+ it "renders message onebox" do
+ onebox_html =
+ Chat::OneboxHandler.handle(
+ "#{public_chat_url}/#{public_message.id}",
+ { channel_id: public_channel.id, message_id: public_message.id },
+ )
+
+ expect(onebox_html).to match_html <<~HTML
+
+ HTML
+ end
+ end
+
+ context "when channel is private" do
+ it "does not create a onebox" do
+ onebox_html =
+ Chat::OneboxHandler.handle(
+ "#{private_chat_url}/#{private_message.id}",
+ { channel_id: private_channel.id, message_id: private_message.id },
+ )
+
+ expect(onebox_html).to be_nil
+ end
+ end
+
+ context "when message does not exists" do
+ it "does not raise an error" do
+ onebox_html =
+ Chat::OneboxHandler.handle(
+ "#{public_chat_url}/999",
+ { channel_id: public_channel.id, message_id: 999 },
+ )
+
+ expect(onebox_html).to be_nil
+ end
+ end
+ end
+end
diff --git a/plugins/chat/spec/plugin_spec.rb b/plugins/chat/spec/plugin_spec.rb
index 84be69df448..d03c60e7d74 100644
--- a/plugins/chat/spec/plugin_spec.rb
+++ b/plugins/chat/spec/plugin_spec.rb
@@ -127,22 +127,14 @@ describe Chat do
describe "chat oneboxes" do
fab!(:chat_channel) { Fabricate(:category_channel) }
- fab!(:user) { Fabricate(:user, active: true) }
- fab!(:user_2) { Fabricate(:user, active: false) }
- fab!(:user_3) { Fabricate(:user, staged: true) }
- fab!(:user_4) { Fabricate(:user, suspended_till: 3.weeks.from_now) }
+ fab!(:user) { Fabricate(:user) }
- let!(:chat_message) do
+ fab!(:chat_message) do
Fabricate(:chat_message, chat_channel: chat_channel, user: user, message: "Hello world!")
end
let(:chat_url) { "#{Discourse.base_url}/chat/c/-/#{chat_channel.id}" }
- before do
- chat_channel.update!(last_message: chat_message)
- chat_channel.add(user)
- end
-
context "when inline" do
it "renders channel" do
results = InlineOneboxer.new([chat_url], skip_cache: true).process
@@ -160,62 +152,6 @@ describe Chat do
)
end
end
-
- context "when regular" do
- it "renders channel, excluding inactive, staged, and suspended users" do
- user_2.user_chat_channel_memberships.create!(chat_channel: chat_channel, following: true)
- user_3.user_chat_channel_memberships.create!(chat_channel: chat_channel, following: true)
- user_4.user_chat_channel_memberships.create!(chat_channel: chat_channel, following: true)
- Chat::Channel.ensure_consistency!
-
- expect(Oneboxer.preview(chat_url)).to match_html <<~HTML
-
-
- HTML
- end
-
- it "renders messages" do
- expect(Oneboxer.preview("#{chat_url}/#{chat_message.id}")).to match_html <<~HTML
-
- HTML
- end
- end
end
describe "auto-joining users to a channel" do