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

Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.

spec/controllers/admin/disputes/appeals_controller_spec.rb

@@ -0,0 +1,53 @@
+require 'rails_helper'
+
+RSpec.describe Admin::Disputes::AppealsController, type: :controller do
+  render_views
+
+  before { sign_in current_user, scope: :user }
+
+  let(:target_account) { Fabricate(:account) }
+  let(:strike) { Fabricate(:account_warning, target_account: target_account, action: :suspend) }
+  let(:appeal) { Fabricate(:appeal, strike: strike, account: target_account) }
+
+  before do
+    target_account.suspend!
+  end
+
+  describe 'POST #approve' do
+    let(:current_user) { Fabricate(:user, admin: true) }
+
+    before do
+      allow(UserMailer).to receive(:appeal_approved).and_return(double('email', deliver_later: nil))
+      post :approve, params: { id: appeal.id }
+    end
+
+    it 'unsuspends a suspended account' do
+      expect(target_account.reload.suspended?).to be false
+    end
+
+    it 'redirects back to the strike page' do
+      expect(response).to redirect_to(disputes_strike_path(appeal.strike))
+    end
+
+    it 'notifies target account about approved appeal' do
+      expect(UserMailer).to have_received(:appeal_approved).with(target_account.user, appeal)
+    end
+  end
+
+  describe 'POST #reject' do
+    let(:current_user) { Fabricate(:user, admin: true) }
+
+    before do
+      allow(UserMailer).to receive(:appeal_rejected).and_return(double('email', deliver_later: nil))
+      post :reject, params: { id: appeal.id }
+    end
+
+    it 'redirects back to the strike page' do
+      expect(response).to redirect_to(disputes_strike_path(appeal.strike))
+    end
+
+    it 'notifies target account about rejected appeal' do
+      expect(UserMailer).to have_received(:appeal_rejected).with(target_account.user, appeal)
+    end
+  end
+end

spec/controllers/disputes/appeals_controller_spec.rb

@@ -0,0 +1,27 @@
+require 'rails_helper'
+
+RSpec.describe Disputes::AppealsController, type: :controller do
+  render_views
+
+  before { sign_in current_user, scope: :user }
+
+  let!(:admin) { Fabricate(:user, admin: true) }
+
+  describe '#create' do
+    let(:current_user) { Fabricate(:user) }
+    let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
+
+    before do
+      allow(AdminMailer).to receive(:new_appeal).and_return(double('email', deliver_later: nil))
+      post :create, params: { strike_id: strike.id, appeal: { text: 'Foo' } }
+    end
+
+    it 'notifies staff about new appeal' do
+      expect(AdminMailer).to have_received(:new_appeal).with(admin.account, Appeal.last)
+    end
+
+    it 'redirects back to the strike page' do
+      expect(response).to redirect_to(disputes_strike_path(strike.id))
+    end
+  end
+end

spec/controllers/disputes/strikes_controller_spec.rb

@@ -0,0 +1,30 @@
+require 'rails_helper'
+
+RSpec.describe Disputes::StrikesController, type: :controller do
+  render_views
+
+  before { sign_in current_user, scope: :user }
+
+  describe '#show' do
+    let(:current_user) { Fabricate(:user) }
+    let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
+
+    before do
+      get :show, params: { id: strike.id }
+    end
+
+    context 'when meant for the user' do
+      it 'returns http success' do
+        expect(response).to have_http_status(:success)
+      end
+    end
+
+    context 'when meant for a different user' do
+      let(:strike) { Fabricate(:account_warning) }
+
+      it 'returns http forbidden' do
+        expect(response).to have_http_status(:forbidden)
+      end
+    end
+  end
+end

spec/fabricators/account_warning_fabricator.rb

@@ -1,5 +1,6 @@
 Fabricator(:account_warning) do
-  account        nil
-  target_account nil
-  text           "MyText"
+  account
+  target_account(fabricator: :account)
+  text { Faker::Lorem.paragraph }
+  action 'suspend'
 end

spec/fabricators/appeal_fabricator.rb

@@ -0,0 +1,5 @@
+Fabricator(:appeal) do
+  strike(fabricator: :account_warning)
+  account { |attrs| attrs[:strike].target_account }
+  text { Faker::Lorem.paragraph }
+end

