summaryrefslogtreecommitdiff
path: root/users/app/controllers/v1/messages_controller.rb
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2013-12-30 15:23:52 -0800
committerjessib <jessib@riseup.net>2013-12-30 15:23:52 -0800
commit396165d867f2009be1b1071d3c001009adf628ee (patch)
tree8afb8d7be89d93d1fccf9d872bff5b8105d32fdc /users/app/controllers/v1/messages_controller.rb
parentc3fadeb8da6eb4400a3ceb2fecee83173eceeaf2 (diff)
parent16b28882aa7659fb89e1661ed8af0c0db72642c8 (diff)
Merge branch 'feature/messages_api' into feature/messages_cron
Diffstat (limited to 'users/app/controllers/v1/messages_controller.rb')
-rw-r--r--users/app/controllers/v1/messages_controller.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/users/app/controllers/v1/messages_controller.rb b/users/app/controllers/v1/messages_controller.rb
index d49b161..18f9f46 100644
--- a/users/app/controllers/v1/messages_controller.rb
+++ b/users/app/controllers/v1/messages_controller.rb
@@ -12,6 +12,7 @@ module V1
# routes ensure this is only for PUT
def mark_read
+=begin
user_message = UserMessage.find_by_user_id_and_message_id([params[:user_id], params[:message_id]])
user_message.seen = true if user_message
@@ -22,6 +23,17 @@ module V1
render json: false
end
end
+=end
+ if (user = User.find(params[:user_id])) && Message.find(params[:message_id])
+ user.message_ids_seen << params[:message_id] if !user.message_ids_seen.include?(params[:message_id]) #is it quicker to instead run uniq after adding?
+ user.message_ids_to_see.delete(params[:message_id])
+ user.save
+ render json: true
+ return
+ else
+ render json: false
+ end
+ end
end
end