From 909efa6fab65374297ca31e1ac83b491a3f9d280 Mon Sep 17 00:00:00 2001 From: Ben Halpern Date: Wed, 16 May 2018 17:29:46 -0400 Subject: [PATCH] Take darker of user colors (#325) --- app/controllers/messages_controller.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 6df1cfd01..49255ccb4 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -42,10 +42,15 @@ class MessagesController < ApplicationController username: new_message.user.username, message: new_message.message_html, timestamp: new_message.timestamp, - color: new_message.user.bg_color_hex, + color: darker_user_color(new_message), }.to_json end + def darker_user_color(new_message) + HexComparer.new([new_message.user.bg_color_hex || "#000000", + new_message.user.text_color_hex || "#000000"]).brightness(0.9) + end + def message_params params.require(:message).permit(:message_markdown, :user_id, :chat_channel_id) end