From 389870c5d361597023b324e0c71a49541e7f9509 Mon Sep 17 00:00:00 2001
From: lda <lda@ari.lt>
Date: Sat, 25 Jan 2025 12:20:47 +0000
Subject: [PATCH] [FIX] Ignore unavailable statuses

They aren't that useful, especially in MUCs.
---
 etc/man/man7/.parsee-bridge-guidebook.7.swp | Bin 0 -> 12288 bytes
 etc/man/man7/.parsee-cmd-syntax.7.swp       | Bin 0 -> 12288 bytes
 etc/man/man7/parsee-bridge-guidebook.7      |  70 ++++++++++++++++++++
 src/MatrixEventHandler.c                    |  18 +++--
 src/Parsee/Utils/Formatting.c               |   4 +-
 src/Unistr.c                                |  10 +++
 src/XMPPThread/Stanzas/IQ.c                 |   5 +-
 src/XMPPThread/Stanzas/Presence.c           |   4 +-
 src/include/Unistring.h                     |   6 ++
 9 files changed, 108 insertions(+), 9 deletions(-)
 create mode 100644 etc/man/man7/.parsee-bridge-guidebook.7.swp
 create mode 100644 etc/man/man7/.parsee-cmd-syntax.7.swp
 create mode 100644 etc/man/man7/parsee-bridge-guidebook.7

diff --git a/etc/man/man7/.parsee-bridge-guidebook.7.swp b/etc/man/man7/.parsee-bridge-guidebook.7.swp
new file mode 100644
index 0000000000000000000000000000000000000000..50976eabdb0b742fe8fbb5be8a1dc7c97357d1b7
GIT binary patch
literal 12288
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
M2BeIpau$i-0o<TpssI20

literal 0
HcmV?d00001

