Feature: Create conversations from Tweets (#470)

* Feature: Add tweets to conversations

app/views/api/v1/contacts/index.json.jbuilder

@@ -5,5 +5,6 @@ json.payload do
     json.email contact.email
     json.phone_number contact.phone_number
     json.thumbnail contact.avatar.profile_thumb.url
+    json.additional_attributes contact.additional_attributes
   end
 end

app/views/api/v1/contacts/show.json.jbuilder

@@ -5,4 +5,5 @@ json.payload do
   json.name @contact.name
   json.phone_number @contact.phone_number
   json.thumbnail @contact.avatar_url
+  json.additional_attributes @contact.additional_attributes
 end

app/views/api/v1/contacts/update.json.jbuilder

@@ -4,4 +4,5 @@ json.payload do
   json.email @contact.email
   json.phone_number @contact.phone_number
   json.thumbnail @contact.avatar.thumb.url
+  json.additional_attributes @contact.additional_attributes
 end

app/views/api/v1/conversations/get_messages.json.jbuilder

@@ -7,8 +7,9 @@ json.payload do
     json.message_type message.message_type_before_type_cast
     json.created_at message.created_at.to_i
     json.private message.private
-    json.fb_id message.fb_id
+    json.source_id message.source_id
     json.attachment message.attachment.push_event_data if message.attachment
     json.sender message.user.push_event_data if message.user
+    json.contact message.contact
   end
 end

app/views/api/v1/conversations/show.json.jbuilder

@@ -13,7 +13,7 @@ json.payload do
     json.message_type message.message_type_before_type_cast
     json.created_at message.created_at.to_i
     json.private message.private
-    json.fb_id message.fb_id
+    json.source_id message.source_id
     json.attachment message.attachment.push_event_data if message.attachment
     json.sender message.user.push_event_data if message.user
   end