diff --git a/app/lib/activitypub/activity/block.rb b/app/lib/activitypub/activity/block.rb
index f630d5db2a2534cf94c945a50491a025c24199dd..26da8bdf5c46edf16b53b2946d19b137d3cd90fe 100644
--- a/app/lib/activitypub/activity/block.rb
+++ b/app/lib/activitypub/activity/block.rb
@@ -7,6 +7,6 @@ class ActivityPub::Activity::Block < ActivityPub::Activity
return if target_account.nil? || !target_account.local? || delete_arrived_first?(@json['id']) || @account.blocking?(target_account)
UnfollowService.new.call(target_account, @account) if target_account.following?(@account)
- @account.block!(target_account)
+ @account.block!(target_account, uri: @json['id'])
end
end
diff --git a/app/lib/activitypub/activity/follow.rb b/app/lib/activitypub/activity/follow.rb
index 8adbbb9c33c7c74fcdbf6ce90cedeb4b58e3ad16..fbbf358a87e371dfa69a6df3571c7dc98d0aa8a5 100644
--- a/app/lib/activitypub/activity/follow.rb
+++ b/app/lib/activitypub/activity/follow.rb
@@ -12,7 +12,7 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity
return
end
- follow_request = FollowRequest.create!(account: @account, target_account: target_account)
+ follow_request = FollowRequest.create!(account: @account, target_account: target_account, uri: @json['id'])
if target_account.locked?
NotifyService.new.call(target_account, follow_request)
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
index fa2a8f7d31e342c990aa1e4a683c918e720ca3dc..908ea963917ecb0f98f9e8a36a31265055ecb2c5 100644
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@@ -38,6 +38,10 @@ class ActivityPub::TagManager
end
end
+ def generate_uri_for(_target)
+ URI.join(root_url, 'payloads', SecureRandom.uuid)
+ end
+
def activity_uri_for(target)
raise ArgumentError, 'target must be a local activity' unless %i(note comment activity).include?(target.object_type) && target.local?
diff --git a/app/models/block.rb b/app/models/block.rb
index df4a6bbacb13bce740a867695d5938d5d3ff21b1..bf3e07600339488b8da6a19b21a51701aec6908d 100644
--- a/app/models/block.rb
+++ b/app/models/block.rb
@@ -8,6 +8,7 @@
# updated_at :datetime not null
# account_id :bigint(8) not null
# target_account_id :bigint(8) not null
+# uri :string
#
class Block < ApplicationRecord
@@ -19,7 +20,12 @@ class Block < ApplicationRecord
validates :account_id, uniqueness: { scope: :target_account_id }
+ def local?
+ false # Force uri_for to use uri attribute
+ end
+
after_commit :remove_blocking_cache
+ before_validation :set_uri, only: :create
private
@@ -27,4 +33,8 @@ class Block < ApplicationRecord
Rails.cache.delete("exclude_account_ids_for:#{account_id}")
Rails.cache.delete("exclude_account_ids_for:#{target_account_id}")
end
+
+ def set_uri
+ self.uri = ActivityPub::TagManager.instance.generate_uri_for(self) if uri.nil?
+ end
end
diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb
index 4a01eed654ea37786cf86ed751fe4adab1de1136..ae43711beac8f2afe24394ff77b43550308d1389 100644
--- a/app/models/concerns/account_interactions.rb
+++ b/app/models/concerns/account_interactions.rb
@@ -82,16 +82,19 @@ module AccountInteractions
has_many :domain_blocks, class_name: 'AccountDomainBlock', dependent: :destroy
end
- def follow!(other_account, reblogs: nil)
+ def follow!(other_account, reblogs: nil, uri: nil)
reblogs = true if reblogs.nil?
- rel = active_relationships.create_with(show_reblogs: reblogs).find_or_create_by!(target_account: other_account)
- rel.update!(show_reblogs: reblogs)
+ rel = active_relationships.create_with(show_reblogs: reblogs, uri: uri)
+ .find_or_create_by!(target_account: other_account)
+
+ rel.update!(show_reblogs: reblogs)
rel
end
- def block!(other_account)
- block_relationships.find_or_create_by!(target_account: other_account)
+ def block!(other_account, uri: nil)
+ block_relationships.create_with(uri: uri)
+ .find_or_create_by!(target_account: other_account)
end
def mute!(other_account, notifications: nil)
diff --git a/app/models/follow.rb b/app/models/follow.rb
index 2ca42ff70b721dbb020de2901c5392eec18572bb..eaf8445f3bfb0c9243c6b1ebb4321e1bfc7bc8a5 100644
--- a/app/models/follow.rb
+++ b/app/models/follow.rb
@@ -9,6 +9,7 @@
# account_id :bigint(8) not null
# target_account_id :bigint(8) not null
# show_reblogs :boolean default(TRUE), not null
+# uri :string
#
class Follow < ApplicationRecord
@@ -26,4 +27,16 @@ class Follow < ApplicationRecord
validates :account_id, uniqueness: { scope: :target_account_id }
scope :recent, -> { reorder(id: :desc) }
+
+ def local?
+ false # Force uri_for to use uri attribute
+ end
+
+ before_validation :set_uri, only: :create
+
+ private
+
+ def set_uri
+ self.uri = ActivityPub::TagManager.instance.generate_uri_for(self) if uri.nil?
+ end
end
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index d559a8f62f96683b791eef3cfd5e01c01421d5f2..9c4875564b29a6d6293d6534b5aa74c2c9e6e8ed 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -9,6 +9,7 @@
# account_id :bigint(8) not null
# target_account_id :bigint(8) not null
# show_reblogs :boolean default(TRUE), not null
+# uri :string
#
class FollowRequest < ApplicationRecord
@@ -23,11 +24,22 @@ class FollowRequest < ApplicationRecord
validates :account_id, uniqueness: { scope: :target_account_id }
def authorize!
- account.follow!(target_account, reblogs: show_reblogs)
+ account.follow!(target_account, reblogs: show_reblogs, uri: uri)
MergeWorker.perform_async(target_account.id, account.id)
-
destroy!
end
alias reject! destroy!
+
+ def local?
+ false # Force uri_for to use uri attribute
+ end
+
+ before_validation :set_uri, only: :create
+
+ private
+
+ def set_uri
+ self.uri = ActivityPub::TagManager.instance.generate_uri_for(self) if uri.nil?
+ end
end
diff --git a/app/serializers/activitypub/follow_serializer.rb b/app/serializers/activitypub/follow_serializer.rb
index 86c9992fe32684a3b58907fb097c2a10192a61b1..24dfe96f897e7850beebf570f46cd9f0c9ed901f 100644
--- a/app/serializers/activitypub/follow_serializer.rb
+++ b/app/serializers/activitypub/follow_serializer.rb
@@ -5,7 +5,7 @@ class ActivityPub::FollowSerializer < ActiveModel::Serializer
attribute :virtual_object, key: :object
def id
- [ActivityPub::TagManager.instance.uri_for(object.account), '#follows/', object.id].join
+ ActivityPub::TagManager.instance.uri_for(object)
end
def type
diff --git a/db/migrate/20180416210259_add_uri_to_relationships.rb b/db/migrate/20180416210259_add_uri_to_relationships.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d8eaca450b521943eda80ff1e608e798b9cb0eb7
--- /dev/null
+++ b/db/migrate/20180416210259_add_uri_to_relationships.rb
@@ -0,0 +1,7 @@
+class AddUriToRelationships < ActiveRecord::Migration[5.2]
+ def change
+ add_column :follows, :uri, :string
+ add_column :follow_requests, :uri, :string
+ add_column :blocks, :uri, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 10a8f2edc5d22f23f2a24f80db05d3a8411aaac2..566a320d87a0fe077ee7862822e3786327f6c5f2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,10 +10,9 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2018_04_10_204633) do
+ActiveRecord::Schema.define(version: 2018_04_16_210259) do
# These are extensions that must be enabled in order to support this database
- enable_extension "pg_stat_statements"
enable_extension "plpgsql"
create_table "account_domain_blocks", force: :cascade do |t|
@@ -112,6 +111,7 @@ ActiveRecord::Schema.define(version: 2018_04_10_204633) do
t.datetime "updated_at", null: false
t.bigint "account_id", null: false
t.bigint "target_account_id", null: false
+ t.string "uri"
t.index ["account_id", "target_account_id"], name: "index_blocks_on_account_id_and_target_account_id", unique: true
end
@@ -176,6 +176,7 @@ ActiveRecord::Schema.define(version: 2018_04_10_204633) do
t.bigint "account_id", null: false
t.bigint "target_account_id", null: false
t.boolean "show_reblogs", default: true, null: false
+ t.string "uri"
t.index ["account_id", "target_account_id"], name: "index_follow_requests_on_account_id_and_target_account_id", unique: true
end
@@ -185,6 +186,7 @@ ActiveRecord::Schema.define(version: 2018_04_10_204633) do
t.bigint "account_id", null: false
t.bigint "target_account_id", null: false
t.boolean "show_reblogs", default: true, null: false
+ t.string "uri"
t.index ["account_id", "target_account_id"], name: "index_follows_on_account_id_and_target_account_id", unique: true
end
diff --git a/spec/models/follow_request_spec.rb b/spec/models/follow_request_spec.rb
index 59893a14fa7862dde99f024fa2b755070c5c7280..2cf28b263cd58e97d08854e8edb73140bce12519 100644
--- a/spec/models/follow_request_spec.rb
+++ b/spec/models/follow_request_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe FollowRequest, type: :model do
let(:target_account) { Fabricate(:account) }
it 'calls Account#follow!, MergeWorker.perform_async, and #destroy!' do
- expect(account).to receive(:follow!).with(target_account, reblogs: true)
+ expect(account).to receive(:follow!).with(target_account, reblogs: true, uri: follow_request.uri)
expect(MergeWorker).to receive(:perform_async).with(target_account.id, account.id)
expect(follow_request).to receive(:destroy!)
follow_request.authorize!