paoda/polyglot
1
0
Fork 0
mirror of https://github.com/beatriceo/polyglot.git synced 2025-10-25 18:52:11 +00:00
Code Issues Projects Releases Wiki Activity

added profile images and colors to the chat messages

Browse Source
This commit is contained in:
Beatrice Olivera
2018-09-06 01:52:00 +01:00
parent 9ddbd38bce
commit bb2a8ad1b9
6 changed files with 87 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/pages_controller.rb
View File

@@ -39,7 +39,6 @@ class PagesController < ApplicationController
chatroom = 'chat_room_' + params[:chat_room_id]
puts params
user_info = {}
photo_url = current_user.photo.url || "https://upload.wikimedia.org/wikipedia/commons/8/89/Portrait_Placeholder.png"
if current_user.first_name.nil? || current_user.last_name.nil?
user_info[:name] = current_user.email
@@ -83,7 +82,8 @@ class PagesController < ApplicationController
ActionCable.server.broadcast "chat_room_#{params[:chat_room_id]}", {
translated_message: translated_message,
userId: userId
userId: userId,
photo_url: params[:photo_url]
}
end
@@ -93,6 +93,7 @@ class PagesController < ApplicationController
chatroom = 'chat_room_' + params[:chat_room_id]
puts params
user_info = {}
photo_url = current_user.photo.url || "https://upload.wikimedia.org/wikipedia/commons/8/89/Portrait_Placeholder.png"
if current_user.first_name.nil? || current_user.last_name.nil?
user_info[:name] = current_user.email
@@ -105,7 +106,8 @@ class PagesController < ApplicationController
message: params[:message],
user_info: user_info,
time_stamp: Time.now.strftime("%H:%M"),
userId: current_user.id
userId: current_user.id,
photo_url: photo_url
}
})
head :ok