todo

.gitignore

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

broker/ntgvision.go

@@ -8,6 +8,7 @@ import (
 	"io"
 	"io/ioutil"
 	"local/truckstop/config"
+	"log"
 	"net/http"
 	"time"
 )
@@ -73,8 +74,15 @@ func (ntg NTGVision) Search(states []config.State) ([]Job, error) {
 	}
 	defer rc.Close()
 
+	b, err := ioutil.ReadAll(rc)
+	if err != nil {
+		return nil, err
+	}
+
+	log.Printf("ntg search for %+v: %s", states, b)
+
 	var ntgjobs []ntgVisionJob
-	err = json.NewDecoder(rc).Decode(&ntgjobs)
+	err = json.Unmarshal(b, &ntgjobs)
 
 	jobs := make([]Job, len(ntgjobs))
 	for i := range jobs {

config.json

@@ -1,6 +1,6 @@
 {
    "Interval": {
-      "Input": "15s..20s",
+      "Input": "5s..10s",
       "OK": "6h0m0s..6h0m0s",
       "Error": "6h0m0s..6h0m0s"
    },
@@ -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": {
@@ -22,13 +22,11 @@
    },
    "Clients": {
       "bel": {
-         "States": [
-            "NC"
-         ],
+         "States": [],
          "IDs": {
-            "Matrix": "@bel:synapse.home.blapointe.com"
+            "Matrix": "@bel:m.bltrucks.top"
          },
-         "Available": 1612328400
+         "Available": 1512328400
       },
       "broc": {
          "States": [
@@ -36,25 +34,16 @@
             "NC"
          ],
          "IDs": {
-            "Matrix": "@belandbroc:matrix.org"
+            "Matrix": "@broc:m.bltrucks.top"
          },
          "Available": 5642452800
       },
-      "caleb": {
-         "States": [
-            "FL"
-         ],
-         "IDs": {
-            "Matrix": "@belandbroc:matrix.org"
-         },
-         "Available": -62135596800
-      },
       "pa": {
          "States": [
             "NC"
          ],
          "IDs": {
-            "Matrix": "@belandbroc:matrix.org"
+            "Matrix": "@ron:m.bltrucks.top"
          },
          "Available": -62135596800
       }
@@ -67,14 +56,15 @@
       "Matrix": {
          "ReceiveEnabled": true,
          "Mock": false,
-         "Homeserver": "https://synapse.home.blapointe.com",
-         "Username": "@bel:synapse.home.blapointe.com",
-         "Token": "MDAyOGxvY2F0aW9uIHN5bmFwc2UuaG9tZS5ibGFwb2ludGUuY29tCjAwMTNpZGVudGlmaWVyIGtleQowMDEwY2lkIGdlbiA9IDEKMDAzMmNpZCB1c2VyX2lkID0gQGJlbDpzeW5hcHNlLmhvbWUuYmxhcG9pbnRlLmNvbQowMDE2Y2lkIHR5cGUgPSBhY2Nlc3MKMDAyMWNpZCBub25jZSA9IFpXTTtCaTNBODdtSTpsZkAKMDAyZnNpZ25hdHVyZSBX37kStY2wt_ftMfEYPfk1ADMJ6ZVfZsro9ic3weZ25Ao",
+         "Continuation": "190",
+         "Homeserver": "https://m.bltrucks.top",
+         "Username": "@bot.m.bltrucks.top",
+         "Token": "mvDWB96KXMF8XhOam8EC5XVdQvSEw0CDeClcSWocBcYkwZX3FPNWZ5uOnQk2EmT1cjpzfeuD7gDYPPjOuyZlI3bE9TE35UjNOlZgi0Tugm25s91iVsbIF6kMZsCIhVMSmEf6w3jxX6wQYOWvmDZ4mu6f5c8wr221EMDcOpEzQV09d1zuBSWgKLBgjqAkYHJZ5dTRIWpEDpPgujhOFZa2ld1HiAOxrJKlIrlfDBN0CUsTlGOGplujDAr4VtpFzNRS",
          "Device": "TGNIOGKATZ",
-         "Room": "!WbawbZxHqnxxfhvcSj:synapse.home.blapointe.com"
+         "Room": "!OYZqtInrBCn1cyz90D:m.bltrucks.top"
       }
    },
-   "Once": false,
+   "Once": true,
    "Brokers": {
       "NTG": {
          "Mock": true,

config/config.go

@@ -37,6 +37,7 @@ type Config struct {
 		Matrix struct {
 			ReceiveEnabled bool
 			Mock           bool
+			Continuation   string
 			Homeserver     string
 			Username       string
 			Token          string

main.go

@@ -23,8 +23,10 @@ func main() {
 	if err := config.Refresh(); err != nil {
 		panic(err)
 	}
-	if err := matrixrecv(); err != nil {
-		panic(err)
+	if config.Get().Message.Matrix.ReceiveEnabled {
+		if err := matrixrecv(); err != nil {
+			panic(err)
+		}
 	}
 	lock := &sync.Mutex{}
 	go func() {
@@ -138,6 +140,11 @@ func matrixrecv() error {
 		}
 		setNewPauses(pauses)
 	}()
+	conf := *config.Get()
+	if conf.Message.Matrix.Continuation != sender.Continuation() {
+		conf.Message.Matrix.Continuation = sender.Continuation()
+		config.Set(conf)
+	}
 	return nil
 }
 
@@ -259,14 +266,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
@@ -318,6 +328,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"
@@ -14,21 +15,23 @@ import (
 )
 
 type Matrix struct {
-	mock       bool
-	homeserver string
-	username   string
-	token      string
-	room       string
+	mock         bool
+	homeserver   string
+	username     string
+	token        string
+	room         string
+	continuation string
 }
 
 func NewMatrix() Matrix {
 	conf := config.Get().Message.Matrix
 	return Matrix{
-		homeserver: conf.Homeserver,
-		username:   conf.Username,
-		token:      conf.Token,
-		room:       conf.Room,
-		mock:       conf.Mock,
+		homeserver:   conf.Homeserver,
+		username:     conf.Username,
+		token:        conf.Token,
+		room:         conf.Room,
+		mock:         conf.Mock,
+		continuation: conf.Continuation,
 	}
 }
 
@@ -36,7 +39,11 @@ func (m Matrix) getclient() (*gomatrix.Client, error) {
 	return gomatrix.NewClient(m.homeserver, m.username, m.token)
 }
 
-func (m Matrix) Receive() ([]Message, error) {
+func (m Matrix) Continuation() string {
+	return m.continuation
+}
+
+func (m *Matrix) Receive() ([]Message, error) {
 	if m.mock {
 		log.Printf("matrix.Receive()")
 		messages := make([]Message, 0)
@@ -64,11 +71,14 @@ func (m Matrix) Receive() ([]Message, error) {
 		return nil, err
 	}
 	messages := make([]Message, 0)
-	result, err := c.Messages(m.room, "", "", 'b', 50)
+	result, err := c.Messages(m.room, "999999999999999999", m.continuation, 'b', 50)
 	if err != nil {
 		return nil, err
 	}
+	log.Printf("%s => {Start:%s End:%v};; %v, (%d)", m.continuation, result.Start, result.End, err, len(result.Chunk))
+	m.continuation = result.End
 	for _, event := range result.Chunk {
+		//log.Printf("%+v", event)
 		if _, ok := matrixIDs[event.Sender]; !ok {
 			continue
 		}
@@ -81,6 +91,7 @@ func (m Matrix) Receive() ([]Message, error) {
 		}
 	}
 	clientChange := regexp.MustCompile("@[a-z]+$")
+	log.Printf("rewriting messages based on @abc")
 	for i := range messages {
 		if found := clientChange.FindString(messages[i].Content); found != "" {
 			messages[i].Content = strings.TrimSpace(strings.ReplaceAll(messages[i].Content, found, ""))
@@ -94,6 +105,14 @@ func (m Matrix) Receive() ([]Message, error) {
 		}
 		messages[i].Content = strings.TrimSpace(messages[i].Content)
 	}
+	log.Printf("rewriting messages based on ! CoMmAnD ...")
+	for i := range messages {
+		if strings.HasPrefix(messages[i].Content, "!") {
+			messages[i].Content = "!" + strings.TrimSpace(messages[i].Content[1:])
+			splits := strings.Split(messages[i].Content, " ")
+			messages[i].Content = strings.ToLower(splits[0]) + " " + strings.Join(splits, " ")
+		}
+	}
 	return messages, nil
 }
 
@@ -129,14 +148,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

message/matrix_test.go

@@ -20,7 +20,7 @@ func TestMatrixSend(t *testing.T) {
 	if err := json.Unmarshal(b, &c); err != nil {
 		t.Fatal(err)
 	}
-	var sender Sender = Matrix{
+	var sender Sender = &Matrix{
 		homeserver: c.Message.Matrix.Homeserver,
 		username:   c.Message.Matrix.Username,
 		token:      c.Message.Matrix.Token,
@@ -43,7 +43,7 @@ func TestMatrixReceive(t *testing.T) {
 	if err := json.Unmarshal(b, &c); err != nil {
 		t.Fatal(err)
 	}
-	var sender Sender = Matrix{
+	var sender Sender = &Matrix{
 		homeserver: c.Message.Matrix.Homeserver,
 		username:   c.Message.Matrix.Username,
 		token:      c.Message.Matrix.Token,

todo.yaml

@@ -1,4 +1,17 @@
 todo:
+- link to view more
+- map with to-from line
+- continuation is garbo, but I can still do better client side to avoid get-set high level
+- todo: details from ntg: stophours for pickup, appointmenttime/facitlyhours for dest
+  details: |
+    curl 'https://ntgvision.com/api/v1/load/LoadDetails?loadId=5088453' -H 'User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0' -H 'Accept: application/json, text/plain, */*' -H 'Accept-Language: en-US,en;q=0.5' -H 'Accept-Encoding: gzip, deflate, br' -H 'Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMzgyMSIsInVuaXF1ZV9uYW1lIjoiYmlyZGNvbXBhbnlsb2dpc3RpY3NAZ21haWwuY29tIiwianRpIjoiYTFiMjkxM2YtN2RjZS00ZDQ0LWEzMDYtMTRjMTBlYjQ2MmE1IiwiaWF0IjoiMS8xMy8yMDIyIDI6MTE6NTUgUE0iLCJudGd2Um9sZSI6IkNhcnJpZXJBcHByb3ZlZCIsImxvY2tVc2VyIjoiRmFsc2UiLCJvdmVycmlkZUJsYWNrbGlzdCI6IkZhbHNlIiwic2hvd1JhdGVzIjoiRmFsc2UiLCJ1c2VyQ2FycmllcnMiOiIxMTQxOTMiLCJvdHJVc2VyIjoiRmFsc2UiLCJuYmYiOjE2NDIwODMxMTUsImV4cCI6MTY0MjE2NTkxNSwiaXNzIjoiTlRHIFNlY3VyaXR5IFRva2VuIFNlcnZpY2UiLCJhdWQiOiJOVEcifQ.eDE2Jfok79b7oD1deP_00h9g8zZ3AnY60McnJ1hfS-8YJ12L3Bl-CJeN0eBos0aj2FXHv5MrqOJ6MFCaatqjIddPJl2MvtSByGUCLBzih67O20mkCowCmZfGjSnKvUu7DHFxjzo_y4_a3cjjGPYNc2LSCVJxV9NYzSXIuXG3WvXeE3dv8ml23bJFFhMWZzhSAfWBOW4kR61sibS6BpRD8dpkKoqUfXInq_7o8jz9_PsEhPBdJydqbXwg8ifQHkaPNAojsIr2rnJ3Tf_iQpom-6oAEUAOd2D3fK1XuWtRrysnD8s41YDthmqKpni2WOk72L-sKzRxD4KX2t_gyEb3Fw' -H 'DNT: 1' -H 'Connection: keep-alive' -H 'Cookie: cookiesession1=678A3E1398901234BCDEFGHIJKLMA492; _uiq_id.711119701.3d83=516d3e744ebe2d9a.1641792415.0.1642083653..; NTGAuthToken=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMzgyMSIsInVuaXF1ZV9uYW1lIjoiYmlyZGNvbXBhbnlsb2dpc3RpY3NAZ21haWwuY29tIiwianRpIjoiYTFiMjkxM2YtN2RjZS00ZDQ0LWEzMDYtMTRjMTBlYjQ2MmE1IiwiaWF0IjoiMS8xMy8yMDIyIDI6MTE6NTUgUE0iLCJudGd2Um9sZSI6IkNhcnJpZXJBcHByb3ZlZCIsImxvY2tVc2VyIjoiRmFsc2UiLCJvdmVycmlkZUJsYWNrbGlzdCI6IkZhbHNlIiwic2hvd1JhdGVzIjoiRmFsc2UiLCJ1c2VyQ2FycmllcnMiOiIxMTQxOTMiLCJvdHJVc2VyIjoiRmFsc2UiLCJuYmYiOjE2NDIwODMxMTUsImV4cCI6MTY0MjE2NTkxNSwiaXNzIjoiTlRHIFNlY3VyaXR5IFRva2VuIFNlcnZpY2UiLCJhdWQiOiJOVEcifQ.eDE2Jfok79b7oD1deP_00h9g8zZ3AnY60McnJ1hfS-8YJ12L3Bl-CJeN0eBos0aj2FXHv5MrqOJ6MFCaatqjIddPJl2MvtSByGUCLBzih67O20mkCowCmZfGjSnKvUu7DHFxjzo_y4_a3cjjGPYNc2LSCVJxV9NYzSXIuXG3WvXeE3dv8ml23bJFFhMWZzhSAfWBOW4kR61sibS6BpRD8dpkKoqUfXInq_7o8jz9_PsEhPBdJydqbXwg8ifQHkaPNAojsIr2rnJ3Tf_iQpom-6oAEUAOd2D3fK1XuWtRrysnD8s41YDthmqKpni2WOk72L-sKzRxD4KX2t_gyEb3Fw' -H 'Sec-Fetch-Dest: empty' -H 'Sec-Fetch-Mode: cors' -H 'Sec-Fetch-Site: same-origin' -H 'Pragma: no-cache' -H 'Cache-Control: no-cache'
+    {"headerSummary":"Washington, NC to Abilene, TX","loadId":5088453,"miles":1481,"weight":6000,"temp":null,"equipment":"Str Truck W/ Lift Gate","categoryName":"Lighting / Lighting Fixtures","categoryLabel":"Product Category","cargoInformation":["Store Fixtures - 6000 lbs"],"loadRequirements":["Straight Truck with lift gate required"],"stopInfos":[{"loadInfoIds":[5431607],"stopDateTime":"0001-01-01T00:00:00","isPickup":true,"location":"Washington, NC","stopDate":"Friday, 01/14/22","stopHours":"10:00 - 12:00","appointmentTime":"","appointmentType":"FCFS","instructions":"***LIFTGATE, PALLET JACK, DRIVER ASSIST***--MUST DELIVER ONLY ON APPT TIME-- CANNOT DELIVER EARLY OR LATE \r\n","isDropTrailer":false,"shipperName":"IDX NORTH CAROLINA","processedStopDate":""},{"loadInfoIds":[5431607],"stopDateTime":"0001-01-01T00:00:00","isPickup":false,"location":"Abilene, TX","stopDate":"Monday, 01/17/22","stopHours":"09:00 - 10:00","appointmentTime":"09:00","appointmentType":"APPT","instructions":"***LIFTGATE, PALLET JACK, DRIVER ASSIST***--MUST DELIVER ONLY ON APPT TIME-- CANNOT DELIVER EARLY OR LATE \r\n","isDropTrailer":false,"shipperName":"hibbett sports","processedStopDate":""}],"drayStopInfos":null,"rateInfo":null,"isDray":false,"equipmentGroupId":8,"totalCarrierRate":2600.00,"payUpTo":2700.00,"firstLoadInfoId":5431607,"loadStatus":"ACTIVE","hasBlockingAlert":false,"customerLoadBlocked":false,"canSeeRate":false,"canBookNow":false,"canBidNow":true,"buttonData":{"useBidDialog":false,"lastBidAmount":null,"remainingBids":1,"carrierPhoneNumber":null,"carrierPhoneExtension":null},"stopData":[{"addr":"IDX NORTH CAROLINA","city":"Washington","state":"NC","zip":"27889"},{"addr":"hibbett sports","city":"Abilene","state":"TX","zip":"79606"}]}
+
+- 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
@@ -9,6 +22,8 @@ todo:
   - banlist criteria like vendors, brokers, metadata
 - set up copy for caleb, broc
 done:
+- TO CONFLUENT.RS OR W/E
+- rm get-set stuff for matrix now that it has continuation
 - setup ma on element !!fluffychat
 - !help,
 - !states optional but explicit option