Merge branch 'wip/new-to-nl-2' into wip/encrypted-rich-text-messages

Author: rsmithlal

app/assets/images/cover_images/default_cover_image_community.jpg

@@ -6,10 +6,11 @@ module Joinable
     extend ActiveSupport::Concern
 
     included do
-      class_attribute :member_role_associations
+      class_attribute :member_role_associations, :joinable_type
       self.member_role_associations = []
 
       def self.joinable(joinable_type:, member_type:, **membership_options) # rubocop:todo Metrics/MethodLength
+        self.joinable_type = joinable_type
         membership_class = "BetterTogether::#{member_type.camelize}#{joinable_type.camelize}Membership"
         membership_name = :"#{member_type}_#{joinable_type}_memberships"
 

app/assets/images/cover_images/default_cover_image_community.png

@@ -6,8 +6,9 @@ module Member
     extend ActiveSupport::Concern
 
     included do # rubocop:todo Metrics/BlockLength
-      class_attribute :joinable_role_associations
+      class_attribute :joinable_role_associations, :joinable_membership_classes
       self.joinable_role_associations = []
+      self.joinable_membership_classes = []
 
       def self.member(joinable_type:, member_type:, **membership_options) # rubocop:todo Metrics/MethodLength
         membership_class = "BetterTogether::#{member_type.camelize}#{joinable_type.camelize}Membership"
@@ -31,6 +32,7 @@ def self.member(joinable_type:, member_type:, **membership_options) # rubocop:to
 
         # Register the association name for role retrieval
         joinable_role_associations << joinable_roles_association
+        joinable_membership_classes << membership_class
       end
 
       # Cache roles for the current instance
@@ -103,8 +105,7 @@ def record_permission_granted?(resource_permission, record)
         # Check if the member has a membership tied explicitly to the record
         memberships = membership_class.where(
           member: self,
-          joinable_id: record.id,
-          joinable_type: record.class.name
+          joinable_id: record.id
         ).includes(:role)
 
         memberships.any? do |membership|
@@ -114,9 +115,9 @@ def record_permission_granted?(resource_permission, record)
 
       # Determine the membership class for the record's joinable type
       def membership_class_for(record)
-        joinable_type = record.class.name
-        membership_class_name = self.class.joinable_role_associations.find do |assoc|
-          assoc.to_s.include?(joinable_type.underscore)
+        joinable_type = record.class.joinable_type
+        membership_class_name = self.class.joinable_membership_classes.find do |assoc|
+          assoc.to_s.include?(joinable_type.capitalize)
         end
 
         membership_class_name&.to_s&.classify&.constantize # rubocop:todo Style/SafeNavigationChainLength

app/assets/images/cover_images/default_cover_image_generic.jpg

@@ -12,8 +12,8 @@ def cover_image_tag(entity, options = {}) # rubocop:todo Metrics/MethodLength, M
       image_width = options[:width] || 2400
       image_height = options[:height] || 600
       image_format = options[:format] || 'jpg'
-      image_alt = options[:alt] || 'Default Cover Image'
-      image_title = options[:title] || 'Default Cover Image'
+      image_alt = options[:alt] || 'Cover Image'
+      image_title = options[:title] || 'Cover Image'
       image_tag_attributes = {
         class: image_classes,
         style: image_style,
@@ -48,8 +48,8 @@ def profile_image_tag(entity, options = {}) # rubocop:todo Metrics/MethodLength,
       image_style = (options[:style]).to_s
       image_size = options[:size] || 300
       image_format = options[:format] || 'jpg'
-      image_alt = options[:alt] || 'Default Cover Image'
-      image_title = options[:title] || 'Default Cover Image'
+      image_alt = options[:alt] || 'Profile Image'
+      image_title = options[:title] || 'Profile Image'
       image_tag_attributes = {
         class: image_classes,
         style: image_style,

app/assets/images/cover_images/default_cover_image_generic.png

@@ -61,8 +61,6 @@ class Community < ApplicationRecord
 
     validates :name,
               presence: true
-    validates :description,
-              presence: true
 
     # Resize the cover image to specific dimensions
     def cover_image_variant(width, height)
@@ -76,12 +74,12 @@ def optimized_profile_image
       else
         # For other formats, analyze to determine transparency
         metadata = profile_image.metadata
-        if profile_image.content_type == 'image/png' && metadata[:alpha]
+        if profile_image.content_type == 'image/png'
           # If PNG with transparency, return the optimized PNG variant
-          profile_image.variant(:optimized_png)
+          profile_image.variant(:optimized_png).processed
         else
           # Otherwise, use the optimized JPG variant
-          profile_image.variant(:optimized_jpeg)
+          profile_image.variant(:optimized_jpeg).processed
         end
       end
     end