From d2f9c2d63a71fc5792c951becf7edcaf7fb2d17c Mon Sep 17 00:00:00 2001
From: June <june@jsts.xyz>
Date: Sat, 16 Aug 2025 02:36:49 +0200
Subject: [PATCH] combine localpart and homeserver arguments into one and
 validate that

Combine the user localpart and homeserver arguments into one user id
argument and validate that.
---
 main.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/main.go b/main.go
index 8b87e09..e028382 100644
--- a/main.go
+++ b/main.go
@@ -281,16 +281,20 @@ func compareVersionStrings(a, b string) int {
 }
 
 func main() {
-	userLocalpart := os.Getenv("MATRIX_USER_LOCALPART")
-	homeserver := os.Getenv("MATRIX_HOMESERVER")
+	userIdString := os.Getenv("MATRIX_USER_ID")
 	token := os.Getenv("MATRIX_TOKEN")
 	room := os.Getenv("MATRIX_ROOM")
 	verbose := false
 	timeoutSeconds := 5
 
+	userId := id.UserID(userIdString)
+	_, homeserver, err := userId.ParseAndValidate()
+	if err != nil {
+		log.Fatal(err)
+	}
 	client, err := mautrix.NewClient(
 		homeserver,
-		id.NewUserID(userLocalpart, homeserver),
+		userId,
 		token,
 	)
 	if err != nil {