Schema/SyncResponse.json

@@ -88,8 +88,8 @@
     },
     "Rooms": {
       "fields": {
-        "invite": { "type": "{InvitedRooms}" },
-        "join": { "type": "{JoinedRooms}" }
+        "invite": { "type": "object" },
+        "join": { "type": "object" }
       },
       "type": "struct"
     },

src/Routes/RouteSync.c

@@ -155,19 +155,22 @@ ROUTE_IMPL(RouteSync, path, argp)
     for (i = 0; i < ArraySize(invites); i++)
     {
         char *roomId = ArrayGet(invites, i);
-        InvitedRooms *invited;
+        InvitedRooms invited = { 0 };
+        HashMap *invitedObject;
 
         if (IsRoomFiltered(filterData, roomId))
         {
             continue;
         }
 
-        invited = Malloc(sizeof(*invited));
-        memset(invited, 0, sizeof(*invited));
-
-        /* TODO: Populate the invitestate */
-        invited->invite_state.events = ArrayCreate();
-        HashMapSet(sync.rooms.invite, roomId, invited);
+        invited.invite_state.events = ArrayCreate();
+        invitedObject = InvitedRoomsToJson(&invited);
+        JsonSet(
+            sync.rooms.invite, 
+            JsonValueObject(invitedObject), 
+            1, roomId
+        );
+        InvitedRoomsFree(&invited);
     }
     UserFreeList(invites);
 
@@ -177,9 +180,10 @@ ROUTE_IMPL(RouteSync, path, argp)
     {
         /* TODO: Rename these variables */
         char *roomId = ArrayGet(joins, i);
-        JoinedRooms *joined;
+        JoinedRooms joined = { 0 };
         char *firstEvent = NULL;
         char *type, *key, *id;
+        HashMap *joinedObj;
         State *state;
         Array *el;
         size_t j;
@@ -190,14 +194,12 @@ ROUTE_IMPL(RouteSync, path, argp)
             continue;
         }
 
-        joined = Malloc(sizeof(*joined));
-        memset(joined, 0, sizeof(*joined));
-
         el = UserGetEvents(user, currBatch, roomId);
         r = RoomLock(db, roomId);
         state = StateCurrent(r);
 
-        joined->timeline.events = ArrayCreate();
+        joined.timeline.events = ArrayCreate();
+
         for (j = 0; j < ArraySize(el); j++)
         {
             char *event = ArrayGet(el, j);
@@ -215,18 +217,18 @@ ROUTE_IMPL(RouteSync, path, argp)
                     firstEvent = c->event_id;
                 }
 
-                ArrayAdd(joined->timeline.events, c);
+                ArrayAdd(joined.timeline.events, c);
             }
 
             JsonFree(eventObj);
             JsonFree(filteredObj);
         }
-        joined->timeline.prev_batch = UserNewMessageToken(
+        joined.timeline.prev_batch = UserNewMessageToken(
             user, roomId, firstEvent
         );
         /* TODO: Don't shove the entire state.
          * That's a recipe for disaster, especially on large rooms. */
-        joined->state.events = ArrayCreate();
+        joined.state.events = ArrayCreate();
         while (StateIterate(state, &type, &key, (void **) &id))
         {
             HashMap *e = RoomEventFetch(r, id);
@@ -236,7 +238,7 @@ ROUTE_IMPL(RouteSync, path, argp)
 
             JsonFree(e);
 
-            ArrayAdd(joined->state.events, s);
+            ArrayAdd(joined.state.events, s);
             Free(type);
             Free(key);
         }
@@ -245,7 +247,9 @@ ROUTE_IMPL(RouteSync, path, argp)
         RoomUnlock(r);
         UserFreeList(el);
 
-        HashMapSet(sync.rooms.join, roomId, joined);
+        joinedObj = JoinedRoomsToJson(&joined);
+        HashMapSet(sync.rooms.join, roomId, JsonValueObject(joinedObj));
+        JoinedRoomsFree(&joined);
     }
     UserFreeList(joins);
 

src/State.c

@@ -77,12 +77,10 @@ V1Cmp(void *a, void *b)
             JsonValueAsString(JsonGet(e1, 1, "event_id"));
         char *e2id = 
             JsonValueAsString(JsonGet(e2, 1, "event_id"));
-
-        /* Matrix, *seriously*? */
         unsigned char *sha1 = Sha1(e1id);
         unsigned char *sha2 = Sha1(e2id);
-        char *str1 = ShaToHex(sha1, HASH_SHA1);
-        char *str2 = ShaToHex(sha2, HASH_SHA1);
+        char *str1 = ShaToHex(sha1);
+        char *str2 = ShaToHex(sha2);
         int ret = strcmp(str1, str2) * -1;
 
         Free(str1);

src/User.c

@@ -411,7 +411,7 @@ UserCheckPassword(User * user, char *password)
 
     tmp = StrConcat(2, password, salt);
     hashBytes = Sha256(tmp);
-    hashedPwd = ShaToHex(hashBytes, HASH_SHA256);
+    hashedPwd = ShaToHex(hashBytes);
     Free(tmp);
     Free(hashBytes);
 
@@ -442,7 +442,7 @@ UserSetPassword(User * user, char *password)
     salt = StrRandom(16);
     tmpstr = StrConcat(2, password, salt);
     hashBytes = Sha256(tmpstr);
-    hash = ShaToHex(hashBytes, HASH_SHA256);
+    hash = ShaToHex(hashBytes);
 
     JsonValueFree(HashMapSet(json, "salt", JsonValueString(salt)));
     JsonValueFree(HashMapSet(json, "password", JsonValueString(hash)));