diff --git a/app/controllers/users/messages_controller.rb b/app/controllers/users/messages_controller.rb index 8c704c1bf..efff9e01a 100644 --- a/app/controllers/users/messages_controller.rb +++ b/app/controllers/users/messages_controller.rb @@ -65,8 +65,9 @@ class Users::MessagesController < Users::BaseController @message_status = begin case params[:status] when "1" then 1 + when "2" then 2 else - 2 + -1 end end end @@ -75,15 +76,6 @@ class Users::MessagesController < Users::BaseController params.permit(:atmeable_type, :atmeable_id, receivers_login: []) end - def message_params - { - sender: current_user.id, - reservers: @receiver.id, - type: @message_type, - content: params[:content] - } - end - def find_receivers @receivers = User.where(login: params[:receivers_login]) return render_not_found if @receivers.size == 0 diff --git a/app/services/notice/read/list_service.rb b/app/services/notice/read/list_service.rb index 69c5c57ce..e4b1fda44 100644 --- a/app/services/notice/read/list_service.rb +++ b/app/services/notice/read/list_service.rb @@ -16,19 +16,11 @@ class Notice::Read::ListService < Notice::Read::ClientService private - def request_status - case status - when 1 then 1 - else - 2 - end - end - def request_params { receiver: receiver, page: page, - show: request_status, + status: status, size: size, type: type }.stringify_keys