From f4bbd534b907fbca6727ea27768d26c0f8aab78f Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Thu, 17 Nov 2022 17:59:47 +0800
Subject: [PATCH] Allow gitea bot as trigger user

---
 models/bots/run_list.go     |  6 +++++-
 services/repository/push.go | 20 ++++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/models/bots/run_list.go b/models/bots/run_list.go
index 147950d5b0..d30ae9e97d 100644
--- a/models/bots/run_list.go
+++ b/models/bots/run_list.go
@@ -49,7 +49,11 @@ func (runs RunList) LoadTriggerUser() error {
 		return err
 	}
 	for _, run := range runs {
-		run.TriggerUser = users[run.TriggerUserID]
+		if run.TriggerUserID == user_model.BotUserID {
+			run.TriggerUser = user_model.NewBotUser()
+		} else {
+			run.TriggerUser = users[run.TriggerUserID]
+		}
 	}
 	return nil
 }
diff --git a/services/repository/push.go b/services/repository/push.go
index e2db18e1f7..d31f7a1114 100644
--- a/services/repository/push.go
+++ b/services/repository/push.go
@@ -109,9 +109,13 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
 		}
 		if opts.IsTag() { // If is tag reference
 			if pusher == nil || pusher.ID != opts.PusherID {
-				var err error
-				if pusher, err = user_model.GetUserByID(opts.PusherID); err != nil {
-					return err
+				if opts.PusherID == user_model.BotUserID {
+					pusher = user_model.NewBotUser()
+				} else {
+					var err error
+					if pusher, err = user_model.GetUserByID(opts.PusherID); err != nil {
+						return err
+					}
 				}
 			}
 			tagName := opts.TagName()
@@ -149,9 +153,13 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
 			}
 		} else if opts.IsBranch() { // If is branch reference
 			if pusher == nil || pusher.ID != opts.PusherID {
-				var err error
-				if pusher, err = user_model.GetUserByID(opts.PusherID); err != nil {
-					return err
+				if opts.PusherID == user_model.BotUserID {
+					pusher = user_model.NewBotUser()
+				} else {
+					var err error
+					if pusher, err = user_model.GetUserByID(opts.PusherID); err != nil {
+						return err
+					}
 				}
 			}