A platform for community discussion. Free, open, simple.
FIX: Localize post excerpts wherever `PostItemExcerpt` renders them
Régis Hanol1254c3637a5f
diff --git a/app/serializers/post_item_excerpt.rb b/app/serializers/post_item_excerpt.rbindex 3df379c3d7f..8143846e0f9 100644--- a/app/serializers/post_item_excerpt.rb+++ b/app/serializers/post_item_excerpt.rb@@ -6,7 +6,9 @@ module PostItemExcerptenddef cooked- @cooked ||= object.cooked || PrettyText.cook(object.raw)+ @cooked ||=+ ContentLocalization.translated_post_cooked(excerpt_source_post, scope) ||+ excerpt_source_post&.cooked || object.cooked || PrettyText.cook(object.raw)enddef excerpt@@ -33,8 +35,16 @@ module PostItemExcerptprivate+ def post_item_excerpt_post+ nil+ end++ def excerpt_source_post+ post_item_excerpt_post || (object if object.is_a?(Post))+ end+def can_see_post_item_excerpt?- return true if !respond_to?(:post_item_excerpt_post) || post_item_excerpt_post.blank?+ return true if post_item_excerpt_post.blank?scope&.can_see_post?(post_item_excerpt_post)endenddiff --git a/app/serializers/user_bookmark_base_serializer.rb b/app/serializers/user_bookmark_base_serializer.rbindex 41c5e69eb2a..bd1270ab19d 100644--- a/app/serializers/user_bookmark_base_serializer.rb+++ b/app/serializers/user_bookmark_base_serializer.rb@@ -24,10 +24,6 @@ class UserBookmarkBaseSerializer < ApplicationSerializerraise NotImplementedErrorend- def cooked- raise NotImplementedError- end-def bookmarkable_urlraise NotImplementedErrorenddiff --git a/app/serializers/user_post_bookmark_serializer.rb b/app/serializers/user_post_bookmark_serializer.rbindex 2e6271e4333..c24f6adf105 100644--- a/app/serializers/user_post_bookmark_serializer.rb+++ b/app/serializers/user_post_bookmark_serializer.rb@@ -21,10 +21,6 @@ class UserPostBookmarkSerializer < UserPostTopicBookmarkBaseSerializerpost.rawend- def cooked- post.cooked- end-def post_item_excerpt_postpostenddiff --git a/app/serializers/user_topic_bookmark_serializer.rb b/app/serializers/user_topic_bookmark_serializer.rbindex a13365275c7..8d7672533aa 100644--- a/app/serializers/user_topic_bookmark_serializer.rb+++ b/app/serializers/user_topic_bookmark_serializer.rb@@ -26,10 +26,6 @@ class UserTopicBookmarkSerializer < UserPostTopicBookmarkBaseSerializerfirst_post.rawend- def cooked- first_post.cooked- end-def post_item_excerpt_postfirst_postenddiff --git a/plugins/discourse-solved/app/serializers/discourse_solved/solved_post_serializer.rb b/plugins/discourse-solved/app/serializers/discourse_solved/solved_post_serializer.rbindex 45f4172cde2..5bbe0fc73a5 100644--- a/plugins/discourse-solved/app/serializers/discourse_solved/solved_post_serializer.rb+++ b/plugins/discourse-solved/app/serializers/discourse_solved/solved_post_serializer.rb@@ -1,13 +1,14 @@# frozen_string_literal: trueclass DiscourseSolved::SolvedPostSerializer < ApplicationSerializer+ include PostItemExcerpt+attributes :created_at,:archived,:avatar_template,:category_id,:closed,:cooked,- :excerpt,:name,:post_id,:post_number,@@ -16,7 +17,6 @@ class DiscourseSolved::SolvedPostSerializer < ApplicationSerializer:slug,:topic_id,:topic_title,- :truncated,:url,:user_id,:username@@ -37,10 +37,6 @@ class DiscourseSolved::SolvedPostSerializer < ApplicationSerializerobject.topic.closedend- def excerpt- @excerpt ||= PrettyText.excerpt(cooked, 300, keep_emoji_images: true)- end-def nameobject.user&.nameend@@ -65,14 +61,6 @@ class DiscourseSolved::SolvedPostSerializer < ApplicationSerializerobject.topic.fancy_titleend- def truncated- true- end-- def include_truncated?- cooked.length > 300- end-def url"#{Discourse.base_url}#{object.url}"enddiff --git a/plugins/discourse-solved/spec/requests/solved_topics_controller_spec.rb b/plugins/discourse-solved/spec/requests/solved_topics_controller_spec.rbindex db7e4947ed2..c66c0968838 100644--- a/plugins/discourse-solved/spec/requests/solved_topics_controller_spec.rb+++ b/plugins/discourse-solved/spec/requests/solved_topics_controller_spec.rb@@ -24,6 +24,19 @@ describe DiscourseSolved::SolvedTopicsController doexpect(result["user_solved_posts"][0]["post_id"]).to eq(answer_post.id)end+ it "returns the translated excerpt" do+ viewer = Fabricate(:user, locale: "ja")+ SiteSetting.content_localization_enabled = true+ answer_post.update!(raw: "Original answer body", locale: "en")+ Fabricate(:post_localization, post: answer_post, locale: "ja", cooked: "<p>翻訳された回答</p>")++ sign_in(viewer)+ get "/solution/by_user.json", params: { username: user.username }++ solved_post = response.parsed_body["user_solved_posts"][0]+ expect(solved_post["excerpt"]).to eq("翻訳された回答")+ end+it "returns escaped topic_title" dotopic.update_columns(title: "<script>alert('xss')</script> test", fancy_title: nil)sign_in(user)diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rbindex d1b3e27aaac..a82660138da 100644--- a/spec/requests/groups_controller_spec.rb+++ b/spec/requests/groups_controller_spec.rb@@ -804,6 +804,19 @@ RSpec.describe GroupsController doexpect(response.parsed_body["posts"].first["id"]).to eq(post.id)end+ it "returns the translated excerpt" do+ viewer = Fabricate(:user, locale: "ja")+ SiteSetting.content_localization_enabled = true+ post = Fabricate(:post, user: user, raw: "Original group post body", locale: "en")+ Fabricate(:post_localization, post: post, locale: "ja", cooked: "<p>翻訳された本文</p>")++ sign_in(viewer)+ get "/groups/#{group.name}/posts.json"++ expect(response.status).to eq(200)+ expect(response.parsed_body["posts"].first["excerpt"]).to eq("翻訳された本文")+ end+it "omits hidden posts from other users", :aggregate_failures dovisible_post = Fabricate(:post, user: user, raw: "visible group post")hidden_post = Fabricate(:post, user: user, raw: "private hidden group post", hidden: true)diff --git a/spec/serializers/user_post_bookmark_serializer_spec.rb b/spec/serializers/user_post_bookmark_serializer_spec.rbindex d2c08bebd27..116e7979d0e 100644--- a/spec/serializers/user_post_bookmark_serializer_spec.rb+++ b/spec/serializers/user_post_bookmark_serializer_spec.rb@@ -26,4 +26,22 @@ RSpec.describe UserPostBookmarkSerializer doexpect(serializer.highest_post_number).to eq(4)endend++ describe "#excerpt" do+ let(:viewer) { Fabricate(:user, locale: "ja") }++ before do+ SiteSetting.content_localization_enabled = true+ post.update!(raw: "Original post body", locale: "en")+ Fabricate(:post_localization, post: post, locale: "ja", cooked: "<p>翻訳された本文</p>")+ end++ it "returns the translated excerpt" do+ I18n.with_locale(:ja) do+ serializer = UserPostBookmarkSerializer.new(bookmark, scope: Guardian.new(viewer))++ expect(serializer.excerpt).to eq("翻訳された本文")+ end+ end+ endend