From 0e23b3ec7d3b4fa6ad9f48043db1c65250157413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs?= <heckyel@hyperbola.info>
Date: Fri, 14 May 2021 12:56:42 -0500
Subject: [PATCH] Fix Mastodon Me

---
 cl-theme/static/images/icons/master.svg |  2 +-
 cl-theme/templates/base.html            | 11 ++++++++---
 pelicanconf.py                          |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/cl-theme/static/images/icons/master.svg b/cl-theme/static/images/icons/master.svg
index 279a0cf..e11cd04 100644
--- a/cl-theme/static/images/icons/master.svg
+++ b/cl-theme/static/images/icons/master.svg
@@ -11,7 +11,7 @@
       <path d="m 26.437634,1121.7817 c 0,-1.847 0.640159,-8.7895 1.591082,-17.2555 0.56685,-5.0465 0.671258,-6.4021 0.61783,-8.0221 -0.09849,-2.986 -0.124113,-3.0265 -5.286132,-8.3483 l -3.620907,-3.7331 -1.225785,-4.2305 c -1.962288,-6.7726 -2.803099,-10.6346 -2.97765,-13.6772 -0.09921,-1.7293 0.10026,-2.774 0.52962,-2.774 0.493158,0 3.340462,2.1018 7.821692,5.7741 4.737972,3.8825 4.437954,3.6695 4.956937,3.5206 0.694729,-0.1991 1.624504,-0.7684 4.043948,-2.476 4.555845,-3.2157 5.531752,-3.743 7.725753,-4.1735 1.755735,-0.3446 5.776753,-0.8946 5.868711,-0.8027 0.14714,0.1471 2.156074,7.52 2.398072,8.8011 0.306805,1.6241 0.218247,2.2189 -0.615134,4.132 -0.808391,1.8556 -0.839145,2.3441 -0.284317,4.5165 l 0.391652,1.5335 -3.291559,5.8189 c -5.296356,9.3628 -5.538228,9.7077 -6.968857,9.9366 -1.110032,0.1776 -1.672363,0.4811 -2.539261,1.3707 -1.029036,1.056 -1.532823,2.1885 -1.606306,3.6109 -0.05113,0.9889 -0.0063,1.2655 0.312244,1.9493 0.526751,1.1291 1.288037,1.9372 2.385458,2.5318 0.881835,0.478 1.044551,0.5142 2.299136,0.5129 1.173202,0 1.45053,-0.054 2.11632,-0.404 1.093495,-0.5747 1.585929,-1.0324 2.090992,-1.9439 0.437567,-0.7895 0.443256,-0.8296 0.452519,-3.1986 0.01,-2.678 0.05914,-2.9009 1.080818,-4.9482 1.583042,-3.1724 5.896438,-10.638 6.83438,-11.8289 l 0.459095,-0.5829 0.281779,0.8078 c 0.582656,1.6703 1.76057,6.6036 1.76057,7.3736 0,0.6845 -0.07764,0.8931 -0.583394,1.5657 -1.499759,1.9952 -1.102083,5.1423 0.884474,6.9995 0.999198,0.9343 1.869608,1.3092 3.054786,1.316 1.284162,0.013 2.273385,-0.4397 3.245653,-1.4673 1.046679,-1.1062 1.535026,-2.2199 1.620497,-3.6957 0.06225,-1.0752 0.03088,-1.2412 -0.397676,-2.1021 -0.591835,-1.1891 -1.451204,-2.1825 -2.476104,-2.8625 -0.781726,-0.5186 -0.820105,-0.5771 -1.272551,-1.941 -0.513624,-1.5482 -1.558339,-5.6312 -1.826152,-7.1372 -0.196169,-1.103 -0.150878,-1.3558 0.484322,-2.7034 0.640237,-1.3581 0.734835,-2.8516 0.27624,-4.3608 -0.279079,-0.9185 -0.45367,-1.2017 -1.18583,-1.9247 -0.472207,-0.4661 -1.092717,-0.9826 -1.378921,-1.1475 -0.674078,-0.3885 -1.083731,-1.2268 -1.732232,-3.5444 -0.618699,-2.2111 -1.413375,-6.0139 -1.413375,-6.7632 0,-0.5105 0.03825,-0.552 0.712569,-0.7748 1.303102,-0.4306 13.579476,-3.4175 16.314093,-3.9694 0.825081,-0.1665 1.871432,-0.3432 2.325227,-0.3927 1.989495,-0.2168 1.997608,-0.239 0.225021,-0.6155 -2.044048,-0.4341 -2.81451,-0.7209 -3.461462,-1.2886 -0.964344,-0.8464 -0.861346,-2.0195 0.476372,-5.4267 0.449769,-1.1456 0.799103,-2.101 0.776312,-2.1232 -0.02275,-0.023 -0.75026,0.5676 -1.616594,1.3107 -3.519993,3.0192 -4.365039,3.4718 -6.45063,3.4547 -0.701318,0 -1.781424,-0.12 -2.400234,-0.2529 -2.657872,-0.5726 -7.267585,-2.3741 -8.522345,-3.3308 -0.282803,-0.2156 -0.643951,-0.6852 -0.802528,-1.0436 -0.326145,-0.737 -0.563331,-2.9216 -0.571044,-5.2599 l -0.005,-1.5306 1.0126,-0.2977 c 25.66093,-7.5458 25.272305,-7.449 27.106272,-6.7563 1.375346,0.5195 2.181137,1.416 2.622606,2.9178 0.418727,1.4243 1.572202,5.0272 4.049345,12.6481 1.001273,3.0804 2.393984,7.4589 3.094915,9.7296 l 1.274412,4.1289 -1.467406,1.5164 c -10.073747,10.4096 -21.124626,22.077 -21.160402,22.3408 -0.07102,0.524 2.824624,30.1674 3.059372,31.319 l 0.08401,0.4124 H 47.226582 26.437634 Z m 0.797408,-52.1839 c -2.249565,-1.5148 -8.179872,-6.8031 -12.072906,-10.7653 -2.617018,-2.6638 -2.882983,-3.1058 -2.54551,-4.2317 0.73565,-2.4542 6.201416,-7.6537 8.045733,-7.6537 0.599055,0 1.051895,0.3814 2.389362,2.0121 2.178122,2.656 9.993013,13.5326 11.60292,16.149 0.560305,0.9106 0.375462,1.6026 -0.683391,2.5589 -1.377346,1.2436 -4.177068,2.8215 -5.006808,2.8215 -0.248476,0 -0.921916,-0.3469 -1.7294,-0.8908 z m 10.078659,-5.4306 c -0.901288,-0.494 -2.727942,-2.6099 -5.869823,-6.7989 -5.193772,-6.9247 -8.08137,-11.527 -8.267355,-13.1762 -0.06176,-0.5476 -0.0017,-0.8064 0.310901,-1.3395 0.504508,-0.8605 2.382767,-2.6161 4.161878,-3.8904 1.621,-1.1607 4.727369,-2.763 5.618041,-2.8975 0.576807,-0.087 0.636262,-0.056 1.315441,0.6689 0.896375,0.9579 2.610805,3.5732 5.473122,8.3494 4.353375,7.2641 9.183422,15.9247 9.412357,16.8771 l 0.09451,0.3931 -3.199263,0.6158 c -3.895442,0.7496 -7.679337,1.3735 -8.294571,1.3673 -0.250387,0 -0.590257,-0.079 -0.755273,-0.1691 z m 15.585296,-2.9177 c -0.821728,-0.8845 -2.397583,-3.2089 -3.144443,-4.6383 -0.518151,-0.9916 -0.529627,-1.0445 -0.236199,-1.0894 0.656451,-0.1 8.718501,2.2364 10.310195,2.9882 1.579003,0.7456 1.595504,1.2173 0.06625,1.8945 -0.916575,0.4057 -4.322871,1.313 -5.531539,1.4733 l -0.783939,0.1038 z m -8.937047,-14.1654 c -4.203099,-6.3519 -7.323315,-11.6473 -7.323315,-12.4283 0,-1.047 5.104048,-4.2353 9.119041,-5.6963 1.098745,-0.3998 4.212762,-1.1412 4.303282,-1.0247 0.01889,0.024 0.794528,1.6973 1.723794,3.7178 1.967041,4.277 3.433397,7.7454 3.490552,8.2562 0.03825,0.342 -0.140526,0.4194 -3.785218,1.6373 -2.103956,0.703 -4.188171,1.4787 -4.631591,1.7241 -1.218531,0.6741 -1.298764,0.9349 -1.117084,3.6311 0.08226,1.221 0.104263,2.349 0.04901,2.5069 -0.07914,0.2255 -0.470472,-0.2719 -1.828404,-2.3241 z m 13.597028,-9.0213 c -0.979133,-1.639 -3.646806,-6.9703 -4.507791,-9.0087 -0.669715,-1.5854 -0.679416,-1.631 -0.41094,-1.9284 0.87296,-0.9671 7.605818,-3.4954 11.526076,-4.3282 1.579579,-0.3357 2.229555,-0.3633 2.442414,-0.1038 0.787787,0.9594 4.234202,9.1543 4.984573,11.8524 l 0.28333,1.0187 -0.404829,0.1557 c -1.214231,0.4661 -12.466367,3.5797 -12.937376,3.5797 -0.136464,0 -0.549003,-0.5231 -0.975457,-1.237 z"/>
     </g>
   </symbol>
