Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove dependency on OStatus2 gem #12822

Merged
merged 1 commit into from Jan 11, 2020
Merged

Remove dependency on OStatus2 gem #12822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion Gemfile
View file
Open in desktop
Expand Up @@ -68,7 +68,6 @@ gem 'nilsimsa', git: 'https://github.com/witgo/nilsimsa', ref: 'fd184883048b922b
gem 'nokogiri', '~> 1.10'
gem 'nsa', '~> 0.2'
gem 'oj', '~> 3.10'
gem 'ostatus2', '~> 2.0'
gem 'ox', '~> 2.11'
gem 'parslet'
gem 'parallel', '~> 1.19'
Expand Down
4 changes: 0 additions & 4 deletions Gemfile.lock
View file
Open in desktop
Expand Up @@ -409,10 +409,6 @@ GEM
omniauth (~> 1.3, >= 1.3.2)
ruby-saml (~> 1.7)
orm_adapter (0.5.0)
ostatus2 (2.0.3)
addressable (~> 2.5)
http (~> 3.0)
nokogiri (~> 1.8)
ox (2.11.0)
paperclip (6.0.0)
activemodel (>= 4.2.0)
Expand Down
4 changes: 0 additions & 4 deletions app/models/account.rb
View file
Open in desktop
Expand Up @@ -314,10 +314,6 @@ def build_fields
self.fields = tmp
end

def subscription(webhook_url)
@subscription ||= OStatus2::Subscription.new(remote_url, secret: secret, webhook: webhook_url, hub: hub_url)
end

def save_with_optional_media!
save!
rescue ActiveRecord::RecordInvalid
Expand Down
7 changes: 0 additions & 7 deletions spec/models/account_spec.rb
View file
Open in desktop
Expand Up @@ -215,13 +215,6 @@
end
end

describe '#subscription' do
it 'returns an OStatus subscription' do
account = Fabricate(:account)
expect(account.subscription('')).to be_instance_of OStatus2::Subscription
end
end

describe '#object_type' do
it 'is always a person' do
account = Fabricate(:account)
Expand Down