diff --git a/app/assets/javascripts/app/views/publisher_view.js b/app/assets/javascripts/app/views/publisher_view.js index f357cb2a6558f481f58215a6f5d3fb1b8e561f92..2b7194ace1fb263664d1c564a56b46905c00b96e 100644 --- a/app/assets/javascripts/app/views/publisher_view.js +++ b/app/assets/javascripts/app/views/publisher_view.js @@ -334,7 +334,6 @@ app.views.Publisher = Backbone.View.extend({ "author" : app.currentUser ? app.currentUser.attributes : {}, "mentioned_people" : mentionedPeople, "photos" : photos, - "frame_name" : "status", "title" : serializedForm["status_message[text]"], "location" : location, "interactions" : {"likes":[],"reshares":[],"comments_count":0,"likes_count":0,"reshares_count":0}, diff --git a/app/presenters/post_presenter.rb b/app/presenters/post_presenter.rb index 6cee90e2fb433c8d157c609f93be105a04a61d3b..13b3cf2e25728f9b1a5176cf65da8363d4560a71 100644 --- a/app/presenters/post_presenter.rb +++ b/app/presenters/post_presenter.rb @@ -15,7 +15,7 @@ class PostPresenter < BasePresenter private def directly_retrieved_attributes - %i(id guid public created_at interacted_at provider_display_name image_url object_url) + %i(id guid public created_at interacted_at provider_display_name) end def non_directly_retrieved_attributes diff --git a/app/serializers/export/post_serializer.rb b/app/serializers/export/post_serializer.rb index 77a79c3e52ea637d9dce1d2f3821130860e29103..84b6a91ed23c312b854e826fcfda9e3a86e590c7 100644 --- a/app/serializers/export/post_serializer.rb +++ b/app/serializers/export/post_serializer.rb @@ -5,9 +5,6 @@ module Export :public, :diaspora_handle, :type, - :image_url, - :image_height, - :image_width, :likes_count, :comments_count, :reshares_count, diff --git a/lib/diaspora/fetcher/public.rb b/lib/diaspora/fetcher/public.rb index 7b7e90d1e276cc685fbfe2fb034af4de165c113d..34af2f30efbf35a2260acbedc091571f80300a38 100644 --- a/lib/diaspora/fetcher/public.rb +++ b/lib/diaspora/fetcher/public.rb @@ -109,14 +109,13 @@ module Diaspora; module Fetcher; class Public :author => @person, :public => true ) - entry.assign_attributes({ - :guid => post['guid'], - :text => post['text'], - :provider_display_name => post['provider_display_name'], - :created_at => ActiveSupport::TimeZone.new('UTC').parse(post['created_at']).to_datetime, - :interacted_at => ActiveSupport::TimeZone.new('UTC').parse(post['interacted_at']).to_datetime, - :frame_name => post['frame_name'] - }) + entry.assign_attributes( + guid: post["guid"], + text: post["text"], + provider_display_name: post["provider_display_name"], + created_at: ActiveSupport::TimeZone.new("UTC").parse(post["created_at"]).to_datetime, + interacted_at: ActiveSupport::TimeZone.new("UTC").parse(post["interacted_at"]).to_datetime + ) entry.save # re-enable everything we disabled before diff --git a/spec/javascripts/jasmine_helpers/factory.js b/spec/javascripts/jasmine_helpers/factory.js index 2419df3f1a9000cdb92cddcd694cdc26f9745dc9..1659574ff7fe047835d013ffc4259683dc5c0f23 100644 --- a/spec/javascripts/jasmine_helpers/factory.js +++ b/spec/javascripts/jasmine_helpers/factory.js @@ -81,13 +81,11 @@ var factory = { "interacted_at" : '2012-01-03T19:53:13Z', "public" : false, "guid" : this.guid(), - "image_url" : null, "o_embed_cache" : null, "open_graph_cache": null, "photos" : [], "text" : "jasmine is bomb", "id" : this.id.next(), - "object_url" : null, "root" : null, "post_type" : "StatusMessage", "interactions" : { diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb index b891f2b5dbcbe7a33de2a3997502968467987c66..924fe6c71b57fe8897ef57818a1d02ed9a05dec6 100644 --- a/spec/serializers/post_serializer_spec.rb +++ b/spec/serializers/post_serializer_spec.rb @@ -9,9 +9,6 @@ describe Export::PostSerializer do it { is_expected.to include %("public":#{post.public}) } it { is_expected.to include %("diaspora_handle":"#{post.diaspora_handle}") } it { is_expected.to include %("type":"#{post.type}") } - it { is_expected.to include %("image_url":#{post.image_url}) } - it { is_expected.to include %("image_height":#{post.image_height}) } - it { is_expected.to include %("image_width":#{post.image_width}) } it { is_expected.to include %("likes_count":#{post.likes_count}) } it { is_expected.to include %("comments_count":#{post.comments_count}) } it { is_expected.to include %("reshares_count":#{post.reshares_count}) }