-  <symbol id="mastodom" viewBox="0 0 100 100">
+  <symbol id="mastodon" viewBox="0 0 100 100">
     <path d="M 49.999999,0 A 50,50 0 0 0 0,50 50,50 0 0 0 49.999999,100 50,50 0 0 0 100,50 50,50 0 0 0 49.999999,0 Z M 49.746835,27.08861 H 60.506329 C 58.417721,28.5443 57.721519,32.78481 57.721519,35 v 20.25317 c 0,4.43038 -3.481013,7.8481 -7.974684,7.8481 -4.430379,0 -7.974682,-3.48102 -7.974682,-7.9114 V 34.93671 c 0,-4.3038 3.481012,-7.8481 7.974682,-7.8481 z M 22.1519,32.02532 c 4.430378,0 7.974681,3.48101 7.974681,7.8481 v 20.25316 c 0,2.1519 0.632911,6.4557 2.721521,7.8481 H 22.1519 c -4.43038,0 -7.974683,-3.48101 -7.974683,-7.8481 V 39.87342 c 0,-4.43038 3.481012,-7.8481 7.974683,-7.8481 z m 55.063289,0 c 4.43038,0 7.974682,3.48101 7.974682,7.8481 v 20.25316 c 0,4.43038 -3.544304,7.8481 -8.037974,7.8481 H 66.392403 c 2.025316,-1.3924 2.721519,-5.6962 2.721519,-7.8481 V 39.87342 c 0,-4.43038 3.544305,-7.8481 7.974683,-7.8481 z" />
   </symbol>
   <symbol id="matrix" viewBox="0 0 100 100">
