Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e2cd24a39f | ||
|
|
48da446e83 | ||
|
|
cc379c52ad | ||
|
|
2a93e52b0b | ||
|
|
2102259ba4 | ||
|
|
9552df9281 | ||
|
|
1cdb399dda | ||
|
|
6bc85d0ab7 | ||
|
|
874de44a47 | ||
|
|
a07a7d5a00 | ||
|
|
65e43f8d2a |
@@ -10,6 +10,7 @@ import (
|
|||||||
|
|
||||||
type Job struct {
|
type Job struct {
|
||||||
ID string
|
ID string
|
||||||
|
URI string
|
||||||
Pickup JobLocation
|
Pickup JobLocation
|
||||||
Dropoff JobLocation
|
Dropoff JobLocation
|
||||||
Weight int
|
Weight int
|
||||||
@@ -25,12 +26,13 @@ type JobLocation struct {
|
|||||||
|
|
||||||
func (j Job) String() string {
|
func (j Job) String() string {
|
||||||
return fmt.Sprintf(
|
return fmt.Sprintf(
|
||||||
`%s => %s (%d miles), Weight:%d, Notes:%s`,
|
`%s => %s (%d miles), Weight:%d, Notes:%s Link:%s`,
|
||||||
j.Pickup.String(),
|
j.Pickup.String(),
|
||||||
j.Dropoff.String(),
|
j.Dropoff.String(),
|
||||||
j.Miles,
|
j.Miles,
|
||||||
j.Weight,
|
j.Weight,
|
||||||
j.Meta,
|
j.Meta,
|
||||||
|
j.URI,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,7 +43,7 @@ func (j JobLocation) String() string {
|
|||||||
func (j Job) FormatMultilineText() string {
|
func (j Job) FormatMultilineText() string {
|
||||||
foo := func(client string) string {
|
foo := func(client string) string {
|
||||||
return fmt.Sprintf(
|
return fmt.Sprintf(
|
||||||
"--- %s: %s => %s ---\nPickup: %s\nDropoff: %s\nNotes: %d lbs, %d miles, %s",
|
"--- %s: %s => %s ---\nPickup: %s\nDropoff: %s\nNotes: %d lbs, %d miles, %s\n%s",
|
||||||
client,
|
client,
|
||||||
j.Pickup.State,
|
j.Pickup.State,
|
||||||
j.Dropoff.State,
|
j.Dropoff.State,
|
||||||
@@ -50,6 +52,7 @@ func (j Job) FormatMultilineText() string {
|
|||||||
j.Weight,
|
j.Weight,
|
||||||
j.Miles,
|
j.Miles,
|
||||||
j.Meta,
|
j.Meta,
|
||||||
|
j.URI,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
out := ""
|
out := ""
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import (
|
|||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"local/truckstop/config"
|
"local/truckstop/config"
|
||||||
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -38,7 +39,8 @@ func (ntgJob ntgVisionJob) Job() Job {
|
|||||||
pickup, _ := time.ParseInLocation("01/02/06", ntgJob.PickupDate, time.Local)
|
pickup, _ := time.ParseInLocation("01/02/06", ntgJob.PickupDate, time.Local)
|
||||||
dropoff, _ := time.ParseInLocation("01/02/06", ntgJob.DropoffDate, time.Local)
|
dropoff, _ := time.ParseInLocation("01/02/06", ntgJob.DropoffDate, time.Local)
|
||||||
return Job{
|
return Job{
|
||||||
ID: fmt.Sprintf("ntg-%d", ntgJob.ID),
|
ID: fmt.Sprintf("ntg-%d", ntgJob.ID),
|
||||||
|
URI: fmt.Sprintf(config.Get().Brokers.NTG.LoadPageURIFormat, ntgJob.ID),
|
||||||
Pickup: JobLocation{
|
Pickup: JobLocation{
|
||||||
Date: pickup,
|
Date: pickup,
|
||||||
City: ntgJob.PickupCity,
|
City: ntgJob.PickupCity,
|
||||||
@@ -73,8 +75,15 @@ func (ntg NTGVision) Search(states []config.State) ([]Job, error) {
|
|||||||
}
|
}
|
||||||
defer rc.Close()
|
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
|
var ntgjobs []ntgVisionJob
|
||||||
err = json.NewDecoder(rc).Decode(&ntgjobs)
|
err = json.Unmarshal(b, &ntgjobs)
|
||||||
|
|
||||||
jobs := make([]Job, len(ntgjobs))
|
jobs := make([]Job, len(ntgjobs))
|
||||||
for i := range jobs {
|
for i := range jobs {
|
||||||
|
|||||||
34
config.json
34
config.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"Interval": {
|
"Interval": {
|
||||||
"Input": "15s..20s",
|
"Input": "5s..10s",
|
||||||
"OK": "6h0m0s..6h0m0s",
|
"OK": "6h0m0s..6h0m0s",
|
||||||
"Error": "6h0m0s..6h0m0s"
|
"Error": "6h0m0s..6h0m0s"
|
||||||
},
|
},
|
||||||
@@ -16,8 +16,11 @@
|
|||||||
"UploadMethod": "POST"
|
"UploadMethod": "POST"
|
||||||
},
|
},
|
||||||
"Maps": {
|
"Maps": {
|
||||||
|
"DirectionsURIFormat": "https://maps.googleapis.com/maps/api/directions/json?origin=%s\u0026destination=%s\u0026mode=driving\u0026key=AIzaSyBkACm-LQkoSfsTO5_XAzBVZE9-JQzcNkg",
|
||||||
|
"PathedURIFormat": "https://maps.googleapis.com/maps/api/staticmap?size=250x250\u0026path=%s\u0026format=jpeg\u0026maptype=roadmap\u0026key=AIzaSyBkACm-LQkoSfsTO5_XAzBVZE9-JQzcNkg\u0026size=250x250\u0026markers=%s|%s\u0026zoom=5",
|
||||||
"URIFormat": "https://maps.googleapis.com/maps/api/staticmap?center=%s\u0026markers=label=A|%s\u0026zoom=5\u0026size=250x250\u0026scale=1\u0026format=jpeg\u0026maptype=roadmap\u0026key=AIzaSyBkACm-LQkoSfsTO5_XAzBVZE9-JQzcNkg",
|
"URIFormat": "https://maps.googleapis.com/maps/api/staticmap?center=%s\u0026markers=label=A|%s\u0026zoom=5\u0026size=250x250\u0026scale=1\u0026format=jpeg\u0026maptype=roadmap\u0026key=AIzaSyBkACm-LQkoSfsTO5_XAzBVZE9-JQzcNkg",
|
||||||
"Pickup": true,
|
"Pathed": true,
|
||||||
|
"Pickup": false,
|
||||||
"Dropoff": false
|
"Dropoff": false
|
||||||
},
|
},
|
||||||
"Clients": {
|
"Clients": {
|
||||||
@@ -26,9 +29,9 @@
|
|||||||
"NC"
|
"NC"
|
||||||
],
|
],
|
||||||
"IDs": {
|
"IDs": {
|
||||||
"Matrix": "@bel:synapse.home.blapointe.com"
|
"Matrix": "@bel:m.bltrucks.top"
|
||||||
},
|
},
|
||||||
"Available": 1612328400
|
"Available": 1512328400
|
||||||
},
|
},
|
||||||
"broc": {
|
"broc": {
|
||||||
"States": [
|
"States": [
|
||||||
@@ -36,25 +39,16 @@
|
|||||||
"NC"
|
"NC"
|
||||||
],
|
],
|
||||||
"IDs": {
|
"IDs": {
|
||||||
"Matrix": "@belandbroc:matrix.org"
|
"Matrix": "@broc:m.bltrucks.top"
|
||||||
},
|
},
|
||||||
"Available": 5642452800
|
"Available": 5642452800
|
||||||
},
|
},
|
||||||
"caleb": {
|
|
||||||
"States": [
|
|
||||||
"FL"
|
|
||||||
],
|
|
||||||
"IDs": {
|
|
||||||
"Matrix": "@belandbroc:matrix.org"
|
|
||||||
},
|
|
||||||
"Available": -62135596800
|
|
||||||
},
|
|
||||||
"pa": {
|
"pa": {
|
||||||
"States": [
|
"States": [
|
||||||
"NC"
|
"NC"
|
||||||
],
|
],
|
||||||
"IDs": {
|
"IDs": {
|
||||||
"Matrix": "@belandbroc:matrix.org"
|
"Matrix": "@ron:m.bltrucks.top"
|
||||||
},
|
},
|
||||||
"Available": -62135596800
|
"Available": -62135596800
|
||||||
}
|
}
|
||||||
@@ -67,17 +61,19 @@
|
|||||||
"Matrix": {
|
"Matrix": {
|
||||||
"ReceiveEnabled": true,
|
"ReceiveEnabled": true,
|
||||||
"Mock": false,
|
"Mock": false,
|
||||||
"Homeserver": "https://synapse.home.blapointe.com",
|
"Continuation": "1314",
|
||||||
"Username": "@bel:synapse.home.blapointe.com",
|
"Homeserver": "https://m.bltrucks.top",
|
||||||
"Token": "MDAyOGxvY2F0aW9uIHN5bmFwc2UuaG9tZS5ibGFwb2ludGUuY29tCjAwMTNpZGVudGlmaWVyIGtleQowMDEwY2lkIGdlbiA9IDEKMDAzMmNpZCB1c2VyX2lkID0gQGJlbDpzeW5hcHNlLmhvbWUuYmxhcG9pbnRlLmNvbQowMDE2Y2lkIHR5cGUgPSBhY2Nlc3MKMDAyMWNpZCBub25jZSA9IFpXTTtCaTNBODdtSTpsZkAKMDAyZnNpZ25hdHVyZSBX37kStY2wt_ftMfEYPfk1ADMJ6ZVfZsro9ic3weZ25Ao",
|
"Username": "@bot.m.bltrucks.top",
|
||||||
|
"Token": "mvDWB96KXMF8XhOam8EC5XVdQvSEw0CDeClcSWocBcYkwZX3FPNWZ5uOnQk2EmT1cjpzfeuD7gDYPPjOuyZlI3bE9TE35UjNOlZgi0Tugm25s91iVsbIF6kMZsCIhVMSmEf6w3jxX6wQYOWvmDZ4mu6f5c8wr221EMDcOpEzQV09d1zuBSWgKLBgjqAkYHJZ5dTRIWpEDpPgujhOFZa2ld1HiAOxrJKlIrlfDBN0CUsTlGOGplujDAr4VtpFzNRS",
|
||||||
"Device": "TGNIOGKATZ",
|
"Device": "TGNIOGKATZ",
|
||||||
"Room": "!WbawbZxHqnxxfhvcSj:synapse.home.blapointe.com"
|
"Room": "!OYZqtInrBCn1cyz90D:m.bltrucks.top"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Once": true,
|
"Once": true,
|
||||||
"Brokers": {
|
"Brokers": {
|
||||||
"NTG": {
|
"NTG": {
|
||||||
"Mock": true,
|
"Mock": true,
|
||||||
|
"LoadPageURIFormat": "https://ntgvision.com/LoadDetails?loadId=%d",
|
||||||
"Token": "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIzMTAyOSIsInVuaXF1ZV9uYW1lIjoibm9lYXN5cnVuc3RydWNraW5nQGdtYWlsLmNvbSIsImp0aSI6IjFmYzhmNjk1LTQzNTYtNGYzZS05NWY1LWZkNWVjMDJlMDkxNyIsImlhdCI6IjEvMTAvMjAyMiAxMTo1OTozNiBQTSIsIm50Z3ZSb2xlIjoiQ2FycmllckFwcHJvdmVkIiwidXNlckNhcnJpZXJzIjoiMTUzNDIzIiwib3RyVXNlciI6IkZhbHNlIiwibmJmIjoxNjQxODU5MTc2LCJleHAiOjE2NDE5NDE5NzYsImlzcyI6Ik5URyBTZWN1cml0eSBUb2tlbiBTZXJ2aWNlIiwiYXVkIjoiTlRHIn0.kpHOBTtcQhbdloAw7xEjnkzfxf4ToMgidrLCMomZmnmKQHlD_7OQuI8nQiCTHc_ntuGtt8Ui92kwWWUiLwN_2tT2vC7Jy6m9IjwqgbAzsgTLi4jAbIwITD-awiDh4FUKDwGq3XpEjs-i7XM3rI7tTk7jg9QSDId8EF3Pt5fJq6QhztC6y7-JaSFQZLMtkSCAWmOQx_TgKgVoVbgMeiqhHbZ2hhoA7TtpEIIL5Gnfq46t3E18ExdrsO96ZCGQGcBw5x8J1ustq2cwdlFKeg4ULNWAAd1ay1hojRa7jCHs98AcoJ3Nts9-o7yEMuN2rrfpK_nm68nciwFtF-ke1KoiBg",
|
"Token": "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIzMTAyOSIsInVuaXF1ZV9uYW1lIjoibm9lYXN5cnVuc3RydWNraW5nQGdtYWlsLmNvbSIsImp0aSI6IjFmYzhmNjk1LTQzNTYtNGYzZS05NWY1LWZkNWVjMDJlMDkxNyIsImlhdCI6IjEvMTAvMjAyMiAxMTo1OTozNiBQTSIsIm50Z3ZSb2xlIjoiQ2FycmllckFwcHJvdmVkIiwidXNlckNhcnJpZXJzIjoiMTUzNDIzIiwib3RyVXNlciI6IkZhbHNlIiwibmJmIjoxNjQxODU5MTc2LCJleHAiOjE2NDE5NDE5NzYsImlzcyI6Ik5URyBTZWN1cml0eSBUb2tlbiBTZXJ2aWNlIiwiYXVkIjoiTlRHIn0.kpHOBTtcQhbdloAw7xEjnkzfxf4ToMgidrLCMomZmnmKQHlD_7OQuI8nQiCTHc_ntuGtt8Ui92kwWWUiLwN_2tT2vC7Jy6m9IjwqgbAzsgTLi4jAbIwITD-awiDh4FUKDwGq3XpEjs-i7XM3rI7tTk7jg9QSDId8EF3Pt5fJq6QhztC6y7-JaSFQZLMtkSCAWmOQx_TgKgVoVbgMeiqhHbZ2hhoA7TtpEIIL5Gnfq46t3E18ExdrsO96ZCGQGcBw5x8J1ustq2cwdlFKeg4ULNWAAd1ay1hojRa7jCHs98AcoJ3Nts9-o7yEMuN2rrfpK_nm68nciwFtF-ke1KoiBg",
|
||||||
"Username": "noeasyrunstrucking@gmail.com",
|
"Username": "noeasyrunstrucking@gmail.com",
|
||||||
"Password": "thumper123"
|
"Password": "thumper123"
|
||||||
|
|||||||
@@ -27,9 +27,12 @@ type Config struct {
|
|||||||
UploadMethod string
|
UploadMethod string
|
||||||
}
|
}
|
||||||
Maps struct {
|
Maps struct {
|
||||||
URIFormat string
|
DirectionsURIFormat string
|
||||||
Pickup bool
|
PathedURIFormat string
|
||||||
Dropoff bool
|
URIFormat string
|
||||||
|
Pathed bool
|
||||||
|
Pickup bool
|
||||||
|
Dropoff bool
|
||||||
}
|
}
|
||||||
Clients map[string]Client
|
Clients map[string]Client
|
||||||
Storage []string
|
Storage []string
|
||||||
@@ -37,6 +40,7 @@ type Config struct {
|
|||||||
Matrix struct {
|
Matrix struct {
|
||||||
ReceiveEnabled bool
|
ReceiveEnabled bool
|
||||||
Mock bool
|
Mock bool
|
||||||
|
Continuation string
|
||||||
Homeserver string
|
Homeserver string
|
||||||
Username string
|
Username string
|
||||||
Token string
|
Token string
|
||||||
@@ -47,10 +51,11 @@ type Config struct {
|
|||||||
Once bool
|
Once bool
|
||||||
Brokers struct {
|
Brokers struct {
|
||||||
NTG struct {
|
NTG struct {
|
||||||
Mock bool
|
Mock bool
|
||||||
Token string
|
LoadPageURIFormat string
|
||||||
Username string
|
Token string
|
||||||
Password string
|
Username string
|
||||||
|
Password string
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
80
main.go
80
main.go
@@ -9,6 +9,7 @@ import (
|
|||||||
"local/truckstop/config"
|
"local/truckstop/config"
|
||||||
"local/truckstop/message"
|
"local/truckstop/message"
|
||||||
"log"
|
"log"
|
||||||
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"regexp"
|
"regexp"
|
||||||
"sort"
|
"sort"
|
||||||
@@ -23,8 +24,10 @@ func main() {
|
|||||||
if err := config.Refresh(); err != nil {
|
if err := config.Refresh(); err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
if err := matrixrecv(); err != nil {
|
if config.Get().Message.Matrix.ReceiveEnabled {
|
||||||
panic(err)
|
if err := matrixrecv(); err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
lock := &sync.Mutex{}
|
lock := &sync.Mutex{}
|
||||||
go func() {
|
go func() {
|
||||||
@@ -69,7 +72,7 @@ func matrixrecv() error {
|
|||||||
if !printed {
|
if !printed {
|
||||||
if _, err := db.Get(key); err == storage.ErrNotFound {
|
if _, err := db.Get(key); err == storage.ErrNotFound {
|
||||||
log.Printf("sending help")
|
log.Printf("sending help")
|
||||||
help := fmt.Sprintf("commands:\n...`!help`...print this help\n...`!state nc NC nC Nc`...set states for self\n...`!available 2022-12-31`...set date self is available for work\n\nrun a command for someone else: `!state ga @caleb`")
|
help := fmt.Sprintf("commands:\n `!help` print this help\n `!state nc NC nC Nc` set states for self\n `!available 2022-12-31` set date self is available for work\n\nrun a command for someone else: `!state ga @caleb`")
|
||||||
if err := sender.Send(help); err != nil {
|
if err := sender.Send(help); err != nil {
|
||||||
log.Printf("failed to send help: %v", err)
|
log.Printf("failed to send help: %v", err)
|
||||||
} else {
|
} else {
|
||||||
@@ -138,6 +141,11 @@ func matrixrecv() error {
|
|||||||
}
|
}
|
||||||
setNewPauses(pauses)
|
setNewPauses(pauses)
|
||||||
}()
|
}()
|
||||||
|
conf := *config.Get()
|
||||||
|
if conf.Message.Matrix.Continuation != sender.Continuation() {
|
||||||
|
conf.Message.Matrix.Continuation = sender.Continuation()
|
||||||
|
config.Set(conf)
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -271,12 +279,13 @@ func once() error {
|
|||||||
}
|
}
|
||||||
log.Printf("once: sending jobs: %+v", jobs)
|
log.Printf("once: sending jobs: %+v", jobs)
|
||||||
for i := range jobs {
|
for i := range jobs {
|
||||||
if err := sendJob(jobs[i]); err != nil {
|
if ok, err := sendJob(jobs[i]); err != nil {
|
||||||
return err
|
|
||||||
}
|
|
||||||
log.Println("sent job", jobs[i])
|
|
||||||
if err := config.Get().DB().Set(jobs[i].ID, []byte(`sent`)); err != nil {
|
|
||||||
return err
|
return err
|
||||||
|
} else if ok {
|
||||||
|
log.Println("sent job", jobs[i])
|
||||||
|
if err := config.Get().DB().Set(jobs[i].ID, []byte(`sent`)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
@@ -318,34 +327,73 @@ func dropBanlistJobs(jobs []broker.Job) ([]broker.Job, error) {
|
|||||||
return jobs, nil
|
return jobs, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func sendJob(job broker.Job) error {
|
func sendJob(job broker.Job) (bool, error) {
|
||||||
sender := message.NewMatrix()
|
sender := message.NewMatrix()
|
||||||
payload := job.FormatMultilineText()
|
payload := job.FormatMultilineText()
|
||||||
log.Printf("once: send job %s if nonzero: %s", job.String(), payload)
|
log.Printf("once: send job %s if nonzero: %s", job.String(), payload)
|
||||||
if len(payload) == 0 {
|
if len(payload) == 0 {
|
||||||
return nil
|
return false, nil
|
||||||
}
|
}
|
||||||
if err := sender.Send(payload); err != nil {
|
if err := sender.Send(payload); err != nil {
|
||||||
return err
|
return false, err
|
||||||
}
|
}
|
||||||
maps := config.Get().Maps
|
maps := config.Get().Maps
|
||||||
|
pickup := fmt.Sprintf("%s,%s", url.QueryEscape(job.Pickup.City), job.Pickup.State)
|
||||||
|
dropoff := fmt.Sprintf("%s,%s", url.QueryEscape(job.Dropoff.City), job.Dropoff.State)
|
||||||
|
if maps.Pathed {
|
||||||
|
directionsURI := fmt.Sprintf(maps.DirectionsURIFormat, pickup, dropoff)
|
||||||
|
resp, err := http.Get(directionsURI)
|
||||||
|
if err != nil {
|
||||||
|
return true, err
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return true, fmt.Errorf("bad status getting path: %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
var directionsResp struct {
|
||||||
|
Routes []struct {
|
||||||
|
Legs []struct {
|
||||||
|
Steps []struct {
|
||||||
|
StartLocation struct {
|
||||||
|
Lat float32 `json:"lat"`
|
||||||
|
Lng float32 `json:"lng"`
|
||||||
|
} `json:"start_location"`
|
||||||
|
} `json:"steps"`
|
||||||
|
} `json:"legs"`
|
||||||
|
} `json:"routes"`
|
||||||
|
}
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&directionsResp); err != nil {
|
||||||
|
return true, err
|
||||||
|
}
|
||||||
|
if len(directionsResp.Routes) < 1 || len(directionsResp.Routes[0].Legs) < 1 || len(directionsResp.Routes[0].Legs[0].Steps) < 1 {
|
||||||
|
} else {
|
||||||
|
latLngPath := make([]string, 0)
|
||||||
|
for _, v := range directionsResp.Routes[0].Legs[0].Steps {
|
||||||
|
latLngPath = append(latLngPath, fmt.Sprintf("%.9f,%.9f", v.StartLocation.Lat, v.StartLocation.Lng))
|
||||||
|
}
|
||||||
|
pathQuery := strings.Join(latLngPath, "|")
|
||||||
|
uri := fmt.Sprintf(maps.PathedURIFormat, pathQuery, pickup, dropoff)
|
||||||
|
log.Printf("sending pathed image: %s", uri)
|
||||||
|
if err := sender.SendImage(uri); err != nil {
|
||||||
|
return true, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
if maps.Pickup {
|
if maps.Pickup {
|
||||||
pickup := fmt.Sprintf("%s,%s", url.QueryEscape(job.Pickup.City), job.Pickup.State)
|
|
||||||
uri := fmt.Sprintf(maps.URIFormat, pickup, pickup)
|
uri := fmt.Sprintf(maps.URIFormat, pickup, pickup)
|
||||||
log.Printf("sending pickup image: %s", uri)
|
log.Printf("sending pickup image: %s", uri)
|
||||||
if err := sender.SendImage(uri); err != nil {
|
if err := sender.SendImage(uri); err != nil {
|
||||||
return err
|
return true, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if maps.Dropoff {
|
if maps.Dropoff {
|
||||||
dropoff := fmt.Sprintf("%s,%s", url.QueryEscape(job.Dropoff.City), job.Dropoff.State)
|
|
||||||
uri := fmt.Sprintf(maps.URIFormat, dropoff, dropoff)
|
uri := fmt.Sprintf(maps.URIFormat, dropoff, dropoff)
|
||||||
log.Printf("sending dropoff image: %s", uri)
|
log.Printf("sending dropoff image: %s", uri)
|
||||||
if err := sender.SendImage(uri); err != nil {
|
if err := sender.SendImage(uri); err != nil {
|
||||||
return err
|
return true, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return true, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func sendNewStates(client string, states []config.State) error {
|
func sendNewStates(client string, states []config.State) error {
|
||||||
|
|||||||
@@ -15,21 +15,23 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Matrix struct {
|
type Matrix struct {
|
||||||
mock bool
|
mock bool
|
||||||
homeserver string
|
homeserver string
|
||||||
username string
|
username string
|
||||||
token string
|
token string
|
||||||
room string
|
room string
|
||||||
|
continuation string
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewMatrix() Matrix {
|
func NewMatrix() Matrix {
|
||||||
conf := config.Get().Message.Matrix
|
conf := config.Get().Message.Matrix
|
||||||
return Matrix{
|
return Matrix{
|
||||||
homeserver: conf.Homeserver,
|
homeserver: conf.Homeserver,
|
||||||
username: conf.Username,
|
username: conf.Username,
|
||||||
token: conf.Token,
|
token: conf.Token,
|
||||||
room: conf.Room,
|
room: conf.Room,
|
||||||
mock: conf.Mock,
|
mock: conf.Mock,
|
||||||
|
continuation: conf.Continuation,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,7 +39,11 @@ func (m Matrix) getclient() (*gomatrix.Client, error) {
|
|||||||
return gomatrix.NewClient(m.homeserver, m.username, m.token)
|
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 {
|
if m.mock {
|
||||||
log.Printf("matrix.Receive()")
|
log.Printf("matrix.Receive()")
|
||||||
messages := make([]Message, 0)
|
messages := make([]Message, 0)
|
||||||
@@ -65,11 +71,14 @@ func (m Matrix) Receive() ([]Message, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
messages := make([]Message, 0)
|
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 {
|
if err != nil {
|
||||||
return nil, err
|
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 {
|
for _, event := range result.Chunk {
|
||||||
|
//log.Printf("%+v", event)
|
||||||
if _, ok := matrixIDs[event.Sender]; !ok {
|
if _, ok := matrixIDs[event.Sender]; !ok {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -82,6 +91,7 @@ func (m Matrix) Receive() ([]Message, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
clientChange := regexp.MustCompile("@[a-z]+$")
|
clientChange := regexp.MustCompile("@[a-z]+$")
|
||||||
|
log.Printf("rewriting messages based on @abc")
|
||||||
for i := range messages {
|
for i := range messages {
|
||||||
if found := clientChange.FindString(messages[i].Content); found != "" {
|
if found := clientChange.FindString(messages[i].Content); found != "" {
|
||||||
messages[i].Content = strings.TrimSpace(strings.ReplaceAll(messages[i].Content, found, ""))
|
messages[i].Content = strings.TrimSpace(strings.ReplaceAll(messages[i].Content, found, ""))
|
||||||
@@ -95,6 +105,14 @@ func (m Matrix) Receive() ([]Message, error) {
|
|||||||
}
|
}
|
||||||
messages[i].Content = strings.TrimSpace(messages[i].Content)
|
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
|
return messages, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ func TestMatrixSend(t *testing.T) {
|
|||||||
if err := json.Unmarshal(b, &c); err != nil {
|
if err := json.Unmarshal(b, &c); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
var sender Sender = Matrix{
|
var sender Sender = &Matrix{
|
||||||
homeserver: c.Message.Matrix.Homeserver,
|
homeserver: c.Message.Matrix.Homeserver,
|
||||||
username: c.Message.Matrix.Username,
|
username: c.Message.Matrix.Username,
|
||||||
token: c.Message.Matrix.Token,
|
token: c.Message.Matrix.Token,
|
||||||
@@ -43,7 +43,7 @@ func TestMatrixReceive(t *testing.T) {
|
|||||||
if err := json.Unmarshal(b, &c); err != nil {
|
if err := json.Unmarshal(b, &c); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
var sender Sender = Matrix{
|
var sender Sender = &Matrix{
|
||||||
homeserver: c.Message.Matrix.Homeserver,
|
homeserver: c.Message.Matrix.Homeserver,
|
||||||
username: c.Message.Matrix.Username,
|
username: c.Message.Matrix.Username,
|
||||||
token: c.Message.Matrix.Token,
|
token: c.Message.Matrix.Token,
|
||||||
|
|||||||
3
testdata/routed_map.sh
vendored
Normal file
3
testdata/routed_map.sh
vendored
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
#! /bin/bash
|
||||||
|
|
||||||
|
poly="${poly:-"$(curl 'https://maps.googleapis.com/maps/api/directions/json?origin=advance,nc&destination=winston-salem,nc&mode=driving&key=AIzaSyBkACm-LQkoSfsTO5_XAzBVZE9-JQzcNkg' | jq -c .routes[0].legs[0].steps[] | jq -c .start_location | jq -r '(.lat|tostring) + "," + (.lng|tostring)' | tr '\n' '|' | sed 's/.$//')"}"; curl "https://maps.googleapis.com/maps/api/staticmap?size=250x250&path=$(urlencode "$poly")&format=jpeg&maptype=roadmap&key=AIzaSyBkACm-LQkoSfsTO5_XAzBVZE9-JQzcNkg&size=600x400&sensor=false" > /tmp/f.jpg ; open /tmp/f.jpg
|
||||||
11
todo.yaml
11
todo.yaml
@@ -1,4 +1,11 @@
|
|||||||
todo:
|
todo:
|
||||||
|
- write-as for clients so ma can write to pa by default
|
||||||
|
- 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
|
- no hard code jpeg or have it in multiple places
|
||||||
- todo: switch house to selfhosted for rate limit
|
- todo: switch house to selfhosted for rate limit
|
||||||
tags: now
|
tags: now
|
||||||
@@ -14,6 +21,10 @@ todo:
|
|||||||
- banlist criteria like vendors, brokers, metadata
|
- banlist criteria like vendors, brokers, metadata
|
||||||
- set up copy for caleb, broc
|
- set up copy for caleb, broc
|
||||||
done:
|
done:
|
||||||
|
- link to view more
|
||||||
|
- map with to-from line
|
||||||
|
- TO CONFLUENT.RS OR W/E
|
||||||
|
- rm get-set stuff for matrix now that it has continuation
|
||||||
- setup ma on element !!fluffychat
|
- setup ma on element !!fluffychat
|
||||||
- !help,
|
- !help,
|
||||||
- !states optional but explicit option
|
- !states optional but explicit option
|
||||||
|
|||||||
Reference in New Issue
Block a user