add logs

.gitignore

@@ -3,3 +3,4 @@ todo-server-yaml
 cmd/cmd
 cmd/cli
 cmd/pttodo/pttodo
+/truckstop

config.json

@@ -12,7 +12,7 @@
       "RefreshURI": "https://api.imgur.com/oauth2/token",
       "RefreshFormat": "refresh_token=%s\u0026client_id=%s\u0026client_secret=%s\u0026grant_type=refresh_token",
       "RefreshMethod": "POST",
-      "UploadURI": "https://api.imgur.com/3/image",
+      "UploadURI": "https://api.imgur.com/3/image?name=something.jpeg",
       "UploadMethod": "POST"
    },
    "Maps": {
@@ -74,7 +74,7 @@
          "Room": "!WbawbZxHqnxxfhvcSj:synapse.home.blapointe.com"
       }
    },
-   "Once": false,
+   "Once": true,
    "Brokers": {
       "NTG": {
          "Mock": true,

main.go

@@ -88,38 +88,52 @@ func matrixrecv() error {
 	}()
 	func() {
 		log.Printf("looking for states")
+		db := config.Get().DB()
 		states := map[string]map[config.State]struct{}{}
 		for _, msg := range messages {
+			key := fmt.Sprintf("states_%d", msg.Timestamp.Unix())
 			if !strings.HasPrefix(msg.Content, "!state") {
 				continue
 			}
 			if _, ok := states[msg.Sender]; ok {
 				continue
 			}
-			states[msg.Sender] = map[config.State]struct{}{}
+			if _, err := db.Get(key); err == storage.ErrNotFound {
-			for _, state := range parseOutStates([]byte(msg.Content)) {
+				states[msg.Sender] = map[config.State]struct{}{}
-				states[msg.Sender][state] = struct{}{}
+				for _, state := range parseOutStates([]byte(msg.Content)) {
+					states[msg.Sender][state] = struct{}{}
+				}
+			}
+			if err := db.Set(key, []byte{'k'}); err != nil {
+				log.Printf("failed to mark state gathered @%s: %v", key, err)
 			}
 		}
 		setNewStates(states)
 	}()
 	func() {
 		log.Printf("looking for pauses")
+		db := config.Get().DB()
 		pauses := map[string]time.Time{}
 		for _, msg := range messages {
+			key := fmt.Sprintf("pauses_%d", msg.Timestamp.Unix())
 			if !strings.HasPrefix(msg.Content, "!available ") {
 				continue
 			}
 			if _, ok := pauses[msg.Sender]; ok {
 				continue
 			}
-			t, err := time.ParseInLocation(
+			if _, err := db.Get(key); err == storage.ErrNotFound {
-				"2006-01-02",
+				t, err := time.ParseInLocation(
-				strings.TrimSpace(strings.TrimPrefix(msg.Content, "!available ")),
+					"2006-01-02",
-				time.Local,
+					strings.TrimSpace(strings.TrimPrefix(msg.Content, "!available ")),
-			)
+					time.Local,
-			if err == nil {
+				)
-				pauses[msg.Sender] = t
+				if err == nil {
+					pauses[msg.Sender] = t
+				}
+			}
+			if err := db.Set(key, []byte{'k'}); err != nil {
+				log.Printf("failed to mark state gathered @%s: %v", key, err)
 			}
 		}
 		setNewPauses(pauses)
@@ -245,14 +259,17 @@ func once() error {
 	if err != nil {
 		return err
 	}
+	log.Printf("once: all jobs: %+v", alljobs)
 	newjobs, err := dropStaleJobs(alljobs)
 	if err != nil {
 		return err
 	}
+	log.Printf("once: new jobs: %+v", newjobs)
 	jobs, err := dropBanlistJobs(newjobs)
 	if err != nil {
 		return err
 	}
+	log.Printf("once: sending jobs: %+v", jobs)
 	for i := range jobs {
 		if err := sendJob(jobs[i]); err != nil {
 			return err
@@ -304,6 +321,7 @@ func dropBanlistJobs(jobs []broker.Job) ([]broker.Job, error) {
 func sendJob(job broker.Job) error {
 	sender := message.NewMatrix()
 	payload := job.FormatMultilineText()
+	log.Printf("once: send job %s if nonzero: %s", job.String(), payload)
 	if len(payload) == 0 {
 		return nil
 	}

message/images.go

@@ -7,8 +7,10 @@ import (
 	"fmt"
 	"io/ioutil"
 	"local/truckstop/config"
+	"log"
 	"mime/multipart"
 	"net/http"
+	"net/url"
 	"time"
 )
 
@@ -30,9 +32,17 @@ func refreshToken() error {
 }
 
 func uploadImage(b []byte) (string, error) {
+	images := config.Get().Images
 	buff := bytes.NewBuffer(nil)
 	writer := multipart.NewWriter(buff)
-	part, err := writer.CreateFormFile("image", "name")
+	name := "name"
+	if u, err := url.Parse(images.UploadURI); err != nil {
+	} else if s, ok := u.Query()["name"]; !ok {
+	} else {
+		name = s[0]
+		log.Printf("found name in upload uri: %s", name)
+	}
+	part, err := writer.CreateFormFile("image", name)
 	if err != nil {
 		return "", err
 	}
@@ -43,7 +53,6 @@ func uploadImage(b []byte) (string, error) {
 	}
 	writer.Close()
 
-	images := config.Get().Images
 	request, err := http.NewRequest(
 		images.UploadMethod,
 		images.UploadURI,

message/matrix.go

@@ -1,6 +1,7 @@
 package message
 
 import (
+	"bytes"
 	"fmt"
 	"io/ioutil"
 	"local/truckstop/config"
@@ -129,14 +130,15 @@ func (m Matrix) SendImage(uri string) error {
 	if err != nil {
 		return err
 	}
-	publicURI, err := UploadImage(b)
-	if err != nil {
-		return err
-	}
 	c, err := m.getclient()
 	if err != nil {
 		return err
 	}
+	mediaUpload, err := c.UploadToContentRepo(bytes.NewReader(b), "image/jpeg", int64(len(b)))
+	if err != nil {
+		return err
+	}
+	publicURI := mediaUpload.ContentURI
 	resp, err := c.SendImage(m.room, "img", publicURI)
 	log.Printf("sent image %s => %s: %+v", uri, publicURI, resp)
 	return err

todo.yaml

@@ -1,4 +1,9 @@
 todo:
+- no hard code jpeg or have it in multiple places
+- todo: switch house to selfhosted for rate limit
+  tags: now
+- mark consumed;; save scroll id for matrix
+- TEST its falling apart
 - test each !command callbacks to matrix
 - change matrix so I test my custom logic even if I dont fetch remote
 - warn/err/etc. on clobbering ids.matrix since clients can mess with one another