Merge remote-tracking branch 'parent/main' into kb_migration

app/javascript/mastodon/components/dismissable_banner.tsx

@@ -33,8 +33,6 @@ export const DismissableBanner: React.FC<PropsWithChildren<Props>> = ({
 
   return (
     <div className='dismissable-banner'>
-      <div className='dismissable-banner__message'>{children}</div>
-
       <div className='dismissable-banner__action'>
         <IconButton
           icon='times'
@@ -42,6 +40,8 @@ export const DismissableBanner: React.FC<PropsWithChildren<Props>> = ({
           onClick={handleDismiss}
         />
       </div>
+
+      <div className='dismissable-banner__message'>{children}</div>
     </div>
   );
 };

app/javascript/styles/mastodon/components.scss

@@ -9300,9 +9300,7 @@ noscript {
   }
 
   &__action {
-    position: absolute;
-    inset-inline-end: 0;
-    top: 0;
+    float: right;
     padding: 15px 10px;
 
     .icon-button {

app/javascript/styles/mastodon/rtl.scss

@@ -58,4 +58,11 @@ body.rtl {
   .fa-chevron-right::before {
     content: '\F053';
   }
+
+  .dismissable-banner,
+  .warning-banner {
+    &__action {
+      float: left;
+    }
+  }
 }

app/lib/activitypub/activity/update.rb

@@ -30,6 +30,6 @@ class ActivityPub::Activity::Update < ActivityPub::Activity
 
     return if @status.nil?
 
-    ActivityPub::ProcessStatusUpdateService.new.call(@status, @object, request_id: @options[:request_id])
+    ActivityPub::ProcessStatusUpdateService.new.call(@status, @json, @object, request_id: @options[:request_id])
   end
 end

app/models/media_attachment.rb

@@ -417,6 +417,6 @@ class MediaAttachment < ApplicationRecord
   end
 
   def reset_parent_cache
-    Rails.cache.delete("statuses/#{status_id}") if status_id.present?
+    Rails.cache.delete("v3:statuses/#{status_id}") if status_id.present?
   end
 end

app/models/poll.rb

@@ -108,7 +108,7 @@ class Poll < ApplicationRecord
   def reset_parent_cache
     return if status_id.nil?
 
-    Rails.cache.delete("statuses/#{status_id}")
+    Rails.cache.delete("v3:statuses/#{status_id}")
   end
 
   def last_fetched_before_expiration?

app/models/status_stat.rb

@@ -21,8 +21,6 @@
 class StatusStat < ApplicationRecord
   belongs_to :status, inverse_of: :status_stat
 
-  after_commit :reset_parent_cache
-
   def replies_count
     [attributes['replies_count'], 0].max
   end
@@ -50,10 +48,4 @@ class StatusStat < ApplicationRecord
   def status_referred_by_count
     [attributes['status_referred_by_count'] || 0, 0].max
   end
-
-  private
-
-  def reset_parent_cache
-    Rails.cache.delete("statuses/#{status_id}")
-  end
 end

app/services/activitypub/fetch_remote_poll_service.rb

@@ -8,6 +8,6 @@ class ActivityPub::FetchRemotePollService < BaseService
 
     return unless supported_context?(json)
 
-    ActivityPub::ProcessStatusUpdateService.new.call(poll.status, json)
+    ActivityPub::ProcessStatusUpdateService.new.call(poll.status, json, json)
   end
 end

app/services/activitypub/process_status_update_service.rb

@@ -5,10 +5,11 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
   include Redisable
   include Lockable
 
-  def call(status, json, request_id: nil)
+  def call(status, activity_json, object_json, request_id: nil)
     raise ArgumentError, 'Status has unsaved changes' if status.changed?
 
-    @json                      = json
+    @activity_json             = activity_json
+    @json                      = object_json
     @status_parser             = ActivityPub::Parser::StatusParser.new(@json)
     @uri                       = @status_parser.uri
     @status                    = status
@@ -324,6 +325,6 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
   end
 
   def forwarder
-    @forwarder ||= ActivityPub::Forwarder.new(@account, @json, @status)
+    @forwarder ||= ActivityPub::Forwarder.new(@account, @activity_json, @status)
   end
 end

app/services/statuses_search_service.rb

@@ -43,12 +43,12 @@ class StatusesSearchService < BaseService
     end
 
     if @options[:min_id]
-      timestamp = Mastodon::Snowflake.to_time(@options[:min_id])
+      timestamp = Mastodon::Snowflake.to_time(@options[:min_id].to_i)
       syntax_options << "after:\"#{timestamp.iso8601}\""
     end
 
     if @options[:max_id]
-      timestamp = Mastodon::Snowflake.to_time(@options[:max_id])
+      timestamp = Mastodon::Snowflake.to_time(@options[:max_id].to_i)
       syntax_options << "before:\"#{timestamp.iso8601}\""
     end