[tor-commits] [tpo/develop] In People page: replaces mastodon_handle with mastodon_url

[gus at torproject.org]

commit d4f56896df14de44a358228b5ae734a648d95a0a
Author: Jim Newsome <jnewsome at torproject.org>
Date:   Tue Apr 28 13:45:37 2020 -0500

    In People page: replaces mastodon_handle with mastodon_url
    
    mastodon_handle assumed a hard-coded mastodon instance of
    mastodon.social. mastodon_url instead takes the full URL, which includes
    both the instance and the handle.
---
 content/about/people/jnewsome/contents.lr | 2 +-
 content/about/people/meejah/contents.lr   | 2 +-
 models/person.ini                         | 4 ++--
 templates/macros/people.html              | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/content/about/people/jnewsome/contents.lr b/content/about/people/jnewsome/contents.lr
index 416c7eb2..68f029c6 100644
--- a/content/about/people/jnewsome/contents.lr
+++ b/content/about/people/jnewsome/contents.lr
@@ -10,7 +10,7 @@ pronoun: he
 ---
 nickname: jnewsome
 ---
-mastodon: sporksmith at mastodon.social
+mastodon_url: https://mastodon.social/@sporksmith
 ---
 twitter_handle: sporksmith
 ---
diff --git a/content/about/people/meejah/contents.lr b/content/about/people/meejah/contents.lr
index ade11754..6e8f4fcf 100644
--- a/content/about/people/meejah/contents.lr
+++ b/content/about/people/meejah/contents.lr
@@ -14,7 +14,7 @@ gpg: https://meejah.ca/meejah.asc
 ---
 image: /static/images/people/meejah.png
 ---
-mastodon_handle: meejah
+mastodon_url: https://mastodon.social/@meejah
 ---
 description:
 
diff --git a/models/person.ini b/models/person.ini
index b4868da1..a3e4bf84 100644
--- a/models/person.ini
+++ b/models/person.ini
@@ -12,8 +12,8 @@ label = Twitter Handle
 type = string
 addon_label = @
 
-[fields.mastodon_handle]
-label = Mastodon Handle
+[fields.mastodon_url]
+label = Mastodon URL
 type = string
 addon_label = @
 
diff --git a/templates/macros/people.html b/templates/macros/people.html
index 779d171a..7c35c6f9 100644
--- a/templates/macros/people.html
+++ b/templates/macros/people.html
@@ -25,8 +25,8 @@
         {% if item.twitter_handle %}
           <a class="float-right py-4 px-2" href="https://twitter.com/{{ item.twitter_handle }}"><i class="fab fa-twitter-png-purple"></i></a>
         {% endif %}
-        {% if item.mastodon_handle %}
-            <a class="float-right py-4 px-2" href="https://mastodon.social/@{{ item.mastodon_handle }}"><i class="fab fa-mastodon-png-purple"></i></a>
+        {% if item.mastodon_url %}
+        <a class="float-right py-4 px-2" href="{{ item.mastodon_url }}"><i class="fab fa-mastodon-png-purple"></i></a>
         {% endif %}
         {% if item.gpg %}
           {% set link = site.get(item.gpg) %}