Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2025-05-30 17:41:31 +02:00
parent 79d0f41296 54ad57ea95
commit c00e27aa55
44 changed files with 297 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/status_filter.rb
View File

@@ -38,7 +38,7 @@ class StatusFilter
end
def silenced_account?
!account&.silenced? && status_account_silenced? && !account_following_status_account?
status_account_silenced? && !account_following_status_account?
end
def status_account_silenced?

4
app/lib/web_push_request.rb
View File

@@ -79,8 +79,8 @@ class WebPushRequest
def vapid_key
@vapid_key ||= Webpush::VapidKey.from_keys(
Rails.configuration.x.vapid_public_key,
Rails.configuration.x.vapid_private_key
Rails.configuration.x.vapid.public_key,
Rails.configuration.x.vapid.private_key
)
end