Add: フレンドサーバー

app/controllers/admin/domain_blocks_controller.rb

@@ -89,17 +89,17 @@ def set_domain_block
 
     def update_params
       params.require(:domain_block).permit(:severity, :reject_media, :reject_favourite, :reject_reply, :reject_reply_exclude_followers, :reject_send_not_public_searchability, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag,
-                                           :reject_straight_follow, :reject_new_follow, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
+                                           :reject_straight_follow, :reject_new_follow, :reject_friend, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
     end
 
     def resource_params
       params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_reply_exclude_followers, :reject_send_not_public_searchability, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag,
-                                           :reject_straight_follow, :reject_new_follow, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
+                                           :reject_straight_follow, :reject_new_follow, :reject_friend, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
     end
 
     def form_domain_block_batch_params
       params.require(:form_domain_block_batch).permit(domain_blocks_attributes: [:enabled, :domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_reply_exclude_followers, :reject_send_not_public_searchability, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media,
-                                                                                 :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous])
+                                                                                 :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :reject_friend, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous])
     end
 
     def action_from_button

app/controllers/admin/friend_servers_controller.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+module Admin
+  class FriendServersController < BaseController
+    before_action :set_friend, except: [:index, :new, :create]
+    before_action :warn_signatures_not_enabled!, only: [:new, :edit, :create, :follow, :unfollow, :accept, :reject]
+
+    def index
+      authorize :friend_server, :update?
+      @friends = FriendDomain.all
+    end
+
+    def new
+      authorize :friend_server, :update?
+      @friend = FriendDomain.new
+    end
+
+    def edit
+      authorize :friend_server, :update?
+    end
+
+    def create
+      authorize :friend_server, :update?
+
+      @friend = FriendDomain.new(resource_params)
+
+      if @friend.save
+        @friend.follow!
+        redirect_to admin_friend_servers_path
+      else
+        render action: :new
+      end
+    end
+
+    def update
+      authorize :friend_server, :update?
+
+      if @friend.update(resource_params)
+        redirect_to admin_friend_servers_path
+      else
+        render action: :edit
+      end
+    end
+
+    def destroy
+      authorize :friend_server, :update?
+      @friend.destroy
+      redirect_to admin_friend_servers_path
+    end
+
+    def follow
+      authorize :friend_server, :update?
+      @friend.follow!
+      render action: :edit
+    end
+
+    def unfollow
+      authorize :friend_server, :update?
+      @friend.unfollow!
+      render action: :edit
+    end
+
+    def accept
+      authorize :friend_server, :update?
+      @friend.accept!
+      render action: :edit
+    end
+
+    def reject
+      authorize :friend_server, :update?
+      @friend.reject!
+      render action: :edit
+    end
+
+    private
+
+    def set_friend
+      @friend = FriendDomain.find(params[:id])
+    end
+
+    def resource_params
+      params.require(:friend_domain).permit(:domain, :inbox_url, :available, :pseudo_relay, :unlocked, :allow_all_posts)
+    end
+
+    def warn_signatures_not_enabled!
+      flash.now[:error] = I18n.t('admin.relays.signatures_not_enabled') if authorized_fetch_mode?
+    end
+  end
+end

app/controllers/api/v1/admin/domain_blocks_controller.rb

