A platform for community discussion. Free, open, simple.
FIX: Events should not lose their multiline formatting (#40277)
Gabriel Grubba9dc7064af154
diff --git a/plugins/discourse-calendar/lib/discourse_post_event/event_parser.rb b/plugins/discourse-calendar/lib/discourse_post_event/event_parser.rbindex 103baf8db70..751436953bb 100644--- a/plugins/discourse-calendar/lib/discourse_post_event/event_parser.rb+++ b/plugins/discourse-calendar/lib/discourse_post_event/event_parser.rb@@ -74,9 +74,11 @@ module DiscoursePostEventdef self.linkify_description(text, post: nil)escaped = ERB::Util.html_escape(text)html =- escaped.gsub(URI::DEFAULT_PARSER.make_regexp(%w[http https])) do |url|- "<a href=\"#{url}\">#{url}</a>"- end+ escaped+ .gsub(URI::DEFAULT_PARSER.make_regexp(%w[http https])) do |url|+ "<a href=\"#{url}\">#{url}</a>"+ end+ .gsub(/\r\n?|\n/, "<br>")doc = Nokogiri::HTML5.fragment(html)add_nofollow = post.nil? || post.add_nofollow?diff --git a/plugins/discourse-calendar/spec/requests/events_controller_spec.rb b/plugins/discourse-calendar/spec/requests/events_controller_spec.rbindex b8264c04142..83050914f26 100644--- a/plugins/discourse-calendar/spec/requests/events_controller_spec.rb+++ b/plugins/discourse-calendar/spec/requests/events_controller_spec.rb@@ -59,6 +59,25 @@ module DiscoursePostEventexpect(event_ids).to match_array([active_event1.id, active_event2.id])end+ it "includes linkified multiline description HTML in detailed JSON" do+ event =+ Fabricate(+ :event,+ original_starts_at: 1.day.from_now,+ description: "Visit https://example.com\n\nBring snacks",+ )++ get "/discourse-post-event/events.json", params: { include_details: "true" }++ expect(response.status).to eq(200)+ description_html =+ response.parsed_body["events"].find { |event_json| event_json["id"] == event.id }[+ "description_html"+ ]+ expect(description_html).to include('<a href="https://example.com"')+ expect(description_html).to include("<br>")+ end+it "should return events in ics format" doevent1 = Fabricate(:event, original_starts_at: 1.day.from_now, name: "Test Event 1")event2 = Fabricate(:event, original_starts_at: 2.days.from_now, name: "Test Event 2")