Compare commits
	
		
			3 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 947887f261 | ||
|  | 6f34fdb616 | ||
|  | 8518d005fd | 
| @@ -9,7 +9,7 @@ class StatusFilter | |||||||
|   end |   end | ||||||
|  |  | ||||||
|   def filtered? |   def filtered? | ||||||
|     account_present? && filtered_status? |     blocked_by_policy? || (account_present? && filtered_status?) || silenced_account? | ||||||
|   end |   end | ||||||
|  |  | ||||||
|   private |   private | ||||||
| @@ -19,7 +19,7 @@ class StatusFilter | |||||||
|   end |   end | ||||||
|  |  | ||||||
|   def filtered_status? |   def filtered_status? | ||||||
|     blocking_account? || blocking_domain? || muting_account? || silenced_account? || blocked_by_policy? |     blocking_account? || blocking_domain? || muting_account? | ||||||
|   end |   end | ||||||
|  |  | ||||||
|   def blocking_account? |   def blocking_account? | ||||||
| @@ -43,7 +43,7 @@ class StatusFilter | |||||||
|   end |   end | ||||||
|  |  | ||||||
|   def account_following_status_account? |   def account_following_status_account? | ||||||
|     account.following? status.account_id |     account&.following? status.account_id | ||||||
|   end |   end | ||||||
|  |  | ||||||
|   def blocked_by_policy? |   def blocked_by_policy? | ||||||
|   | |||||||
| @@ -86,8 +86,10 @@ pl: | |||||||
|       profile_url: Adres profilu |       profile_url: Adres profilu | ||||||
|       public: Publiczne |       public: Publiczne | ||||||
|       push_subscription_expires: Subskrypcja PuSH wygasa |       push_subscription_expires: Subskrypcja PuSH wygasa | ||||||
|  |       redownload: Odśwież awatar | ||||||
|       reset: Resetuj |       reset: Resetuj | ||||||
|       reset_password: Resetuj hasło |       reset_password: Resetuj hasło | ||||||
|  |       resubscribe: Ponów subskrypcję | ||||||
|       salmon_url: Adres Salmon |       salmon_url: Adres Salmon | ||||||
|       search: Szukaj |       search: Szukaj | ||||||
|       show: |       show: | ||||||
| @@ -96,9 +98,11 @@ pl: | |||||||
|         targeted_reports: Zgłoszenia dotyczące tego użytkownika |         targeted_reports: Zgłoszenia dotyczące tego użytkownika | ||||||
|       silence: Cisza |       silence: Cisza | ||||||
|       statuses: Statusy |       statuses: Statusy | ||||||
|  |       subscribe: Subskrybuj | ||||||
|       title: Konta |       title: Konta | ||||||
|       undo_silenced: Cofnij wyciszenie |       undo_silenced: Cofnij wyciszenie | ||||||
|       undo_suspension: Cofnij zawieszenie |       undo_suspension: Cofnij zawieszenie | ||||||
|  |       unsubscribe: Przestań subskrybować | ||||||
|       username: Nazwa użytkownika |       username: Nazwa użytkownika | ||||||
|       web: Sieć |       web: Sieć | ||||||
|     domain_blocks: |     domain_blocks: | ||||||
| @@ -145,8 +149,8 @@ pl: | |||||||
|       id: Identyfikator |       id: Identyfikator | ||||||
|       mark_as_resolved: Oznacz jako rozwiązane |       mark_as_resolved: Oznacz jako rozwiązane | ||||||
|       nsfw: |       nsfw: | ||||||
|         'false': NSFW nie będzie wyświetlane |         'false': Nie oznaczaj jako NSFW | ||||||
|         'true': NSFW będzie wyświetlane |         'true': Oznaczaj jako NSFW | ||||||
|       report: 'Zgłoszenie #%{id}' |       report: 'Zgłoszenie #%{id}' | ||||||
|       report_contents: Zawartość |       report_contents: Zawartość | ||||||
|       reported_account: Zgłoszone konto |       reported_account: Zgłoszone konto | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ module Mastodon | |||||||
|     end |     end | ||||||
|  |  | ||||||
|     def patch |     def patch | ||||||
|       2 |       3 | ||||||
|     end |     end | ||||||
|  |  | ||||||
|     def pre |     def pre | ||||||
|   | |||||||
| @@ -9,7 +9,25 @@ describe StatusFilter do | |||||||
|     context 'without an account' do |     context 'without an account' do | ||||||
|       subject { described_class.new(status, nil) } |       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 |     end | ||||||
|  |  | ||||||
|     context 'with real account' do |     context 'with real account' do | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user