fix a lot of stuff

ryhn-link · Jun 13, 2022 · 12df390 · 12df390
1 parent 4cfdf42
commit 12df390
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/source/matrix/package.d b/source/matrix/package.d
@@ -91,7 +91,7 @@ public:
 	/// Joins a room by it's room id or alias, retuns it's room id
 	RoomID joinRoom(T)(T room) if (isSomeRoomID!T)
 	{
-		JSONValue ret = new RequestBuilder("join/%s".format(urlEncode(room)))
+		JSONValue ret = new RequestBuilder(buildUrl("join/%s".format(urlEncode(room))))
 			.addAuth(this)
 			.mxPost();
 
@@ -297,7 +297,7 @@ public:
 	{
 		JSONValue ret = new RequestBuilder(buildUrl("rooms/%s/send/%s/%d".format(urlEncode(room), eventType, transactionId)))
 			.addAuth(this)
-			.mxPost(json);
+			.mxPut(json);
 
 		transactionId++;
 		return EventID(ret["event_id"].str);
@@ -436,7 +436,7 @@ public:
 	/// NOTE: Room aliases don't have the same data as their resolved room ids
 	JSONValue getRoomData(string room_id, string type)
 	{
-		JSONValue resp = new RequestBuilder("user/%s/rooms/%s/account_data/%s".format(urlEncode(userId),
+		JSONValue resp = new RequestBuilder(buildUrl("user/%s/rooms/%s/account_data/%s".format(urlEncode(userId)),
 				urlEncode(room_id), type))
 				.addAuth(this)
 				.mxGet();
@@ -448,7 +448,7 @@ public:
 	/// NOTE: Room aliases don't have the same data as their resolved room ids
 	void setRoomData(string room_id, string type, JSONValue data)
 	{
-		new RequestBuilder("user/%s/rooms/%s/account_data/%s".format(urlEncode(userId),
+		new RequestBuilder(buildUrl("user/%s/rooms/%s/account_data/%s".format(urlEncode(userId)),
 				urlEncode(room_id), type))
 				.addAuth(this)
 				.mxPut(data);
@@ -472,7 +472,7 @@ public:
 
 	JSONValue getRoomStates(T)(T room) if (isSomeRoomID!T)
 	{
-		JSONValue resp = new RequestBuilder("rooms/%s/state".format(urlEncode(room)))
+		JSONValue resp = new RequestBuilder(buildUrl("rooms/%s/state".format(urlEncode(room))))
 			.addAuth(this)
 			.mxGet();
 

diff --git a/source/matrix/text.d b/source/matrix/text.d
@@ -55,10 +55,10 @@ EventID addReaction(T)(MatrixClient c, T room, EventID event, string emoji)
 		if (isSomeRoomID!T)
 {
 	JSONValue json = JSONValue();
-	req["m.relates_to"] = JSONValue();
-	req["m.relates_to"]["rel_type"] = "m.annotation";
-	req["m.relates_to"]["event_id"] = event.toString;
-	req["m.relates_to"]["key"] = emoji;
+	json["m.relates_to"] = JSONValue();
+	json["m.relates_to"]["rel_type"] = "m.annotation";
+	json["m.relates_to"]["event_id"] = event.toString;
+	json["m.relates_to"]["key"] = emoji;
 
 	return c.sendEvent(room, "m.reaction", json);
 }
diff --git a/source/matrix/utils.d b/source/matrix/utils.d
@@ -33,41 +33,49 @@ class RequestBuilder
 		return this;
 	}
 
+	Request createRequest()
+	{
+		Request r = Request();
+		r.sslSetVerifyPeer(false);
+		r.addHeaders(headers);
+		return r;
+	}
+
 	Response get()
 	{
-		Request r = Request(); r.sslSetVerifyPeer(false);
+		Request r = createRequest();
 		return r.get(url, params);
 	}
 
 	Response put()
 	{
-		Request r = Request(); r.sslSetVerifyPeer(false);
+		Request r = createRequest();
 		import requests.utils : aa2params;
 		return r.put(url, params.aa2params);
 	}
 
 	Response put(T)(T data, string contentType)
 	{
 		import std.stdio;
-		Request r = Request(); r.sslSetVerifyPeer(false);
+		Request r = createRequest();
 		return r.put(url, data, contentType);
 	}
 
 	Response post()
 	{
-		Request r = Request(); r.sslSetVerifyPeer(false);
+		Request r = createRequest();
 		return r.post(url, params);
 	}
 
 	Response post(T)(T data, string contentType)
 	{
-		Request r = Request(); r.sslSetVerifyPeer(false);
+		Request r = createRequest();
 		return r.post(url, data, contentType);
 	}
 
 	Response del()
 	{
-		Request r = Request(); r.sslSetVerifyPeer(false);
+		Request r = createRequest();
 		return r.deleteRequest(url, params);
 	}
 }
@@ -78,7 +86,7 @@ RequestBuilder addAuth(RequestBuilder rb, MatrixClient c)
 	import std.exception : enforce;
 	enforce(c.accessToken, "Atempted to call authenticated method without access token");
 	rb.setHeader("Authorization", "Bearer " ~ c.accessToken);
-	rb.setParameter("access_token", c.accessToken);
+	//rb.setParameter("access_token", c.accessToken);
 	return rb;
 }