Merge branch 'release/1.2.1' into develop

app/controllers/api/v1/conversations/messages_controller.rb

@@ -1,8 +1,18 @@
 class Api::V1::Conversations::MessagesController < Api::BaseController
-  before_action :set_conversation, only: [:create]
+  before_action :set_conversation, only: [:index, :create]
+
+  def index
+    @messages = message_finder.perform
+  end
 
   def create
     mb = Messages::Outgoing::NormalBuilder.new(current_user, @conversation, params)
     @message = mb.perform
   end
+
+  private
+
+  def message_finder
+    @message_finder ||= MessageFinder.new(@conversation, params)
+  end
 end

app/controllers/api/v1/conversations_controller.rb

@@ -7,9 +7,7 @@ class Api::V1::ConversationsController < Api::BaseController
     @conversations_count = result[:count]
   end
 
-  def show
-    @messages = messages_finder.perform
-  end
+  def show; end
 
   def toggle_status
     @status = @conversation.toggle_status
@@ -34,8 +32,4 @@ class Api::V1::ConversationsController < Api::BaseController
   def conversation_finder
     @conversation_finder ||= ConversationFinder.new(current_user, params)
   end
-
-  def messages_finder
-    @message_finder ||= MessageFinder.new(@conversation, params)
-  end
 end

app/controllers/twitter/callbacks_controller.rb

@@ -1,5 +1,7 @@
 class Twitter::CallbacksController < Twitter::BaseController
   def show
+    return redirect_to app_new_twitter_inbox_url if permitted_params[:denied]
+
     @response = twitter_client.access_token(
       oauth_token: permitted_params[:oauth_token],
       oauth_verifier: permitted_params[:oauth_verifier]
@@ -46,6 +48,6 @@ class Twitter::CallbacksController < Twitter::BaseController
   end
 
   def permitted_params
-    params.permit(:oauth_token, :oauth_verifier)
+    params.permit(:oauth_token, :oauth_verifier, :denied)
   end
 end