Include the Mastodon URL in a link element on user page (#2046)

nud · nud · commit c22059bba89e · 2023-01-02T22:03:06.000+01:00
We add a `<link rel="me" href="https://mastodon.example/@me">` URL in the `<head>` when the user configures their Mastodon URL. We only accept URLs (not `@me@mastodon.example`-style identifiers) for the sake of simplicity, because it's both the most universal format and the one required for the "verification" feature. A placeholder is used to convey that fact. For the record, at this time Mastodon requires a `<a>` or `<link>` element with `rel="me"` and an `href` attribute pointing to the `https://` URL of the Mastodon account. I opted for the `<link>` element because it didn't involve modifying the web interface any further. See https://docs.joinmastodon.org/user/profile/#verification for details. https://linuxfr.org/suivi/faire-valider-sa-page-perso-linuxfr-org-sur-mastodon
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -37,6 +37,7 @@ def seo_filter
     @keywords      = %w(Linux Logiciel Libre GNU Free Software Actualité Forum Communauté)
     @description   = "L’actualité du logiciel libre et des sujets voisins (DIY, Open Hardware, Open Data, les Communs, etc.), sur un site francophone contributif géré par une équipe bénévole par et pour des libristes enthousiastes"
     @feeds         = {}
+    @links         = {}
     @last_comments = Comment.footer
     @popular_tags  = Tag.footer
     @friend_sites  = FriendSite.select([:url, :title])
@@ -56,7 +57,7 @@ def configure_permitted_parameters
       :sort_by_date_on_home, :hide_signature, :show_negative_nodes,
       :totoz_style, :totoz_source,
       :board_in_sidebar,
-      user_attributes: [:id, :name, :homesite, :jabber_id, :signature, :avatar, :custom_avatar_url]
+      user_attributes: [:id, :name, :homesite, :jabber_id, :mastodon_url, :signature, :avatar, :custom_avatar_url]
     ])
   end
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -16,6 +16,10 @@ def feed(title, link=nil)
     @feeds[link] = title
   end
 
+  def link(rel, link)
+    @links[link] = rel
+  end
+
   def meta_for(content)
     @author      = content.node.user.try(:name)
     @keywords    = content.node.popular_tags.map &:name
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -7,6 +7,7 @@
 #  name              :string(40)
 #  homesite          :string(100)
 #  jabber_id         :string(32)
+#  mastodon_url      :string(100)
 #  cached_slug       :string(32)       not null
 #  created_at        :datetime
 #  updated_at        :datetime
@@ -33,6 +34,8 @@ class User < ActiveRecord::Base
   validates :homesite, length: { maximum: 100, message: "L’adresse du site Web personnel est trop longue" }
   validates :name, length: { maximum: 40, message: "Le nom affiché est trop long" }
   validates :jabber_id, length: { maximum: 32, message: "L’adresse XMPP est trop longue" }
+  validates_format_of :mastodon_url, message: "L’adresse du comte Mastodon n’est pas une URL valide", with: URI::regexp(%w(http https)), allow_blank: true
+  validates :mastodon_url, length: { maximum: 255, message: "L’adresse du compte Mastodon est trop longue" }
   validates :signature, length: { maximum: 255, message: "La signature est trop longue" }
   validates :custom_avatar_url, length: { maximum: 255, message: "L’adresse de l’avatar est trop longue" }
 
diff --git a/app/views/devise/registrations/_preferences.html.haml b/app/views/devise/registrations/_preferences.html.haml
@@ -11,6 +11,12 @@
       = u.label :jabber_id, 'Adresse XMPP'
       %span.prefix xmpp:
       = u.text_field :jabber_id, placeholder: "me@example.net", maxlength: 32
+    %p
+      = u.label :mastodon_url, 'Adresse du compte Mastodon'
+      = u.text_field :mastodon_url, placeholder: "https://mastodon.example/@me", maxlength: 255
+      %span.help
+        Après avoir enregistré l'adresse de votre compte Mastodon, vous pourrez utiliser le lien <kbd>https://linuxfr.org/users/#{current_user.login}</kbd> pour
+        <a href="https://docs.joinmastodon.org/user/profile/#verification">prouver que le compte Mastodon et le compte LinuxFr.org appartiennent à la même personne.</a>
     %p
       = u.label :signature, "Signature"
       = u.text_field :signature, maxlength: 250, size: 100
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
@@ -18,3 +18,5 @@
     %meta(name="robots" content="noindex, nofollow")
   - @feeds.each do |link,title|
     = auto_discovery_link_tag :atom, link, { title: title }
+  - @links.each do |link,rel|
+    %link(rel=rel href=link)
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
@@ -4,5 +4,7 @@
 
 =h1 "#{@user.name} a écrit #{pluralize @nodes.total_count, "contenu"} de type dépêche ou journal"
 - feed "Flux Atom de #{@user.name}", "/users/#{@user.to_param}.atom"
+- if @user.mastodon_url
+  - link "me", @user.mastodon_url
 - filter_pagination_params ['id', 'order', 'page']
 = paginated_nodes @nodes
diff --git a/db/migrate/20221219214058_add_mastodon_url_to_users.rb b/db/migrate/20221219214058_add_mastodon_url_to_users.rb
@@ -0,0 +1,5 @@
+class AddMastodonUrlToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :mastodon_url, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_01_31_231806) do
+ActiveRecord::Schema.define(version: 2022_12_19_214058) do
 
   create_table "accounts", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", force: :cascade do |t|
     t.integer "user_id"
@@ -373,6 +373,7 @@
     t.string "avatar"
     t.string "signature"
     t.string "custom_avatar_url"
+    t.string "mastodon_url"
     t.index ["cached_slug"], name: "index_users_on_cached_slug"
   end
 
