Merge pull request #89 from jhalter/fix_threaded_news_post_delete

[rbdr/mobius] / hotline / news.go

diff --git a/hotline/news.go b/hotline/news.go
index 77c66966f9ddf0dde81e15331b0cec87fdae2bb1..11e2a27dc54ee9bcc729faf6b429ad943d09ef98 100644 (file)
--- a/hotline/news.go
+++ b/hotline/news.go
@@ -52,6 +52,7 @@ func (newscat *NewsCategoryListData15) GetNewsArtListData() NewsArtListData {
 
        nald := NewsArtListData{
                ID:          []byte{0, 0, 0, 0},
+               Count:       len(newsArts),
                Name:        []byte{},
                Description: []byte{},
                NewsArtList: newsArtsPayload,
@@ -85,11 +86,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,6 +204,7 @@ func (newscat *NewsCategoryListData15) nameLen() []byte {
        return []byte{uint8(len(newscat.Name))}
 }
 
+// TODO: re-implement as bufio.Scanner interface
 func ReadNewsPath(newsPath []byte) []string {
        if len(newsPath) == 0 {
                return []string{}