combined mastodon and mastodon_instance columns into a single mastodon column

2017-07-07 19:41:28 +02:00
parent 668c9a2960
commit 2289d37e69
6 changed files with 11 additions and 8 deletions
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -62,10 +62,11 @@
      <tr>
        <td><b>Mastodon</b></td>
        <td>
-          <% if @user.mastodon_instance %>
-            <%= link_to "@#{@user.mastodon}", "https://#{CGI.escape(@user.mastodon_instance)}/@#{CGI.escape(@user.mastodon)}", :target => "_blank" %></td>
+          <% mstdn_array = @user.mastodon.split("@") %>
+          <% if mstdn_array.length > 1 %>
+            <%= link_to "@#{mstdn_array[0]}", "https://#{CGI.escape(mstdn_array[1])}/@#{CGI.escape(mstdn_array[0])}", :target => "_blank" %></td>
          <% else %>
-            <%= @user.mastodon %>
+            <%= "@" + @user.mastodon %>
          <% end %>
      </tr>
      <% end %>