X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/72dd37f1abb2b550aaaac48eac677403d5664797..9c6291aa00db7b7e1d262e0465bfc7e08fc28807:/hotline/news.go?ds=sidebyside diff --git a/hotline/news.go b/hotline/news.go index 7a5c30c..77c6696 100644 --- a/hotline/news.go +++ b/hotline/news.go @@ -5,7 +5,6 @@ import ( "crypto/rand" "encoding/binary" "sort" - "time" ) type ThreadedNews struct { @@ -13,7 +12,7 @@ type ThreadedNews struct { } 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"` // @@ -65,11 +64,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"` } @@ -203,27 +202,6 @@ 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 -//} - func ReadNewsPath(newsPath []byte) []string { if len(newsPath) == 0 { return []string{} @@ -250,25 +228,3 @@ func (s *Server) GetNewsCatByPath(paths []string) map[string]NewsCategoryListDat } return cats } - -// News article date field contains this structure: -// Year 2 -// Milliseconds 2 (seriously?) -// Seconds 4 -func NewsDate() []byte { - t := time.Now() - ms := []byte{0, 0} - seconds := []byte{0, 0, 0, 0} - - year := []byte{0, 0} - binary.BigEndian.PutUint16(year, uint16(t.Year())) - - yearStart := time.Date(t.Year(), time.January, 1, 0, 0, 0, 0, time.Local) - - binary.BigEndian.PutUint32(seconds, uint32(t.Sub(yearStart).Seconds())) - - date := append(year, ms...) - date = append(date, seconds...) - - return date -}