From cc75a0ec465c63c0a3a2d6a2a0b241cab236ba64 Mon Sep 17 00:00:00 2001
From: yuyuanshifu <747342561@qq.com>
Date: Tue, 26 Jan 2021 14:51:47 +0800
Subject: [PATCH] timer

---
 models/pull_list.go    | 2 ++
 modules/timer/timer.go | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/models/pull_list.go b/models/pull_list.go
index 8fb5c3f22..582d44f60 100755
--- a/models/pull_list.go
+++ b/models/pull_list.go
@@ -5,6 +5,7 @@
 package models
 
 import (
+	"code.gitea.io/gitea/modules/setting"
 	"fmt"
 
 	"code.gitea.io/gitea/modules/base"
@@ -175,6 +176,7 @@ func GetUnTransformedMergedPullRequests() ([]*PullRequest, error) {
 	prs := make([]*PullRequest, 0, 10)
 	return prs, x.
 		Where("has_merged = ? AND is_transformed = ?",true, false).
+		And("to_timestamp(merged_unix) >= ?", setting.CommitValidDate).
 		Join("INNER", "issue", "issue.id = pull_request.issue_id").
 		Find(&prs)
 }
diff --git a/modules/timer/timer.go b/modules/timer/timer.go
index a776188ad..d8e5ecc2d 100755
--- a/modules/timer/timer.go
+++ b/modules/timer/timer.go
@@ -18,8 +18,8 @@ func init() {
 	specCheckRepoBlockChainSuccess := "*/5 * * * *"
 	c.AddFunc(specCheckRepoBlockChainSuccess, repo.HandleBlockChainUnSuccessRepos)
 
-	//specCheckUnTransformedActions := "*/1 * * * *"
-	//c.AddFunc(specCheckUnTransformedActions, repo.HandleBlockChainMergedPulls)
+	specCheckUnTransformedPRs := "*/1 * * * *"
+	c.AddFunc(specCheckUnTransformedPRs, repo.HandleBlockChainMergedPulls)
 
 	//specCheckUnTransformedActions := "*/1 * * * *"
 	//c.AddFunc(specCheckUnTransformedActions, repo.HandleUnTransformedActions)