From cda5a3f5d3d233985b0e91650233fbc2e908a679 Mon Sep 17 00:00:00 2001 From: Kavin <20838718+FireMasterK@users.noreply.github.com> Date: Mon, 28 Nov 2022 01:04:37 +0000 Subject: [PATCH] Add better error messages on room join fail --- .../kavin/piped/utils/obj/MatrixHelper.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/me/kavin/piped/utils/obj/MatrixHelper.java b/src/main/java/me/kavin/piped/utils/obj/MatrixHelper.java index f57a799..3ecceaa 100644 --- a/src/main/java/me/kavin/piped/utils/obj/MatrixHelper.java +++ b/src/main/java/me/kavin/piped/utils/obj/MatrixHelper.java @@ -42,12 +42,20 @@ public class MatrixHelper { } if (UNAUTHENTICATED) { - ROOM_ID = RequestUtils.getJsonNode(h2client, new Request.Builder() - .url(MATRIX_SERVER + "/_matrix/client/v3/directory/room/" + URLUtils.silentEncode(MATRIX_ROOM)) - .header("Authorization", "Bearer " + MATRIX_TOKEN) - .build()) - .get("room_id") - .asText(); + + var joinResp = RequestUtils.getJsonNode(h2client, new Request.Builder() + .url(MATRIX_SERVER + "/_matrix/client/v3/directory/room/" + URLUtils.silentEncode(MATRIX_ROOM)) + .header("Authorization", "Bearer " + MATRIX_TOKEN) + .build()); + + try { + ROOM_ID = joinResp.get("room_id") + .asText(); + } catch (Exception e) { + System.err.println("Failed to join matrix room."); + System.err.println("Response: " + mapper.writeValueAsString(joinResp)); + throw e; + } } else { ROOM_ID = RequestUtils.getJsonNode(h2client, new Request.Builder() .url(MATRIX_SERVER + "/_matrix/client/v3/join/" + URLUtils.silentEncode(MATRIX_ROOM))