Misc minor cleanup and linter appeasement

[rbdr/mobius] / hotline / news.go

diff --git a/hotline/news.go b/hotline/news.go
index a6b8372795c7ff1917f0d0bb3a7593076cbe04ad..38db97af42dee4f11a8731e0cdb740674a01b79b 100644 (file)
--- a/hotline/news.go
+++ b/hotline/news.go
@@ -7,12 +7,20 @@ import (
        "sort"
 )
 
+const defaultNewsDateFormat = "Jan02 15:04" // Jun23 20:49
+
+const defaultNewsTemplate = `From %s (%s):
+
+%s
+
+__________________________________________________________`
+
 type ThreadedNews struct {
        Categories map[string]NewsCategoryListData15 `yaml:"Categories"`
 }
 
 type NewsCategoryListData15 struct {
-       Type     []byte `yaml:"Type"` //Size 2 ; Bundle (2) or category (3)
+       Type     []byte `yaml:"Type"` // Size 2 ; Bundle (2) or category (3)
        Count    []byte // Article or SubCategory count Size 2
        NameSize byte
        Name     string                            `yaml:"Name"`     //
@@ -52,6 +60,7 @@ func (newscat *NewsCategoryListData15) GetNewsArtListData() NewsArtListData {
 
        nald := NewsArtListData{
                ID:          []byte{0, 0, 0, 0},
+               Count:       len(newsArts),
                Name:        []byte{},
                Description: []byte{},
                NewsArtList: newsArtsPayload,
@@ -64,11 +73,11 @@ func (newscat *NewsCategoryListData15) GetNewsArtListData() NewsArtListData {
 type NewsArtData struct {
        Title         string `yaml:"Title"`
        Poster        string `yaml:"Poster"`
-       Date          []byte `yaml:"Date"`             //size 8
-       PrevArt       []byte `yaml:"PrevArt"`          //size 4
-       NextArt       []byte `yaml:"NextArt"`          //size 4
-       ParentArt     []byte `yaml:"ParentArt"`        //size 4
-       FirstChildArt []byte `yaml:"FirstChildArtArt"` //size 4
+       Date          []byte `yaml:"Date"`             // size 8
+       PrevArt       []byte `yaml:"PrevArt"`          // size 4
+       NextArt       []byte `yaml:"NextArt"`          // size 4
+       ParentArt     []byte `yaml:"ParentArt"`        // size 4
+       FirstChildArt []byte `yaml:"FirstChildArtArt"` // size 4
        DataFlav      []byte `yaml:"DataFlav"`         // "text/plain"
        Data          string `yaml:"Data"`
 }
@@ -85,11 +94,12 @@ type NewsArtListData struct {
        Name        []byte `yaml:"Name"`
        Description []byte `yaml:"Description"` // not used?
        NewsArtList []byte // List of articles                  Optional (if article count > 0)
+       Count       int
 }
 
 func (nald *NewsArtListData) Payload() []byte {
        count := make([]byte, 4)
-       binary.BigEndian.PutUint32(count, uint32(len(nald.NewsArtList)))
+       binary.BigEndian.PutUint32(count, uint32(nald.Count))
 
        out := append(nald.ID, count...)
        out = append(out, []byte{uint8(len(nald.Name))}...)
@@ -202,27 +212,7 @@ func (newscat *NewsCategoryListData15) nameLen() []byte {
        return []byte{uint8(len(newscat.Name))}
 }
 
-//type NewsPath struct {
-//     Paths []string
-//}
-//
-//func (np *NewsPath) Payload() []byte {
-//     var out []byte
-//
-//     count := make([]byte, 2)
-//     binary.BigEndian.PutUint16(count, uint16(len(np.Paths)))
-//
-//     out = append(out, count...)
-//     for _, p := range np.Paths {
-//             pLen := byte(len(p))
-//             out = append(out, []byte{0, 0}...) // what is this?
-//             out = append(out, pLen)
-//             out = append(out, []byte(p)...)
-//     }
-//
-//     return out
-//}
-
+// TODO: re-implement as bufio.Scanner interface
 func ReadNewsPath(newsPath []byte) []string {
        if len(newsPath) == 0 {
                return []string{}