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

xep-0092: make it possible to ask servers or components for software

Browse Source 
This adds the new `/serversoftware` command.

```
/software user@domain.org/resource
/serversoftware domain.org
```

Fix https://github.com/profanity-im/profanity/issues/1338
This commit is contained in:
Michael Vetter
2020-05-14 19:13:27 +02:00
parent 9243655a22
commit 9c853d9f46
4 changed files with 65 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/xmpp/iq.c
View File

@@ -1505,28 +1505,39 @@ _version_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata)
xmpp_ctx_t *ctx = xmpp_conn_get_context(conn);
Jid *jidp = jid_create((char*)userdata);
const char *presence = NULL;
if (muc_active(jidp->barejid)) {
Occupant *occupant = muc_roster_item(jidp->barejid, jidp->resourcepart);
presence = string_from_resource_presence(occupant->presence);
} else {
PContact contact = roster_get_contact(jidp->barejid);
if (contact) {
Resource *resource = p_contact_get_resource(contact, jidp->resourcepart);
if (!resource) {
ui_handle_software_version_error(jidp->fulljid, "Unknown resource");
if (name_str) xmpp_free(ctx, name_str);
if (version_str) xmpp_free(ctx, version_str);
if (os_str) xmpp_free(ctx, os_str);
return 0;
}
presence = string_from_resource_presence(resource->presence);
// if it has a fulljid it is a regular user (not server or component)
if (jidp->fulljid) {
if (muc_active(jidp->barejid)) {
Occupant *occupant = muc_roster_item(jidp->barejid, jidp->resourcepart);
presence = string_from_resource_presence(occupant->presence);
} else {
presence = "offline";
PContact contact = roster_get_contact(jidp->barejid);
if (contact) {
Resource *resource = p_contact_get_resource(contact, jidp->resourcepart);
if (!resource) {
ui_handle_software_version_error(jidp->fulljid, "Unknown resource");
if (name_str) xmpp_free(ctx, name_str);
if (version_str) xmpp_free(ctx, version_str);
if (os_str) xmpp_free(ctx, os_str);
return 0;
}
presence = string_from_resource_presence(resource->presence);
} else {
presence = "offline";
}
}
}
ui_show_software_version(jidp->fulljid, presence, name_str, version_str, os_str);
if (jidp->fulljid) {
// regular user
ui_show_software_version(jidp->fulljid, presence, name_str, version_str, os_str);
} else {
// server or component
ui_show_software_version(jidp->barejid, "online", name_str, version_str, os_str);
}
jid_destroy(jidp);