From c12bb5071d31ede337013307b91110dc69427ceb Mon Sep 17 00:00:00 2001 From: Tim Fitzgerald Date: Wed, 25 Jul 2018 11:27:23 -0700 Subject: [PATCH] Stash for new branch --- zendesk/tickets.go | 6 ++---- zendesk/widget.go | 5 +---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/zendesk/tickets.go b/zendesk/tickets.go index e8282895..8cbe53d2 100644 --- a/zendesk/tickets.go +++ b/zendesk/tickets.go @@ -66,8 +66,7 @@ func listTickets(pag ...string) (*TicketArray, error) { } -func newTickets(ticketStatus string) ([]Ticket, *TicketArray, error) { - newTickets := []Ticket{} +func newTickets(ticketStatus string) (*TicketArray, error) { newTicketArray := &TicketArray{} tickets, err := listTickets() if err != nil { @@ -75,10 +74,9 @@ func newTickets(ticketStatus string) ([]Ticket, *TicketArray, 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, newTicketArray, nil + return newTicketArray, nil } diff --git a/zendesk/widget.go b/zendesk/widget.go index d796c20d..91879d70 100644 --- a/zendesk/widget.go +++ b/zendesk/widget.go @@ -26,16 +26,13 @@ func NewWidget() *Widget { /* -------------------- Exported Functions -------------------- */ func (widget *Widget) Refresh() { ticketStatus := wtf.Config.UString("wtf.mods.zendesk.status") - tickets, ticketArray, err := newTickets(ticketStatus) + ticketArray, err := newTickets(ticketStatus) ticketArray.Count = len(ticketArray.Tickets) if err != nil { log.Fatal(err) } widget.UpdateRefreshedAt() - // Just to use the tickets variable somewhere to remove warning - fmt.Sprintf(string(len(tickets))) - widget.View.SetTitle(fmt.Sprintf("%s (%d)", widget.Name, ticketArray.Count)) widget.View.SetText(widget.textContent(ticketArray.Tickets))