Merge remote-tracking branch 'origin/master' into merge-upstream

master
David Yip 7 years ago
commit da70208b45
No known key found for this signature in database
GPG Key ID: 7DA0036508FCC0CC
  1. 2
      app/javascript/mastodon/components/scrollable_list.js
  2. 8
      app/lib/activitypub/activity.rb
  3. 1
      app/lib/activitypub/activity/announce.rb
  4. 1
      app/lib/activitypub/activity/create.rb
  5. 10
      app/lib/ostatus/activity/creation.rb
  6. 4
      app/models/status.rb
  7. 2
      app/workers/activitypub/processing_worker.rb
  8. 2
      app/workers/processing_worker.rb
  9. 2
      config/locales/ja.yml
  10. 2
      lib/mastodon/snowflake.rb

@ -72,7 +72,7 @@ export default class ScrollableList extends PureComponent {
const someItemInserted = React.Children.count(prevProps.children) > 0 &&
React.Children.count(prevProps.children) < React.Children.count(this.props.children) &&
this.getFirstChildKey(prevProps) !== this.getFirstChildKey(this.props);
if (someItemInserted && this.node.scrollTop > 0 || this.state.mouseOver) {
if (someItemInserted && this.node.scrollTop > 0 || (this.state.mouseOver && !prevProps.isLoading)) {
return this.node.scrollHeight - this.node.scrollTop;
} else {
return null;

@ -78,9 +78,11 @@ class ActivityPub::Activity
notify_about_reblog(status) if reblog_of_local_account?(status)
notify_about_mentions(status)
# Only continue if the status is supposed to have
# arrived in real-time
return unless status.within_realtime_window?
# Only continue if the status is supposed to have arrived in real-time.
# Note that if @options[:override_timestamps] isn't set, the status
# may have a lower snowflake id than other existing statuses, potentially
# "hiding" it from paginated API calls
return unless @options[:override_timestamps] || status.within_realtime_window?
distribute_to_followers(status)
end

@ -16,6 +16,7 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
reblog: original_status,
uri: @json['id'],
created_at: @json['published'],
override_timestamps: @options[:override_timestamps],
visibility: original_status.visibility
)

@ -48,6 +48,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
language: detected_language,
spoiler_text: @object['summary'] || '',
created_at: @object['published'],
override_timestamps: @options[:override_timestamps],
reply: @object['inReplyTo'].present?,
sensitive: @object['sensitive'] || false,
visibility: visibility_from_audience,

@ -40,6 +40,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
text: content,
spoiler_text: content_warning,
created_at: published,
override_timestamps: @options[:override_timestamps],
reply: thread?,
language: content_language,
visibility: visibility_scope,
@ -61,7 +62,14 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution"
LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text?
DistributionWorker.perform_async(status.id) if status.within_realtime_window?
# Only continue if the status is supposed to have arrived in real-time.
# Note that if @options[:override_timestamps] isn't set, the status
# may have a lower snowflake id than other existing statuses, potentially
# "hiding" it from paginated API calls
return status unless @options[:override_timestamps] || status.within_realtime_window?
DistributionWorker.perform_async(status.id)
status
end

@ -33,6 +33,10 @@ class Status < ApplicationRecord
include Cacheable
include StatusThreadingConcern
# If `override_timestamps` is set at creation time, Snowflake ID creation
# will be based on current time instead of `created_at`
attr_accessor :override_timestamps
update_index('statuses#status', :proper) if Chewy.enabled?
enum visibility: [:public, :unlisted, :private, :direct], _suffix: :visibility

@ -6,6 +6,6 @@ class ActivityPub::ProcessingWorker
sidekiq_options backtrace: true
def perform(account_id, body)
ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id))
ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id), override_timestamps: true)
end
end

@ -6,6 +6,6 @@ class ProcessingWorker
sidekiq_options backtrace: true
def perform(account_id, body)
ProcessFeedService.new.call(body, Account.find(account_id))
ProcessFeedService.new.call(body, Account.find(account_id), override_timestamps: true)
end
end

@ -805,7 +805,7 @@ ja:
default: "%Y年%m月%d日 %H:%M"
two_factor_authentication:
code_hint: 確認するには認証アプリで表示されたコードを入力してください
description_html: "<strong>二段階認証</strong>を有効にするとログイン時、電話でコードを受け取る必要があります。"
description_html: "<strong>二段階認証</strong>を有効にするとログイン時、認証アプリからコードを入力する必要があります。"
disable: 無効
enable: 有効
enabled: 二段階認証は有効になっています

@ -7,7 +7,7 @@ module Mastodon::Snowflake
def self.around_create(record)
now = Time.now.utc
if record.created_at.nil? || record.created_at >= now || record.created_at == record.updated_at
if record.created_at.nil? || record.created_at >= now || record.created_at == record.updated_at || record.override_timestamps
yield
else
record.id = Mastodon::Snowflake.id_at(record.created_at)

Loading…
Cancel
Save