- Update chat sync logic to map the group chat notification mode as a user preference.

Author: bradencohen

Rock/Communication/Chat/ChatHelper.cs

@@ -1291,7 +1291,7 @@ bool HasChatNotificationModeChanged( ChatChannel lastSyncedChannel, ChatChannel
                                     }
 
                                     // If the chat notification mode has changed, we need to re-sync all of the members.
-                                    if( HasChatNotificationModeChanged( existingChannel, channel ) )
+                                    if ( HasChatNotificationModeChanged( existingChannel, channel ) )
                                     {
                                         channelsToTriggerGroupMemberSync.Add( channel );
                                     }
@@ -2419,7 +2419,7 @@ bool AreBadgeListsEqual( List<ChatBadge> badges1, List<ChatBadge> badges2 )
                                 || existingUser.IsProfileVisible != chatUser.IsProfileVisible
                                 || existingUser.IsOpenDirectMessageAllowed != chatUser.IsOpenDirectMessageAllowed
                                 || existingUser.CampusId != chatUser.CampusId;
-                            
+
                             if ( !shouldUpdate )
                             {
                                 // Only compare badges as a last resort, if no other props already forced an update.
@@ -3536,13 +3536,13 @@ internal string GetQueryableChatChannelKey( int groupId )
         /// </remarks>
         internal string GetQueryableChatChannelKey( string channelIdentifier, bool allowIntegerIdentifier = false )
         {
-            if( channelIdentifier.IsNullOrWhiteSpace() )
+            if ( channelIdentifier.IsNullOrWhiteSpace() )
             {
                 return string.Empty;
             }
 
             var groupId = GroupCache.Get( channelIdentifier, allowIntegerIdentifier )?.Id;
-            if( groupId.HasValue )
+            if ( groupId.HasValue )
             {
                 return GetQueryableChatChannelKey( groupId.Value );
             }
@@ -3676,9 +3676,6 @@ member has already been banned from the channel.
                         gm.IsArchived,
                         IsGroupActive = gm.Group.IsActive,
                         IsGroupArchived = gm.Group.IsArchived,
-
-                        // For now, hard code this based on the group type.
-                        GroupChatNotificationMode = gm.Group.GroupTypeId == ChatSharedChannelGroupTypeId ? ChatNotificationMode.Mentions : ChatNotificationMode.AllMessages
                     } )
                     .GroupBy( gm => new
                     {
@@ -3692,7 +3689,11 @@ member has already been banned from the channel.
                         g.Key.PersonId,
                         GroupMembers = g.ToList()
                     } )
-                    .ToDictionary( g => $"{g.GroupId}|{g.PersonId}", g => g.GroupMembers );
+                    .ToDictionary( g => $"{g.GroupId}|{g.PersonId}", g => new
+                    {
+                        g.GroupMembers,
+                        g.GroupId
+                    } );
 
                 var rockChatGroupMembers = new List<RockChatGroupMember>();
 
@@ -3721,14 +3722,14 @@ member has already been banned from the channel.
                     rockChatGroupMembers.Add( rockChatChannelMember );
 
                     // Find all member records for this group & person combination.
-                    if ( !membersByGroupAndPerson.TryGetValue( groupAndPersonKey, out var members ) || !members.Any() )
+                    if ( !membersByGroupAndPerson.TryGetValue( groupAndPersonKey, out var members ) || !members.GroupMembers.Any() )
                     {
                         // This person is not currently a member of this group.
                         rockChatChannelMember.ShouldDelete = true;
                         continue;
                     }
 
-                    var memberToSync = members
+                    var memberToSync = members.GroupMembers
                         .OrderBy( gm => gm.IsArchived ) // Prefer non-archived.
                         .ThenByDescending( gm => gm.GroupMemberStatus == GroupMemberStatus.Active ) // Prefer active.
                         .ThenBy( gm => gm.GroupRoleOrder )
@@ -3759,7 +3760,10 @@ member has already been banned from the channel.
                         rockChatChannelMember.IsDeceased = memberToSync.IsDeceased;
                         rockChatChannelMember.ShouldDelete = false;
                         rockChatChannelMember.ShouldIgnore = false;
-                        rockChatChannelMember.PushNotificationMode = memberToSync.GroupChatNotificationMode;
+
+                        // BC TODO: In the future, we can probably pass this from the command instead
+                        // of re-fetching the group from cache.
+                        rockChatChannelMember.PushNotificationMode = GroupCache.Get( members.GroupId ).GetChatPushNotificationMode();
                     }
                 }
 

Rock/Model/Group/Group/Group.Logic.cs

@@ -771,18 +771,7 @@ public bool GetIsChatChannelAlwaysShown()
         /// <returns>The <see cref="ChatNotificationMode"/> to control how push notifications are sent for this chat channel.</returns>
         public ChatNotificationMode GetChatPushNotificationMode()
         {
-            if ( this.ChatPushNotificationModeOverride.HasValue )
-            {
-                return this.ChatPushNotificationModeOverride.Value;
-            }
-
-            var groupTypeCache = GroupTypeCache.Get( this.GroupTypeId );
-            if ( groupTypeCache != null )
-            {
-                return groupTypeCache.ChatPushNotificationMode;
-            }
-
-            return ChatNotificationMode.AllMessages;
+            return GroupCache.GetChatPushNotificationMode( ChatPushNotificationModeOverride, GroupTypeId );
         }
 
         /// <summary>

