chat 0.2.0 → 0.9.0

data/app/jobs/chat/application_job.rb

@@ -1,5 +1,13 @@
+# frozen_string_literal: true
+
 module Chat
-  class ApplicationJob < ActiveJob::Base
+  class ApplicationJob < ::ApplicationJob
     queue_as :default
+
+    private
+
+    def broadcast(channel, payload)
+      ActionCable.server.broadcast(channel, payload)
+    end
   end
 end

data/app/jobs/chat/message_relay_job.rb

@@ -1,31 +1,23 @@
+# frozen_string_literal: true
+
 module Chat
   class MessageRelayJob < ApplicationJob
     def perform(message_id)
       message = Chat::Message.find(message_id)
-      ActionCable.server.broadcast(
+      broadcast(
         "chats::#{message.conversation_id}::messages", render_message(message)
       )
     end
 
     def render_message(message)
       {
-        user: message.user_id,
-        avatar: avatar(message.user)
+        user: message.user_id, avatar: renderer.chat_avatar(message.user).to_s
       }.merge(content(message))
     end
 
-    def avatar(user)
-      renderer.chat_avatar(user).to_s
-    end
-
     def content(message)
       if message.image?
-        {
-          message: renderer.image_tag(
-            message.image.url, class: "chat__message-image"
-          ),
-          image: true
-        }
+        { message: renderer.image_tag(message.image.url), image: true }
       else
         { message: message.text, image: false }
       end

data/app/jobs/chat/notification_relay_job.rb

@@ -1,11 +1,17 @@
+# frozen_string_literal: true
+
 module Chat
   class NotificationRelayJob < ApplicationJob
     def perform(message)
-      (message.conversation.user_ids - [message.user_id]).each do |user_id|
-        ActionCable.server.broadcast(
-          "users::#{user_id}::chats", chat_id: message.conversation_id
-        )
+      user_ids(message).each do |user_id|
+        broadcast("users::#{user_id}::chats", chat_id: message.conversation_id)
       end
     end
+
+    private
+
+    def user_ids(message)
+      message.conversation.users.where.not(id: message.user_id).ids
+    end
   end
 end

data/app/jobs/chat/status_relay_job.rb

@@ -1,9 +1,9 @@
+# frozen_string_literal: true
+
 module Chat
   class StatusRelayJob < ApplicationJob
     def perform(user)
-      ActionCable.server.broadcast(
-        "chat::status", user_id: user.id, status: user.chat_status
-      )
+      broadcast("chat::status", user_id: user.id, status: user.chat_status)
     end
   end
 end

data/app/mailers/chat/application_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Chat
   class ApplicationMailer < ActionMailer::Base
     default from: "from@example.com"

data/app/models/chat/application_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Chat::ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 end

data/app/models/chat/conversation.rb

@@ -1,9 +1,21 @@
+# frozen_string_literal: true
+
 class Chat::Conversation < ApplicationRecord
   has_many :messages
   has_many :sessions, dependent: :destroy
   has_many :users, through: :sessions, class_name: "::User"
 
+  has_one :last_message, -> { order(created_at: :desc) },
+          class_name: "Chat::Message"
+
   validates :sessions, presence: {
     message: "At least one user must be selected"
   }
+  validate do
+    next unless Chat::Conversation.joins(:users).where.not(id: id).where(
+      users: { id: user_ids }
+    ).group(:id).having("COUNT(DISTINCT users.id) = ?", user_ids.count).exists?
+
+    errors.add(:conversation, "already taking place")
+  end
 end

data/app/models/chat/dot_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Chat
   class DotCommand
     attr_reader :text, :message

data/app/models/chat/dot_command/gif.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Chat
   class DotCommand
     class Gif

data/app/models/chat/dot_command/shrug.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Chat
   class DotCommand
     class Shrug
@@ -20,7 +22,7 @@ module Chat
       private
 
       def shruggie
-        "¯\\_(ツ)_/¯"
+        '¯\_(ツ)_/¯'
       end
     end
   end

data/app/models/chat/dot_command/validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Chat
   class DotCommand
     class Validator
@@ -12,7 +14,7 @@ module Chat
       end
 
       def commands
-        %w(.gif .shrug .leave)
+        %w(.gif .shrug)
       end
 
       def custom_commands

data/app/models/chat/message.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Chat::Message < ApplicationRecord
   has_attached_file :image
   validates_attachment :image, content_type: {
@@ -6,13 +8,15 @@ class Chat::Message < ApplicationRecord
 
   belongs_to :user, class_name: "::User"
   belongs_to :conversation
+  belongs_to :session
 
   delegate :name, to: :user
+  before_save :remove_extra_new_line
   before_save :execute_dot_command
 
   after_create_commit do
-    Chat::MessageRelayJob.perform_later(id)
-    Chat::NotificationRelayJob.perform_later(self)
+    Chat::MessageRelayJob.send(Chat.perform_method.to_sym, id)
+    Chat::NotificationRelayJob.send(Chat.perform_method.to_sym, self)
   end
 
   private
@@ -26,4 +30,8 @@ class Chat::Message < ApplicationRecord
   def dot_command
     @dot_command ||= Chat::DotCommand.new(self, text)
   end
+
+  def remove_extra_new_line
+    self.text = text[0..-16]
+  end
 end

data/app/models/chat/session.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 class Chat::Session < ApplicationRecord
   belongs_to :conversation
   belongs_to :user, class_name: "::User"
 
-  has_many :messages, foreign_key: [:user_id, :conversation_id],
-                      primary_key: [:user_id, :conversation_id],
-                      dependent: :destroy
+  has_many :messages, dependent: :destroy
 
   validates :user_id, uniqueness: { scope: :conversation_id }
 end

data/app/views/chat/_chat.html.haml

@@ -1,14 +1,18 @@
-= launch_chat_fab(background, color)
+= launch_chat_fab
 
 #chat
+  #chat__background
   .chat__header
-    = material_icon.menu.css_class('chat__settings')
+    .chat__settings
+      %div
+      %div
     .chat__flex
     %h6 Chat
     .chat__flex
-    = material_icon.close.css_class('chat__close')
-
-  = render 'chat/conversations/new'
+    = material_icon.close.css_class("chat__close")
+  = render "chat/conversations/new"
   .chat__list
-    = render 'chat/conversations/index'
+    = render "chat/conversations/index"
+  = link_to nil, class: "chat__start-new" do
+    = material_icon.add
   .current_chat

data/app/views/chat/conversations/_conversation.html.haml

@@ -0,0 +1,23 @@
+= link_to [chat, conversation], remote: true, id: "chat__show-#{conversation.id}" do
+  .avatar_container{ class: chat_avatar_count(conversation) }
+    - if chat_avatar_count(conversation) == "count_default"
+      = chat_avatars(conversation).sample.html_safe
+      .chat_count
+        %span
+          = conversation_user_count(conversation)
+    - else
+      = chat_avatars(conversation).join("").html_safe
+  .chat__glance
+    .chat__glance-name-date
+      .name
+        - if conversation.users.to_a.size > 2
+          Group Chat
+        - else
+          = conversation.users.where.not(id: current_user.id).first.first_name
+      .flex
+      .date
+        - if conversation.last_message.present?
+          = time_ago_in_words conversation.last_message&.created_at
+          ago
+    .chat__glance-last-message
+      = raw conversation.last_message&.text

data/app/views/chat/conversations/_index.html.haml

@@ -1,11 +1,6 @@
 - if chat_list.present?
-  .chat__index
-    - chat_list.each do |conversation|
-      = link_to [chat, conversation], remote: true, id: "chat__show-#{conversation.id}" do
-        = conversation.names.gsub(", #{current_user.name}", '').gsub("#{current_user.name}, ", '')
-  .chat__flex
+  = render chat_list
 - else
   .chat__none-available
     = material_icon.chat_bubble_outline
     %h5 No Chats
-= link_to 'Start a Chat', nil, class: 'chat__start-new'

data/app/views/chat/conversations/_new.html.haml

@@ -1,9 +1,7 @@
 = form_for [chat, Chat::Conversation.new], remote: true do |f|
   - if chatable_users.present?
-    .chat__user-check-boxes
-      = chatable_user_check_boxes(f)
-    .chat__flex
-    = f.submit 'Start Chatting'
+    = chatable_user_check_boxes(f)
+    .chat__submit-container= f.submit "Start Chatting"
   - else
     .chat__none-available
       = material_icon.people

data/app/views/chat/conversations/_show.html.haml

@@ -1,9 +1,10 @@
 .chat__transcript{ data: { channel: 'messages', current: { chat: @conversation.id, user: current_user.id }}}
-  = render @conversation.messages
-
+  - @conversation.messages.each_with_index do |msg, i|
+    = render "chat/messages/message", message: msg, previous: (i > 0 ? @conversation.messages[i-1] : nil)
 .chat__flex
-= form_for [chat, @conversation, Chat::Message.new], remote: true do |f|
-  = material_icon.insert_photo.css_class("chat__insert-image")
-  = f.text_area :text, placeholder: 'Send message...', autocomplete: 'off'
-  %span.bar
-  = f.file_field :image
+%div
+  = form_for [chat, @conversation, Chat::Message.new], remote: true do |f|
+    = material_icon.insert_photo.css_class("chat__insert-image")
+    = f.text_area :text, placeholder: 'Send message...', autocomplete: 'off'
+    %span.bar
+    = f.file_field :image

data/app/views/chat/conversations/create.js.erb

@@ -1,21 +1,25 @@
-<% if @conversation.valid? %>
+<% if @conversation.errors.messages[:sessions].blank? %>
   $('#chat .chat__list').html("<%= j render 'chat/conversations/index' %>");
-  $('#chat .chat__list').css('display', 'none');
   $('.new_conversation').replaceWith("<%= j render 'chat/conversations/new' %>");
   $('.current_chat').html("<%= j render 'chat/conversations/show' %>");
-  $('.current_chat').css('display', 'flex');
-  $('.chat__transcript').scrollTop($('.chat__transcript').prop('scrollHeight'));
+  $('.new_message textarea').emojioneArea();
   App.chat_message.followCurrentChat();
-<% elsif @conversation.errors.messages[:sessions].present? %>
+  $("#new_message").fileupload();
+  if($("#chat__show-<%= @conversation.id %>").hasClass('chat__has_new_message')) {
+    App.chat_notification.decrement();
+    $("#chat__show-<%= @conversation.id %>").removeClass('chat__has_new_message')
+  }
+  $('.current_chat').toggleClass("slide_left");
+  $('.chat__list').addClass("slide_left");
+  $('.chat__start-new').addClass("chat__disappear");
+  $('.current_chat').scrollTop($('.current_chat').prop('scrollHeight'));
+<% else %>
   error_msg =
     `<div class='chat__errors'>
       <%= j @conversation.errors.values.flatten.join(', ') %>
      </div>`;
   if($('.chat__errors').length == 0) {
-    $('.chat__user-check-boxes').prepend(error_msg);
+    $('.new_conversation').scrollTop(0);
+    $('.new_conversation').prepend(error_msg);
   }
-<% else %>
-    <% id = Chat.joins(:chat_users).find_by(chat_users: { user_id: @conversation.user_ids }).id %>
-    $('.new_conversation').replaceWith("<%= j render 'chats/new' %>");
-    $("a[href='/chats/<%= id %>']").click();
 <% end %>

data/app/views/chat/conversations/show.js.erb

@@ -1,12 +1,15 @@
+$('.new_conversation').replaceWith("<%= j render 'chat/conversations/new' %>");
 $('.current_chat').html("<%= j render 'chat/conversations/show' %>");
-$('.new_message textarea').emojioneArea()
-$('.chat__list').css('display', 'none');
-$('.new_conversation').css('display', 'none');
-$('.current_chat').css('display', 'flex');
+$('.new_message textarea').emojioneArea();
 App.chat_message.followCurrentChat();
 $("#new_message").fileupload();
 if($("#chat__show-<%= @conversation.id %>").hasClass('chat__has_new_message')) {
   App.chat_notification.decrement();
   $("#chat__show-<%= @conversation.id %>").removeClass('chat__has_new_message')
 }
-$('.chat__transcript').scrollTop($('.chat__transcript').prop('scrollHeight'));
+$('.current_chat').toggleClass("slide_left");
+$('.chat__list').removeClass("slide_right");
+$('.chat__list').addClass("slide_left");
+$('.chat__start-new').addClass("chat__disappear");
+$('.current_chat').scrollTop($('.current_chat').prop('scrollHeight'));
+$(".new_conversation").removeClass("slide_right");

data/app/views/chat/messages/_message.haml

@@ -1,13 +1,10 @@
-- if message.image?
-  .chat__image-message{ class: "#{'current' if message.user == current_user}" }
-    = image_tag message.image.url
-- else
-  .chat__message
-    - if message.user == current_user
-      .chat__flex
-      .text.right= raw(message.text)
-      = chat_avatar(message.user)
+.message-container{ class: message.user == current_user ? "right" : "left" }
+  - if message.user == previous&.user
+    .transcript_placeholder_avatar
+  - else
+    = chat_avatar(message.user)
+  .message{ class: ("image" if message.image?).to_s }
+    - if message.image?
+      = image_tag message.image.url
     - else
-      = chat_avatar(message.user)
-      .text.left= raw(message.text)
-      .chat__flex
+      .content= raw(message.text)

data/config/routes.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 Chat::Engine.routes.draw do
-  resources :conversations, only: [:show, :create] do
-    resources :messages, only: [:create, :destroy]
+  resources :conversations, only: %i(show create) do
+    resources :messages, only: %i(create destroy)
   end
 end

data/lib/chat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "chat/engine"
 require "chat/version"
 require "chat/user"
@@ -6,7 +8,6 @@ require "paperclip"
 require "material_icons"
 require "coffee-rails"
 require "jquery-rails"
-require "composite_primary_keys"
 require "jquery-fileupload-rails"
 require "giphy"
 require "sidekiq"
@@ -21,6 +22,9 @@ module Chat
   # The field that contains the users avatar
   mattr_accessor :user_avatar
 
+  # Can be perform_now or perform_later. Called on jobs
+  mattr_accessor :perform_method
+
   def self.table_name_prefix
     "chat_"
   end

data/lib/chat/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Chat
   class Engine < ::Rails::Engine
     isolate_namespace Chat

data/lib/chat/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/concern"
 
 module Chat
@@ -27,25 +29,18 @@ module Chat
       update(chat_status: "offline")
     end
 
-    def leave_conversation(conversation)
-      session = sessions.where(conversation: conversation)
-      session.destroy
+    def chat_avatar
+      send(Chat.user_avatar)
     end
 
-    module ClassMethods
-      def first_name
-        "first_name"
-      end
-
-      def last_name
-        "last_name"
-      end
+    def chat_avatar?
+      send("#{Chat.user_avatar}?")
     end
 
     private
 
     def broadcast_status
-      Chat::StatusRelayJob.perform_later(self)
+      Chat::StatusRelayJob.send(Chat.perform_method, self)
     end
   end
 end