Merge branch 'kb_development' into kb_migration
This commit is contained in:
commit
c2324203fd
2 changed files with 5 additions and 6 deletions
|
@ -11,7 +11,7 @@ class ActivityPub::EmojiReactionSerializer < ActivityPub::Serializer
|
||||||
end
|
end
|
||||||
|
|
||||||
def type
|
def type
|
||||||
'EmojiReact'
|
'Like'
|
||||||
end
|
end
|
||||||
|
|
||||||
def actor
|
def actor
|
||||||
|
|
|
@ -6,10 +6,9 @@ class ProcessReferencesService < BaseService
|
||||||
DOMAIN = ENV['WEB_DOMAIN'] || ENV.fetch('LOCAL_DOMAIN', nil)
|
DOMAIN = ENV['WEB_DOMAIN'] || ENV.fetch('LOCAL_DOMAIN', nil)
|
||||||
REFURL_EXP = /(RT|QT|BT|RN|RE)((:|;)?\s+|:|;)(#{URI::DEFAULT_PARSER.make_regexp(%w(http https))})/
|
REFURL_EXP = /(RT|QT|BT|RN|RE)((:|;)?\s+|:|;)(#{URI::DEFAULT_PARSER.make_regexp(%w(http https))})/
|
||||||
|
|
||||||
def call(status, reference_parameters, save_records: true, urls: nil)
|
def call(status, reference_parameters, urls: nil)
|
||||||
@status = status
|
@status = status
|
||||||
@reference_parameters = reference_parameters || []
|
@reference_parameters = reference_parameters || []
|
||||||
@save_records = save_records
|
|
||||||
@urls = urls || []
|
@urls = urls || []
|
||||||
|
|
||||||
old_references
|
old_references
|
||||||
|
@ -20,10 +19,10 @@ class ProcessReferencesService < BaseService
|
||||||
remove_old_references
|
remove_old_references
|
||||||
add_references
|
add_references
|
||||||
|
|
||||||
@status.save! if @save_records
|
@status.save!
|
||||||
|
|
||||||
create_notifications!
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
create_notifications!
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue