Split into several filters.

Author: nat-henderson

assets/lib/filters/approval.rb

@@ -0,0 +1,22 @@
+module Filters
+  class Approval
+    def initialize(pull_requests:, input: Input.instance)
+      @pull_requests = pull_requests
+      @input = input
+    end
+
+    def pull_requests
+      if @input.source.require_review_approval
+        @pull_requests.delete_if {|x| !x.review_approved? }
+      end
+      if @input.source.require_manual_approval
+        @pull_requests.delete_if {|x| !x.approved_by_collaborator? }
+      end
+      if @input.source.authorship_restriction
+        @pull_requests.delete_if {|x| !x.author_associated? }
+      end
+
+      @pull_requests
+    end
+  end
+end

assets/lib/pull_request.rb

@@ -17,9 +17,23 @@ def from_fork?
   end
 
   def mergeable?
-      (@pr['mergeable'] &&
-       @pr['base']['repo']['permissions']['push'] &&
-       Octokit.pull_request_reviews(base_repo, id).any? {|r| r['state'] == 'APPROVED'})
+    @pr['mergeable']
+  end
+
+  def review_approved?
+    Octokit.pull_request_reviews(base_repo, id).any? {|r| r['state'] == 'APPROVED'}
+  end
+
+  def author_associated?
+    # Checks whether the author is associated with the repo that the PR is against:
+    # either the owner of that repo, someone invited to collaborate, or a member
+    # of the organization who owns that repository.
+    %w(OWNER COLLABORATOR MEMBER).include? @pr['author_association']
+  end
+
+  def approved_by_collaborator?
+    Octokit.pull_comments(base_repo, id).any? {|c| (%w(OWNER COLLABORATOR MEMBER).include?(c['author_association']) &&
+                                                    c['body'].downcase.include?('ci ok')) }
   end
 
   def equals?(id:, sha:)

assets/lib/repository.rb

@@ -6,11 +6,12 @@
 require_relative 'filters/path'
 require_relative 'filters/ci_skip'
 require_relative 'filters/mergeable'
+require_relative 'filters/approval'
 
 class Repository
   attr_reader :name
 
-  def initialize(name:, input: Input.instance, filters: [Filters::All, Filters::Path, Filters::Fork, Filters::Label, Filters::CISkip, Filters::Mergeable])
+  def initialize(name:, input: Input.instance, filters: [Filters::All, Filters::Path, Filters::Fork, Filters::Label, Filters::CISkip, Filters::Mergeable, Filters::Approval])
     @filters = filters
     @name    = name
     @input   = input