Merge pull request #6940 from SuperTux88/cleanup-posts-table

Cleanup posts table

Changelog.md

@@ -116,6 +116,7 @@ before.
 * Extract photo export into a service class [#6922](https://github.com/diaspora/diaspora/pull/6922)
 * Use handlebars template for aspect membership dropdown [#6864](https://github.com/diaspora/diaspora/pull/6864)
 * Extract relayable signatures into their own tables [#6932](https://github.com/diaspora/diaspora/pull/6932)
+* Remove outdated columns from posts table [#6940](https://github.com/diaspora/diaspora/pull/6940)
 
 ## Bug fixes
 * Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)

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},

app/models/photo.rb

@@ -141,6 +141,6 @@ class Photo < ActiveRecord::Base
              else
                Photo.where(author_id: person.id, public: true)
              end
-    photos.order("created_at desc")
+    photos.where(pending: false).order("created_at DESC")
   end
 end

app/models/post.rb

@@ -43,6 +43,7 @@ class Post < ActiveRecord::Base
     ) #note should include root and photos, but i think those are both on status_message
   }
 
+  scope :all_public, -> { where(public: true) }
 
   scope :commented_by, ->(person)  {
     select('DISTINCT posts.*')
@@ -129,10 +130,6 @@ class Post < ActiveRecord::Base
     new(params.to_hash.stringify_keys.slice(*column_names, "author"))
   end
 
-  def activity_streams?
-    false
-  end
-
   def comment_email_subject
     I18n.t('notifier.a_post_you_shared')
   end

app/models/user/querying.rb

@@ -117,7 +117,7 @@ module User::Querying
   end
 
   def visible_shareables_query(query, opts)
-    query.with_visibility.where(pending: false).where(
+    query.with_visibility.where(
       visible_private_shareables(opts).or(opts[:klass].arel_table[:public].eq(true))
     )
   end
@@ -129,7 +129,7 @@ module User::Querying
   end
 
   def construct_shareable_from_self_query(opts)
-    conditions = {pending: false, author_id: person_id}
+    conditions = {author_id: person_id}
     conditions[:type] = opts[:type] if opts.has_key?(:type)
     query = opts[:klass].where(conditions)
 

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

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,

app/views/reshares/_reshare.mobile.haml

@@ -13,9 +13,8 @@
     - unless post.is_a?(Reshare)
       = render "shared/nsfw_shield", post: post
 
-      - if !post.activity_streams?
-        .nsfw-hidden
-          = render "status_messages/status_message", post: post, photos: post.photos
+      .nsfw-hidden
+        = render "status_messages/status_message", post: post, photos: post.photos
   - else
     .content
       = t(".deleted")

app/views/shared/_photo_area.mobile.haml

@@ -11,6 +11,3 @@
             .additional_photo_count
               = "+ #{post.photos.size-1}"
           = image_tag post.photos.first.url(:thumb_large), class: "stream-photo big-stream-photo"
-  - elsif post.activity_streams?
-    = image_tag post.image_url
-

app/views/shared/_post_info.mobile.haml

@@ -20,9 +20,7 @@
         = link_to(post_path(post)) do
           = timeago(post.created_at)
       %span.via
-        - if post.activity_streams?
-          = t('shared.stream_element.via', link: link_to("#{post.provider_display_name}", post.actor_url)).html_safe
-        - elsif post.provider_display_name == 'mobile'
+        - if post.provider_display_name == "mobile"
           = t('shared.stream_element.via_mobile', link: nil)
       –
       %span.scope_scope

app/views/status_messages/_status_message.mobile.haml

@@ -11,8 +11,6 @@
             .additional_photo_count
               = "+ #{post.photos.size-1}"
           = image_tag post.first_photo_url(:thumb_large), :class => "stream-photo big-stream-photo"
-    - elsif post.activity_streams?
-      = image_tag post.image_url
 
 %div{:class => direction_for(post.text)}
   != post.message.markdownified

db/migrate/20160802212635_cleanup_posts_table.rb

@@ -0,0 +1,30 @@
+class CleanupPostsTable < ActiveRecord::Migration
+  def change
+    remove_index :posts, column: %i(status_message_guid pending),
+                 name: :index_posts_on_status_message_guid_and_pending, length: {status_message_guid: 190}
+    remove_index :posts, column: :status_message_guid, name: :index_posts_on_status_message_guid, length: 191
+    remove_index :posts, column: %i(type pending id), name: :index_posts_on_type_and_pending_and_id
+
+    # from photos?
+    remove_column :posts, :pending, :boolean, default: false, null: false
+    remove_column :posts, :remote_photo_path, :text
+    remove_column :posts, :remote_photo_name, :string
+    remove_column :posts, :random_string, :string
+    remove_column :posts, :processed_image, :string
+    remove_column :posts, :unprocessed_image, :string
+    remove_column :posts, :status_message_guid, :string
+
+    # old cubbi.es stuff
+    remove_column :posts, :object_url, :string
+    remove_column :posts, :image_url, :string
+    remove_column :posts, :image_height, :integer
+    remove_column :posts, :image_width, :integer
+    remove_column :posts, :actor_url, :string
+    remove_column :posts, :objectId, :string
+
+    # old single post view templates
+    remove_column :posts, :frame_name, :string
+
+    add_index :posts, %i(id type), name: :index_posts_on_id_and_type
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160720212620) do
+ActiveRecord::Schema.define(version: 20160802212635) do
 
   create_table "account_deletions", force: :cascade do |t|
     t.string   "diaspora_handle", limit: 255
@@ -450,31 +450,17 @@ ActiveRecord::Schema.define(version: 20160720212620) do
     t.integer  "author_id",             limit: 4,                     null: false
     t.boolean  "public",                              default: false, null: false
     t.string   "guid",                  limit: 255,                   null: false
-    t.boolean  "pending",                             default: false, null: false
     t.string   "type",                  limit: 40,                    null: false
     t.text     "text",                  limit: 65535
-    t.text     "remote_photo_path",     limit: 65535
-    t.string   "remote_photo_name",     limit: 255
-    t.string   "random_string",         limit: 255
-    t.string   "processed_image",       limit: 255
     t.datetime "created_at",                                          null: false
     t.datetime "updated_at",                                          null: false
-    t.string   "unprocessed_image",     limit: 255
-    t.string   "object_url",            limit: 255
-    t.string   "image_url",             limit: 255
-    t.integer  "image_height",          limit: 4
-    t.integer  "image_width",           limit: 4
     t.string   "provider_display_name", limit: 255
-    t.string   "actor_url",             limit: 255
-    t.string   "objectId",              limit: 255
     t.string   "root_guid",             limit: 255
-    t.string   "status_message_guid",   limit: 255
     t.integer  "likes_count",           limit: 4,     default: 0
     t.integer  "comments_count",        limit: 4,     default: 0
     t.integer  "o_embed_cache_id",      limit: 4
     t.integer  "reshares_count",        limit: 4,     default: 0
     t.datetime "interacted_at"
-    t.string   "frame_name",            limit: 255
     t.string   "facebook_id",           limit: 255
     t.string   "tweet_id",              limit: 255
     t.integer  "open_graph_cache_id",   limit: 4
@@ -485,11 +471,9 @@ ActiveRecord::Schema.define(version: 20160720212620) do
   add_index "posts", ["author_id"], name: "index_posts_on_person_id", using: :btree
   add_index "posts", ["guid"], name: "index_posts_on_guid", unique: true, length: {"guid"=>191}, using: :btree
   add_index "posts", ["id", "type", "created_at"], name: "index_posts_on_id_and_type_and_created_at", using: :btree
+  add_index "posts", ["id", "type"], name: "index_posts_on_id_and_type", using: :btree
   add_index "posts", ["root_guid"], name: "index_posts_on_root_guid", length: {"root_guid"=>191}, using: :btree
-  add_index "posts", ["status_message_guid", "pending"], name: "index_posts_on_status_message_guid_and_pending", length: {"status_message_guid"=>190, "pending"=>nil}, using: :btree
-  add_index "posts", ["status_message_guid"], name: "index_posts_on_status_message_guid", length: {"status_message_guid"=>191}, using: :btree
   add_index "posts", ["tweet_id"], name: "index_posts_on_tweet_id", length: {"tweet_id"=>191}, using: :btree
-  add_index "posts", ["type", "pending", "id"], name: "index_posts_on_type_and_pending_and_id", using: :btree
 
   create_table "ppid", force: :cascade do |t|
     t.integer "o_auth_application_id", limit: 4

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

lib/diaspora/shareable.rb

@@ -19,8 +19,6 @@ module Diaspora
         delegate :id, :name, :first_name, to: :author, prefix: true
 
         # scopes
-        scope :all_public, -> { where(public: true, pending: false) }
-
         scope :with_visibility, -> {
           joins("LEFT OUTER JOIN share_visibilities ON share_visibilities.shareable_id = #{table_name}.id AND "\
             "share_visibilities.shareable_type = '#{base_class}'")
@@ -77,7 +75,7 @@ module Diaspora
       end
 
       def owned_by_user(user)
-        user.person.public_send(table_name).where(pending: false)
+        user.person.public_send(table_name)
       end
 
       private

spec/fixtures/data_conversion/aspect_memberships.csv

@@ -1,7 +0,0 @@
-contact_mongo_id,aspect_mongo_id
-4d2b6eb7cc8cb43cc200000f,4d2b6eb6cc8cb43cc2000008
-4d2b6eb7cc8cb43cc2000010,4d2b6eb7cc8cb43cc200000c
-4d2b6eb7cc8cb43cc2000013,4d2b6eb7cc8cb43cc200000c
-4d2b6eb7cc8cb43cc200001c,4d2b6eb7cc8cb43cc2000015
-4d2b6eb8cc8cb43cc2000022,4d2b6eb7cc8cb43cc2000015
-4d2b6ec2cc8cb43cc2000035,4d2b6eb7cc8cb43cc2000019

spec/fixtures/data_conversion/aspects.csv

@@ -1,5 +0,0 @@
-mongo_id,name,user_mongo_id,created_at,updated_at
-4d2b6eb6cc8cb43cc2000008,generic,4d2b6eb6cc8cb43cc2000007,1294692022000,1294692033000
-4d2b6eb7cc8cb43cc200000c,generic,4d2b6eb6cc8cb43cc200000b,1294692023000,1294692033000
-4d2b6eb7cc8cb43cc2000015,generic,4d2b6eb7cc8cb43cc2000014,1294692023000,1294692034000
-4d2b6eb7cc8cb43cc2000019,generic,4d2b6eb7cc8cb43cc2000018,1294692023000,1294692036000

spec/fixtures/data_conversion/comments.csv

@@ -1,3 +0,0 @@
-mongo_id,post_mongo_id,person_mongo_id,diaspora_handle,text,youtube_titles
-4d2b6ebfcc8cb43cc200002b,4d2b6ebecc8cb43cc2000029,4d2b6eb7cc8cb43cc2000017,bob3c6c46f@localhost,Hey me!,""
-4d2b6ebfcc8cb43cc200002c,4d2b6ebecc8cb43cc2000027,4d2b6eb7cc8cb43cc200000e,bob2f66ee4@localhost,Hey you!,""

spec/fixtures/data_conversion/contacts.csv

@@ -1,7 +0,0 @@
-mongo_id,user_mongo_id,person_mongo_id,pending,created_at,updated_at
-4d2b6eb7cc8cb43cc200000f,4d2b6eb6cc8cb43cc2000007,4d2b6eb7cc8cb43cc200000e,false,,
-4d2b6eb7cc8cb43cc2000010,4d2b6eb6cc8cb43cc200000b,4d2b6eb6cc8cb43cc200000a,false,,
-4d2b6eb7cc8cb43cc2000013,4d2b6eb6cc8cb43cc200000b,4d2b6eb7cc8cb43cc2000011,false,,
-4d2b6eb7cc8cb43cc200001c,4d2b6eb7cc8cb43cc2000014,4d2b6eb7cc8cb43cc200001b,true,,
-4d2b6eb8cc8cb43cc2000022,4d2b6eb7cc8cb43cc2000014,4d2b6eb8cc8cb43cc2000020,true,,
-4d2b6ec2cc8cb43cc2000035,4d2b6eb7cc8cb43cc2000018,4d2b6ec2cc8cb43cc2000034,false,,

spec/fixtures/data_conversion/invitations.csv

@@ -1,2 +0,0 @@
-mongo_id,recipient_mongo_id,sender_mongo_id,aspect_mongo_id,message
-4d2b6ebecc8cb43cc2000026,4d2b6ebccc8cb43cc2000025,4d2b6eb6cc8cb43cc2000007,4d2b6eb6cc8cb43cc2000008,Hello!

spec/fixtures/data_conversion/notifications.csv

@@ -1,3 +0,0 @@
-mongo_id,target_mongo_id,recipient_mongo_id,actor_mongo_id,action,target_type,unread
-4d2b6eb8cc8cb43cc200001f,4d2b6eb8cc8cb43cc200001e,4d2b6eb7cc8cb43cc2000018,4d2b6eb7cc8cb43cc2000017,,new_request,true
-4d2b6ec4cc8cb43cc200003b,4d2b6ec4cc8cb43cc200003a,4d2b6eb6cc8cb43cc200000b,4d2b6ec2cc8cb43cc2000034,,new_request,true

spec/fixtures/data_conversion/people.csv

@@ -1,61 +0,0 @@
-created_at,updated_at,serialized_public_key,url,mongo_id,owner_mongo_id,diaspora_handle
-1294692022000,1294692022000,"-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAKuK2doYFmBhcymlxKTII8fmFUXQtgk+NxSoJqCRWds/Uhsg/S/97Kzp
-DJjzYWWDKNRfHXnrKsQ5wgcis+rIuvVrB6uVVe2pWjVRZoDxC/4qy5TghwnBsf5O
-9/mfN1YhZLRzHCbGL5GBDwk5+emP7Re6l4hqNZRxZB5bpssoTShdAgMBAAE=
------END RSA PUBLIC KEY-----
-",http://google-1b05052.com/,4d2b6eb6cc8cb43cc2000001,,bob-person-1fe12fb@aol.com
-1294692022000,1294692022000,"-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAKuK2doYFmBhcymlxKTII8fmFUXQtgk+NxSoJqCRWds/Uhsg/S/97Kzp
-DJjzYWWDKNRfHXnrKsQ5wgcis+rIuvVrB6uVVe2pWjVRZoDxC/4qy5TghwnBsf5O
-9/mfN1YhZLRzHCbGL5GBDwk5+emP7Re6l4hqNZRxZB5bpssoTShdAgMBAAE=
------END RSA PUBLIC KEY-----
-",http://google-287b15e.com/,4d2b6eb6cc8cb43cc2000003,,bob-person-2281475@aol.com
-1294692022000,1294692022000,"-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAKuK2doYFmBhcymlxKTII8fmFUXQtgk+NxSoJqCRWds/Uhsg/S/97Kzp
-DJjzYWWDKNRfHXnrKsQ5wgcis+rIuvVrB6uVVe2pWjVRZoDxC/4qy5TghwnBsf5O
-9/mfN1YhZLRzHCbGL5GBDwk5+emP7Re6l4hqNZRxZB5bpssoTShdAgMBAAE=
------END RSA PUBLIC KEY-----
-",http://google-37bb582.com/,4d2b6eb6cc8cb43cc2000005,,bob-person-34e6e33@aol.com
-1294692022000,1294692033000,"-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBANLXsDZWFFy/SyjfTcykyCZVd5raI7G+EF+2kM3yF8UAAHf3FdinP0xv
-mB9LsL86PZMiVfKSYU/pwPaIDO/XccnMspd6KxHORX+SbB9F3HC5auiYeekqNxPu
-GqmsgBGFLjz8FZ3pbJbuu44XLf0cP1qfBqxKaDSOpwRH8bxvaUXLAgMBAAE=
------END RSA PUBLIC KEY-----
-",http://google-4e2e53f.com/,4d2b6eb6cc8cb43cc200000a,4d2b6eb6cc8cb43cc2000007,bob1d2f837@localhost
-1294692023000,1294692032000,"-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBANLXsDZWFFy/SyjfTcykyCZVd5raI7G+EF+2kM3yF8UAAHf3FdinP0xv
-mB9LsL86PZMiVfKSYU/pwPaIDO/XccnMspd6KxHORX+SbB9F3HC5auiYeekqNxPu
-GqmsgBGFLjz8FZ3pbJbuu44XLf0cP1qfBqxKaDSOpwRH8bxvaUXLAgMBAAE=
------END RSA PUBLIC KEY-----
-",http://google-57834ac.com/,4d2b6eb7cc8cb43cc200000e,4d2b6eb6cc8cb43cc200000b,bob2f66ee4@localhost
-1294692023000,1294692023000,"-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAKuK2doYFmBhcymlxKTII8fmFUXQtgk+NxSoJqCRWds/Uhsg/S/97Kzp
-DJjzYWWDKNRfHXnrKsQ5wgcis+rIuvVrB6uVVe2pWjVRZoDxC/4qy5TghwnBsf5O
-9/mfN1YhZLRzHCbGL5GBDwk5+emP7Re6l4hqNZRxZB5bpssoTShdAgMBAAE=
------END RSA PUBLIC KEY-----
-",http://google-6be752e.com/,4d2b6eb7cc8cb43cc2000011,,bob-person-46c7362@aol.com
-1294692023000,1294692034000,"-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBANLXsDZWFFy/SyjfTcykyCZVd5raI7G+EF+2kM3yF8UAAHf3FdinP0xv
-mB9LsL86PZMiVfKSYU/pwPaIDO/XccnMspd6KxHORX+SbB9F3HC5auiYeekqNxPu
-GqmsgBGFLjz8FZ3pbJbuu44XLf0cP1qfBqxKaDSOpwRH8bxvaUXLAgMBAAE=
------END RSA PUBLIC KEY-----
-",http://google-732b7c0.com/,4d2b6eb7cc8cb43cc2000017,4d2b6eb7cc8cb43cc2000014,bob3c6c46f@localhost
-1294692023000,1294692036000,"-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBANLXsDZWFFy/SyjfTcykyCZVd5raI7G+EF+2kM3yF8UAAHf3FdinP0xv
-mB9LsL86PZMiVfKSYU/pwPaIDO/XccnMspd6KxHORX+SbB9F3HC5auiYeekqNxPu
-GqmsgBGFLjz8FZ3pbJbuu44XLf0cP1qfBqxKaDSOpwRH8bxvaUXLAgMBAAE=
------END RSA PUBLIC KEY-----
-",http://google-8b1c74b.com/,4d2b6eb7cc8cb43cc200001b,4d2b6eb7cc8cb43cc2000018,bob457b189@localhost
-1294692024000,1294692024000,"-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAKuK2doYFmBhcymlxKTII8fmFUXQtgk+NxSoJqCRWds/Uhsg/S/97Kzp
-DJjzYWWDKNRfHXnrKsQ5wgcis+rIuvVrB6uVVe2pWjVRZoDxC/4qy5TghwnBsf5O
-9/mfN1YhZLRzHCbGL5GBDwk5+emP7Re6l4hqNZRxZB5bpssoTShdAgMBAAE=
------END RSA PUBLIC KEY-----
-",http://google-934e10b.com/,4d2b6eb8cc8cb43cc2000020,,bob-person-5e2a1d1@aol.com
-1294692034000,1294692036000,"-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBANLXsDZWFFy/SyjfTcykyCZVd5raI7G+EF+2kM3yF8UAAHf3FdinP0xv
-mB9LsL86PZMiVfKSYU/pwPaIDO/XccnMspd6KxHORX+SbB9F3HC5auiYeekqNxPu
-GqmsgBGFLjz8FZ3pbJbuu44XLf0cP1qfBqxKaDSOpwRH8bxvaUXLAgMBAAE=
------END RSA PUBLIC KEY-----
-",http://google-105a8ed8.com/,4d2b6ec2cc8cb43cc2000034,,bob5aa0fd5@localhost

spec/fixtures/data_conversion/post_visibilities.csv

@@ -1,9 +0,0 @@
-aspect_mongo_id,post_mongo_id
-4d2b6eb6cc8cb43cc2000008,4d2b6ebecc8cb43cc2000027
-4d2b6eb6cc8cb43cc2000008,4d2b6ebfcc8cb43cc200002d
-4d2b6eb7cc8cb43cc200000c,4d2b6ebecc8cb43cc2000027
-4d2b6eb7cc8cb43cc200000c,4d2b6ebfcc8cb43cc200002d
-4d2b6eb7cc8cb43cc2000015,4d2b6ebecc8cb43cc2000029
-4d2b6eb7cc8cb43cc2000015,4d2b6ec1cc8cb43cc200002f
-4d2b6eb7cc8cb43cc2000019,4d2b6ec2cc8cb43cc2000036
-4d2b6eb7cc8cb43cc2000019,4d2b6ec4cc8cb43cc2000037

spec/fixtures/data_conversion/posts.csv

@@ -1,7 +0,0 @@
-youtube_titles,pending,created_at,public,updated_at,status_message_mongo_id,caption,remote_photo_path,remote_photo_name,random_string,image,mongo_id,type,diaspora_handle,person_mongo_id,message
-"",false,1294692030000,false,1294692030000,,,,,,,4d2b6ebecc8cb43cc2000027,StatusMessage,bob1d2f837@localhost,4d2b6eb6cc8cb43cc200000a,User2 can see this
-"",false,1294692030000,false,1294692030000,,,,,,,4d2b6ebecc8cb43cc2000029,StatusMessage,bob3c6c46f@localhost,4d2b6eb7cc8cb43cc2000017,User3 can see this
-,false,1294692030000,false,1294692030000,4d2b6ebecc8cb43cc2000027,,,,mUKUIxkYlV,mUKUIxkYlV4d2b6ebfcc8cb43cc200002d.png,4d2b6ebfcc8cb43cc200002d,Photo,bob2f66ee4@localhost,4d2b6eb7cc8cb43cc200000e,
-,false,1294692034000,false,1294692034000,,,,,AtwSOhcrt0,AtwSOhcrt04d2b6ec1cc8cb43cc200002f.png,4d2b6ec1cc8cb43cc200002f,Photo,bob3c6c46f@localhost,4d2b6eb7cc8cb43cc2000017,
-,false,1294692036000,false,1294692036000,,,/uploads/images,3jcOyI5M444d2b6ec2cc8cb43cc2000036.png,,,4d2b6ec2cc8cb43cc2000036,Photo,bob5aa0fd5@localhost,4d2b6ec2cc8cb43cc2000034,
-"",false,1294692036000,false,1294692036000,,,,,,,4d2b6ec4cc8cb43cc2000037,StatusMessage,bob5aa0fd5@localhost,4d2b6ec2cc8cb43cc2000034,from another server!

spec/fixtures/data_conversion/profiles.csv

@@ -1,11 +0,0 @@
-image_url_medium,searchable,image_url,person_mongo_id,gender,diaspora_handle,birthday,last_name,bio,image_url_small,first_name
-,true,,4d2b6eb6cc8cb43cc2000001,,,,weinstien,,,eugene
-,true,,4d2b6eb6cc8cb43cc2000003,,,,weinstien,,,eugene
-,true,,4d2b6eb6cc8cb43cc2000005,,,,weinstien,,,eugene
-,true,,4d2b6eb6cc8cb43cc200000a,,,,Grimm12dfa3a,,,Robert1742367
-,true,,4d2b6eb7cc8cb43cc200000e,,,,Grimm2527144,,,Robert27d6c2c
-,true,,4d2b6eb7cc8cb43cc2000011,,,,weinstien,,,eugene
-,true,,4d2b6eb7cc8cb43cc2000017,,,,Grimm3089db2,,,Robert39365a5
-,true,,4d2b6eb7cc8cb43cc200001b,,,,Grimm49fb290,,,Robert405fcf8
-,true,,4d2b6eb8cc8cb43cc2000020,,,,weinstien,,,eugene
-,true,,4d2b6ec2cc8cb43cc2000034,,,,Grimm50990f2,,,Robert5501643

spec/fixtures/data_conversion/requests.csv

@@ -1,3 +0,0 @@
-mongo_id,recipient_mongo_id,sender_mongo_id,aspect_mongo_id
-4d2b6eb8cc8cb43cc200001e,4d2b6eb7cc8cb43cc200001b,4d2b6eb7cc8cb43cc2000017,
-4d2b6ec4cc8cb43cc200003a,4d2b6eb7cc8cb43cc200000e,4d2b6ec2cc8cb43cc2000034,

spec/fixtures/data_conversion/services.csv

@@ -1,3 +0,0 @@
-mongo_id,type,user_mongo_id,provider,uid,access_token,access_secret,nickname
-4d2b6ec4cc8cb43cc200003e,Services::Facebook,4d2b6eb7cc8cb43cc2000014,,,yeah,,
-4d2b6ec4cc8cb43cc200003f,Services::Twitter,4d2b6eb6cc8cb43cc200000b,,,yeah,foobar,

spec/fixtures/data_conversion/users.csv

@@ -1,169 +0,0 @@
-mongo_id,email,username,serialized_private_key,encrypted_password,invites,invitation_token,invitation_sent_at,getting_started,disable_mail,language,last_sign_in_ip,last_sign_in_at,reset_password_token,password_salt
-4d2b6eb6cc8cb43cc2000007,bob1a25dee@pivotallabs.com,bob1d2f837,"-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDS17A2VhRcv0so303MpMgmVXea2iOxvhBftpDN8hfFAAB39xXY
-pz9Mb5gfS7C/Oj2TIlXykmFP6cD2iAzv13HJzLKXeisRzkV/kmwfRdxwuWromHnp
-KjcT7hqprIARhS48/BWd6WyW7ruOFy39HD9anwasSmg0jqcER/G8b2lFywIDAQAB
-AoGALGz4GyreFYDVJGKQ8QrThYhCsGVAWiZTKue78TkOmxrZ/m0YtFLhOojVA9sd
-/d0WtlboxzjiukTlvMyD9VFvDxVZMIS1/bSqVjTCKAetN3q2LPEfFwaHi3Uj+D66
-ulZYaf9VOd0wXREsKQB8Ri0uzlT+zTydbtr6Dnky14IfhuECQQDvGXktxLP9ywSz
-avTpNHhwj0Q8aBHSJU7Ms8MCzAHATzjjxZfJCZz5xuocyrpGT18zmmQ6XJS7s8fM
-WG5ykmUxAkEA4b7nDh6AxBzFAV5TdxZwThee9ZsndN4tYQmDyI1aCI9xG1lKIxbL
-4N/DRyHv7CWkVCxM5L7Kn0QcqnCsYxRLuwJAMCLGvKofOncG6UAdMl336WFOcYLa
-I56TMK74EbYUnCzW3TRIjJa83aRoOYeu3LzaA7+Pchh1cRyOmtsq0TIb4QJAQJ6s
-9VW19m1l12Zw7f32V+RbFGM9gC65PrXCi34q75hgADwnBLRZ2B01gP8t9qMvzwh/
-WltjFQQiUIfAUPxWUQJBAMyoY38x2AP7WclMtNELAF2lUJ270uq3cxlzrGy9wJP9
-bf3qTUrqURMKgZezWW3iZke1h3vW+regHB2RBgdGmwk=
------END RSA PRIVATE KEY-----
-",$2a$10$n1LF9/RgYmytvu5GYGj/Q.XhoquuQv55tdU6NrFSSxyeJabZbvk1y,4,,,true,false,en,,,,$2a$10$n1LF9/RgYmytvu5GYGj/Q.
-4d2b6eb6cc8cb43cc200000b,bob21f51ad@pivotallabs.com,bob2f66ee4,"-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDS17A2VhRcv0so303MpMgmVXea2iOxvhBftpDN8hfFAAB39xXY
-pz9Mb5gfS7C/Oj2TIlXykmFP6cD2iAzv13HJzLKXeisRzkV/kmwfRdxwuWromHnp
-KjcT7hqprIARhS48/BWd6WyW7ruOFy39HD9anwasSmg0jqcER/G8b2lFywIDAQAB
-AoGALGz4GyreFYDVJGKQ8QrThYhCsGVAWiZTKue78TkOmxrZ/m0YtFLhOojVA9sd
-/d0WtlboxzjiukTlvMyD9VFvDxVZMIS1/bSqVjTCKAetN3q2LPEfFwaHi3Uj+D66
-ulZYaf9VOd0wXREsKQB8Ri0uzlT+zTydbtr6Dnky14IfhuECQQDvGXktxLP9ywSz
-avTpNHhwj0Q8aBHSJU7Ms8MCzAHATzjjxZfJCZz5xuocyrpGT18zmmQ6XJS7s8fM
-WG5ykmUxAkEA4b7nDh6AxBzFAV5TdxZwThee9ZsndN4tYQmDyI1aCI9xG1lKIxbL
-4N/DRyHv7CWkVCxM5L7Kn0QcqnCsYxRLuwJAMCLGvKofOncG6UAdMl336WFOcYLa
-I56TMK74EbYUnCzW3TRIjJa83aRoOYeu3LzaA7+Pchh1cRyOmtsq0TIb4QJAQJ6s
-9VW19m1l12Zw7f32V+RbFGM9gC65PrXCi34q75hgADwnBLRZ2B01gP8t9qMvzwh/
-WltjFQQiUIfAUPxWUQJBAMyoY38x2AP7WclMtNELAF2lUJ270uq3cxlzrGy9wJP9
-bf3qTUrqURMKgZezWW3iZke1h3vW+regHB2RBgdGmwk=
------END RSA PRIVATE KEY-----
-",$2a$10$zq/w8.JTL9VxSlwjFI/Pe.ffWpzmmmRhJ9GXPS48KBTQar5l5CIQi,5,,,true,false,en,,,,$2a$10$zq/w8.JTL9VxSlwjFI/Pe.
-4d2b6eb7cc8cb43cc2000014,bob3a2252c@pivotallabs.com,bob3c6c46f,"-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDS17A2VhRcv0so303MpMgmVXea2iOxvhBftpDN8hfFAAB39xXY
-pz9Mb5gfS7C/Oj2TIlXykmFP6cD2iAzv13HJzLKXeisRzkV/kmwfRdxwuWromHnp
-KjcT7hqprIARhS48/BWd6WyW7ruOFy39HD9anwasSmg0jqcER/G8b2lFywIDAQAB
-AoGALGz4GyreFYDVJGKQ8QrThYhCsGVAWiZTKue78TkOmxrZ/m0YtFLhOojVA9sd
-/d0WtlboxzjiukTlvMyD9VFvDxVZMIS1/bSqVjTCKAetN3q2LPEfFwaHi3Uj+D66
-ulZYaf9VOd0wXREsKQB8Ri0uzlT+zTydbtr6Dnky14IfhuECQQDvGXktxLP9ywSz
-avTpNHhwj0Q8aBHSJU7Ms8MCzAHATzjjxZfJCZz5xuocyrpGT18zmmQ6XJS7s8fM
-WG5ykmUxAkEA4b7nDh6AxBzFAV5TdxZwThee9ZsndN4tYQmDyI1aCI9xG1lKIxbL
-4N/DRyHv7CWkVCxM5L7Kn0QcqnCsYxRLuwJAMCLGvKofOncG6UAdMl336WFOcYLa
-I56TMK74EbYUnCzW3TRIjJa83aRoOYeu3LzaA7+Pchh1cRyOmtsq0TIb4QJAQJ6s
-9VW19m1l12Zw7f32V+RbFGM9gC65PrXCi34q75hgADwnBLRZ2B01gP8t9qMvzwh/
-WltjFQQiUIfAUPxWUQJBAMyoY38x2AP7WclMtNELAF2lUJ270uq3cxlzrGy9wJP9
-bf3qTUrqURMKgZezWW3iZke1h3vW+regHB2RBgdGmwk=
------END RSA PRIVATE KEY-----
-",$2a$10$qGnZ/GODnmZVukDf9UC49uNgmYk9hRrtomisb0GTs559E1yxMQgvu,5,,,true,false,en,,,,$2a$10$qGnZ/GODnmZVukDf9UC49u
-4d2b6eb7cc8cb43cc2000018,bob438d5bc@pivotallabs.com,bob457b189,"-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDS17A2VhRcv0so303MpMgmVXea2iOxvhBftpDN8hfFAAB39xXY
-pz9Mb5gfS7C/Oj2TIlXykmFP6cD2iAzv13HJzLKXeisRzkV/kmwfRdxwuWromHnp
-KjcT7hqprIARhS48/BWd6WyW7ruOFy39HD9anwasSmg0jqcER/G8b2lFywIDAQAB
-AoGALGz4GyreFYDVJGKQ8QrThYhCsGVAWiZTKue78TkOmxrZ/m0YtFLhOojVA9sd
-/d0WtlboxzjiukTlvMyD9VFvDxVZMIS1/bSqVjTCKAetN3q2LPEfFwaHi3Uj+D66
-ulZYaf9VOd0wXREsKQB8Ri0uzlT+zTydbtr6Dnky14IfhuECQQDvGXktxLP9ywSz
-avTpNHhwj0Q8aBHSJU7Ms8MCzAHATzjjxZfJCZz5xuocyrpGT18zmmQ6XJS7s8fM
-WG5ykmUxAkEA4b7nDh6AxBzFAV5TdxZwThee9ZsndN4tYQmDyI1aCI9xG1lKIxbL
-4N/DRyHv7CWkVCxM5L7Kn0QcqnCsYxRLuwJAMCLGvKofOncG6UAdMl336WFOcYLa
-I56TMK74EbYUnCzW3TRIjJa83aRoOYeu3LzaA7+Pchh1cRyOmtsq0TIb4QJAQJ6s
-9VW19m1l12Zw7f32V+RbFGM9gC65PrXCi34q75hgADwnBLRZ2B01gP8t9qMvzwh/
-WltjFQQiUIfAUPxWUQJBAMyoY38x2AP7WclMtNELAF2lUJ270uq3cxlzrGy9wJP9
-bf3qTUrqURMKgZezWW3iZke1h3vW+regHB2RBgdGmwk=
------END RSA PRIVATE KEY-----
-",$2a$10$35yqJfo2RHCZIDrkNSWvYebxt7Ac5HULdn0ZVNS/4onPqEWmdsDKm,5,,,true,false,en,,,,$2a$10$35yqJfo2RHCZIDrkNSWvYe
-4d2b6eb8cc8cb43cc2000024,random@example.com,,"-----BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
-","",3,wY567RLhNsA8pp4SnnFa,1294617600000,true,false,en,,,,""
-4d2b6ebccc8cb43cc2000025,random2@example.net,,"-----BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
-","",5,aA1hEEz6V7btITaZUJKT,1294617600000,true,false,en,,,,""

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" : {

spec/lib/diaspora/shareable_spec.rb

@@ -2,22 +2,6 @@ require "spec_helper"
 
 describe Diaspora::Shareable do
   describe "scopes" do
-    describe ".all_public" do
-      it "includes all public posts" do
-        post1 = FactoryGirl.create(:status_message, author: alice.person, public: true)
-        post2 = FactoryGirl.create(:status_message, author: bob.person, public: true)
-        post3 = FactoryGirl.create(:status_message, author: eve.person, public: true)
-        expect(Post.all_public.map(&:id)).to match_array([post1.id, post2.id, post3.id])
-      end
-
-      it "doesn't include any private posts" do
-        FactoryGirl.create(:status_message, author: alice.person, public: false)
-        FactoryGirl.create(:status_message, author: bob.person, public: false)
-        FactoryGirl.create(:status_message, author: eve.person, public: false)
-        expect(Post.all_public.map(&:id)).to eq([])
-      end
-    end
-
     context "having multiple objects with equal db IDs" do
       before do
         # Determine the next database key ID, free on both Photo and StatusMessage

spec/models/photo_spec.rb

@@ -256,6 +256,11 @@ describe Photo, :type => :model do
         expect(@user).to receive(:photos_from).with(@user.person, limit: :all, max_time: nil).and_call_original
         Photo.visible(@user, @user.person)
       end
+
+      it "does not contain pending photos" do
+        pending_photo = @user.post(:photo, pending: true, user_file: File.open(photo_fixture_name), to: @aspect)
+        expect(Photo.visible(@user, @user.person).ids).not_to include(pending_photo.id)
+      end
     end
 
     context "without a current user" do

spec/models/post_spec.rb

@@ -42,6 +42,21 @@ describe Post, :type => :model do
       end
     end
 
+    describe ".all_public" do
+      it "includes all public posts" do
+        post1 = FactoryGirl.create(:status_message, author: alice.person, public: true)
+        post2 = FactoryGirl.create(:status_message, author: bob.person, public: true)
+        post3 = FactoryGirl.create(:status_message, author: eve.person, public: true)
+        expect(Post.all_public.ids).to match_array([post1.id, post2.id, post3.id])
+      end
+
+      it "doesn't include any private posts" do
+        FactoryGirl.create(:status_message, author: alice.person, public: false)
+        FactoryGirl.create(:status_message, author: bob.person, public: false)
+        FactoryGirl.create(:status_message, author: eve.person, public: false)
+        expect(Post.all_public.ids).to eq([])
+      end
+    end
 
     describe '.for_a_stream' do
       it 'calls #for_visible_shareable_sql' do

spec/models/user/querying_spec.rb

@@ -45,22 +45,11 @@ describe User::Querying, :type => :model do
       expect(alice.visible_shareable_ids(Post)).not_to include(invisible_post.id)
     end
 
-    it "does not contain pending posts" do
-      pending_post = bob.post(:status_message, :text => "hey", :public => true, :to => @bobs_aspect.id, :pending => true)
-      expect(pending_post).to be_pending
-      expect(alice.visible_shareable_ids(Post)).not_to include pending_post.id
-    end
-
-    it "does not contain pending photos" do
-      pending_photo = bob.post(:photo, :pending => true, :user_file=> File.open(photo_fixture_name), :to => @bobs_aspect)
-      expect(alice.visible_shareable_ids(Photo)).not_to include pending_photo.id
-    end
-
     it "respects the :type option" do
-      post = bob.post(:status_message, :text => "hey", :public => true, :to => @bobs_aspect.id, :pending => false)
-      reshare = bob.post(:reshare, :pending => false, :root_guid => post.guid, :to => @bobs_aspect)
-      expect(alice.visible_shareable_ids(Post, :type => "Reshare")).to include(reshare.id)
-      expect(alice.visible_shareable_ids(Post, :type => 'StatusMessage')).not_to include(reshare.id)
+      post = bob.post(:status_message, text: "hey", public: true, to: @bobs_aspect.id)
+      reshare = bob.post(:reshare, root_guid: post.guid, to: @bobs_aspect)
+      expect(alice.visible_shareable_ids(Post, type: "Reshare")).to include(reshare.id)
+      expect(alice.visible_shareable_ids(Post, type: "StatusMessage")).not_to include(reshare.id)
     end
 
     it "does not contain duplicate posts" do

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}) }