Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream introduced support for private pinned toots, but glitch-soc's query
  was a bit different as it filtered out local-only toots.
  Used upstream's query, while adding local-only filtering back.
- `app/controllers/activitypub/collections_controller.rb`:
  Same thing with regards to local-only posts.
- `app/validators/status_pin_validator.rb`:
  Not a real conflict, but the line below was different in glitch-soc due to
  the configurable pinned toots limit.

diff --cc app/controllers/accounts_controller.rb
index f9bd616e430cbf612e333b9e24571ee4a8e2b41a,ddd38cbb01f7024203690122a31d8c27ef194130..03c07c50b060a8b4b0d5c1813c7c645919326b0d
--- 1/app/controllers/accounts_controller.rb
--- 2/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@@ -65,6 -64,10 +65,10 @@@ class AccountsController < ApplicationC
      [replies_requested?, media_requested?, tag_requested?, params[:max_id].present?, params[:min_id].present?].none?
    end
  
 -    @account.pinned_statuses.where(visibility: [:public, :unlisted])
+   def filtered_pinned_statuses
++    @account.pinned_statuses.not_local_only.where(visibility: [:public, :unlisted])
+   end
+ 
    def filtered_statuses
      default_statuses.tap do |statuses|
        statuses.merge!(hashtag_scope)    if tag_requested?

diff --cc app/controllers/activitypub/collections_controller.rb
index 00f3d3cba86a0c8192d6bfe7b74571189adf7a79,e4e994a9855c3bfe3ccff4fe19d215ee5143b0bc..ac7ab8a0b25c0b4ce607d034367a0eee5afca3da
--- 1/app/controllers/activitypub/collections_controller.rb
--- 2/app/controllers/activitypub/collections_controller.rb
+++ b/app/controllers/activitypub/collections_controller.rb
@@@ -20,7 -20,8 +20,8 @@@ class ActivityPub::CollectionsControlle
    def set_items
      case params[:id]
      when 'featured'
 -      @items = for_signed_account { cache_collection(@account.pinned_statuses, Status) }
 +      @items = for_signed_account { cache_collection(@account.pinned_statuses.not_local_only, Status) }
+       @items = @items.map { |item| item.distributable? ? item : ActivityPub::TagManager.instance.uri_for(item) }
      when 'tags'
        @items = for_signed_account { @account.featured_tags }
      when 'devices'

diff --cc app/validators/status_pin_validator.rb
index 16353066c16337a0543af24656e73cb6ff99b94d,2fdd5b34fd41e008964980bce4111a4153bc635e..35a101f1d7559b4df8168cfb25c9098d565fe120
--- 1/app/validators/status_pin_validator.rb
--- 2/app/validators/status_pin_validator.rb
+++ b/app/validators/status_pin_validator.rb
@@@ -6,7 -4,7 +6,7 @@@ class StatusPinValidator < ActiveModel:
    def validate(pin)
      pin.errors.add(:base, I18n.t('statuses.pin_errors.reblog')) if pin.status.reblog?
      pin.errors.add(:base, I18n.t('statuses.pin_errors.ownership')) if pin.account_id != pin.status.account_id
-     pin.errors.add(:base, I18n.t('statuses.pin_errors.private')) unless %w(public unlisted).include?(pin.status.visibility)
+     pin.errors.add(:base, I18n.t('statuses.pin_errors.direct')) if pin.status.direct_visibility?
 -    pin.errors.add(:base, I18n.t('statuses.pin_errors.limit')) if pin.account.status_pins.count > 4 && pin.account.local?
 +    pin.errors.add(:base, I18n.t('statuses.pin_errors.limit')) if pin.account.status_pins.count >= MAX_PINNED  && pin.account.local?
    end
  end