lda/telodendria
lda/telodendria
1
1
Fork 1
forked from Telodendria/Telodendria
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[FIX] Make Telodendria play ball with Schildi

Browse source 
The web versions worked fine, but the old Android ones tend to be
strict, which is a great tool for testing.
This commit is contained in:
LDA 2024-11-23 14:20:32 +01:00
parent 276b7fecd7
commit 1d0a7e62f2
4 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Schema/SyncResponse.json
View file

@ -29,7 +29,7 @@
},
"States": {
"fields": {
"events": { "type": "[StrippedStateEvent]" }
"events": { "type": "array" }
},
"type": "struct"
},

13
src/Routes/RouteMessages.c
View file

@ -60,6 +60,8 @@ ROUTE_IMPL(RouteMessages, path, argp)
int limit = strtol(limitStr, NULL, 10);
Array *messages = NULL;
Array *state = NULL;
size_t i;
Room *room = NULL;
@ -136,7 +138,18 @@ ROUTE_IMPL(RouteMessages, path, argp)
Free(startId);
}
response = HashMapCreate();
state = ArrayCreate();
JsonSet(response, JsonValueArray(messages), 1, "chunk");
for (i = 0; i < ArraySize(messages); i++)
{
HashMap *e = JsonValueAsObject(ArrayGet(messages, i));
if (HashMapGet(e, "state_key"))
{
ArrayAdd(state, JsonValueDuplicate(ArrayGet(messages, i)));
}
}
JsonSet(response, JsonValueArray(state), 1, "state");
JsonSet(response, JsonValueString(from), 1, "start");
if (end)
{
JsonSet(response, JsonValueString(end), 1, "end");

16
src/Routes/RouteSync.c
View file

@ -50,15 +50,6 @@ ClientfyEventSync(HashMap *pdu)
return ret;
}
static StrippedStateEvent
StripStateEventSync(HashMap *pdu)
{
StrippedStateEvent ret = { 0 };
char *ignored;
StrippedStateEventFromJson(pdu, &ret, &ignored);
return ret;
}
ROUTE_IMPL(RouteSync, path, argp)
{
@ -245,13 +236,8 @@ ROUTE_IMPL(RouteSync, path, argp)
while (StateIterate(state, &type, &key, (void **) &id))
{
HashMap *e = RoomEventFetch(r, id, true);
StrippedStateEvent rs = StripStateEventSync(e);
StrippedStateEvent *s = Malloc(sizeof(*s));
memcpy(s, &rs, sizeof(*s));
JsonFree(e);
ArrayAdd(joined->state.events, s);
ArrayAdd(joined->state.events, JsonValueObject(e));
Free(type);
Free(key);
}

7
src/User.c
View file

@ -1318,13 +1318,11 @@ UserPushAccountData(User *user, char *key)
JsonValueFree(HashMapSet(join,
key, JsonValueObject(accountEntry)
));
Log(LOG_INFO, "user=%s's batch=%s", user->name, entry);
}
DbUnlock(user->db, syncRef);
}
DbListFree(entries);
Log(LOG_INFO, "You have notified the '%s' about key=%s", user->name, key);
UserNotifyUser(user->name);
}
void
@ -1461,8 +1459,6 @@ UserFillSyncDiff(User *user, char *batch)
return;
}
Log(LOG_WARNING, "This is an initial sync.");
joins = UserListJoins(user);
syncRef = DbLock(
user->db, 4, "users", user->name, "sync", batch
@ -1744,8 +1740,7 @@ UserFetchMessages(User *user, int n, char *token, char **next)
bool toFree = true;
/* Push event into our message list.
* TODO: Check if the user has the right to see the event/room. */
/* Push event into our message list, and check if we can use it */
if (RoomIsEventVisible(room, user, curr))
{
ArrayAdd(messages, event);