Add support for indexable attribute on remote actors (#26485)
				
					
				
			Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
This commit is contained in:
		
							parent
							
								
									738b024d0c
								
							
						
					
					
						commit
						3c50a91087
					
				
					 5 changed files with 22 additions and 1 deletions
				
			
		|  | @ -20,6 +20,7 @@ module ContextHelper | ||||||
|     focal_point: { 'toot' => 'http://joinmastodon.org/ns#', 'focalPoint' => { '@container' => '@list', '@id' => 'toot:focalPoint' } }, |     focal_point: { 'toot' => 'http://joinmastodon.org/ns#', 'focalPoint' => { '@container' => '@list', '@id' => 'toot:focalPoint' } }, | ||||||
|     blurhash: { 'toot' => 'http://joinmastodon.org/ns#', 'blurhash' => 'toot:blurhash' }, |     blurhash: { 'toot' => 'http://joinmastodon.org/ns#', 'blurhash' => 'toot:blurhash' }, | ||||||
|     discoverable: { 'toot' => 'http://joinmastodon.org/ns#', 'discoverable' => 'toot:discoverable' }, |     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' }, |     voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' }, | ||||||
|     olm: { |     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', |       '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', | ||||||
|  |  | ||||||
|  | @ -50,6 +50,7 @@ | ||||||
| #  trendable                     :boolean | #  trendable                     :boolean | ||||||
| #  reviewed_at                   :datetime | #  reviewed_at                   :datetime | ||||||
| #  requested_review_at           :datetime | #  requested_review_at           :datetime | ||||||
|  | #  indexable                     :boolean          default(FALSE), not null | ||||||
| # | # | ||||||
| 
 | 
 | ||||||
| class Account < ApplicationRecord | class Account < ApplicationRecord | ||||||
|  |  | ||||||
|  | @ -115,6 +115,7 @@ class ActivityPub::ProcessAccountService < BaseService | ||||||
|     @account.fields                  = property_values || {} |     @account.fields                  = property_values || {} | ||||||
|     @account.also_known_as           = as_array(@json['alsoKnownAs'] || []).map { |item| value_or_id(item) } |     @account.also_known_as           = as_array(@json['alsoKnownAs'] || []).map { |item| value_or_id(item) } | ||||||
|     @account.discoverable            = @json['discoverable'] || false |     @account.discoverable            = @json['discoverable'] || false | ||||||
|  |     @account.indexable               = @json['indexable'] || false | ||||||
|   end |   end | ||||||
| 
 | 
 | ||||||
|   def set_fetchable_key! |   def set_fetchable_key! | ||||||
|  |  | ||||||
							
								
								
									
										17
									
								
								db/migrate/20230814223300_add_indexable_to_accounts.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								db/migrate/20230814223300_add_indexable_to_accounts.rb
									
									
									
									
									
										Normal file
									
								
							|  | @ -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 | ||||||
|  | @ -10,7 +10,7 @@ | ||||||
| # | # | ||||||
| # It's strongly recommended that you check this file into your version control system. | # 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 |   # These are extensions that must be enabled in order to support this database | ||||||
|   enable_extension "plpgsql" |   enable_extension "plpgsql" | ||||||
| 
 | 
 | ||||||
|  | @ -185,6 +185,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_08_11_103651) do | ||||||
|     t.boolean "trendable" |     t.boolean "trendable" | ||||||
|     t.datetime "reviewed_at", precision: nil |     t.datetime "reviewed_at", precision: nil | ||||||
|     t.datetime "requested_review_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 "(((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 "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" |     t.index ["domain", "id"], name: "index_accounts_on_domain_and_id" | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue