From 84f12adce8512ea37c75aabc25a1f3cd3ce6e5db Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 6 Jan 2022 14:29:31 +0800
Subject: [PATCH] fix: webhook tasks list error delay

---
 app/models/gitea/webhook_task.rb                | 7 ++++++-
 app/views/projects/webhooks/tasks.json.jbuilder | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/models/gitea/webhook_task.rb b/app/models/gitea/webhook_task.rb
index d19a163aa..325352c69 100644
--- a/app/models/gitea/webhook_task.rb
+++ b/app/models/gitea/webhook_task.rb
@@ -1,7 +1,6 @@
 class Gitea::WebhookTask < Gitea::Base 
   serialize :payload_content, JSON
   serialize :request_content, JSON
-  serialize :response_content, JSON
 
   self.inheritance_column = nil
 
@@ -10,4 +9,10 @@ class Gitea::WebhookTask < Gitea::Base
   belongs_to :webhook, class_name: "Gitea::Webhook", foreign_key: :hook_id
 
   enum type: {gogs: 1, slack: 2, gitea: 3, discord: 4, dingtalk: 5, telegram: 6, msteams: 7, feishu: 8, matrix: 9}
+
+  def response_content_json
+    JSON.parse(response_content)
+  rescue 
+    {}
+  end
 end
\ No newline at end of file
diff --git a/app/views/projects/webhooks/tasks.json.jbuilder b/app/views/projects/webhooks/tasks.json.jbuilder
index b8aef99f5..82b2eae4a 100644
--- a/app/views/projects/webhooks/tasks.json.jbuilder
+++ b/app/views/projects/webhooks/tasks.json.jbuilder
@@ -1,5 +1,6 @@
 json.total_count @tasks.total_count 
 json.tasks @tasks.each do |task|
-  json.(task, :id, :type, :uuid, :is_succeed, :is_delivered, :payload_content, :request_content, :response_content)
+  json.(task, :id, :event_type, :type, :uuid, :is_succeed, :is_delivered, :payload_content, :request_content)
+  json.response_content task.response_content_json
   json.delivered_time Time.at(task.delivered*10**-9).strftime("%Y-%m-%d %H:%M:%S")
 end
\ No newline at end of file