Rock/Web/Cache/Entities/GroupCache.cs

@@ -312,15 +312,41 @@ internal bool GetIsChatChannelAlwaysShown()
         /// If <see cref="ChatPushNotificationModeOverride"/> set to <see langword="null"/>, then the value of
         /// <see cref="GroupTypeCache.ChatPushNotificationMode"/> will be used.
         /// </summary>
-        /// <returns>The <see cref="ChatNotificationMode"/> to control how pushS notifications are sent for this chat channel.</returns>
+        /// <returns>The <see cref="ChatNotificationMode"/> to control how push notifications are sent for this chat channel.</returns>
         internal ChatNotificationMode GetChatPushNotificationMode()
         {
-            if ( this.ChatPushNotificationModeOverride.HasValue )
+            return GetChatPushNotificationMode( ChatPushNotificationModeOverride, GroupTypeId );
+        }
+
+        /// <summary>
+        /// Determines the <see cref="ChatNotificationMode"/> for a chat channel, using an optional override or falling back to the group type's default.
+        /// </summary>
+        /// <param name="chatPushNotificationModeOverride">
+        /// Optional override value. If provided, this value will be returned instead of the default.
+        /// </param>
+        /// <param name="groupTypeId">
+        /// The identifier of the group type used to fetch the default <see cref="ChatNotificationMode"/> from the cache.
+        /// </param>
+        /// <returns>
+        /// The resolved <see cref="ChatNotificationMode"/> to be used for push notifications.
+        /// </returns>
+        /// <remarks>
+        /// If no override is provided and the group type is not found in the cache, defaults to <see cref="ChatNotificationMode.AllMessages"/>.
+        /// </remarks>
+        internal static ChatNotificationMode GetChatPushNotificationMode( ChatNotificationMode? chatPushNotificationModeOverride, int groupTypeId )
+        {
+            if ( chatPushNotificationModeOverride.HasValue )
+            {
+                return chatPushNotificationModeOverride.Value;
+            }
+
+            var groupTypeCache = GroupTypeCache.Get( groupTypeId );
+            if ( groupTypeCache != null )
             {
-                return this.ChatPushNotificationModeOverride.Value;
+                return groupTypeCache.ChatPushNotificationMode;
             }
 
-            return this.GroupType?.ChatPushNotificationMode ?? ChatNotificationMode.AllMessages;
+            return ChatNotificationMode.AllMessages;
         }
 
         /// <summary>
@@ -525,6 +551,7 @@ public override void SetFromEntity( IEntity entity )
             IsLeavingChatChannelAllowedOverride = group.IsLeavingChatChannelAllowedOverride;
             IsChatChannelPublicOverride = group.IsChatChannelPublicOverride;
             IsChatChannelAlwaysShownOverride = group.IsChatChannelAlwaysShownOverride;
+            ChatPushNotificationModeOverride = group.ChatPushNotificationModeOverride;
             ChatChannelKey = group.ChatChannelKey;
             GroupMemberRecordSourceValueId = group.GroupMemberRecordSourceValueId;
         }

RockWeb/Blocks/Groups/GroupDetail.ascx

@@ -387,7 +387,7 @@
                                     <Rock:RockDropDownList ID="ddlChatPushNotificationMode" runat="server" CssClass="input-width-xl" Label="Push Notification Mode" Help="Controls how push notifications are sent for this chat channel.">
                                         <asp:ListItem Value="" Text="Inherit from Group Type" />
                                         <asp:ListItem Value="0" Text="All Messages" />
-                                        <asp:ListItem Value="1" Text="Mentions And Replies" />
+                                        <asp:ListItem Value="1" Text="Mentions" />
                                         <asp:ListItem Value="2" Text="Silent" />
                                     </Rock:RockDropDownList>
                                 </div>

RockWeb/Blocks/Groups/GroupTypeDetail.ascx

@@ -536,7 +536,7 @@
                                 <Rock:RockCheckBox ID="cbIsChatChannelAlwaysShown" runat="server" Label="Always Show Channel" Help="If enabled, chat channels of this type are always shown in the channel list even if the person has not joined the channel. This also implies that the channel may be joined by any person via the chat application." />
                                 <Rock:RockDropDownList ID="ddlChatPushNotificationMode" runat="server" CssClass="input-width-xl" Label="Push Notification Mode" Help="Controls how push notifications are sent for chat channels of this type.">
                                     <asp:ListItem Value="0" Text="All Messages" />
-                                    <asp:ListItem Value="1" Text="Mentions And Replies" />
+                                    <asp:ListItem Value="1" Text="Mentions" />
                                     <asp:ListItem Value="2" Text="Silent" />
                                 </Rock:RockDropDownList>
                             </div>