Browse Source

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

mp-additions
Thibaut Girka 8 months ago
parent
commit
dfe7322922

+ 12
- 1
Vagrantfile View File

@@ -44,7 +44,18 @@ sudo apt-get install \

# Install rvm
read RUBY_VERSION < .ruby-version
gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB

gpg_command="gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"
$($gpg_command)
if [ $? -ne 0 ];then
echo "GPG command failed, This prevented RVM from installing."
echo "Retrying once..." && $($gpg_command)
if [ $? -ne 0 ];then
echo "GPG failed for the second time, please ensure network connectivity."
echo "Exiting..." && exit 1
fi
fi

curl -sSL https://raw.githubusercontent.com/rvm/rvm/stable/binscripts/rvm-installer | bash -s stable --ruby=$RUBY_VERSION
source /home/vagrant/.rvm/scripts/rvm


+ 17
- 0
app/services/suspend_account_service.rb View File

@@ -41,6 +41,7 @@ class SuspendAccountService < BaseService
@account = account
@options = options

reject_follows!
purge_user!
purge_profile!
purge_content!
@@ -48,6 +49,14 @@ class SuspendAccountService < BaseService

private

def reject_follows!
return if @account.local? || !@account.activitypub?

ActivityPub::DeliveryWorker.push_bulk(Follow.where(account: @account)) do |follow|
[build_reject_json(follow), follow.target_account_id, follow.account.inbox_url]
end
end

def purge_user!
return if !@account.local? || @account.user.nil?

@@ -120,6 +129,14 @@ class SuspendAccountService < BaseService
@delete_actor_json = Oj.dump(ActivityPub::LinkedDataSignature.new(payload).sign!(@account))
end

def build_reject_json(follow)
ActiveModelSerializers::SerializableResource.new(
follow,
serializer: ActivityPub::RejectFollowSerializer,
adapter: ActivityPub::Adapter
).to_json
end

def delivery_inboxes
@delivery_inboxes ||= @account.followers.inboxes + Relay.enabled.pluck(:inbox_url)
end

+ 1
- 1
app/views/about/_forms.html.haml View File

@@ -1,7 +1,7 @@
- if @instance_presenter.open_registrations
= render 'registration'
- else
= link_to t('auth.register_elsewhere'), 'https://joinmastodon.org', class: 'button button-primary'
= link_to t('auth.register_elsewhere'), 'https://joinmastodon.org/#getting-started', class: 'button button-primary'

.closed-registrations-message
- if @instance_presenter.closed_registrations_message.blank?

+ 1
- 1
app/views/about/_links.html.haml View File

@@ -11,6 +11,6 @@
= link_to t('auth.login'), new_user_session_path, class: 'webapp-btn'
%li= link_to t('about.about_this'), about_more_path
%li
= link_to 'https://joinmastodon.org/' do
= link_to 'https://joinmastodon.org/#getting-started' do
= "#{t('about.other_instances')}"
%i.fa.fa-external-link{ style: 'padding-left: 5px;' }

+ 43
- 1
spec/services/suspend_account_service_spec.rb View File

@@ -1,7 +1,7 @@
require 'rails_helper'

RSpec.describe SuspendAccountService, type: :service do
describe '#call' do
describe '#call on local account' do
before do
stub_request(:post, "https://alice.com/inbox").to_return(status: 201)
stub_request(:post, "https://bob.com/inbox").to_return(status: 201)
@@ -43,4 +43,46 @@ RSpec.describe SuspendAccountService, type: :service do
expect(a_request(:post, "https://bob.com/inbox")).to have_been_made.once
end
end

describe '#call on remote account' do
before do
stub_request(:post, "https://alice.com/inbox").to_return(status: 201)
stub_request(:post, "https://bob.com/inbox").to_return(status: 201)
end

subject do
-> { described_class.new.call(remote_bob) }
end

let!(:account) { Fabricate(:account) }
let!(:remote_alice) { Fabricate(:account, inbox_url: 'https://alice.com/inbox', protocol: :activitypub) }
let!(:remote_bob) { Fabricate(:account, inbox_url: 'https://bob.com/inbox', protocol: :activitypub) }
let!(:status) { Fabricate(:status, account: remote_bob) }
let!(:media_attachment) { Fabricate(:media_attachment, account: remote_bob) }
let!(:notification) { Fabricate(:notification, account: remote_bob) }
let!(:favourite) { Fabricate(:favourite, account: remote_bob) }
let!(:active_relationship) { Fabricate(:follow, account: remote_bob, target_account: account) }
let!(:passive_relationship) { Fabricate(:follow, target_account: remote_bob) }
let!(:subscription) { Fabricate(:subscription, account: remote_bob) }

it 'deletes associated records' do
is_expected.to change {
[
remote_bob.statuses,
remote_bob.media_attachments,
remote_bob.stream_entries,
remote_bob.notifications,
remote_bob.favourites,
remote_bob.active_relationships,
remote_bob.passive_relationships,
remote_bob.subscriptions
].map(&:count)
}.from([1, 1, 1, 1, 1, 1, 1, 1]).to([0, 0, 0, 0, 0, 0, 0, 0])
end

it 'sends a reject follow to follwer inboxes' do
subject.call
expect(a_request(:post, remote_bob.inbox_url)).to have_been_made.once
end
end
end

+ 5
- 9
streaming/index.js View File

@@ -24,7 +24,7 @@ const dbUrlToConfig = (dbUrl) => {
return {};
}

const params = url.parse(dbUrl);
const params = url.parse(dbUrl, true);
const config = {};

if (params.auth) {
@@ -45,8 +45,8 @@ const dbUrlToConfig = (dbUrl) => {

const ssl = params.query && params.query.ssl;

if (ssl) {
config.ssl = ssl === 'true' || ssl === '1';
if (ssl && ssl === 'true' || ssl === '1') {
config.ssl = true;
}

return config;
@@ -89,9 +89,7 @@ const startWorker = (workerId) => {
host: process.env.DB_HOST || pg.defaults.host,
port: process.env.DB_PORT || pg.defaults.port,
max: 10,
ssl: {
sslmode: process.env.DB_SSLMODE || 'prefer',
},
ssl: !!process.env.DB_SSLMODE && process.env.DB_SSLMODE !== 'disable' ? true : undefined,
},

production: {
@@ -101,9 +99,7 @@ const startWorker = (workerId) => {
host: process.env.DB_HOST || 'localhost',
port: process.env.DB_PORT || 5432,
max: 10,
ssl: {
sslmode: process.env.DB_SSLMODE || 'prefer',
},
ssl: !!process.env.DB_SSLMODE && process.env.DB_SSLMODE !== 'disable' ? true : undefined,
},
};


Loading…
Cancel
Save