little

main.go

@@ -126,9 +126,7 @@ func matrixrecv() error {
 				logtr.Errorf("failed to mark state gathered @%s: %v", key, err)
 			}
 		}
-		if config.Get().Brokers.UseZips {
-			setNewZips(zips)
-		}
+		setNewZips(zips)
 	}()
 	func() {
 		logtr.Verbosef("looking for states")
@@ -152,9 +150,7 @@ func matrixrecv() error {
 				logtr.Errorf("failed to mark state gathered @%s: %v", key, err)
 			}
 		}
-		if !config.Get().Brokers.UseZips {
-			setNewStates(states)
-		}
+		setNewStates(states)
 	}()
 	func() {
 		logtr.Verbosef("looking for radius")
@@ -526,6 +522,9 @@ func updateDeadJobs(jobs []broker.Job) error {
 				return err
 			}
 			*/
+			if err := message.NewMatrix().Remove(recorded.MatrixID); err != nil {
+				logtr.Debugf("failed to remove matrix: %v: %v", recorded.MatrixID, err)
+			}
 			if err := db.Set(listEntry, nil); err != nil {
 				logtr.Debugf("failed to remove db: %v: %v", listEntry, err)
 			}

message/matrix.go

@@ -2,7 +2,6 @@ package message
 
 import (
 	"bytes"
-	"crypto/tls"
 	"fmt"
 	"io/ioutil"
 	"local/truckstop/config"
@@ -46,19 +45,7 @@ func newMatrix(conf config.Matrix, cont string) Matrix {
 }
 
 func (m Matrix) getclient() (*gomatrix.Client, error) {
-	client, err := gomatrix.NewClient(m.homeserver, m.username, m.token)
-	if err != nil {
-		return nil, err
-	}
-	client.Client = &http.Client{
-		Timeout: time.Minute,
-		Transport: &http.Transport{
-			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: true,
-			},
-		},
-	}
-	return client, nil
+	return gomatrix.NewClient(m.homeserver, m.username, m.token)
 }
 
 func (m Matrix) Continuation() string {