nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor conversations controller create

Browse source 
closes #7224
This commit is contained in:
Steffen van Bergerem 2016-11-26 01:13:15 +01:00 committed by Benjamin Neff
parent 3586fa6ae7
commit 610700ffd5
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/controllers/conversations_controller.rb
View file

@ -38,21 +38,22 @@ class ConversationsController < ApplicationController
person_ids = current_user.contacts.mutual.where(column => params[recipients_param].split(",")).pluck(:person_id) person_ids = current_user.contacts.mutual.where(column => params[recipients_param].split(",")).pluck(:person_id)
end end
unless person_ids.present?
render text: I18n.t("javascripts.conversation.create.no_recipient"), status: 422
return
end
opts = params.require(:conversation).permit(:subject) opts = params.require(:conversation).permit(:subject)
opts[:participant_ids] = person_ids opts[:participant_ids] = person_ids
opts[:message] = { text: params[:conversation][:text] } opts[:message] = { text: params[:conversation][:text] }
@conversation = current_user.build_conversation(opts) @conversation = current_user.build_conversation(opts)
if person_ids.present? && @conversation.save if @conversation.save
Diaspora::Federation::Dispatcher.defer_dispatch(current_user, @conversation) Diaspora::Federation::Dispatcher.defer_dispatch(current_user, @conversation)
flash[:notice] = I18n.t("conversations.create.sent") flash[:notice] = I18n.t("conversations.create.sent")
render json: {id: @conversation.id} render json: {id: @conversation.id}
else else
message = I18n.t("conversations.create.fail") render text: I18n.t("conversations.create.fail"), status: 422
if person_ids.blank?
message = I18n.t("javascripts.conversation.create.no_recipient")
end
render text: message, status: 422
end end
end end