diff --git a/ruby/spec/jam_ruby/models/feed_spec.rb b/ruby/spec/jam_ruby/models/feed_spec.rb index b61596fc9..750cbd2f4 100644 --- a/ruby/spec/jam_ruby/models/feed_spec.rb +++ b/ruby/spec/jam_ruby/models/feed_spec.rb @@ -158,8 +158,8 @@ describe Feed do # creates both recording and history record in feed claimed_recording1 = FactoryGirl.create(:claimed_recording) - # move the feed entry created for the recording back more than a months ago - claimed_recording1.recording.feed.created_at = 25.hours.ago + # move the feed entry created for the recording back more than a day ago + claimed_recording1.recording.feed.created_at = 48.hours.ago claimed_recording1.recording.feed.save! feeds, start = Feed.index(user1, :type => 'recording', time_range: 'today') diff --git a/web/app/assets/javascripts/shareDialog.js b/web/app/assets/javascripts/shareDialog.js index 7ef6e2978..aacf3ae6d 100644 --- a/web/app/assets/javascripts/shareDialog.js +++ b/web/app/assets/javascripts/shareDialog.js @@ -106,7 +106,8 @@ description: data.description, caption: data.caption, name: data.title, - picture: data.photo_url + picture: data.photo_url, + link: data.url }) .done(function(response) { checkShareCheckbox('facebook', false); @@ -163,7 +164,8 @@ description: data.description, caption: data.caption, name: data.title, - picture: data.photo_url + picture: data.photo_url, + link: data.url }) .done(function(response) { checkShareCheckbox('facebook', false); diff --git a/web/app/controllers/api_users_controller.rb b/web/app/controllers/api_users_controller.rb index 0a3bec6ec..36861a7b5 100644 --- a/web/app/controllers/api_users_controller.rb +++ b/web/app/controllers/api_users_controller.rb @@ -531,6 +531,7 @@ class ApiUsersController < ApiController description: view_context.description_for_music_session_history(history), title: view_context.title_for_music_session_history(history, current_user), photo_url: view_context.facebook_image_for_music_session_history(history), + url: share_token_url(history.share_token.token), caption: 'www.jamkazam.com' }, status: 200 @@ -557,6 +558,7 @@ class ApiUsersController < ApiController description: view_context.description_for_claimed_recording(claimed_recording), title: view_context.title_for_claimed_recording(claimed_recording, current_user), photo_url: view_context.facebook_image_for_claimed_recording(claimed_recording), + url: share_token_url(claimed_recording.share_token.token), caption: 'www.jamkazam.com' }, status: 200