diff options
| -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 | ||||
| -rw-r--r-- | db/migrate/20170718211102_add_activitypub_to_accounts.rb | 9 | ||||
| -rw-r--r-- | db/schema.rb | 7 |
6 files changed, 27 insertions, 2 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 diff --git a/db/migrate/20170718211102_add_activitypub_to_accounts.rb b/db/migrate/20170718211102_add_activitypub_to_accounts.rb new file mode 100644 index 000000000..c08e38bb9 --- /dev/null +++ b/db/migrate/20170718211102_add_activitypub_to_accounts.rb @@ -0,0 +1,9 @@ +class AddActivityPubToAccounts < ActiveRecord::Migration[5.1] + def change + add_column :accounts, :inbox_url, :string, null: false, default: '' + add_column :accounts, :outbox_url, :string, null: false, default: '' + add_column :accounts, :shared_inbox_url, :string, null: false, default: '' + add_column :accounts, :followers_url, :string, null: false, default: '' + add_column :accounts, :protocol, :integer, null: false, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 5ec78a7c9..cf7b0722f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170714184731) do +ActiveRecord::Schema.define(version: 20170718211102) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -56,6 +56,11 @@ ActiveRecord::Schema.define(version: 20170714184731) do t.integer "followers_count", default: 0, null: false t.integer "following_count", default: 0, null: false t.datetime "last_webfingered_at" + t.string "inbox_url", default: "", null: false + t.string "outbox_url", default: "", null: false + t.string "shared_inbox_url", default: "", null: false + t.string "followers_url", default: "", null: false + t.integer "protocol", default: 0, 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), lower((domain)::text)", name: "index_accounts_on_username_and_domain_lower" t.index ["uri"], name: "index_accounts_on_uri" |