~cytrogen/masto-fe

90ec88d58b1342d812810fd91b8e6c3ee84d5a4e — Claire 2 years ago fc5ab2d
Add support for `indexable` attribute on remote actors (#26485)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
M app/helpers/context_helper.rb => app/helpers/context_helper.rb +1 -0
@@ 20,6 20,7 @@ module ContextHelper
    focal_point: { 'toot' => 'http://joinmastodon.org/ns#', 'focalPoint' => { '@container' => '@list', '@id' => 'toot:focalPoint' } },
    blurhash: { 'toot' => 'http://joinmastodon.org/ns#', 'blurhash' => 'toot:blurhash' },
    discoverable: { 'toot' => 'http://joinmastodon.org/ns#', 'discoverable' => 'toot:discoverable' },
    indexable: { 'toot' => 'http://joinmastodon.org/ns#', 'indexable' => 'toot:indexable' },
    voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' },
    olm: {
      'toot' => 'http://joinmastodon.org/ns#', 'Device' => 'toot:Device', 'Ed25519Signature' => 'toot:Ed25519Signature', 'Ed25519Key' => 'toot:Ed25519Key', 'Curve25519Key' => 'toot:Curve25519Key', 'EncryptedMessage' => 'toot:EncryptedMessage', 'publicKeyBase64' => 'toot:publicKeyBase64', 'deviceId' => 'toot:deviceId',

M app/models/account.rb => app/models/account.rb +1 -0
@@ 50,6 50,7 @@
#  trendable                     :boolean
#  reviewed_at                   :datetime
#  requested_review_at           :datetime
#  indexable                     :boolean          default(FALSE), not null
#

class Account < ApplicationRecord

M app/services/activitypub/process_account_service.rb => app/services/activitypub/process_account_service.rb +1 -0
@@ 115,6 115,7 @@ class ActivityPub::ProcessAccountService < BaseService
    @account.fields                  = property_values || {}
    @account.also_known_as           = as_array(@json['alsoKnownAs'] || []).map { |item| value_or_id(item) }
    @account.discoverable            = @json['discoverable'] || false
    @account.indexable               = @json['indexable'] || false
  end

  def set_fetchable_key!

A db/migrate/20230814223300_add_indexable_to_accounts.rb => db/migrate/20230814223300_add_indexable_to_accounts.rb +17 -0
@@ 0,0 1,17 @@
# frozen_string_literal: true

require Rails.root.join('lib', 'mastodon', 'migration_helpers')

class AddIndexableToAccounts < ActiveRecord::Migration[7.0]
  include Mastodon::MigrationHelpers

  disable_ddl_transaction!

  def up
    safety_assured { add_column_with_default :accounts, :indexable, :boolean, default: false, allow_null: false }
  end

  def down
    remove_column :accounts, :indexable
  end
end

M db/schema.rb => db/schema.rb +2 -1
@@ 10,7 10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema[7.0].define(version: 2023_08_11_103651) do
ActiveRecord::Schema[7.0].define(version: 2023_08_14_223300) do
  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"



@@ 185,6 185,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_08_11_103651) do
    t.boolean "trendable"
    t.datetime "reviewed_at", precision: nil
    t.datetime "requested_review_at", precision: nil
    t.boolean "indexable", default: false, null: false
    t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
    t.index "lower((username)::text), COALESCE(lower((domain)::text), ''::text)", name: "index_accounts_on_username_and_domain_lower", unique: true
    t.index ["domain", "id"], name: "index_accounts_on_domain_and_id"