diff --git a/etc/man/man7/.parsee-cmd-syntax.7.swp b/etc/man/man7/.parsee-cmd-syntax.7.swp
new file mode 100644
index 0000000000000000000000000000000000000000..64990b7365d3d5d826b23c7841ea331dd5487064
GIT binary patch
literal 12288
zcmeI2&u<$=6vtmU@uMwJBn~~jx(KIIyonvE2&5bw$Fx>s$Jhx%iV+&`&e|jG4|iwX
z)UC>o8$EC-f*XSWg1>_^;*7+F0~|PT;5+MesM<rRI8}NpeYD=$**9-KZ{`qX##<kD
zy8N!UMYvug`r)IylWUDj^lL^G1<JKP^@^2=p4tf=K1IOIzRIlDn>zP5W0g2|HfKd!
z&5whcT_m}><L&&Hc+y7<h=FG@aGtgs^<t}Esa)naE*?M2$I@2}hygJm2E>3E5CdXB
z42Xf}+(15Cqt7sh7s`1w%KO@5_wrG0Vn7Ut0Wly3#DEwO17bi7hygJm2E@Q~Xg~!-
zS6?A|=^T>B|NmEi|NrzV(RV<D0Gxn};B~MDe!M{R4R`>)0QbQs-~@aCZi4He1ulS>
z0fE2I6a5AL1b=|v!EfLf@HKb{z5-u@&%sUb9=HbH20tUu@4>g=A$S1pfx939Z-Fb|
zP2lGAB9KcAhygJm2E>3E5CdXB42Xfp40wCIJcheoze?Wl1`pe9ZXOH|iH@ema*+D-
zSSLB-_dE%7#<Tf2GCp45{BN?sX~wPA7MqZhG-nk>>8TEQyx=JHRm71x^@_L$omRUy
zY!hYL&a|JK+d5j{)gF)5Gg~2*1gnQC<x|bKRW#R}XdPJ2Q}$Dw5H<<lny0z88;mXs
zj@5$4nzi-S45OZ!d`ios#4cZag_m=SHzCrrCZ0uQTm*2PmxI_<aFa~f&XljM$DNQ}
zJ}R3ub}PuGQKYzPtM69PR<H5~sXWijc%EwxbZ8Qdagn{B#yH~~lsUjeq=OAETJY9I
z?lrq@ICc;HKGXlrJ4simmuc5`U4~~P5P5b+-snDggEo1tUOc)tA}=)VgUcr_pO4*q
zmme-??q=Djy5HM{1y`%ldT?vILS7P<;fDOqqX98Y^KAYo1Kh`ugeoY@Hbu?*{c^TN
z{eu8&kE@o#ER8wSlX;{v9;Z2q1h4Ezsl~cOHEDT@+?CX_!hE%FLafEI<gUo2cURx3
z@uzMXOmw0%6kx%D2}7N^)m$ve{r0dm==6^|hdrVv4x@98_murNx=EH3F=?_~J7qFm
zh5Fw)8@PyE)Rw%X8|CJD<cvG-aHah6I5&~W7ZtA9TxGR1tWDFIhS>^s-~o4=y?*n0
zd&ut}4!GYO6gzX!=HuRe8x6;M*iyWI*ll)tm`{b>T8fm-IW#&7iVaXK#6Tx1)^NEf
KR_3X~w)+SC<a=HK

literal 0
HcmV?d00001

diff --git a/etc/man/man7/parsee-bridge-guidebook.7 b/etc/man/man7/parsee-bridge-guidebook.7
new file mode 100644
index 0000000..b5932f2
--- /dev/null
+++ b/etc/man/man7/parsee-bridge-guidebook.7
@@ -0,0 +1,70 @@
+." The last field is the codename, by the way.
+." ALL MANPAGES FOR PARSEE ARE UNDER PUBLIC DOMAIN 
+.TH parsee-bridge-guidebook 7 "Parsee Utility" "star-of-hope"
+
+.SH NAME
+parsee-bridge-guidebook - A short guidebook on running a Parsee bridge
+
+.SH INTRODUCTION
+.P
+This manpage is intended to be a guidebook for Parsee administrators. It 
+is meant to show how to create an instance with an XMPP-Matrix server 
+(though it cannot be specific, due to their ecosystem diversity), how to 
+plumb rooms, and moderate them through.
+.P
+It also assumes Parsee is properly built and installed, in which case you 
+are seeing this from 
+.I man 
+itself.
+
+.SH CONVENTIONS
+This page shall assume a few things that 
+.B must 
+be changed to fit your configuration. Please read those carefully, or it 
+will come and bite at you!
+
+.P 
+First off, it assumes that you have a domain at 
+.I blow.hole
+and that any other domains related to Parsee are it's subdomains, as
+you'll see.
+
+.P 
+We also assume you're planning on making the XMPP component available at 
+.I j.blow.hole ,
+and that Parsee can reach it by using 
+.I localhost:1234 .
+It is highly recommended that Parsee can reach the component locally, as 
+the stream cannot be encrypted!
+
+.P 
+The Parsee HTTP server (which is used for media and the appservice) shall 
+be reached through 
+.I https://p.blow.hole/ 
+via a reverse proxy. This manual shall only show you what port to make 
+available, as there are many reverse proxy options available.
+
+.P 
+Finally, the Matrix server will be publicly known as
+.I m.blow.hole
+.
+
+That is, if 
+.B bob 
+is in it, then they shall be known as 
+.I @bob:m.blow.hole .
+
+.SH SETTING UP
+Setting up Parsee mainly involves creating a valid configuration file 
+and the database. Most of this however is dealt with by 
+.I parsee-config(1)
+TODO
+
+.P 
+
+.SH LICENSE
+This document is under public domain, or CC0 if not allowed by local law.
+
+.SH SEE ALSO
+.B parsee(1), parsee-cmd-syntax(7)
+
diff --git a/src/MatrixEventHandler.c b/src/MatrixEventHandler.c
index 89e342d..60a41c7 100644
--- a/src/MatrixEventHandler.c
+++ b/src/MatrixEventHandler.c
@@ -30,13 +30,16 @@ JoinMUC(ParseeData *data, HashMap *event, char *jid, char *muc, char *name, char
 
     UnistrFree(uninick);
     UnistrFree(filtered);
+    UnistrFree(filterASCII);
 
-    /* TODO: vCards! */
+    /* TODO: Make sure that we fall back to plain ASCII if it fails too many 
+     * times. */
     while (!XMPPJoinMUC(data->jabber, jid, rev, hash, -1, true) && nonce < 32)
     {
         char *nonce_str = StrInt(nonce);
         char *input = StrConcat(3, sender, name, nonce_str);
         char *hex = ParseeHMACS(data->id, input);
+        Unistr *filterASCII = UnistrFilter(uninick, UnistrIsASCII);
 
         if (strlen(hex) >= 8)
         {
@@ -45,6 +48,7 @@ JoinMUC(ParseeData *data, HashMap *event, char *jid, char *muc, char *name, char
 
         Free(nick);
         Free(rev);
+        Free(revscii);
 
         nick = StrConcat(4, name, "[", hex, "]");
         rev = StrConcat(3, muc, "/", nick);
@@ -364,13 +368,13 @@ ParseeMessageHandler(ParseeData *data, HashMap *event)
     StanzaBuilder *builder = NULL;
     DbRef *ref = NULL;
     HashMap *json = NULL;
-
-    char *unedited_id = MatrixGetEdit(event);
+    
+    char *m_sender = GrabString(event, 1, "sender");
+    char *unedited_id = NULL;
     char *body = GrabString(event, 2, "content", "body");
     char *id = GrabString(event, 1, "room_id");
     char *ev_id = GrabString(event, 1, "event_id");
-    char *m_sender = GrabString(event, 1, "sender");
-    char *chat_id, *muc_id;
+    char *chat_id = NULL, *muc_id = NULL;
     char *reply_id = MatrixGetReply(event);
     char *xepd = ParseeXMPPify(event);
     char *type, *user, *xmppified_user = NULL, *to = NULL;
@@ -381,6 +385,7 @@ ParseeMessageHandler(ParseeData *data, HashMap *event)
     char *encoded_from = NULL;
 
     bool direct = false;
+    unedited_id = MatrixGetEdit(event);
 
     if (unedited_id)
     {
@@ -455,6 +460,7 @@ ParseeMessageHandler(ParseeData *data, HashMap *event)
         Free(name);
         Free(avatar);
     }
+    
     if (reply_id)
     {
         /* TODO: Monocles chat DM users HATE this trick! 
@@ -511,8 +517,8 @@ end:
     Free(stanza);
     Free(sender);
     Free(unauth);
-    Free(unedited_id);
     Free(encoded_from);
+    Free(unedited_id);
 
     DbUnlock(data->db, ref);
     ref = NULL;
diff --git a/src/Parsee/Utils/Formatting.c b/src/Parsee/Utils/Formatting.c
index 2abf3b5..8f41a56 100644
--- a/src/Parsee/Utils/Formatting.c
+++ b/src/Parsee/Utils/Formatting.c
@@ -210,9 +210,11 @@ XMPPifyElement(HashMap *event, XMLElement *elem, XMPPFlags flags)
 static char *
 GetRawBody(HashMap *event)
 {
-    if (MatrixGetEdit(event))
+    void *id;
+    if ((id = MatrixGetEdit(event)))
     {
         char *new = GrabString(event, 3, "content", "m.new_content", "body");
+        Free(id);
         if (new)
         {
             return new;
diff --git a/src/Unistr.c b/src/Unistr.c
index 5eaae43..a1eb1e4 100644
--- a/src/Unistr.c
+++ b/src/Unistr.c
@@ -192,6 +192,16 @@ UnistrGetch(Unistr *unistr, size_t i)
     return i < unistr->length ? unistr->codepoints[i] : 0;
 }
 bool
+UnistrIsASCII(uint32_t u)
+{
+    if (u == 0)
+    {
+        return NULL;
+    }
+
+    return u < 0x7F;
+}
+bool
 UnistrIsBMP(uint32_t u)
 {
     if (u == 0)
diff --git a/src/XMPPThread/Stanzas/IQ.c b/src/XMPPThread/Stanzas/IQ.c
index 17092b0..af71cca 100644
--- a/src/XMPPThread/Stanzas/IQ.c
+++ b/src/XMPPThread/Stanzas/IQ.c
@@ -572,7 +572,7 @@ IQGet(ParseeData *args, XMLElement *stanza, XMPPThread *thr)
     else if (XMLookForTKV(stanza, "query", "xmlns", "jabber:iq:version"))
     {
         XMLElement *iq_reply, *query;
-        XMLElement *name, *version;
+        XMLElement *name, *version, *os;
 
         iq_reply = XMLCreateTag("iq");
         XMLAddAttr(iq_reply, "to", from);
@@ -585,12 +585,15 @@ IQGet(ParseeData *args, XMLElement *stanza, XMPPThread *thr)
         {
             name = XMLCreateTag("name");
             version = XMLCreateTag("version");
+            os = XMLCreateTag("os");
 
             XMLAddChild(name, XMLCreateText(NAME));
             XMLAddChild(version, XMLCreateText(VERSION "[" CODE "]"));
+            XMLAddChild(os, XMLCreateText(VERSION "POSIX-like"));
         }
         XMLAddChild(query, name);
         XMLAddChild(query, version);
+        XMLAddChild(query, os);
         XMLAddChild(iq_reply, query);
 
         XMPPSendStanza(jabber, iq_reply, args->config->max_stanza_size);
diff --git a/src/XMPPThread/Stanzas/Presence.c b/src/XMPPThread/Stanzas/Presence.c
index 65c2082..947fc4b 100644
--- a/src/XMPPThread/Stanzas/Presence.c
+++ b/src/XMPPThread/Stanzas/Presence.c
@@ -298,7 +298,7 @@ end_item:
         Free(room);
         FreeStatuses(statuses);
     }
-    if (status)
+    if (status && !StrEquals(type, "unavailable"))
     {
         XMLElement *status_data = ArrayGet(status->children, 0);
         char *decode_from = ParseeLookupJID(oid);
@@ -309,6 +309,8 @@ end_item:
             status_str = status_data->data;
         }
 
+        
+
         /* TODO: "The server will automatically set a user's presence to 
          * unavailable if their last active time was over a threshold value 
          * (e.g. 5 minutes)."
diff --git a/src/include/Unistring.h b/src/include/Unistring.h
index 6fbc296..d90d61c 100644
--- a/src/include/Unistring.h
+++ b/src/include/Unistring.h
@@ -64,6 +64,12 @@ extern void UnistrFree(Unistr *unistr);
  * Returns: whenever the character is within the BMP */
 extern bool UnistrIsBMP(uint32_t u);
 
+/** Returns true IFF the character is within the 7-bit ASCII range
+ * not 0x0000
+ * ------------------------------------------------------------
+ * Returns: whenever the character is within ASCII */
+extern bool UnistrIsASCII(uint32_t u);
+
 typedef bool (*UnistrFilterFunc)(uint32_t u);
 /** "Filters" characters in a Unistring by codepoint, removing 
  * those with callbacks which return false into a new unistring.