Merge remote-tracking branch 'upstream/pull/5416'

[rails.git] / app / helpers / social_share_button_helper.rb

diff --git a/app/helpers/social_share_button_helper.rb b/app/helpers/social_share_button_helper.rb
index 0fdba2799f58a42b77fa803abc90ac08c46ccf1e..da49347c3054a56f32a063e54cb44faf84bc2e79 100644 (file)
--- a/app/helpers/social_share_button_helper.rb
+++ b/app/helpers/social_share_button_helper.rb
@@ -12,49 +12,47 @@ module SocialShareButtonHelper
   }.freeze
 
   # Generates a set of social share buttons based on the specified options.
-  def social_share_buttons(opts = {})
+  def social_share_buttons(title:, url:)
     tag.div(
       :class => "social-share-button d-flex gap-1 align-items-end flex-wrap mb-3"
     ) do
-      SOCIAL_SHARE_CONFIG.map do |site, icon|
+      safe_join(SOCIAL_SHARE_CONFIG.map do |site, icon|
         link_options = {
-          :rel => ["nofollow", opts[:rel]].compact,
+          :rel => "nofollow",
           :class => "ssb-icon rounded-circle",
           :title => I18n.t("application.share.#{site}.title"),
           :target => "_blank"
         }
 
-        link_to generate_share_url(site, opts), link_options do
+        link_to generate_share_url(site, title, url), link_options do
           image_tag(icon, :alt => I18n.t("application.share.#{site}.alt"), :size => 28)
         end
-      end.join.html_safe
+      end, "\n")
     end
   end
 
   private
 
-  def generate_share_url(site, params)
+  def generate_share_url(site, title, url)
     site = site.to_sym
+    title = URI.encode_www_form_component(title)
+    url = URI.encode_www_form_component(url)
+
     case site
     when :email
-      to = params[:to] || ""
-      subject = CGI.escape(params[:title])
-      body = CGI.escape(params[:url])
-      "mailto:#{to}?subject=#{subject}&body=#{body}"
+      "mailto:?subject=#{title}&body=#{url}"
     when :x
-      via_str = params[:via] ? "&via=#{URI.encode_www_form_component(params[:via])}" : ""
-      hashtags_str = params[:hashtags] ? "&hashtags=#{URI.encode_www_form_component(params[:hashtags].join(','))}" : ""
-      "https://x.com/intent/tweet?url=#{URI.encode_www_form_component(params[:url])}&text=#{URI.encode_www_form_component(params[:title])}#{hashtags_str}#{via_str}"
+      "https://x.com/intent/tweet?url=#{url}&text=#{title}"
     when :linkedin
-      "https://www.linkedin.com/sharing/share-offsite/?url=#{URI.encode_www_form_component(params[:url])}"
+      "https://www.linkedin.com/sharing/share-offsite/?url=#{url}"
     when :facebook
-      "https://www.facebook.com/sharer/sharer.php?u=#{URI.encode_www_form_component(params[:url])}&t=#{URI.encode_www_form_component(params[:title])}"
+      "https://www.facebook.com/sharer/sharer.php?u=#{url}&t=#{title}"
     when :mastodon
-      "https://mastodonshare.com/?text=#{URI.encode_www_form_component(params[:title])}&url=#{URI.encode_www_form_component(params[:url])}"
+      "https://mastodonshare.com/?text=#{title}&url=#{url}"
     when :telegram
-      "https://t.me/share/url?url=#{URI.encode_www_form_component(params[:url])}&text=#{URI.encode_www_form_component(params[:title])}"
+      "https://t.me/share/url?url=#{url}&text=#{title}"
     when :bluesky
-      "https://bsky.app/intent/compose?text=#{URI.encode_www_form_component(params[:title])}+#{URI.encode_www_form_component(params[:url])}"
+      "https://bsky.app/intent/compose?text=#{title}+#{url}"
     else
       raise ArgumentError, "Unsupported platform: #{platform}"
     end