From 9dcce18cda5317ea1150eed06d6589b6285577e6 Mon Sep 17 00:00:00 2001
From: TheArcaneBrony <myrainbowdash949@gmail.com>
Date: Mon, 4 Sep 2023 06:29:00 +0200
Subject: Add start of Media Moderator PoC bot

---
 .../Homeservers/AuthenticatedHomeserverGeneric.cs   | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'LibMatrix/Homeservers')

diff --git a/LibMatrix/Homeservers/AuthenticatedHomeserverGeneric.cs b/LibMatrix/Homeservers/AuthenticatedHomeserverGeneric.cs
index ecac4e4..bb34112 100644
--- a/LibMatrix/Homeservers/AuthenticatedHomeserverGeneric.cs
+++ b/LibMatrix/Homeservers/AuthenticatedHomeserverGeneric.cs
@@ -6,6 +6,7 @@ using System.Net.Http;
 using System.Net.Http.Json;
 using System.Text.Json;
 using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using LibMatrix.Extensions;
 using LibMatrix.Helpers;
@@ -56,7 +57,10 @@ public class AuthenticatedHomeserverGeneric : RemoteHomeServer {
     }
 
     public async Task<GenericRoom> CreateRoom(CreateRoomRequest creationEvent) {
-        var res = await _httpClient.PostAsJsonAsync("/_matrix/client/v3/createRoom", creationEvent);
+        creationEvent.CreationContent["creator"] = UserId;
+        var res = await _httpClient.PostAsJsonAsync("/_matrix/client/v3/createRoom", creationEvent, new JsonSerializerOptions {
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+        });
         if (!res.IsSuccessStatusCode) {
             Console.WriteLine($"Failed to create room: {await res.Content.ReadAsStringAsync()}");
             throw new InvalidDataException($"Failed to create room: {await res.Content.ReadAsStringAsync()}");
@@ -68,13 +72,14 @@ public class AuthenticatedHomeserverGeneric : RemoteHomeServer {
 #region Account Data
 
     public async Task<T> GetAccountData<T>(string key) {
-        var res = await _httpClient.GetAsync($"/_matrix/client/v3/user/{UserId}/account_data/{key}");
-        if (!res.IsSuccessStatusCode) {
-            Console.WriteLine($"Failed to get account data: {await res.Content.ReadAsStringAsync()}");
-            throw new InvalidDataException($"Failed to get account data: {await res.Content.ReadAsStringAsync()}");
-        }
-
-        return await res.Content.ReadFromJsonAsync<T>();
+        // var res = await _httpClient.GetAsync($"/_matrix/client/v3/user/{UserId}/account_data/{key}");
+        // if (!res.IsSuccessStatusCode) {
+        //     Console.WriteLine($"Failed to get account data: {await res.Content.ReadAsStringAsync()}");
+        //     throw new InvalidDataException($"Failed to get account data: {await res.Content.ReadAsStringAsync()}");
+        // }
+        //
+        // return await res.Content.ReadFromJsonAsync<T>();
+        return await _httpClient.GetFromJsonAsync<T>($"/_matrix/client/v3/user/{UserId}/account_data/{key}");
     }
 
     public async Task SetAccountData(string key, object data) {
-- 
cgit 1.4.1