From ea06ed0b511459b29a7939881a333bf25d0b8638 Mon Sep 17 00:00:00 2001
From: Rune Philosof <rune.philosof@karnovgroup.com>
Date: Wed, 1 Nov 2023 08:43:54 +0100
Subject: [PATCH] Woodpecker-go: Use model.Feed instead Activity

The models had gotten out of sync.
Use the same definition to avoid them getting out of sync in the future.

Closes https://github.com/woodpecker-ci/woodpecker/issues/2679
---
 woodpecker-go/woodpecker/client.go    |  4 ++--
 woodpecker-go/woodpecker/interface.go |  2 +-
 woodpecker-go/woodpecker/types.go     | 13 ++++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/woodpecker-go/woodpecker/client.go b/woodpecker-go/woodpecker/client.go
index 051f613a8f..8b6408d752 100644
--- a/woodpecker-go/woodpecker/client.go
+++ b/woodpecker-go/woodpecker/client.go
@@ -251,8 +251,8 @@ func (c *client) PipelineCreate(repoID int64, options *PipelineOptions) (*Pipeli
 }
 
 // PipelineQueue returns a list of enqueued pipelines.
-func (c *client) PipelineQueue() ([]*Activity, error) {
-	var out []*Activity
+func (c *client) PipelineQueue() ([]*Feed, error) {
+	var out []*Feed
 	uri := fmt.Sprintf(pathPipelineQueue, c.addr)
 	err := c.get(uri, &out)
 	return out, err
diff --git a/woodpecker-go/woodpecker/interface.go b/woodpecker-go/woodpecker/interface.go
index b1c9172a6d..f15e74f81a 100644
--- a/woodpecker-go/woodpecker/interface.go
+++ b/woodpecker-go/woodpecker/interface.go
@@ -88,7 +88,7 @@ type Client interface {
 	PipelineList(repoID int64) ([]*Pipeline, error)
 
 	// PipelineQueue returns a list of enqueued pipelines.
-	PipelineQueue() ([]*Activity, error)
+	PipelineQueue() ([]*Feed, error)
 
 	// PipelineCreate returns creates a pipeline on specified branch.
 	PipelineCreate(repoID int64, opts *PipelineOptions) (*Pipeline, error)
diff --git a/woodpecker-go/woodpecker/types.go b/woodpecker-go/woodpecker/types.go
index 90e75e4a40..2dde96dcd8 100644
--- a/woodpecker-go/woodpecker/types.go
+++ b/woodpecker-go/woodpecker/types.go
@@ -139,12 +139,11 @@ type (
 		Events []string `json:"events"`
 	}
 
-	// Activity represents an item in the user's feed or timeline.
-	Activity struct {
-		Owner    string `json:"owner"`
-		Name     string `json:"name"`
-		FullName string `json:"full_name"`
-		Number   int    `json:"number,omitempty"`
+	// Feed represents an item in the user's feed or timeline.
+	Feed struct {
+		RepoID   int64  `json:"repo_id"`
+		ID       int64  `json:"id,omitempty"`
+		Number   int64  `json:"number,omitempty"`
 		Event    string `json:"event,omitempty"`
 		Status   string `json:"status,omitempty"`
 		Created  int64  `json:"created_at,omitempty"`
@@ -154,7 +153,7 @@ type (
 		Branch   string `json:"branch,omitempty"`
 		Ref      string `json:"ref,omitempty"`
 		Refspec  string `json:"refspec,omitempty"`
-		CloneURL string `json:"clone_url,omitempty"`
+		Remote   string `json:"remote,omitempty"`
 		Title    string `json:"title,omitempty"`
 		Message  string `json:"message,omitempty"`
 		Author   string `json:"author,omitempty"`