diff options
Diffstat (limited to 'app/helpers/page_layout_helper.rb')
-rw-r--r-- | app/helpers/page_layout_helper.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb index 8920133734c..6997c8cffda 100644 --- a/app/helpers/page_layout_helper.rb +++ b/app/helpers/page_layout_helper.rb @@ -159,13 +159,20 @@ module PageLayoutHelper end def user_status_properties(user) - default_properties = { current_emoji: '', current_message: '', can_set_user_availability: Feature.enabled?(:set_user_availability_status, user, default_enabled: :yaml), default_emoji: UserStatus::DEFAULT_EMOJI } + default_properties = { + current_emoji: '', + current_message: '', + can_set_user_availability: Feature.enabled?(:set_user_availability_status, user, default_enabled: :yaml), + default_emoji: UserStatus::DEFAULT_EMOJI + } + return default_properties unless user&.status default_properties.merge({ current_emoji: user.status.emoji.to_s, current_message: user.status.message.to_s, - current_availability: user.status.availability.to_s + current_availability: user.status.availability.to_s, + current_clear_status_after: user.status.clear_status_at.to_s }) end |