Skip to content

Software version #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ri0n merged 2 commits into from
Mar 20, 2026
Merged

Software version #82

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9562120
client.cpp: add softwareinfo fields only if not empty
stokito Mar 17, 2026
659f24d
client.cpp: use form.setRegistrarType() to set FORM_TYPE
stokito Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 31 additions & 29 deletions src/xmpp/xmpp-im/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,38 +1177,40 @@ DiscoItem Client::makeDiscoResult(const QString &node) const
XData si;
XData::FieldList si_fields;

XData::Field si_type_field;
si_type_field.setType(XData::Field::Field_Hidden);
si_type_field.setVar("FORM_TYPE");
si_type_field.setValue(QStringList(QLatin1String("urn:xmpp:dataforms:softwareinfo")));
si_fields.append(si_type_field);

XData::Field software_field;
software_field.setType(XData::Field::Field_TextSingle);
software_field.setVar("software");
software_field.setValue(QStringList(d->clientName));
si_fields.append(software_field);

XData::Field software_v_field;
software_v_field.setType(XData::Field::Field_TextSingle);
software_v_field.setVar("software_version");
software_v_field.setValue(QStringList(d->clientVersion));
si_fields.append(software_v_field);

XData::Field os_field;
os_field.setType(XData::Field::Field_TextSingle);
os_field.setVar("os");
os_field.setValue(QStringList(d->osName));
si_fields.append(os_field);

XData::Field os_v_field;
os_v_field.setType(XData::Field::Field_TextSingle);
os_v_field.setVar("os_version");
os_v_field.setValue(QStringList(d->osVersion));
si_fields.append(os_v_field);
if (!d->clientName.isEmpty()) {
XData::Field software_field;
software_field.setType(XData::Field::Field_TextSingle);
software_field.setVar("software");
software_field.setValue(QStringList(d->clientName));
si_fields.append(software_field);
}

if (!d->clientVersion.isEmpty()) {
XData::Field software_v_field;
software_v_field.setType(XData::Field::Field_TextSingle);
software_v_field.setVar("software_version");
software_v_field.setValue(QStringList(d->clientVersion));
si_fields.append(software_v_field);
}

if (!d->osName.isEmpty()) {
XData::Field os_field;
os_field.setType(XData::Field::Field_TextSingle);
os_field.setVar("os");
os_field.setValue(QStringList(d->osName));
si_fields.append(os_field);
}

if (!d->osVersion.isEmpty()) {
XData::Field os_v_field;
os_v_field.setType(XData::Field::Field_TextSingle);
os_v_field.setVar("os_version");
os_v_field.setValue(QStringList(d->osVersion));
si_fields.append(os_v_field);
}
si.setType(XData::Data_Result);
si.setFields(si_fields);
si.setRegistrarType("urn:xmpp:dataforms:softwareinfo");

item.setExtensions(QList<XData>() << si);

Expand Down
Loading