@@ -70,7 +70,7 @@ def filtered_domain_blocks
 
   def domain_block_params
     params.permit(:severity, :reject_media, :reject_favourite, :reject_reply, :reject_reply_exclude_followers, :reject_reports, :reject_send_not_public_searchability, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow,
-                  :reject_new_follow, :detect_invalid_subscription, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
+                  :reject_new_follow, :reject_friend, :detect_invalid_subscription, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
   end
 
   def insert_pagination_headers
@@ -103,6 +103,6 @@ def pagination_params(core_params)
 
   def resource_params
     params.permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_reply_exclude_followers, :reject_send_not_public_searchability, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow,
-                  :reject_new_follow, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
+                  :reject_new_follow, :reject_friend, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
   end
 end

app/lib/activitypub/activity/accept.rb

@@ -3,6 +3,7 @@
 class ActivityPub::Activity::Accept < ActivityPub::Activity
   def perform
     return accept_follow_for_relay if relay_follow?
+    return accept_follow_for_friend if friend_follow?
     return accept_follow!(follow_request_from_object) unless follow_request_from_object.nil?
 
     case @object['type']
@@ -43,6 +44,18 @@ def relay_follow?
     relay.present?
   end
 
+  def accept_follow_for_friend
+    friend.update!(active_state: :accepted)
+  end
+
+  def friend
+    @friend ||= FriendDomain.find_by(domain: @account.domain, active_follow_activity_id: object_uri, active_state: [:pending, :accepted]) if @account.domain.present?
+  end
+
+  def friend_follow?
+    friend.present?
+  end
+
   def target_uri
     @target_uri ||= value_or_id(@object['actor'])
   end

app/lib/activitypub/activity/create.rb

@@ -447,7 +447,7 @@ def ignore_hashtags?
 
   def related_to_local_activity?
     fetch? || followed_by_local_accounts? || requested_through_relay? ||
-      responds_to_followed_account? || addresses_local_accounts? || quote_local?
+      responds_to_followed_account? || addresses_local_accounts? || quote_local? || free_friend_domain?
   end
 
   def responds_to_followed_account?
@@ -502,6 +502,10 @@ def quote_local?
     end
   end
 
+  def free_friend_domain?
+    FriendDomain.free_receivings.exists?(domain: @account.domain)
+  end
+
   def quote
     @quote ||= @object['quote'] || @object['quoteUrl'] || @object['quoteURL'] || @object['_misskey_quote']
   end

app/lib/activitypub/activity/delete.rb

@@ -4,6 +4,8 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
   def perform
     if @account.uri == object_uri
       delete_person
+    elsif object_uri == ActivityPub::TagManager::COLLECTIONS[:public]
+      delete_friend
     else
       delete_note
     end
@@ -42,6 +44,11 @@ def delete_note
     end
   end
 
+  def delete_friend
+    friend = FriendDomain.find_by(domain: @account.domain)
+    friend&.destroy
+  end
+
   def forwarder
     @forwarder ||= ActivityPub::Forwarder.new(@account, @json, @status)
   end

app/lib/activitypub/activity/follow.rb

@@ -4,6 +4,8 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity
   include Payloadable
 
   def perform
+    return request_follow_for_friend if friend_follow?
+
     target_account = account_from_uri(object_uri)
 
     return if target_account.nil? || !target_account.local? || delete_arrived_first?(@json['id'])
@@ -43,6 +45,36 @@ def reject_follow_request!(target_account)
     ActivityPub::DeliveryWorker.perform_async(json, target_account.id, @account.inbox_url)
   end
 
+  def request_follow_for_friend
+    already_accepted = false
+
+    if friend.present?
+      already_accepted = friend.they_are_accepted?
+      friend.update!(passive_state: :pending, passive_follow_activity_id: @json['id'])
+    else
+      @friend = FriendDomain.create!(domain: @account.domain, passive_state: :pending, passive_follow_activity_id: @json['id'])
+    end
+
+    if already_accepted || friend.unlocked || Setting.unlocked_friend
+      friend.accept!
+    else
+      # Notify for admin even if unlocked
+      notify_staff_about_pending_friend_server!
+    end
+  end
+
+  def friend
+    @friend ||= FriendDomain.find_by(domain: @account.domain) if @account.domain.present?
+  end
+
+  def friend_follow?
+    @json['object'] == ActivityPub::TagManager::COLLECTIONS[:public] && !block_friend?
+  end
+
+  def block_friend?
+    @block_friend ||= DomainBlock.reject_friend?(@account.domain) || DomainBlock.blocked?(@account.domain)
+  end
+
   def block_straight_follow?
     @block_straight_follow ||= DomainBlock.reject_straight_follow?(@account.domain)
   end
@@ -73,4 +105,12 @@ def proxyable_software?
   def instance_info
     @instance_info ||= InstanceInfo.find_by(domain: @account.domain)
   end
+
+  def notify_staff_about_pending_friend_server!
+    User.those_who_can(:manage_federation).includes(:account).find_each do |u|
+      next unless u.allows_pending_friend_server_emails?
+
+      AdminMailer.with(recipient: u.account).new_pending_friend_server(friend).deliver_later
+    end
+  end
 end

app/lib/activitypub/activity/reject.rb

@@ -3,6 +3,7 @@
 class ActivityPub::Activity::Reject < ActivityPub::Activity
   def perform
     return reject_follow_for_relay if relay_follow?
+    return reject_follow_for_friend if friend_follow?
     return follow_request_from_object.reject! unless follow_request_from_object.nil?
     return UnfollowService.new.call(follow_from_object.account, @account) unless follow_from_object.nil?
 
@@ -37,6 +38,18 @@ def relay_follow?
     relay.present?
   end
 
+  def reject_follow_for_friend
+    friend.update!(active_state: :rejected)
+  end
+
+  def friend
+    @friend ||= FriendDomain.find_by(domain: @account.domain, active_follow_activity_id: object_uri, active_state: [:pending, :accepted]) if @account.domain.present?
+  end
+
+  def friend_follow?
+    friend.present?
+  end
+
   def target_uri
     @target_uri ||= value_or_id(@object['actor'])
   end

app/lib/activitypub/activity/undo.rb

@@ -87,6 +87,8 @@ def undo_accept
   end
 
   def undo_follow
+    return remove_follow_from_friend if friend_follow?
+
     target_account = account_from_uri(target_uri)
 
     return if target_account.nil? || !target_account.local?
@@ -100,6 +102,18 @@ def undo_follow
     end
   end
 
+  def remove_follow_from_friend
+    friend.update!(passive_state: :idle, passive_follow_activity_id: nil)
+  end
+
+  def friend
+    @friend ||= FriendDomain.find_by(domain: @account.domain) if @account.domain.present? && @object['object'] == ActivityPub::TagManager::COLLECTIONS[:public]
+  end
+
+  def friend_follow?
+    friend.present?
+  end
+
   def undo_like_original
     status = status_from_uri(target_uri)
 

app/lib/activitypub/parser/status_parser.rb

@@ -76,6 +76,8 @@ def sensitive
   def visibility
     if audience_to.any? { |to| ActivityPub::TagManager.instance.public_collection?(to) }
       :public
+    elsif audience_to.include?('LocalPublic')
+      :public_unlisted
     elsif audience_cc.any? { |cc| ActivityPub::TagManager.instance.public_collection?(cc) }
       :unlisted
     elsif audience_to.include?('as:LoginOnly') || audience_to.include?('LoginUser')
@@ -198,6 +200,8 @@ def searchability_from_audience
       :public
     elsif audience_searchable_by.include?('as:Limited')
       :limited
+    elsif audience_searchable_by.include?('LocalPublic')
+      :public_unlisted
     elsif audience_searchable_by.include?(@account.followers_url)
       :private
     else

app/lib/activitypub/tag_manager.rb

@@ -126,6 +126,12 @@ def to(status)
     end
   end
 
+  def to_for_friend(status)
+    to = to(status)
+    to << 'LocalPublic' if status.public_unlisted_visibility?
+    to
+  end
+
   # Secondary audience of a status
   # Public statuses go out to followers as well
   # Unlisted statuses go to the public as well
@@ -147,7 +153,7 @@ def cc(status)
   end
 
   def cc_for_misskey(status)
-    if (status.account.user&.setting_reject_unlisted_subscription && status.visibility == 'unlisted') || (status.account.user&.setting_reject_public_unlisted_subscription && status.visibility == 'public_unlisted')
+    if (status.account.user&.setting_reject_unlisted_subscription && status.unlisted_visibility?) || (status.account.user&.setting_reject_public_unlisted_subscription && status.public_unlisted_visibility?)
       cc = cc_private_visibility(status)
       cc << uri_for(status.reblog.account) if status.reblog?
       return cc
@@ -251,6 +257,12 @@ def searchable_by(status)
     searchable_by.concat(mentions_uris(status)).compact
   end
 
+  def searchable_by_for_friend(status)
+    searchable = searchable_by(status)
+    searchable << 'LocalPublic' if status.compute_searchability_local == 'public_unlisted'
+    searchable
+  end
+
   def account_searchable_by(account)
     case account.compute_searchability_activitypub
     when 'public'