spec/lib/activitypub/activity/announce_spec.rb

@@ -113,26 +113,23 @@ RSpec.describe ActivityPub::Activity::Announce do
       let!(:relay_account) { Fabricate(:account, inbox_url: 'https://relay.example.com/inbox') }
       let!(:relay) { Fabricate(:relay, inbox_url: 'https://relay.example.com/inbox') }
 
+      let(:object_json) { 'https://example.com/actor/hello-world' }
+
       subject { described_class.new(json, sender, relayed_through_account: relay_account) }
 
+      before do
+        stub_request(:get, 'https://example.com/actor/hello-world').to_return(body: Oj.dump(unknown_object_json))
+      end
+
       context 'and the relay is enabled' do
         before do
           relay.update(state: :accepted)
           subject.perform
         end
 
-        let(:object_json) do
-          {
-            id: 'https://example.com/actor#bar',
-            type: 'Note',
-            content: 'Lorem ipsum',
-            to: 'http://example.com/followers',
-            attributedTo: 'https://example.com/actor',
-          }
-        end
-
-        it 'creates a reblog by sender of status' do
-          expect(sender.statuses.count).to eq 2
+        it 'fetches the remote status' do
+          expect(a_request(:get, 'https://example.com/actor/hello-world')).to have_been_made
+          expect(Status.find_by(uri: 'https://example.com/actor/hello-world').text).to eq 'Hello world'
         end
       end
 
@@ -141,14 +138,9 @@ RSpec.describe ActivityPub::Activity::Announce do
           subject.perform
         end
 
-        let(:object_json) do
-          {
-            id: 'https://example.com/actor#bar',
-            type: 'Note',
-            content: 'Lorem ipsum',
-            to: 'http://example.com/followers',
-            attributedTo: 'https://example.com/actor',
-          }
+        it 'does not fetch the remote status' do
+          expect(a_request(:get, 'https://example.com/actor/hello-world')).not_to have_been_made
+          expect(Status.find_by(uri: 'https://example.com/actor/hello-world')).to be_nil
         end
 
         it 'does not create anything' do

spec/mailers/previews/admin_mailer_preview.rb

@@ -15,4 +15,9 @@ class AdminMailerPreview < ActionMailer::Preview
   def new_trending_links
     AdminMailer.new_trending_links(Account.first, PreviewCard.limit(3))
   end
+
+  # Preview this email at http://localhost:3000/rails/mailers/admin_mailer/new_appeal
+  def new_appeal
+    AdminMailer.new_appeal(Account.first, Appeal.first)
+  end
 end

spec/mailers/previews/user_mailer_preview.rb

@@ -82,6 +82,11 @@ class UserMailerPreview < ActionMailer::Preview
     UserMailer.warning(User.first, AccountWarning.last)
   end
 
+  # Preview this email at http://localhost:3000/rails/mailers/user_mailer/appeal_approved
+  def appeal_approved
+    UserMailer.appeal_approved(User.first, Appeal.last)
+  end
+
   # Preview this email at http://localhost:3000/rails/mailers/user_mailer/sign_in_token
   def sign_in_token
     UserMailer.sign_in_token(User.first.tap { |user| user.generate_sign_in_token }, '127.0.0.1', 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:75.0) Gecko/20100101 Firefox/75.0', Time.now.utc)

spec/models/appeal_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Appeal, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/models/user_spec.rb

@@ -89,6 +89,19 @@ RSpec.describe User, type: :model do
         expect(User.matches_email('specified')).to match_array([specified])
       end
     end
+
+    describe 'matches_ip' do
+      it 'returns a relation of users whose ip address is matching with the given CIDR' do
+        user1 = Fabricate(:user)
+        user2 = Fabricate(:user)
+        Fabricate(:session_activation, user: user1, ip: '2160:2160::22', session_id: '1')
+        Fabricate(:session_activation, user: user1, ip: '2160:2160::23', session_id: '2')
+        Fabricate(:session_activation, user: user2, ip: '2160:8888::24', session_id: '3')
+        Fabricate(:session_activation, user: user2, ip: '2160:8888::25', session_id: '4')
+
+        expect(User.matches_ip('2160:2160::/32')).to match_array([user1])
+      end
+    end
   end
 
   let(:account) { Fabricate(:account, username: 'alice') }