Merge branch 'develop' into feat/setup-eslint-rules

app/models/attachment.rb

@@ -81,7 +81,7 @@ class Attachment < ApplicationRecord
       height: file.metadata[:height]
     }
 
-    metadata[:data_url] = metadata[:thumb_url] = external_url if message.inbox.instagram?
+    metadata[:data_url] = metadata[:thumb_url] = external_url if message.inbox.instagram? && message.incoming?
     metadata
   end
 

spec/models/attachment_spec.rb

@@ -44,9 +44,14 @@ RSpec.describe Attachment do
       }.to_json, headers: {})
     end
 
-    it 'returns external url as data and thumb urls' do
+    it 'returns external url as data and thumb urls when message is incoming' do
       external_url = instagram_message.attachments.first.external_url
       expect(instagram_message.attachments.first.push_event_data[:data_url]).to eq external_url
     end
+
+    it 'returns original attachment url as data url if the message is outgoing' do
+      message = create(:message, :instagram_story_mention, message_type: :outgoing)
+      expect(message.attachments.first.push_event_data[:data_url]).not_to eq message.attachments.first.external_url
+    end
   end
 end