Add editing for published statuses (#17320)
* Add editing for published statuses * Fix change of multiple-choice boolean in poll not resetting votes * Remove the ability to update existing media attachments for nowth-downstream
Eugen Rochko
3 years ago
committed by
GitHub
parent
f52e8d4663
commit
cb76142d9e
@ -1,20 +1,40 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class ProcessHashtagsService < BaseService
|
||||
def call(status, tags = [])
|
||||
tags = Extractor.extract_hashtags(status.text) if status.local?
|
||||
records = []
|
||||
def call(status, raw_tags = [])
|
||||
@status = status
|
||||
@account = status.account
|
||||
@raw_tags = status.local? ? Extractor.extract_hashtags(status.text) : raw_tags
|
||||
@previous_tags = status.tags.to_a
|
||||
@current_tags = []
|
||||
|
||||
Tag.find_or_create_by_names(tags) do |tag|
|
||||
status.tags << tag
|
||||
records << tag
|
||||
tag.update(last_status_at: status.created_at) if tag.last_status_at.nil? || (tag.last_status_at < status.created_at && tag.last_status_at < 12.hours.ago)
|
||||
assign_tags!
|
||||
update_featured_tags!
|
||||
end
|
||||
|
||||
return unless status.distributable?
|
||||
private
|
||||
|
||||
status.account.featured_tags.where(tag_id: records.map(&:id)).each do |featured_tag|
|
||||
featured_tag.increment(status.created_at)
|
||||
def assign_tags!
|
||||
@status.tags = @current_tags = Tag.find_or_create_by_names(@raw_tags)
|
||||
end
|
||||
|
||||
def update_featured_tags!
|
||||
return unless @status.distributable?
|
||||
|
||||
added_tags = @current_tags - @previous_tags
|
||||
|
||||
unless added_tags.empty?
|
||||
@account.featured_tags.where(tag_id: added_tags.map(&:id)).each do |featured_tag|
|
||||
featured_tag.increment(@status.created_at)
|
||||
end
|
||||
end
|
||||
|
||||
removed_tags = @previous_tags - @current_tags
|
||||
|
||||
unless removed_tags.empty?
|
||||
@account.featured_tags.where(tag_id: removed_tags.map(&:id)).each do |featured_tag|
|
||||
featured_tag.decrement(@status.id)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -0,0 +1,156 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class UpdateStatusService < BaseService
|
||||
include Redisable
|
||||
|
||||
# @param [Status] status
|
||||
# @param [Integer] account_id
|
||||
# @param [Hash] options
|
||||
# @option options [Array<Integer>] :media_ids
|
||||
# @option options [Hash] :poll
|
||||
# @option options [String] :text
|
||||
# @option options [String] :spoiler_text
|
||||
# @option options [Boolean] :sensitive
|
||||
# @option options [String] :language
|
||||
def call(status, account_id, options = {})
|
||||
@status = status
|
||||
@options = options
|
||||
@account_id = account_id
|
||||
@media_attachments_changed = false
|
||||
@poll_changed = false
|
||||
|
||||
Status.transaction do
|
||||
create_previous_edit!
|
||||
update_media_attachments!
|
||||
update_poll!
|
||||
update_immediate_attributes!
|
||||
create_edit!
|
||||
end
|
||||
|
||||
queue_poll_notifications!
|
||||
reset_preview_card!
|
||||
update_metadata!
|
||||
broadcast_updates!
|
||||
|
||||
@status
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def update_media_attachments!
|
||||
previous_media_attachments = @status.media_attachments.to_a
|
||||
next_media_attachments = validate_media!
|
||||
removed_media_attachments = previous_media_attachments - next_media_attachments
|
||||
added_media_attachments = next_media_attachments - previous_media_attachments
|
||||
|
||||
MediaAttachment.where(id: removed_media_attachments.map(&:id)).update_all(status_id: nil)
|
||||
MediaAttachment.where(id: added_media_attachments.map(&:id)).update_all(status_id: @status.id)
|
||||
|
||||
@status.media_attachments.reload
|
||||
@media_attachments_changed = true if removed_media_attachments.any? || added_media_attachments.any?
|
||||
end
|
||||
|
||||
def validate_media!
|
||||
return [] if @options[:media_ids].blank? || !@options[:media_ids].is_a?(Enumerable)
|
||||
|
||||
raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll].present?
|
||||
|
||||
media_attachments = @status.account.media_attachments.where(status_id: [nil, @status.id]).where(scheduled_status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i)).to_a
|
||||
|
||||
raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if media_attachments.size > 1 && media_attachments.find(&:audio_or_video?)
|
||||
raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_ready') if media_attachments.any?(&:not_processed?)
|
||||
|
||||
media_attachments
|
||||
end
|
||||
|
||||
def update_poll!
|
||||
previous_poll = @status.preloadable_poll
|
||||
@previous_expires_at = previous_poll&.expires_at
|
||||
|
||||
if @options[:poll].present?
|
||||
poll = previous_poll || @status.account.polls.new(status: @status, votes_count: 0)
|
||||
|
||||
# If for some reasons the options were changed, it invalidates all previous
|
||||
# votes, so we need to remove them
|
||||
if @options[:poll][:options] != poll.options || ActiveModel::Type::Boolean.new.cast(@options[:poll][:multiple]) != poll.multiple
|
||||
@poll_changed = true
|
||||
poll.votes.delete_all unless poll.new_record?
|
||||
end
|
||||
|
||||
poll.options = @options[:poll][:options]
|
||||
poll.hide_totals = @options[:poll][:hide_totals] || false
|
||||
poll.multiple = @options[:poll][:multiple] || false
|
||||
poll.expires_in = @options[:poll][:expires_in]
|
||||
poll.save!
|
||||
|
||||
@status.poll_id = poll.id
|
||||
elsif previous_poll.present?
|
||||
previous_poll.destroy
|
||||
@poll_changed = true
|
||||
@status.poll_id = nil
|
||||
end
|
||||
end
|
||||
|
||||
def update_immediate_attributes!
|
||||
@status.text = @options[:text].presence || @options.delete(:spoiler_text) || ''
|
||||
@status.spoiler_text = @options[:spoiler_text] || ''
|
||||
@status.sensitive = @options[:sensitive] || @options[:spoiler_text].present?
|
||||
@status.language = language_from_option || @status.language
|
||||
@status.edited_at = Time.now.utc
|
||||
|
||||
@status.save!
|
||||
end
|
||||
|
||||
def language_from_option
|
||||
ISO_639.find(@options[:language])&.alpha2
|
||||
end
|
||||
|
||||
def reset_preview_card!
|
||||
return unless @status.text_previously_changed?
|
||||
|
||||
@status.preview_cards.clear
|
||||
LinkCrawlWorker.perform_async(@status.id)
|
||||
end
|
||||
|
||||
def update_metadata!
|
||||
ProcessHashtagsService.new.call(@status)
|
||||
ProcessMentionsService.new.call(@status)
|
||||
end
|
||||
|
||||
def broadcast_updates!
|
||||
DistributionWorker.perform_async(@status.id, { 'update' => true })
|
||||
ActivityPub::StatusUpdateDistributionWorker.perform_async(@status.id)
|
||||
end
|
||||
|
||||
def queue_poll_notifications!
|
||||
poll = @status.preloadable_poll
|
||||
|
||||
# If the poll had no expiration date set but now has, or now has a sooner
|
||||
# expiration date, and people have voted, schedule a notification
|
||||
|
||||
return unless poll.present? && poll.expires_at.present? && poll.votes.exists?
|
||||
|
||||
PollExpirationNotifyWorker.remove_from_scheduled(poll.id) if @previous_expires_at.present? && @previous_expires_at > poll.expires_at
|
||||
PollExpirationNotifyWorker.perform_at(poll.expires_at + 5.minutes, poll.id)
|
||||
end
|
||||
|
||||
def create_previous_edit!
|
||||
# We only need to create a previous edit when no previous edits exist, e.g.
|
||||
# when the status has never been edited. For other cases, we always create
|
||||
# an edit, so the step can be skipped
|
||||
|
||||
return if @status.edits.any?
|
||||
|
||||
@status.snapshot!(
|
||||
media_attachments_changed: false,
|
||||
at_time: @status.created_at
|
||||
)
|
||||
end
|
||||
|
||||
def create_edit!
|
||||
@status.snapshot!(
|
||||
media_attachments_changed: @media_attachments_changed || @poll_changed,
|
||||
account_id: @account_id
|
||||
)
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,28 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class ActivityPub::StatusUpdateDistributionWorker < ActivityPub::DistributionWorker
|
||||
# Distribute an profile update to servers that might have a copy
|
||||
# of the account in question
|
||||
def perform(status_id, options = {})
|
||||
@options = options.with_indifferent_access
|
||||
@status = Status.find(status_id)
|
||||
|
||||
distribute!
|
||||
rescue ActiveRecord::RecordNotFound
|
||||
true
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def activity
|
||||
ActivityPub::ActivityPresenter.new(
|
||||
id: [ActivityPub::TagManager.instance.uri_for(@status), '#updates/', @status.edited_at.to_i].join,
|
||||
type: 'Update',
|
||||
actor: ActivityPub::TagManager.instance.uri_for(@status.account),
|
||||
published: @status.edited_at,
|
||||
to: ActivityPub::TagManager.instance.to(@status),
|
||||
cc: ActivityPub::TagManager.instance.cc(@status),
|
||||
virtual_object: @status
|
||||
)
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,248 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe ActivityPub::ProcessStatusUpdateService, type: :service do
|
||||
let!(:status) { Fabricate(:status, text: 'Hello world', account: Fabricate(:account, domain: 'example.com')) }
|
||||
|
||||
let(:alice) { Fabricate(:account) }
|
||||
let(:bob) { Fabricate(:account) }
|
||||
|
||||
let(:mentions) { [] }
|
||||
let(:tags) { [] }
|
||||
let(:media_attachments) { [] }
|
||||
|
||||
before do
|
||||
mentions.each { |a| Fabricate(:mention, status: status, account: a) }
|
||||
tags.each { |t| status.tags << t }
|
||||
media_attachments.each { |m| status.media_attachments << m }
|
||||
end
|
||||
|
||||
let(:payload) do
|
||||
{
|
||||
'@context': 'https://www.w3.org/ns/activitystreams',
|
||||
id: 'foo',
|
||||
type: 'Note',
|
||||
summary: 'Show more',
|
||||
content: 'Hello universe',
|
||||
updated: '2021-09-08T22:39:25Z',
|
||||
tag: [
|
||||
{ type: 'Hashtag', name: 'hoge' },
|
||||
{ type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) },
|
||||
],
|
||||
}
|
||||
end
|
||||
|
||||
let(:json) { Oj.load(Oj.dump(payload)) }
|
||||
|
||||
subject { described_class.new }
|
||||
|
||||
describe '#call' do
|
||||
it 'updates text' do
|
||||
subject.call(status, json)
|
||||
expect(status.reload.text).to eq 'Hello universe'
|
||||
end
|
||||
|
||||
it 'updates content warning' do
|
||||
subject.call(status, json)
|
||||
expect(status.reload.spoiler_text).to eq 'Show more'
|
||||
end
|
||||
|
||||
context 'originally without tags' do
|
||||
before do
|
||||
subject.call(status, json)
|
||||
end
|
||||
|
||||
it 'updates tags' do
|
||||
expect(status.tags.reload.map(&:name)).to eq %w(hoge)
|
||||
end
|
||||
end
|
||||
|
||||
context 'originally with tags' do
|
||||
let(:tags) { [Fabricate(:tag, name: 'test'), Fabricate(:tag, name: 'foo')] }
|
||||
|
||||
let(:payload) do
|
||||
{
|
||||
'@context': 'https://www.w3.org/ns/activitystreams',
|
||||
id: 'foo',
|
||||
type: 'Note',
|
||||
summary: 'Show more',
|
||||
content: 'Hello universe',
|
||||
updated: '2021-09-08T22:39:25Z',
|
||||
tag: [
|
||||
{ type: 'Hashtag', name: 'foo' },
|
||||
],
|
||||
}
|
||||
end
|
||||
|
||||
before do
|
||||
subject.call(status, json)
|
||||
end
|
||||
|
||||
it 'updates tags' do
|
||||
expect(status.tags.reload.map(&:name)).to eq %w(foo)
|
||||
end
|
||||
end
|
||||
|
||||
context 'originally without mentions' do
|
||||
before do
|
||||
subject.call(status, json)
|
||||
end
|
||||
|
||||
it 'updates mentions' do
|
||||
expect(status.active_mentions.reload.map(&:account_id)).to eq [alice.id]
|
||||
end
|
||||
end
|
||||
|
||||
context 'originally with mentions' do
|
||||
let(:mentions) { [alice, bob] }
|
||||
|
||||
before do
|
||||
subject.call(status, json)
|
||||
end
|
||||
|
||||
it 'updates mentions' do
|
||||
expect(status.active_mentions.reload.map(&:account_id)).to eq [alice.id]
|
||||
end
|
||||
end
|
||||
|
||||
context 'originally without media attachments' do
|
||||
before do
|
||||
allow(RedownloadMediaWorker).to receive(:perform_async)
|
||||
subject.call(status, json)
|
||||
end
|
||||
|
||||
let(:payload) do
|
||||
{
|
||||
'@context': 'https://www.w3.org/ns/activitystreams',
|
||||
id: 'foo',
|
||||
type: 'Note',
|
||||
content: 'Hello universe',
|
||||
updated: '2021-09-08T22:39:25Z',
|
||||
attachment: [
|
||||
{ type: 'Image', mediaType: 'image/png', url: 'https://example.com/foo.png' },
|
||||
]
|
||||
}
|
||||
end
|
||||
|
||||
it 'updates media attachments' do
|
||||
media_attachment = status.media_attachments.reload.first
|
||||
|
||||
expect(media_attachment).to_not be_nil
|
||||
expect(media_attachment.remote_url).to eq 'https://example.com/foo.png'
|
||||
end
|
||||
|
||||
it 'queues download of media attachments' do
|
||||
expect(RedownloadMediaWorker).to have_received(:perform_async)
|
||||
end
|
||||
|
||||
it 'records media change in edit' do
|
||||
expect(status.edits.reload.last.media_attachments_changed).to be true
|
||||
end
|
||||
end
|
||||
|
||||
context 'originally with media attachments' do
|
||||
let(:media_attachments) { [Fabricate(:media_attachment, remote_url: 'https://example.com/foo.png'), Fabricate(:media_attachment, remote_url: 'https://example.com/unused.png')] }
|
||||
|
||||
let(:payload) do
|
||||
{
|
||||
'@context': 'https://www.w3.org/ns/activitystreams',
|
||||
id: 'foo',
|
||||
type: 'Note',
|
||||
content: 'Hello universe',
|
||||
updated: '2021-09-08T22:39:25Z',
|
||||
attachment: [
|
||||
{ type: 'Image', mediaType: 'image/png', url: 'https://example.com/foo.png', name: 'A picture' },
|
||||
]
|
||||
}
|
||||
end
|
||||
|
||||
before do
|
||||
allow(RedownloadMediaWorker).to receive(:perform_async)
|
||||
subject.call(status, json)
|
||||
end
|
||||
|
||||
it 'updates the existing media attachment in-place' do
|
||||
media_attachment = status.media_attachments.reload.first
|
||||
|
||||
expect(media_attachment).to_not be_nil
|
||||
expect(media_attachment.remote_url).to eq 'https://example.com/foo.png'
|
||||
expect(media_attachment.description).to eq 'A picture'
|
||||
end
|
||||
|
||||
it 'does not queue redownload for the existing media attachment' do
|
||||
expect(RedownloadMediaWorker).to_not have_received(:perform_async)
|
||||
end
|
||||
|
||||
it 'updates media attachments' do
|
||||
expect(status.media_attachments.reload.map(&:remote_url)).to eq %w(https://example.com/foo.png)
|
||||
end
|
||||
|
||||
it 'records media change in edit' do
|
||||
expect(status.edits.reload.last.media_attachments_changed).to be true
|
||||
end
|
||||
end
|
||||
|
||||
context 'originally with a poll' do
|
||||
before do
|
||||
poll = Fabricate(:poll, status: status)
|
||||
status.update(preloadable_poll: poll)
|
||||
subject.call(status, json)
|
||||
end
|
||||
|
||||
it 'removes poll' do
|
||||
expect(status.reload.poll).to eq nil
|
||||
end
|
||||
|
||||
it 'records media change in edit' do
|
||||
expect(status.edits.reload.last.media_attachments_changed).to be true
|
||||
end
|
||||
end
|
||||
|
||||
context 'originally without a poll' do
|
||||
let(:payload) do
|
||||
{
|
||||
'@context': 'https://www.w3.org/ns/activitystreams',
|
||||
id: 'foo',
|
||||
type: 'Question',
|
||||
content: 'Hello universe',
|
||||
updated: '2021-09-08T22:39:25Z',
|
||||
closed: true,
|
||||
oneOf: [
|
||||
{ type: 'Note', name: 'Foo' },
|
||||
{ type: 'Note', name: 'Bar' },
|
||||
{ type: 'Note', name: 'Baz' },
|
||||
],
|
||||
}
|
||||
end
|
||||
|
||||
before do
|
||||
subject.call(status, json)
|
||||
end
|
||||
|
||||
it 'creates a poll' do
|
||||
poll = status.reload.poll
|
||||
|
||||
expect(poll).to_not be_nil
|
||||
expect(poll.options).to eq %w(Foo Bar Baz)
|
||||
end
|
||||
|
||||
it 'records media change in edit' do
|
||||
expect(status.edits.reload.last.media_attachments_changed).to be true
|
||||
end
|
||||
end
|
||||
|
||||
it 'creates edit history' do
|
||||
subject.call(status, json)
|
||||
expect(status.edits.reload.map(&:text)).to eq ['Hello world', 'Hello universe']
|
||||
end
|
||||
|
||||
it 'sets edited timestamp' do
|
||||
subject.call(status, json)
|
||||
expect(status.reload.edited_at.to_s).to eq '2021-09-08 22:39:25 UTC'
|
||||
end
|
||||
|
||||
it 'records that no media has been changed in edit' do
|
||||
subject.call(status, json)
|
||||
expect(status.edits.reload.last.media_attachments_changed).to be false
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,130 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe UpdateStatusService, type: :service do
|
||||
subject { described_class.new }
|
||||
|
||||
context 'when text changes' do
|
||||
let!(:status) { Fabricate(:status, text: 'Foo') }
|
||||
let(:preview_card) { Fabricate(:preview_card) }
|
||||
|
||||
before do
|
||||
status.preview_cards << preview_card
|
||||
subject.call(status, status.account_id, text: 'Bar')
|
||||
end
|
||||
|
||||
it 'updates text' do
|
||||
expect(status.reload.text).to eq 'Bar'
|
||||
end
|
||||
|
||||
it 'resets preview card' do
|
||||
expect(status.reload.preview_card).to be_nil
|
||||
end
|
||||
|
||||
it 'saves edit history' do
|
||||
expect(status.edits.pluck(:text, :media_attachments_changed)).to eq [['Foo', false], ['Bar', false]]
|
||||
end
|
||||
end
|
||||
|
||||
context 'when content warning changes' do
|
||||
let!(:status) { Fabricate(:status, text: 'Foo', spoiler_text: '') }
|
||||
let(:preview_card) { Fabricate(:preview_card) }
|
||||
|
||||
before do
|
||||
status.preview_cards << preview_card
|
||||
subject.call(status, status.account_id, text: 'Foo', spoiler_text: 'Bar')
|
||||
end
|
||||
|
||||
it 'updates content warning' do
|
||||
expect(status.reload.spoiler_text).to eq 'Bar'
|
||||
end
|
||||
|
||||
it 'saves edit history' do
|
||||
expect(status.edits.pluck(:text, :spoiler_text, :media_attachments_changed)).to eq [['Foo', '', false], ['Foo', 'Bar', false]]
|
||||
end
|
||||
end
|
||||
|
||||
context 'when media attachments change' do
|
||||
let!(:status) { Fabricate(:status, text: 'Foo') }
|
||||
let!(:detached_media_attachment) { Fabricate(:media_attachment, account: status.account) }
|
||||
let!(:attached_media_attachment) { Fabricate(:media_attachment, account: status.account) }
|
||||
|
||||
before do
|
||||
status.media_attachments << detached_media_attachment
|
||||
subject.call(status, status.account_id, text: 'Foo', media_ids: [attached_media_attachment.id])
|
||||
end
|
||||
|
||||
it 'updates media attachments' do
|
||||
expect(status.media_attachments.to_a).to eq [attached_media_attachment]
|
||||
end
|
||||
|
||||
it 'detaches detached media attachments' do
|
||||
expect(detached_media_attachment.reload.status_id).to be_nil
|
||||
end
|
||||
|
||||
it 'attaches attached media attachments' do
|
||||
expect(attached_media_attachment.reload.status_id).to eq status.id
|
||||
end
|
||||
|
||||
it 'saves edit history' do
|
||||
expect(status.edits.pluck(:text, :media_attachments_changed)).to eq [['Foo', false], ['Foo', true]]
|
||||
end
|
||||
end
|
||||
|
||||
context 'when poll changes' do
|
||||
let!(:status) { Fabricate(:status, text: 'Foo') }
|
||||
let!(:poll) { Fabricate(:poll, options: %w(Foo Bar)) }
|
||||
|
||||
before do
|
||||
status.update(poll: poll)
|
||||
subject.call(status, status.account_id, text: 'Foo', poll: { options: %w(Bar Baz), expires_in: 5.days.to_i })
|
||||
end
|
||||
|
||||
it 'updates poll' do
|
||||
expect(status.poll).to_not eq poll
|
||||
expect(status.poll.options).to eq %w(Bar Baz)
|
||||
end
|
||||
|
||||
it 'saves edit history' do
|
||||
expect(status.edits.pluck(:text, :media_attachments_changed)).to eq [['Foo', false], ['Foo', true]]
|
||||
end
|
||||
end
|
||||
|
||||
context 'when mentions in text change' do
|
||||
let!(:account) { Fabricate(:account) }
|
||||
let!(:alice) { Fabricate(:account, username: 'alice') }
|
||||
let!(:bob) { Fabricate(:account, username: 'bob') }
|
||||
let!(:status) { PostStatusService.new.call(account, text: 'Hello @alice') }
|
||||
|
||||
before do
|
||||
subject.call(status, status.account_id, text: 'Hello @bob')
|
||||
end
|
||||
|
||||
it 'changes mentions' do
|
||||
expect(status.active_mentions.pluck(:account_id)).to eq [bob.id]
|
||||
end
|
||||
|
||||
it 'keeps old mentions as silent mentions' do
|
||||
expect(status.mentions.pluck(:account_id)).to eq [alice.id, bob.id]
|
||||
end
|
||||
end
|
||||
|
||||
context 'when hashtags in text change' do
|
||||
let!(:account) { Fabricate(:account) }
|
||||
let!(:status) { PostStatusService.new.call(account, text: 'Hello #foo') }
|
||||
|
||||
before do
|
||||
subject.call(status, status.account_id, text: 'Hello #bar')
|
||||
end
|
||||
|
||||
it 'changes tags' do
|
||||
expect(status.tags.pluck(:name)).to eq %w(bar)
|
||||
end
|
||||
end
|
||||
|
||||
it 'notifies ActivityPub about the update' do
|
||||
status = Fabricate(:status, text: 'Foo')
|
||||
allow(ActivityPub::DistributionWorker).to receive(:perform_async)
|
||||
subject.call(status, status.account_id, text: 'Bar')
|
||||
expect(ActivityPub::DistributionWorker).to have_received(:perform_async)
|
||||
end
|
||||
end
|
||||
Loading…
Reference in new issue