about summary refs log tree commit diff
path: root/app/models/remote_follow.rb
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2017-12-06 20:17:13 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2017-12-06 20:17:13 +0000
commit8ca91cef45417947607079118b1af07c9774ae58 (patch)
treecafbe6cc30563ca35ffa522056ead63ca450d9c1 /app/models/remote_follow.rb
parentf2f2f1032082d6212771bd0307136484f671d37e (diff)
parenta0047fdca052088cce0e23c3b58b95f13be19805 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/models/remote_follow.rb')
-rw-r--r--app/models/remote_follow.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/remote_follow.rb b/app/models/remote_follow.rb
index c3f867743..070144e2d 100644
--- a/app/models/remote_follow.rb
+++ b/app/models/remote_follow.rb
@@ -7,8 +7,8 @@ class RemoteFollow
 
   validates :acct, presence: true
 
-  def initialize(attrs = {})
-    @acct = attrs[:acct].gsub(/\A@/, '').strip unless attrs[:acct].nil?
+  def initialize(attrs = nil)
+    @acct = attrs[:acct].gsub(/\A@/, '').strip if !attrs.nil? && !attrs[:acct].nil?
   end
 
   def valid?