Merge branch 'feature/groups-improvements' of https://code.gab.com/gab/social/gab-social into develop
This commit is contained in:
commit
0bd0d164d4
|
@ -59,6 +59,7 @@ class Notification < ApplicationRecord
|
|||
def target_status
|
||||
case type
|
||||
when :reblog
|
||||
return status if status&.quote?
|
||||
status&.reblog
|
||||
when :favourite
|
||||
favourite&.status
|
||||
|
|
|
@ -162,6 +162,10 @@ class Status < ApplicationRecord
|
|||
!reblog_of_id.nil?
|
||||
end
|
||||
|
||||
def quote?
|
||||
!quote_of_id.nil?
|
||||
end
|
||||
|
||||
def within_realtime_window?
|
||||
created_at >= REAL_TIME_WINDOW.ago
|
||||
end
|
||||
|
|
|
@ -68,6 +68,7 @@ class PostStatusService < BaseService
|
|||
|
||||
process_hashtags_service.call(@status)
|
||||
process_mentions_service.call(@status)
|
||||
process_quote_service.call(@status)
|
||||
end
|
||||
|
||||
def schedule_status!
|
||||
|
@ -117,6 +118,10 @@ class PostStatusService < BaseService
|
|||
ISO_639.find(str)&.alpha2
|
||||
end
|
||||
|
||||
def process_quote_service
|
||||
ProcessQuoteService.new
|
||||
end
|
||||
|
||||
def process_mentions_service
|
||||
ProcessMentionsService.new
|
||||
end
|
||||
|
|
|
@ -0,0 +1,42 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class ProcessQuoteService < BaseService
|
||||
include StreamEntryRenderer
|
||||
|
||||
# Create notification for a quote
|
||||
# @param [Status] status Quoting status
|
||||
# @return [Status]
|
||||
def call(status)
|
||||
create_notification(status)
|
||||
bump_potential_friendship(status)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def create_notification(status)
|
||||
quoted_status = status.quote
|
||||
|
||||
if quoted_status.account.local?
|
||||
LocalNotificationWorker.perform_async(quoted_status.account_id, status.id, status.class.name)
|
||||
elsif quoted_status.account.ostatus?
|
||||
NotificationWorker.perform_async(stream_entry_to_xml(status.stream_entry), status.account_id, quoted_status.account_id)
|
||||
elsif quoted_status.account.activitypub? && !quoted_status.account.following?(status.account)
|
||||
ActivityPub::DeliveryWorker.perform_async(build_json(status), status.account_id, quoted_status.account.inbox_url)
|
||||
end
|
||||
end
|
||||
|
||||
def bump_potential_friendship(status)
|
||||
ActivityTracker.increment('activity:interactions')
|
||||
return if status.account.following?(status.quote.account_id)
|
||||
PotentialFriendshipTracker.record(status.account_id, status.quote.account_id, :reblog)
|
||||
end
|
||||
|
||||
def build_json(status)
|
||||
Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(
|
||||
status,
|
||||
serializer: ActivityPub::ActivitySerializer,
|
||||
adapter: ActivityPub::Adapter
|
||||
).as_json).sign!(status.account))
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue