diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-07-19 17:06:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-19 17:06:46 +0200 |
| commit | bbdcfd6baf8da01098eb377c3d3579b23ae54d80 (patch) | |
| tree | a67dc304f49b5fd72d3deffa3066419ef25a17cd /app | |
| parent | f0d6550f1628b828268369b3ffcc352bab127012 (diff) | |
Add ActivityPub attributes to accounts (#4273)
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/account.rb | 7 | ||||
| -rw-r--r-- | app/services/send_interaction_service.rb | 2 | ||||
| -rw-r--r-- | app/services/subscribe_service.rb | 2 | ||||
| -rw-r--r-- | app/services/unsubscribe_service.rb | 2 |
4 files changed, 12 insertions, 1 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 58b0a1086..82c9b58d5 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -36,6 +36,11 @@ # followers_count :integer default(0), not null # following_count :integer default(0), not null # last_webfingered_at :datetime +# inbox_url :string default(""), not null +# outbox_url :string default(""), not null +# shared_inbox_url :string default(""), not null +# followers_url :string default(""), not null +# protocol :integer default("ostatus"), not null # class Account < ApplicationRecord @@ -49,6 +54,8 @@ class Account < ApplicationRecord include Remotable include EmojiHelper + enum protocol: [:ostatus, :activitypub] + # Local users has_one :user, inverse_of: :account diff --git a/app/services/send_interaction_service.rb b/app/services/send_interaction_service.rb index ef38a748b..ab0d3aeed 100644 --- a/app/services/send_interaction_service.rb +++ b/app/services/send_interaction_service.rb @@ -10,7 +10,7 @@ class SendInteractionService < BaseService @source_account = source_account @target_account = target_account - return if block_notification? + return if !target_account.ostatus? || block_notification? delivery = build_request.perform diff --git a/app/services/subscribe_service.rb b/app/services/subscribe_service.rb index f58067038..c1c0a4c8b 100644 --- a/app/services/subscribe_service.rb +++ b/app/services/subscribe_service.rb @@ -2,6 +2,8 @@ class SubscribeService < BaseService def call(account) + return unless account.ostatus? + @account = account @account.secret = SecureRandom.hex @response = build_request.perform diff --git a/app/services/unsubscribe_service.rb b/app/services/unsubscribe_service.rb index c2f022d7d..c5e0e73fe 100644 --- a/app/services/unsubscribe_service.rb +++ b/app/services/unsubscribe_service.rb @@ -2,6 +2,8 @@ class UnsubscribeService < BaseService def call(account) + return unless account.ostatus? + @account = account @response = build_request.perform |