From 706424f0d24a5abe08e3238eb9e537f724ce3074 Mon Sep 17 00:00:00 2001 From: Badlop Date: Mon, 4 Sep 2023 11:17:54 +0200 Subject: [PATCH] Fix crash when loading room from DB older than ffa07c6, 23.04 Before commit ffa07c6, the subject_author was just the author nick, since that commit, subject_author contains {author nick, JID}. --- src/mod_muc_room.erl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl index 34575733b..46a4c5fc3 100644 --- a/src/mod_muc_room.erl +++ b/src/mod_muc_room.erl @@ -4201,7 +4201,10 @@ set_opts2([{Opt, Val} | Opts], StateData) -> is_list(Val) -> Val end, StateData#state{subject = Subj}; - subject_author -> StateData#state{subject_author = Val}; + subject_author when is_tuple(Val) -> + StateData#state{subject_author = Val}; + subject_author when is_binary(Val) -> % ejabberd 23.04 or older + StateData#state{subject_author = {Val, #jid{}}}; hats_users -> Hats = maps:from_list( lists:map(fun({U, H}) -> {U, maps:from_list(H)} end,