mirrors/Parsee
1
0
Fork 0
mirror of https://forge.fsky.io/lda/Parsee.git synced 2026-03-13 13:45:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MOD] Rewrite the status code slightly

Browse source 
Also handle error-based kicks
This commit is contained in:
LDA 2024-10-05 09:43:12 +02:00
commit 94090a8c97
1 changed files with 58 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/XMPPThread/Stanzas/Presence.c
View file

@ -56,6 +56,60 @@ GuessStatus(XMLElement *stanza)
} }
return USER_STATUS_ONLINE; return USER_STATUS_ONLINE;
} }
static Array *
GetStatuses(XMLElement *info)
{
XMLElement *child;
Array *ret;
size_t i;
if (!info)
{
return NULL;
}
ret = ArrayCreate();
for (i = 0; i < ArraySize(info->children); i++)
{
child = ArrayGet(info->children, i);
if (StrEquals(child->name, "status"))
{
ArrayAdd(ret, HashMapGet(child->attrs, "code"));
}
}
return ret;
}
static void
FreeStatuses(Array *statuses)
{
if (!statuses)
{
return;
}
ArrayFree(statuses);
}
static bool
HasStatus(Array *statuses, const char *code)
{
size_t i;
if (!statuses || !code)
{
return false;
}
for (i = 0; i < ArraySize(statuses); i++)
{
if (StrEquals(ArrayGet(statuses, i), code))
{
return true;
}
}
return false;
}
void void
PresenceStanza(ParseeData *args, XMLElement *stanza, XMPPThread *thr) PresenceStanza(ParseeData *args, XMLElement *stanza, XMPPThread *thr)
{ {
@ -96,9 +150,8 @@ PresenceStanza(ParseeData *args, XMLElement *stanza, XMPPThread *thr)
if ((user_info = XMLookForTKV(stanza, "x", "xmlns", MUC_USER_NS))) if ((user_info = XMLookForTKV(stanza, "x", "xmlns", MUC_USER_NS)))
{ {
XMLElement *item = XMLookForUnique(user_info, "item"); XMLElement *item = XMLookForUnique(user_info, "item");
XMLElement *status = XMLookForUnique(user_info, "status"); Array *statuses = GetStatuses(user_info);
#define IsStatus(code) (status && \ #define IsStatus(code) (HasStatus(statuses, #code))
StrEquals(HashMapGet(status->attrs, "code"), #code))
char *jid = item ? HashMapGet(item->attrs, "jid") : NULL; char *jid = item ? HashMapGet(item->attrs, "jid") : NULL;
char *trim = ParseeTrimJID(jid); char *trim = ParseeTrimJID(jid);
char *from = NULL; char *from = NULL;
@ -197,7 +250,7 @@ PresenceStanza(ParseeData *args, XMLElement *stanza, XMPPThread *thr)
{ {
ASBan(args->config, room, real_matrix); ASBan(args->config, room, real_matrix);
} }
else if (IsStatus(307)) else if (IsStatus(307) && !IsStatus(333))
{ {
ASKick(args->config, room, real_matrix); ASKick(args->config, room, real_matrix);
} }
@ -235,6 +288,7 @@ PresenceStanza(ParseeData *args, XMLElement *stanza, XMPPThread *thr)
Free(parsee_j); Free(parsee_j);
Free(parsee); Free(parsee);
Free(room); Free(room);
FreeStatuses(statuses);
} }
if (status) if (status)
{ {