From 90f70930da61b4d53cc7170abbda2a53c52c4eab Mon Sep 17 00:00:00 2001
From: Andrew Brown <drusepth@gmail.com>
Date: Fri, 3 May 2019 20:22:32 -0500
Subject: [PATCH] timestamps

---
 app/models/events/content_change_event.rb         |  2 +-
 app/views/users/profile/_recent_activity.html.erb | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/models/events/content_change_event.rb b/app/models/events/content_change_event.rb
index 98e3926f..36ae4e13 100644
--- a/app/models/events/content_change_event.rb
+++ b/app/models/events/content_change_event.rb
@@ -8,6 +8,6 @@ class ContentChangeEvent < ApplicationRecord
   end
   
   def entity
-    content.entity
+    content.try(:entity) || content
   end
 end
diff --git a/app/views/users/profile/_recent_activity.html.erb b/app/views/users/profile/_recent_activity.html.erb
index 0feab36b..87895141 100644
--- a/app/views/users/profile/_recent_activity.html.erb
+++ b/app/views/users/profile/_recent_activity.html.erb
@@ -23,13 +23,15 @@
             %>
           </h5>
           <p>
-            <% if entity.universe.present? %>
-              <%= @user.name %>
-              <%= change_events.first.action %> a
-              <%= entity.class.name.downcase %> in the
+            <%= @user.name %>
+            <%= change_events.first.action %> a
+            <%= entity.class.name.downcase %>
+            <% if !entity.is_a?(Universe) && entity.universe.present? %>
+              in the
               <%= link_to entity.universe.name, entity.universe, class: "#{Universe.color}-text" %>
-              universe.
+              universe
             <% end %>
+            <span class="grey-text"><%= time_ago_in_words(change_events.first.updated_at) %> ago</span>.
           </p>
         </div>
         <div class="card-action">