From 19263fe851486deb025047d07ed28282d60166bb Mon Sep 17 00:00:00 2001 From: Filip Gralinski Date: Sat, 30 May 2020 22:06:21 +0200 Subject: [PATCH] More filtering --- Handler/ShowChallenge.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Handler/ShowChallenge.hs b/Handler/ShowChallenge.hs index ed7e1b3..94ba71d 100644 --- a/Handler/ShowChallenge.hs +++ b/Handler/ShowChallenge.hs @@ -309,8 +309,12 @@ isBefore moment (Just deadline) = moment <= deadline -- | An attempt to filtre out mistaken/unwanted submissions (without cloning -- the submission repo, just by looking at the metadata) willClone :: Challenge -> ChallengeSubmissionData -> Bool -willClone challenge submissionData = (challengeName challenge) `isInfixOf` url +willClone challenge submissionData = + (challengeName challenge) `isInfixOf` url && branch /= dontPeek && not (dontPeek `isInfixOf` url) where url = repoSpecUrl $ challengeSubmissionDataRepo submissionData + branch = repoSpecBranch $ challengeSubmissionDataRepo submissionData + dontPeek = "dont-peek" + -- | Main place where submission is done (whether manually or by trigger) doCreateSubmission :: UserId -> Key Challenge -> ChallengeSubmissionData -> Channel -> Handler ()