diff --git a/broker/job.go b/broker/job.go index 5c2c21b..36ea769 100644 --- a/broker/job.go +++ b/broker/job.go @@ -43,16 +43,10 @@ func (j JobLocation) String() string { func (j Job) FormatMultilineText() string { foo := func(client string) string { return fmt.Sprintf( - "--- %s: %s => %s ---\nPickup: %s\nDropoff: %s\nNotes: %d lbs, %d miles, %s\n%s", + "--- %s: %s => %s ---", client, j.Pickup.State, j.Dropoff.State, - j.Pickup.String(), - j.Dropoff.String(), - j.Weight, - j.Miles, - j.Meta, - j.URI, ) } out := "" @@ -61,10 +55,22 @@ func (j Job) FormatMultilineText() string { log.Printf("job multiline: %+v contains %s then use %v", clients[k].States, j.Pickup.State, k) if strings.Contains(fmt.Sprint(clients[k].States), j.Pickup.State) { if len(out) > 0 { - out += "\n\n" + out += "\n" } out += foo(k) } } + if len(out) > 0 { + out = fmt.Sprintf( + "%s\nPickup: %s\nDropoff: %s\nNotes: %d lbs, %d miles, %s\n%s", + out, + j.Pickup.String(), + j.Dropoff.String(), + j.Weight, + j.Miles, + j.Meta, + j.URI, + ) + } return out } diff --git a/config.json b/config.json index cdabebf..f2fb86f 100644 --- a/config.json +++ b/config.json @@ -19,7 +19,7 @@ "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", - "Pathed": true, + "Pathed": false, "Pickup": false, "Dropoff": false }, @@ -61,7 +61,7 @@ "Matrix": { "ReceiveEnabled": true, "Mock": false, - "Continuation": "1314", + "Continuation": "1318", "Homeserver": "https://m.bltrucks.top", "Username": "@bot.m.bltrucks.top", "Token": "mvDWB96KXMF8XhOam8EC5XVdQvSEw0CDeClcSWocBcYkwZX3FPNWZ5uOnQk2EmT1cjpzfeuD7gDYPPjOuyZlI3bE9TE35UjNOlZgi0Tugm25s91iVsbIF6kMZsCIhVMSmEf6w3jxX6wQYOWvmDZ4mu6f5c8wr221EMDcOpEzQV09d1zuBSWgKLBgjqAkYHJZ5dTRIWpEDpPgujhOFZa2ld1HiAOxrJKlIrlfDBN0CUsTlGOGplujDAr4VtpFzNRS",