--- a/.travis.yml Tue Mar 20 13:53:04 2018 +0100
+++ b/.travis.yml Tue Mar 20 15:50:32 2018 +0100
@@ -20,6 +20,5 @@
- go get github.com/ghodss/yaml
- go get github.com/pkg/errors
- go get github.com/kr/text
-- go get github.com/m0t0k1ch1/gomif
- go get github.com/mattn/go-isatty
- go get github.com/stretchr/testify/assert
--- a/printer/plainprinter.go Tue Mar 20 13:53:04 2018 +0100
+++ b/printer/plainprinter.go Tue Mar 20 15:50:32 2018 +0100
@@ -12,8 +12,6 @@
"reflect"
"time"
- "github.com/m0t0k1ch1/gomif"
-
"github.com/McKael/madon"
"github.com/McKael/madonctl/printer/html2text"
)
@@ -47,7 +45,7 @@
[]madon.List, []madon.Mention, []madon.Notification,
[]madon.Relationship, []madon.Report, []madon.Results,
[]madon.Status, []madon.StreamEvent, []madon.Tag,
- []madon.DomainName, []*gomif.InstanceStatus:
+ []madon.DomainName:
return p.plainForeach(o, w, initialIndent)
case *madon.DomainName:
return p.plainPrintDomainName(o, w, initialIndent)
@@ -109,10 +107,6 @@
return p.plainPrintUserToken(o, w, initialIndent)
case madon.UserToken:
return p.plainPrintUserToken(&o, w, initialIndent)
- case *gomif.InstanceStatus:
- return p.plainPrintInstanceStatistics(o, w, initialIndent)
- case gomif.InstanceStatus:
- return p.plainPrintInstanceStatistics(&o, w, initialIndent)
}
// TODO: Mention
// TODO: StreamEvent
@@ -368,16 +362,3 @@
indentedPrint(w, indent, false, true, "Scope", "%s", s.Scope)
return nil
}
-
-func (p *PlainPrinter) plainPrintInstanceStatistics(is *gomif.InstanceStatus, w io.Writer, indent string) error {
- if is == nil {
- return nil
- }
- indentedPrint(w, indent, true, false, "Instance", "%s", is.InstanceName)
- indentedPrint(w, indent, false, false, "Users", "%d", is.Users)
- indentedPrint(w, indent, false, false, "Statuses", "%d", is.Statuses)
- indentedPrint(w, indent, false, false, "Open Registrations", "%v", is.OpenRegistrations)
- indentedPrint(w, indent, false, false, "Up", "%v", is.Up)
- indentedPrint(w, indent, false, false, "Date", "%s", time.Unix(is.Date, 0))
- return nil
-}
--- a/printer/templateprinter.go Tue Mar 20 13:53:04 2018 +0100
+++ b/printer/templateprinter.go Tue Mar 20 15:50:32 2018 +0100
@@ -16,7 +16,6 @@
"time"
"github.com/kr/text"
- "github.com/m0t0k1ch1/gomif"
"github.com/mattn/go-isatty"
"github.com/McKael/madon"
@@ -83,7 +82,7 @@
[]madon.Instance, []madon.List, []madon.Mention,
[]madon.Notification, []madon.Relationship, []madon.Report,
[]madon.Results, []madon.Status, []madon.StreamEvent,
- []madon.Tag, []*gomif.InstanceStatus, []string:
+ []madon.Tag, []string:
return p.templateForeach(ot, w)
}
--- a/printer/themeprinter.go Tue Mar 20 13:53:04 2018 +0100
+++ b/printer/themeprinter.go Tue Mar 20 15:50:32 2018 +0100
@@ -13,7 +13,6 @@
"path/filepath"
"strings"
- "github.com/m0t0k1ch1/gomif"
"github.com/pkg/errors"
"github.com/McKael/madon"
@@ -98,9 +97,6 @@
objType = "stream_event"
case []madon.Tag, madon.Tag, *madon.Tag:
objType = "tag"
-
- case []*gomif.InstanceStatus, *gomif.InstanceStatus:
- objType = "instancestats"
}
var rp *ResourcePrinter