diff --git a/src/account.cpp b/src/account.cpp index c1f7f43e053867a006fe6fb4ce9fb8b0694a6cfa..427bc0c48f5a71e2270e37c9833435ad4b3d86f0 100644 --- a/src/account.cpp +++ b/src/account.cpp @@ -326,8 +326,9 @@ Account::setAccountDetails(const std::map<std::string, std::string>& details) parseBool(details, Conf::CONFIG_UPNP_ENABLED, upnpEnabled_); enableUpnp(upnpEnabled_ && isEnabled()); - auto defMod = string_join(defaultModerators_); + std::string defMod; parseString(details, Conf::CONFIG_DEFAULT_MODERATORS, defMod); + defaultModerators_ = string_split_set(defMod); parseBool(details, Conf::CONFIG_LOCAL_MODERATORS_ENABLED, localModeratorsEnabled_); parseBool(details, Conf::CONFIG_ALL_MODERATORS_ENABLED, allModeratorsEnabled_); } diff --git a/src/account_schema.h b/src/account_schema.h index f66d87e92ecfa73ba41543b1a5c8dc81464e601f..7b0ead89a4f9d5d331b277586cd4ded46d531426 100644 --- a/src/account_schema.h +++ b/src/account_schema.h @@ -70,8 +70,8 @@ static const char* const CONFIG_LOCAL_PORT = "Account.localPort"; static const char* const CONFIG_PUBLISHED_PORT = "Account.publishedPort"; static const char* const CONFIG_PUBLISHED_ADDRESS = "Account.publishedAddress"; static const char* const CONFIG_UPNP_ENABLED = "Account.upnpEnabled"; -static const char* const CONFIG_DEFAULT_MODERATORS = "Account.defaultModerator"; -static const char* const CONFIG_LOCAL_MODERATORS_ENABLED = "Account.localModeratorEnabled"; +static const char* const CONFIG_DEFAULT_MODERATORS = "Account.defaultModerators"; +static const char* const CONFIG_LOCAL_MODERATORS_ENABLED = "Account.localModeratorsEnabled"; static const char* const CONFIG_ALL_MODERATORS_ENABLED = "Account.allModeratorEnabled"; // SIP specific parameters diff --git a/src/conference.cpp b/src/conference.cpp index 13cdb78b54ba7d678abd0103f2183b3176527666..d6ead086a476008ae979e29f8da30b356bc263c4 100644 --- a/src/conference.cpp +++ b/src/conference.cpp @@ -197,7 +197,7 @@ Conference::add(const std::string& participant_id) moderators_.emplace(mod); } - // Check for localModeratorEnabled preference + // Check for localModeratorsEnabled preference if (account->isLocalModeratorsEnabled() && not localModAdded_) { auto accounts = jami::Manager::instance().getAllAccounts<JamiAccount>(); for (const auto& account : accounts) {