Compare commits

...

3 Commits

Author SHA1 Message Date
Eugen Rochko
947887f261 Bump version to 1.4.3 2017-06-15 03:03:42 +02:00
m4sk1n
6f34fdb616 updated Polish translation (#3751)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-06-15 02:00:23 +02:00
Eugen Rochko
8518d005fd Fix regression from #3490 - filter out hidden statuses from ancestors/descendants even if the viewer is anonymous (#3752) 2017-06-15 02:00:08 +02:00
4 changed files with 29 additions and 7 deletions

View File

@@ -9,7 +9,7 @@ class StatusFilter
end
def filtered?
account_present? && filtered_status?
blocked_by_policy? || (account_present? && filtered_status?) || silenced_account?
end
private
@@ -19,7 +19,7 @@ class StatusFilter
end
def filtered_status?
blocking_account? || blocking_domain? || muting_account? || silenced_account? || blocked_by_policy?
blocking_account? || blocking_domain? || muting_account?
end
def blocking_account?
@@ -43,7 +43,7 @@ class StatusFilter
end
def account_following_status_account?
account.following? status.account_id
account&.following? status.account_id
end
def blocked_by_policy?

View File

@@ -86,8 +86,10 @@ pl:
profile_url: Adres profilu
public: Publiczne
push_subscription_expires: Subskrypcja PuSH wygasa
redownload: Odśwież awatar
reset: Resetuj
reset_password: Resetuj hasło
resubscribe: Ponów subskrypcję
salmon_url: Adres Salmon
search: Szukaj
show:
@@ -96,9 +98,11 @@ pl:
targeted_reports: Zgłoszenia dotyczące tego użytkownika
silence: Cisza
statuses: Statusy
subscribe: Subskrybuj
title: Konta
undo_silenced: Cofnij wyciszenie
undo_suspension: Cofnij zawieszenie
unsubscribe: Przestań subskrybować
username: Nazwa użytkownika
web: Sieć
domain_blocks:
@@ -145,8 +149,8 @@ pl:
id: Identyfikator
mark_as_resolved: Oznacz jako rozwiązane
nsfw:
'false': NSFW nie będzie wyświetlane
'true': NSFW będzie wyświetlane
'false': Nie oznaczaj jako NSFW
'true': Oznaczaj jako NSFW
report: 'Zgłoszenie #%{id}'
report_contents: Zawartość
reported_account: Zgłoszone konto

View File

@@ -13,7 +13,7 @@ module Mastodon
end
def patch
2
3
end
def pre

View File

@@ -9,7 +9,25 @@ describe StatusFilter do
context 'without an account' do
subject { described_class.new(status, nil) }
it { is_expected.not_to be_filtered }
context 'when there are no connections' do
it { is_expected.not_to be_filtered }
end
context 'when status account is silenced' do
before do
status.account.update(silenced: true)
end
it { is_expected.to be_filtered }
end
context 'when status policy does not allow show' do
before do
expect_any_instance_of(StatusPolicy).to receive(:show?).and_return(false)
end
it { is_expected.to be_filtered }
end
end
context 'with real account' do