From 93543abe4be00c945c6452cc472fd5f731504b65 Mon Sep 17 00:00:00 2001
From: Sam Wedgwood <sam@wedgwood.dev>
Date: Thu, 27 Jul 2023 14:28:57 +0100
Subject: [PATCH] stop using maybe

---
 clientapi/routing/directory.go | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/clientapi/routing/directory.go b/clientapi/routing/directory.go
index b9dddb6d8..32f7f2ec3 100644
--- a/clientapi/routing/directory.go
+++ b/clientapi/routing/directory.go
@@ -181,25 +181,23 @@ func SetLocalAlias(
 		return *resErr
 	}
 
-	maybeRoomID, err := spec.NewRoomID(r.RoomID)
+	roomID, err := spec.NewRoomID(r.RoomID)
 	if err != nil {
 		return util.JSONResponse{
 			Code: http.StatusBadRequest,
 			JSON: spec.InvalidParam("invalid room ID"),
 		}
 	}
-	roomID := *maybeRoomID // should be safe due to error check
 
-	maybeUserID, err := spec.NewUserID(device.UserID, true)
+	userID, err := spec.NewUserID(device.UserID, true)
 	if err != nil {
 		return util.JSONResponse{
 			Code: http.StatusInternalServerError,
 			JSON: spec.Unknown("internal server error"),
 		}
 	}
-	userID := *maybeUserID
 
-	senderID, err := rsAPI.QuerySenderIDForUser(req.Context(), roomID, userID)
+	senderID, err := rsAPI.QuerySenderIDForUser(req.Context(), *roomID, *userID)
 	if err != nil {
 		util.GetLogger(req.Context()).WithError(err).Error("QuerySenderIDForUser failed")
 		return util.JSONResponse{