@@ -126,6 +126,13 @@ class WsChatController < WsController

                 client.send(message)

             end

+            stripped_me = client.jid.strip.to_s

+            stripped_to = Jabber::JID.new(message[:to]).strip!.to_s

+            if User.can_save_conversation(stripped_me, stripped_to, chat_id)

+                Rails.logger.debug ['saving send message', stripped_me]

+                History.save_message(stripped_me, stripped_me, message[:message], stripped_to, chat_id)

+            end

+

             trigger_success message[:message]

         else

             trigger_failure

@@ -196,10 +203,18 @@ class WsChatController < WsController

     private

-    def process_incoming_message(from, to, body, chat_id = nil)

+    def process_incoming_message(from, me, body, chat_id = nil)

+        stripped_me = me.strip.to_s

+        stripped_from = from.strip.to_s

+

+        if User.can_save_conversation(stripped_me, stripped_from, chat_id)

+            Rails.logger.debug ['saving received message', stripped_me, chat_id]

+            History.save_message(stripped_me, stripped_from, body, stripped_from, chat_id)

+        end

+

         send_message 'app.chat.messageReceived',

                      from: from.to_s,

-                     to: to.strip.to_s,

+                     to: stripped_me,

                      message: body,

                      chat_id: chat_id

     end

@@ -3,6 +3,7 @@ class Account

     field :jid, type: String

     field :pass, type: String

+    field :conversation_settings, type: Array, default: []

     embedded_in :user

 end

\ No newline at end of file

@@ -1,7 +1,7 @@

 class User

 	include Mongoid::Document

-    embeds_many :accounts

+    embeds_many :accounts, cascade_callbacks: true

     accepts_nested_attributes_for :accounts

     index({ 'accounts.jid' => 1 })

@@ -32,18 +32,29 @@ class User

     end

     def self.crendentials_for_token(token)

+        user = find_by_token(token)

+        return user ? user.accounts : []

+    end

+

+    def self.find_by_token(token)

         found = Token.where(token: token).only(:user_id).limit(1).first

+

         if found

-            user_id = found.user_id

+            return find(found.user_id)

         else

-            return []

+            return nil

         end

-

-        user = where(id: user_id).only(:accounts).first

-        return user ? user.accounts : []

     end

     def self.can_save_conversation(my_jid, friend_jid, chat_id = nil)

+        if chat_id.blank?

+            found = User.where('accounts.jid' => my_jid)

+                        .elem_match('accounts.conversation_settings' => {jid: friend_jid, value: 0})

+        else

+            found = User.where('accounts.jid' => my_jid)

+                        .elem_match('accounts.conversation_settings' => {chat_id: chat_id, value: 0})

+        end

+        found.first.nil?

     end

 end

\ No newline at end of file