From 16313a73cbc51ca7e6a3958e4c3cfa4c0dc76a7c Mon Sep 17 00:00:00 2001 From: Tim Fitzgerald Date: Wed, 25 Jul 2018 10:55:08 -0700 Subject: [PATCH] REturning new tickets as a TicketArray item --- zendesk/tickets.go | 6 ++++-- zendesk/widget.go | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/zendesk/tickets.go b/zendesk/tickets.go index 7a770f705..e8282895a 100644 --- a/zendesk/tickets.go +++ b/zendesk/tickets.go @@ -66,8 +66,9 @@ func listTickets(pag ...string) (*TicketArray, error) { } -func newTickets(ticketStatus string) ([]Ticket, error) { +func newTickets(ticketStatus string) ([]Ticket, *TicketArray, error) { newTickets := []Ticket{} + newTicketArray := &TicketArray{} tickets, err := listTickets() if err != nil { log.Fatal(err) @@ -75,8 +76,9 @@ func newTickets(ticketStatus string) ([]Ticket, error) { for _, Ticket := range tickets.Tickets { if Ticket.Status == ticketStatus && Ticket.Status != "closed" && Ticket.Status != "solved" { newTickets = append(newTickets, Ticket) + newTicketArray.Tickets = append(newTicketArray.Tickets, Ticket) } } - return newTickets, nil + return newTickets, newTicketArray, nil } diff --git a/zendesk/widget.go b/zendesk/widget.go index 278fe3d22..dc40d61b2 100644 --- a/zendesk/widget.go +++ b/zendesk/widget.go @@ -26,13 +26,14 @@ func NewWidget() *Widget { /* -------------------- Exported Functions -------------------- */ func (widget *Widget) Refresh() { ticketStatus := wtf.Config.UString("wtf.mods.zendesk.status") - tickets, err := newTickets(ticketStatus) + tickets, ticketArray, err := newTickets(ticketStatus) + ticketArray.Count = len(ticketArray.Tickets) if err != nil { log.Fatal(err) } widget.UpdateRefreshedAt() - widget.View.SetTitle(fmt.Sprintf("%s (%d)", widget.Name, len(tickets))) + widget.View.SetTitle(fmt.Sprintf("%s (%d)", widget.Name, ticketArray.Count)) widget.View.SetText(widget.textContent(tickets)) }