Merge pull request #1121 from pooza/3_6_1

3.6.1

Gemfile.lock

@@ -40,7 +40,7 @@ GIT
 
 GIT
   remote: https://github.com/pooza/ginseng-fediverse.git
-  revision: 9826291080c1674e418936506db17a255f75b971
+  revision: b5f5e33a244999e2d40f56a5ff86200324617a21
   specs:
     ginseng-fediverse (1.8.13)
 

app/lib/tomato_shrieker/source/feed_source.rb

@@ -127,7 +127,7 @@ def entries(&block)
       return enum_for(__method__) unless block
       feedjira.entries
         .sort_by {|entry| entry.published.to_f}
-        .each {|entry| entry.title = entry.title&.escape_status}
+        .each {|entry| entry.title = entry.title&.sanitize_status}
         .each(&block)
     end
 

app/lib/tomato_shrieker/source/icalendar_source.rb

@@ -76,9 +76,9 @@ def create_entry(event)
       return {
         start_date: Time.parse(event.dtstart.to_s).getlocal,
         end_date: Time.parse(event.dtend.to_s).getlocal,
-        title: event.summary&.escape_status,
-        body: event.description&.escape_status,
-        location: event.location&.escape_status,
+        title: event.summary&.sanitize_status,
+        body: event.description&.sanitize_status,
+        location: event.location&.sanitize_status,
         all_day: event.dtstart.is_a?(Icalendar::Values::Date),
       }
     end

views/calendar.erb

@@ -11,10 +11,10 @@
 <%= entry[:start_date].strftime('%m/%d %H:%M') %>〜<%= entry[:end_date].strftime('%m/%d %H:%M') %>
 <% end -%>
 <% end -%>
-<% if entry[:title] -%><%= entry[:title].sanitize %><% end %>
+<% if entry[:title] -%><%= entry[:title] %><% end %>
 
-<% if entry[:location] -%><%= entry[:location].sanitize %><% end %>
-<% if entry[:body] -%><%= entry[:body].sanitize %><% end %>
+<% if entry[:location] -%><%= entry[:location] %><% end %>
+<% if entry[:body] -%><%= entry[:body] %><% end %>
 
 <% if @params[:tag] && @params[:source] -%>
 <%= @params[:source].tags.map(&:to_hashtag).join(' ') %>