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

[MOD] Make the User API use a bit of the parser

Browse source
This commit is contained in:
lda 2023-11-26 13:35:12 +01:00
parent 4298ee469a
commit 30679d7999
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/User.c
View file

@ -31,6 +31,8 @@
#include <Cytoplasm/Int64.h> #include <Cytoplasm/Int64.h>
#include <Cytoplasm/UInt64.h> #include <Cytoplasm/UInt64.h>
#include <Parser.h>
#include <string.h> #include <string.h>
struct User struct User
@ -907,26 +909,29 @@ UserIdParse(char *id, char *defaultServer)
/* Fully-qualified user ID */ /* Fully-qualified user ID */
if (*id == '@') if (*id == '@')
{ {
char *localStart = id + 1; CommonID commonID;
char *serverStart = localStart; commonID.sigil = '\0';
commonID.local = NULL;
while (*serverStart != ':' && *serverStart != '\0') commonID.server = NULL;
{ if (!ParseCommonID(id, &commonID) || !commonID.server)
serverStart++;
}
if (*serverStart == '\0')
{ {
Free(userId); Free(userId);
Free(commonID.local);
Free(commonID.server);
userId = NULL;
goto finish;
}
if (*commonID.server == '\0')
{
Free(userId);
Free(commonID.local);
Free(commonID.server);
userId = NULL; userId = NULL;
goto finish; goto finish;
} }
*serverStart = '\0'; userId->localpart = commonID.local;
serverStart++; userId->server = commonID.server;
userId->localpart = StrDuplicate(localStart);
userId->server = StrDuplicate(serverStart);
} }
else else
{ {