Skip to content
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

Jump to bottom

OF-2916 and OF-2917 Add the option to control MUC history preservation #2621

Merged
merged 7 commits into from
Nov 29, 2024
Merged

OF-2916 and OF-2917 Add the option to control MUC history preservation #2621

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ddfdb2e
OF-2916 and OF-2917: Add preserveHistOnRoomDeletion field to the ofMu…
Nov 26, 2024
98622ce
OF-2916 and OF-2917: Add new language-specific labels for the preserv…
Nov 26, 2024
cd5507b
OF-2916 and OF-2917: Add a new preserveHistOnRoomDeletion field to th…
Nov 26, 2024
d83f6a0
OF-2916 and OF-2917: Update processConfigurationForm in IQOwnerHandle…
Nov 26, 2024
0adb42e
OF-2916 and OF-2917: 1. Update the SQL queries used in MUCPersistence…
Nov 26, 2024
d9d6a3e
OF-2916 and OF-2917: Add the option to control MUC history preservation
Nov 27, 2024
a114f0b
OF-2916 and OF-2917: Add the option to control MUC history preservation
Nov 27, 2024
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
14 changes: 14 additions & 0 deletions xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQOwnerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,12 @@ private void processConfigurationForm(@Nonnull final DataForm completedForm, @No
room.setPublicRoom( parseFirstValueAsBoolean( field, true ) );
}

field = completedForm.getField("muc#roomconfig_preservehistondel");
guusdk marked this conversation as resolved.
Show resolved Hide resolved
if (field != null) {
final boolean newValue = parseFirstValueAsBoolean(field, true);
room.setPreserveHistOnRoomDeletionEnabled(newValue);
}

field = completedForm.getField("muc#roomconfig_persistentroom");
if (field != null) {
boolean isPersistent = parseFirstValueAsBoolean( field, true );
Expand Down Expand Up @@ -570,6 +576,10 @@ private Element generateProbeResult(Locale preferredLocale) {
LocaleUtils.getLocalizedString("muc.form.conf.owner_enablelogging", preferredLocale),
Type.boolean_type);

configurationForm.addField("muc#roomconfig_preservehistondel",
LocaleUtils.getLocalizedString("muc.form.conf.owner_preservehistondel", preferredLocale),
Type.boolean_type);

configurationForm.addField("x-muc#roomconfig_reservednick",
LocaleUtils.getLocalizedString("muc.form.conf.owner_reservednick", preferredLocale),
Type.boolean_type);
Expand Down Expand Up @@ -663,6 +673,10 @@ private Element generateProbeResult(Locale preferredLocale) {
field.clearValues();
field.addValue((room.isLogEnabled() ? "1" : "0"));

field = configurationForm.getField("muc#roomconfig_preservehistondel");
field.clearValues();
field.addValue((room.isPreserveHistOnRoomDeletionEnabled() ? "1" : "0"));

field = configurationForm.getField("x-muc#roomconfig_reservednick");
field.clearValues();
field.addValue((room.isLoginRestrictedToNickname() ? "1" : "0"));
Expand Down