summaryrefslogtreecommitdiff
path: root/app/controllers/users_controller.rb
diff options
context:
space:
mode:
authorMrYummy <elemental428@gmail.com>2017-07-07 19:41:28 +0200
committerMrYummy <elemental428@gmail.com>2017-07-07 19:42:37 +0200
commit2289d37e6985220a775402490f436aab12b3de0e (patch)
tree1b964f9512a9564250642ec6bfba94adc3bb7d0f /app/controllers/users_controller.rb
parent668c9a296021d37b0d1b0b2c040f2829e9213a59 (diff)
combined mastodon and mastodon_instance columns into a single mastodon column
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r--app/controllers/users_controller.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3380482..c228857 100644
--- 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]