Skip to content

Feature/text multi fix #15

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

Open
itmiku wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Feature/text multi fix #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4f2d4a
Fix assembly build
itmiku Oct 17, 2025
2f82e7a
Set field type to text_multi when extension field contains multiple v…
itmiku Oct 17, 2025
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
0 changelog.html → src/changelog.html
View file
Open in desktop
File renamed without changes.
16 changes: 12 additions & 4 deletions src/main/java/org/igniterealtime/openfire/plugin/mucextinfo/DiscoInfoProviderProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,21 +127,29 @@ static Set<org.xmpp.forms.DataForm> merge( @Nullable Set<org.xmpp.forms.DataForm
.orElse( newDataForm );

// Now, add or merge fields from the extension data into the result.
for ( final Field extensionFields : extensionElement.getFields() )
for ( final Field extensionField : extensionElement.getFields() )
{
FormField formField = dataForm.getField(extensionFields.getVarName());
FormField formField = dataForm.getField(extensionField.getVarName());
if ( formField == null ) {
formField = dataForm.addField( extensionFields.getVarName(), extensionFields.getLabel(), null);
formField = dataForm.addField( extensionField.getVarName(), extensionField.getLabel(), null);
}

for ( final String value : extensionFields.getValues() )
for ( final String value : extensionField.getValues() )
{
formField.addValue(value);
}

// Default type is text-single, multiple values means it actually is a multi-field
if(isMultiField(formField)) {
formField.setType(FormField.Type.text_multi);
}
}

result.add(dataForm);

return result;
}
private static boolean isMultiField(FormField field) {
return field.getValues() != null && field.getValues().size() > 1;
}
}
0 plugin.xml → src/plugin.xml
View file
Open in desktop
File renamed without changes.
0 readme.html → src/readme.html
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions ...t/java/org/igniterealtime/openfire/plugin/mucextinfo/DiscoInfoProviderProxyMergeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@
import org.xmpp.forms.DataForm;
import org.xmpp.forms.FormField;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;

import static org.junit.Assert.*;

Expand Down Expand Up @@ -224,6 +222,7 @@ public void testOriginalWithExtensionSameFormSameFieldDifferentValue()
assertEquals( 2, resultFields.size() ); // should contain the field we added, as well as a 'FORM_TYPE' field.
assertTrue( resultFields.stream().anyMatch( formField -> "origvar".equals( formField.getVariable() )
&& "origlabel".equals( formField.getLabel() )
&& formField.getType().equals(FormField.Type.text_multi)
&& formField.getValues().contains( "origvalue")
&& formField.getValues().contains( "extvalue")
&& formField.getValues().size() == 2
Expand Down