diff --git a/cl-theme/templates/base.html b/cl-theme/templates/base.html
index eca0b87..2bb3e62 100644
--- a/cl-theme/templates/base.html
+++ b/cl-theme/templates/base.html
@@ -10,9 +10,6 @@
             <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
             <meta name="HandheldFriendly" content="True"/>
 
-            <!-- Mastodom Me -->
-            <a rel="me" href="https://masto.nogafam.es/@heckyel">Mastodon</a>
-
             <!-- Feed -->
             {% if FEED_ALL_ATOM %}
                 <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ _('Fuente completa de entradas Atom de %(sitename)s', sitename=SITENAME) }}"/>
@@ -251,6 +248,14 @@
                         </svg>
                     </span>
                 </a>
+                <a class="navbar-item" href="{{ SOCIAL['mastodon'] }}" itemprop="followee" rel="me">
+                    <span class="soumaicon">
+                        <svg>
+                            <use href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/icons/master.svg#mastodon"/>
+                            <title>Mastodon</title>
+                        </svg>
+                    </span>
+                </a>
                 <a class="navbar-item" href="{{ SOCIAL['pixelfed'] }}" itemprop="followee">
                     <span class="soumaicon">
                         <svg>
diff --git a/pelicanconf.py b/pelicanconf.py
index 8aef8dc..f641ecf 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -154,7 +154,7 @@ SITEMAP = {
 SOCIAL = {
     'diaspora': '#',
     'gnusocial': '#',
-    'mastodom': '#',
+    'mastodon': 'https://masto.nogafam.es/@heckyel',
     'matrix': '#',
     'mediagoblin': '#',
     'peertube': 'https://video.ploud.jp/video-channels/cl',