devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

add connection_get_jid()

Browse Source 
Use a singleton `Jid` inside the connection instead of always re-creating
a `Jid` from the same string.

Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
This commit is contained in:
Steffen Jaeckel
2023-11-14 14:53:49 +01:00
parent b18b6cbd29
commit 847a86de50
17 changed files with 88 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/xmpp/message.c
View File

@@ -101,9 +101,7 @@ static GHashTable* pubsub_event_handlers;
gchar*
get_display_name(const ProfMessage* const message, int* flags)
{
auto_char char* barejid = connection_get_barejid();
if (g_strcmp0(barejid, message->from_jid->barejid) == 0) {
if (g_strcmp0(connection_get_barejid(), message->from_jid->barejid) == 0) {
return g_strdup("me");
} else {
if (flags)
@@ -261,11 +259,10 @@ _message_handler(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void* con
if (carbons) {
// carbon must come from ourselves
auto_char char* mybarejid = connection_get_barejid();
const char* const stanza_from = xmpp_stanza_get_from(stanza);
if (stanza_from) {
if (g_strcmp0(mybarejid, stanza_from) != 0) {
if (g_strcmp0(connection_get_barejid(), stanza_from) != 0) {
log_warning("Invalid carbon received, from: %s", stanza_from);
msg_stanza = NULL;
} else {
@@ -1464,10 +1461,8 @@ _handle_chat(xmpp_stanza_t* const stanza, gboolean is_mam, gboolean is_carbon, c
if (message->plain || message->body || message->encrypted) {
if (is_carbon) {
auto_char char* mybarejid = connection_get_barejid();
// if we are the recipient, treat as standard incoming message
if (g_strcmp0(mybarejid, message->to_jid->barejid) == 0) {
if (g_strcmp0(connection_get_barejid(), message->to_jid->barejid) == 0) {
sv_ev_incoming_carbon(message);
// else treat as a sent message
} else {