misskey.go: improve efficiency of timeline streaming

adapter/misskey.go

@@ -5,7 +5,7 @@ import (
 	. "forge.lightcrystal.systems/lightcrystal/underbbs/models"
 	"github.com/yitsushi/go-misskey"
 	mkm "github.com/yitsushi/go-misskey/models"
-	notes "github.com/yitsushi/go-misskey/services/notes"
+	n "github.com/yitsushi/go-misskey/services/notes"
 	tl "github.com/yitsushi/go-misskey/services/notes/timeline"
 	_ "strings"
 	"time"
@@ -25,10 +25,6 @@ type MisskeyAdapter struct {
 	cache map[string]time.Time
 
 	stop chan bool
-
-	notes   chan mkm.Note
-	users   chan mkm.User
-	follows chan mkm.FollowStatus
 }
 
 func (self *MisskeyAdapter) Init(settings Settings, data chan SocketData) error {
@@ -76,7 +72,15 @@ func (self *MisskeyAdapter) Subscribe(filter string) []error {
 	// if they are newer than the cache, convert them to UnderBBS objects
 	// and send them on the data channel
 
-	go func() {
+	go self.poll()
+
+	return nil
+}
+
+func (self *MisskeyAdapter) poll() {
+
+	var latest *time.Time
+
 	notesService := self.mk.Notes()
 	timelineService := notesService.Timeline()
 
@@ -89,16 +93,24 @@ func (self *MisskeyAdapter) Subscribe(filter string) []error {
 		default:
 
 			// TODO: we have to actually decode and pass our filter criteria
-				tlnotes, tlerr := timelineService.Get(tl.GetRequest{
+			// probe for new notes
-					Limit: 50,
 
+			probenote, err := timelineService.Get(tl.GetRequest{
+				Limit: 1,
 			})
-				mentions, merr := notesService.Mentions(notes.MentionsRequest{
+			if err == nil && len(probenote) > 0 && self.isNew(probenote[0]) {
-					Limit: 50,
+				if latest == nil {
+					latest = &probenote[0].CreatedAt
+					// this is the first fetch of notes, we can just grab them
+					notes, err := timelineService.Get(tl.GetRequest{
+						Limit: 100,
 					})
-
+					// if latest is nil also get mentions history
-				if tlerr != nil {
+					mentions, merr := notesService.Mentions(n.MentionsRequest{
-					fmt.Println(tlerr.Error())
+						Limit: 100,
+					})
+					if err != nil {
+						fmt.Println(err.Error())
 					}
 					if merr != nil {
 						fmt.Println(merr.Error())
@@ -107,7 +119,7 @@ func (self *MisskeyAdapter) Subscribe(filter string) []error {
 					// check the cache for everything we just collected
 					// if anything is newer or as of yet not in the cache, add it
 					// and convert it to a SocketData implementation before sending on data channel
-				for _, n := range tlnotes {
+					for _, n := range notes {
 						msg := self.cacheAndConvert(n)
 						if msg != nil {
 							self.data <- msg
@@ -120,14 +132,42 @@ func (self *MisskeyAdapter) Subscribe(filter string) []error {
 						}
 					}
 
-				time.Sleep(5*time.Second)
+				} else {
+					for {
+						// get notes since latest, until the probe
+						notes, err := timelineService.Get(tl.GetRequest{
+							SinceDate: uint64(latest.Unix()),
+							UntilDate: uint64(probenote[0].CreatedAt.Unix()),
+							Limit:     100,
+						})
+						if err != nil {
+							fmt.Println(err.Error())
+						}
+						for _, n := range notes {
+							msg := self.cacheAndConvert(n)
+							if msg == nil {
+
+								latest = &probenote[0].CreatedAt
+								break
+							}
+						}
+						if *latest == probenote[0].CreatedAt {
+							break
+						}
+					}
+				}
+			}
+
+			time.Sleep(5 * time.Second)
 		}
 
 	}
 
-	}()
+}
 
-	return nil
+func (self *MisskeyAdapter) isNew(n mkm.Note) bool {
+	timestamp, exists := self.cache[n.ID]
+	return !exists || timestamp.Before(n.CreatedAt)
 }
 
 func (self *MisskeyAdapter) cacheAndConvert(n mkm.Note) *Message {