mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-08-18 14:05:26 +00:00
* Allow hiding of reblogs from followed users This adds a new entry to the account menu to allow users to hide future reblogs from a user (and then if they've done that, to show future reblogs instead). This does not remove or add historical reblogs from/to the user's timeline; it only affects new statuses. The API for this operates by sending a "reblogs" key to the follow endpoint. If this is sent when starting a new follow, it will be respected from the beginning of the follow relationship (even if the follow request must be approved by the followee). If this is sent when a follow relationship already exists, it will simply update the existing follow relationship. As with the notification muting, this will now return an object ({reblogs: [true|false]}) or false for each follow relationship when requesting relationship information for an account. This should cause few issues due to an object being truthy in many languages, but some modifications may need to be made in pickier languages. Database changes: adds a show_reblogs column (default true, non-nullable) to the follows and follow_requests tables. Because these are non-nullable, we use the existing MigrationHelpers to perform this change without locking those tables, although the tables are likely to be small anyway. Tests included. See also <https://github.com/glitch-soc/mastodon/pull/212>. * Rubocop fixes * Code review changes * Test fixes This patchset closes #648 and resolves #3271. * Rubocop fix * Revert reblogs defaulting in argument, fix tests It turns out we needed this for the same reason we needed it in muting: if nil gets passed in somehow (most usually by an API client not passing any value), we need to detect and handle it. We could specify a default in the parameter and then also catch nil, but there's no great reason to duplicate the default value.
130 lines
4.1 KiB
Ruby
130 lines
4.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class NotifyService < BaseService
|
|
def call(recipient, activity)
|
|
@recipient = recipient
|
|
@activity = activity
|
|
@notification = Notification.new(account: @recipient, activity: @activity)
|
|
|
|
return if recipient.user.nil? || blocked?
|
|
|
|
create_notification
|
|
send_email if email_enabled?
|
|
rescue ActiveRecord::RecordInvalid
|
|
return
|
|
end
|
|
|
|
private
|
|
|
|
def blocked_mention?
|
|
FeedManager.instance.filter?(:mentions, @notification.mention.status, @recipient.id)
|
|
end
|
|
|
|
def blocked_favourite?
|
|
false
|
|
end
|
|
|
|
def blocked_follow?
|
|
false
|
|
end
|
|
|
|
def blocked_reblog?
|
|
@recipient.muting_reblogs?(@notification.from_account)
|
|
end
|
|
|
|
def blocked_follow_request?
|
|
false
|
|
end
|
|
|
|
def following_sender?
|
|
return @following_sender if defined?(@following_sender)
|
|
@following_sender = @recipient.following?(@notification.from_account) || @recipient.requested?(@notification.from_account)
|
|
end
|
|
|
|
def optional_non_follower?
|
|
@recipient.user.settings.interactions['must_be_follower'] && !@notification.from_account.following?(@recipient)
|
|
end
|
|
|
|
def optional_non_following?
|
|
@recipient.user.settings.interactions['must_be_following'] && !following_sender?
|
|
end
|
|
|
|
def direct_message?
|
|
@notification.type == :mention && @notification.target_status.direct_visibility?
|
|
end
|
|
|
|
def response_to_recipient?
|
|
@notification.target_status.in_reply_to_account_id == @recipient.id
|
|
end
|
|
|
|
def optional_non_following_and_direct?
|
|
direct_message? &&
|
|
@recipient.user.settings.interactions['must_be_following_dm'] &&
|
|
!following_sender? &&
|
|
!response_to_recipient?
|
|
end
|
|
|
|
def hellbanned?
|
|
@notification.from_account.silenced? && !following_sender?
|
|
end
|
|
|
|
def from_self?
|
|
@recipient.id == @notification.from_account.id
|
|
end
|
|
|
|
def domain_blocking?
|
|
@recipient.domain_blocking?(@notification.from_account.domain) && !following_sender?
|
|
end
|
|
|
|
def blocked?
|
|
blocked = @recipient.suspended? # Skip if the recipient account is suspended anyway
|
|
blocked ||= from_self? # Skip for interactions with self
|
|
blocked ||= domain_blocking? # Skip for domain blocked accounts
|
|
blocked ||= @recipient.blocking?(@notification.from_account) # Skip for blocked accounts
|
|
blocked ||= @recipient.muting_notifications?(@notification.from_account)
|
|
blocked ||= hellbanned? # Hellban
|
|
blocked ||= optional_non_follower? # Options
|
|
blocked ||= optional_non_following? # Options
|
|
blocked ||= optional_non_following_and_direct? # Options
|
|
blocked ||= conversation_muted?
|
|
blocked ||= send("blocked_#{@notification.type}?") # Type-dependent filters
|
|
blocked
|
|
end
|
|
|
|
def conversation_muted?
|
|
if @notification.target_status
|
|
@recipient.muting_conversation?(@notification.target_status.conversation)
|
|
else
|
|
false
|
|
end
|
|
end
|
|
|
|
def create_notification
|
|
@notification.save!
|
|
return unless @notification.browserable?
|
|
Redis.current.publish("timeline:#{@recipient.id}", Oj.dump(event: :notification, payload: InlineRenderer.render(@notification, @recipient, :notification)))
|
|
send_push_notifications
|
|
end
|
|
|
|
def send_push_notifications
|
|
# HACK: Can be caused by quickly unfavouriting a status, since creating
|
|
# a favourite and creating a notification are not wrapped in a transaction.
|
|
return if @notification.activity.nil?
|
|
|
|
sessions_with_subscriptions = @recipient.user.session_activations.where.not(web_push_subscription: nil)
|
|
sessions_with_subscriptions_ids = sessions_with_subscriptions.select { |session| session.web_push_subscription.pushable? @notification }.map(&:id)
|
|
|
|
WebPushNotificationWorker.push_bulk(sessions_with_subscriptions_ids) do |session_activation_id|
|
|
[session_activation_id, @notification.id]
|
|
end
|
|
end
|
|
|
|
def send_email
|
|
NotificationMailer.public_send(@notification.type, @recipient, @notification).deliver_later
|
|
end
|
|
|
|
def email_enabled?
|
|
@recipient.user.settings.notification_emails[@notification.type.to_s]
|
|
end
|
|
end
|