Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js

7 files changed, 73 insertions, 7 deletions

diff --git a/spec/controllers/concerns/localized_spec.rb b/spec/controllers/concerns/localized_spec.rb
index 8c80b7d2a..76c3de118 100644
--- a/spec/controllers/concerns/localized_spec.rb
+++ b/spec/controllers/concerns/localized_spec.rb
@@ -28,7 +28,7 @@ describe ApplicationController, type: :controller do
       expect(I18n.locale).to eq :fa
     end
 
-    it 'sets available and compatible langauge if none of available languages are preferred' do
+    it 'sets available and compatible language if none of available languages are preferred' do
       request.headers['Accept-Language'] = 'fa-IR'
       get 'success'
       expect(I18n.locale).to eq :fa
diff --git a/spec/controllers/emojis_controller_spec.rb b/spec/controllers/emojis_controller_spec.rb
index 68bae256d..fbbd11f64 100644
--- a/spec/controllers/emojis_controller_spec.rb
+++ b/spec/controllers/emojis_controller_spec.rb
@@ -6,11 +6,11 @@ describe EmojisController do
   let(:emoji) { Fabricate(:custom_emoji) }
 
   describe 'GET #show' do
-    subject(:responce) { get :show, params: { id: emoji.id, format: :json } }
+    subject(:response) { get :show, params: { id: emoji.id, format: :json } }
     subject(:body) { JSON.parse(response.body, symbolize_names: true) }
 
     it 'returns the right response' do
-      expect(responce).to have_http_status 200
+      expect(response).to have_http_status 200
       expect(body[:name]).to eq ':coolcat:'
     end
   end
diff --git a/spec/controllers/stream_entries_controller_spec.rb b/spec/controllers/stream_entries_controller_spec.rb
index 534bc393d..eb7fdf9d7 100644
--- a/spec/controllers/stream_entries_controller_spec.rb
+++ b/spec/controllers/stream_entries_controller_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe StreamEntriesController, type: :controller do
   render_views
 
   shared_examples 'before_action' do |route|
-    context 'when account is not suspended anbd stream_entry is available' do
+    context 'when account is not suspended and stream_entry is available' do
       it 'assigns instance variables' do
         status = Fabricate(:status)
 
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 8fb5bbddf..6a3f9e6ec 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -559,7 +559,7 @@ RSpec.describe Account, type: :model do
     end
 
     context 'when is local' do
-      it 'is invalid if the username is not unique in case-insensitive comparsion among local accounts' do
+      it 'is invalid if the username is not unique in case-insensitive comparison among local accounts' do
         account_1 = Fabricate(:account, username: 'the_doctor')
         account_2 = Fabricate.build(:account, username: 'the_Doctor')
         account_2.valid?
diff --git a/spec/models/subscription_spec.rb b/spec/models/subscription_spec.rb
index 84096e6ae..b83979d13 100644
--- a/spec/models/subscription_spec.rb
+++ b/spec/models/subscription_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe Subscription, type: :model do
   end
 
   describe 'lease_seconds' do
-    it 'returns the time remaing until expiration' do
+    it 'returns the time remaining until expiration' do
       datetime = 1.day.from_now
       subscription = Subscription.new(expires_at: datetime)
       travel_to(datetime - 12.hours) do
diff --git a/spec/services/process_feed_service_spec.rb b/spec/services/process_feed_service_spec.rb
index d8b065063..1f26660ed 100644
--- a/spec/services/process_feed_service_spec.rb
+++ b/spec/services/process_feed_service_spec.rb
@@ -166,7 +166,7 @@ XML
     expect(created_statuses.first.reblog.text).to eq 'Overwatch rocks'
   end
 
-  it 'ignores reblogs if it failed to retreive reblogged statuses' do
+  it 'ignores reblogs if it failed to retrieve reblogged statuses' do
     stub_request(:get, 'https://overwatch.com/users/tracer/updates/1').to_return(status: 404)
 
     actor = Fabricate(:account, username: 'tracer', domain: 'overwatch.com')
diff --git a/spec/services/verify_link_service_spec.rb b/spec/services/verify_link_service_spec.rb
new file mode 100644
index 000000000..acd4e851e
--- /dev/null
+++ b/spec/services/verify_link_service_spec.rb
@@ -0,0 +1,66 @@
+require 'rails_helper'
+
+RSpec.describe VerifyLinkService, type: :service do
+  subject { described_class.new }
+
+  let(:account) { Fabricate(:account, username: 'alice') }
+  let(:field)   { Account::Field.new(account, 'name' => 'Website', 'value' => 'http://example.com') }
+
+  before do
+    stub_request(:get, 'http://example.com').to_return(status: 200, body: html)
+    subject.call(field)
+  end
+
+  context 'when a link contains an <a> back' do
+    let(:html) do
+      <<-HTML
+        <!doctype html>
+        <body>
+          <a href="#{ActivityPub::TagManager.instance.url_for(account)}" rel="me">Follow me on Mastodon</a>
+        </body>
+      HTML
+    end
+
+    it 'marks the field as verified' do
+      expect(field.verified?).to be true
+    end
+  end
+
+  context 'when a link contains an <a rel="noopener"> back' do
+    let(:html) do
+      <<-HTML
+        <!doctype html>
+        <body>
+          <a href="#{ActivityPub::TagManager.instance.url_for(account)}" rel="noopener me" target="_blank">Follow me on Mastodon</a>
+        </body>
+      HTML
+    end
+
+    it 'marks the field as verified' do
+      expect(field.verified?).to be true
+    end
+  end
+
+  context 'when a link contains a <link> back' do
+    let(:html) do
+      <<-HTML
+        <!doctype html>
+        <head>
+          <link type="text/html" href="#{ActivityPub::TagManager.instance.url_for(account)}" rel="me" />
+        </head>
+      HTML
+    end
+
+    it 'marks the field as verified' do
+      expect(field.verified?).to be true
+    end
+  end
+
+  context 'when a link does not contain a link back' do
+    let(:html) { '' }
+
+    it 'marks the field as verified' do
+      expect(field.verified?).to be false
+    end
+  end
+end