From a3788dfbd1ef9fb0424f2cc41389b22e50839cc0 Mon Sep 17 00:00:00 2001
From: Ben Halpern <bendhalpern@gmail.com>
Date: Mon, 30 Jul 2018 10:51:10 -0700
Subject: [PATCH] Fix TwitterBot arguments (#634)

* Fix TwitterBot arguments

* Fix ::random_identity
---
 app/models/tweet.rb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/models/tweet.rb b/app/models/tweet.rb
index bfa6655b9..0d27f2061 100644
--- a/app/models/tweet.rb
+++ b/app/models/tweet.rb
@@ -97,11 +97,10 @@ class Tweet < ApplicationRecord
   end
 
   def self.random_identity
-    if Rails.env.production?
-      Identity.where(provider: "twitter").last(250).sample
-    else
-      Identity.where(provider: "twitter").last ||
-        { token: ApplicationConfig["TWITTER_KEY"], secret: ApplicationConfig["TWITTER_SECRET"] }
-    end
+    iden = Identity.where(provider: "twitter").last(250).sample
+    {
+      token: iden&.token || ApplicationConfig["TWITTER_KEY"],
+      secret: iden&.secret || ApplicationConfig["TWITTER_SECRET"],
+    }
   end
 end