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/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -153,6 +153,10 @@ class UsersController < ApplicationController
      if userdata[:badge]
        userdata[:badge] = Badge.get(userdata[:badge])
      end
+      unless userdata[:mastodon].blank?
+        userdata[:mastodon] = "#{userdata[:mastodon].gsub("@", "")}#{("@" + userdata[:mastodon_instance].gsub("@", "")) unless userdata[:mastodon_instance].blank?}"
+      end
+      userdata.delete(:mastodon_instance)
      if @user.youtube != userdata[:youtube]
        youtube = get_youtube(userdata[:youtube])
        userdata[:youtube] = youtube[:channel]