[Backport 5.1] OF-3364: Fix getMaxMessages() reporting unlimited for default-type rooms - #3486
Merged
Conversation
MUCRoomHistory.getMaxMessages() switched on the room's own HistoryStrategy type, which is always 'defaulType' (sic) for rooms that inherit their history settings. This caused the method to always return -1 (unlimited) for such rooms, regardless of the parent's actual configured maximum. Add HistoryStrategy.resolveEffective() to walk up the parent chain to the strategy whose settings are actually in effect, and use it in getMaxMessages() so the correct type and maxNumber are reported. (cherry picked from commit 6e867a2)
…in the future Right now, none of the callers to addMessage or to isHistoryEnabled can have a deep hierarchy of HistoryStrategy. This refactoring uses the new implementation to ensure we can't slip the same class of bug as OF-3364 into the code again in the future. (cherry picked from commit 3a5d411)
(cherry picked from commit efc8498)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Backport of #3485 to
5.1.