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

Turn local-only threads into a one-way street #2906

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −1
Open

Turn local-only threads into a one-way street #2906

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/models/status.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ def set_visibility
def set_local_only
return unless account.domain.nil? && !attribute_changed?(:local_only)

self.local_only = marked_local_only?
self.local_only = marked_local_only? || thread&.local_only
end

def set_conversation
Expand Down
17 changes: 17 additions & 0 deletions spec/models/status_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,23 @@
end
end
end

describe 'on a status in a local-only thread' do
subject { described_class.new }

context 'when a status does not contain the local-only emoji' do
let(:thread) { Fabricate(:Status, local_only: true) }

before do
subject.thread = thread
end

it 'is marked local-only' do
subject.save!

expect(subject).to be_local_only
end
end
end

describe '#reported?' do
Expand Down