Wip/encrypted rich text messages (#735)

Configure encrypted secrets and attributes.

Improves interface and performance of messaging/conversations. Allows
for rich text messages that are encrypted-at-rest in the db. Moves
notifications list to dropdown menu.

Author: rsmithlal

.github/workflows/rubyonrails.yml

@@ -9,7 +9,7 @@ on:
   push:
     branches: [ "main" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "wip/new-to-nl-2" ]
 jobs:
   rspec:
     runs-on: ubuntu-latest

Gemfile.lock

@@ -471,7 +471,7 @@ GEM
     pundit (2.4.0)
       activesupport (>= 3.0.0)
     racc (1.8.1)
-    rack (3.1.9)
+    rack (3.1.10)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-mini-profiler (3.3.1)

app/assets/stylesheets/better_together/conversations.scss

@@ -43,34 +43,35 @@
     display: flex;
     align-items: center;
   }
-  
+
   .message-container {
     max-width: 75%;
   }
-  
+
   .message-header {
     margin-bottom: 0.25rem;
   }
-  
+
   .message-bubble {
     background-color: #f1f1f1;
     border-radius: 15px;
   }
-  
-  .justify-content-end .message-bubble {
+
+  .me .message-bubble {
     background-color: #007bff;
     color: white;
+    min-width: 40vw;
   }
-  
+
   .card-body {
     background-color: #e9ecef;
   }
-  
+
   .input-group textarea.form-control {
     resize: none;
     border-radius: 15px 0 0 15px;
   }
-  
+
   .input-group button {
     border-radius: 0 15px 15px 0;
   }

app/assets/stylesheets/better_together/profiles.scss

@@ -39,6 +39,11 @@
     margin-right: 1%;
     box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.15);
   }
+
+  &.mention {
+    width: 2rem;
+    height: 2rem;
+  }
 }
 
 .profile-header img.cover-image {

app/controllers/better_together/conversations_controller.rb

@@ -4,7 +4,7 @@ module BetterTogether
   # Handles managing conversations
   class ConversationsController < ApplicationController
     before_action :authenticate_user!
-    before_action :set_conversations
+    before_action :set_conversations, only: %i[index new]
     before_action :set_conversation, only: %i[show]
 
     helper_method :available_participants
@@ -30,7 +30,7 @@ def create
     end
 
     def show # rubocop:todo Metrics/MethodLength
-      @messages = @conversation.messages.order(:created_at)
+      @messages = @conversation.messages.with_all_rich_text.includes(sender: [:string_translations]).order(:created_at)
       @message = @conversation.messages.build
 
       respond_to do |format|
@@ -48,8 +48,7 @@ def show # rubocop:todo Metrics/MethodLength
     private
 
     def available_participants
-      participants = Person
-                     .where.not(id: helpers.current_person.id)
+      participants = Person.all
 
       unless helpers.current_person.permitted_to?('manage_platform')
         # only allow messaging platform mangers unless you are a platform_manager
@@ -64,11 +63,16 @@ def conversation_params
     end
 
     def set_conversation
-      @conversation = Conversation.find(params[:id])
+      @conversation = helpers.current_person.conversations.includes(:participants).find(params[:id])
     end
 
     def set_conversations
-      @conversations = helpers.current_person.conversations.order(updated_at: :desc)
+      @conversations = helpers.current_person.conversations.includes(messages: [:sender],
+                                                                     participants: [
+                                                                       :string_translations,
+                                                                       :contact_detail,
+                                                                       { profile_image_attachment: :blob }
+                                                                     ]).order(updated_at: :desc).distinct(:id)
     end
 
     def platform_manager_ids

app/controllers/better_together/navigation_items_controller.rb

@@ -5,9 +5,9 @@
 module BetterTogether
   # Responds to requests for navigation items
   class NavigationItemsController < FriendlyResourceController # rubocop:todo Metrics/ClassLength
-    before_action :set_navigation_area
+    before_action :navigation_area
     before_action :set_pages, only: %i[new edit create update]
-    before_action :set_navigation_item, only: %i[show edit update destroy]
+    before_action :navigation_item, only: %i[show edit update destroy]
 
     helper_method :available_parent_items
 
@@ -103,14 +103,14 @@ def set_pages
       )
     end
 
-    def set_navigation_area
+    def navigation_area
       @navigation_area ||= find_by_translatable(
         translatable_type: ::BetterTogether::NavigationArea.name,
         friendly_id: params[:navigation_area_id]
       )
     end
 
-    def set_navigation_item
+    def navigation_item
       @navigation_item = set_resource_instance
     end
 

app/helpers/better_together/notifications_helper.rb

@@ -9,5 +9,9 @@ def unread_notification_count
 
       content_tag(:span, count, class: 'badge bg-primary rounded-pill position-absolute notification-badge')
     end
+
+    def recent_notifications
+      current_person.notifications.joins(:event).order(created_at: :desc).limit(5)
+    end
   end
 end

app/models/better_together/community.rb

@@ -71,16 +71,14 @@ def optimized_profile_image
       if profile_image.content_type == 'image/svg+xml'
         # If SVG, return the original without transformation
         profile_image
+
+      # For other formats, analyze to determine transparency
+      elsif profile_image.content_type == 'image/png'
+        # If PNG with transparency, return the optimized PNG variant
+        profile_image.variant(:optimized_png).processed
       else
-        # For other formats, analyze to determine transparency
-        metadata = profile_image.metadata
-        if profile_image.content_type == 'image/png'
-          # If PNG with transparency, return the optimized PNG variant
-          profile_image.variant(:optimized_png).processed
-        else
-          # Otherwise, use the optimized JPG variant
-          profile_image.variant(:optimized_jpeg).processed
-        end
+        # Otherwise, use the optimized JPG variant
+        profile_image.variant(:optimized_jpeg).processed
       end
     end
 

app/models/better_together/message.rb

@@ -6,6 +6,8 @@ class Message < ApplicationRecord
     belongs_to :conversation, touch: true
     belongs_to :sender, class_name: 'BetterTogether::Person'
 
+    has_rich_text :content, encrypted: true
+
     validates :content, presence: true
 
     after_create_commit do
@@ -16,5 +18,9 @@ class Message < ApplicationRecord
                                                        created_at: created_at.strftime('%H:%M %d-%m-%Y')
                                                      })
     end
+
+    # def content
+    #   super || self[:content]
+    # end
   end
 end

app/models/better_together/person.rb

@@ -72,6 +72,14 @@ def cover_image_variant(width, height)
       cover_image.variant(resize_to_fill: [width, height]).processed
     end
 
+    def handle
+      slug
+    end
+
+    def select_option_title
+      "#{name} - @#{handle}"
+    end
+
     def to_s
       name
     end