Removed accidental n+1 query from notifications, updated some deps,

improved how "show more" link looks

3 files changed, 23 insertions, 11 deletions

diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx
index ded98c1cd..d6d7a5721 100644
--- a/app/assets/javascripts/components/components/status_content.jsx
+++ b/app/assets/javascripts/components/components/status_content.jsx
@@ -3,6 +3,17 @@ import PureRenderMixin from 'react-addons-pure-render-mixin';
 import emojify from '../emoji';
 import { FormattedMessage } from 'react-intl';
 
+const spoilerStyle = {
+  display: 'inline-block',
+  borderRadius: '2px',
+  color: '#363c4b',
+  fontWeight: '500',
+  fontSize: '11px',
+  padding: '0px 6px',
+  textTransform: 'uppercase',
+  lineHeight: 'inherit'
+};
+
 const StatusContent = React.createClass({
 
   contextTypes: {
@@ -86,16 +97,6 @@ const StatusContent = React.createClass({
 
     const content = { __html: emojify(status.get('content')) };
     const spoilerContent = { __html: emojify(status.get('spoiler_text', '')) };
-    const spoilerStyle = {
-      backgroundColor: '#616b86', 
-      borderRadius: '4px',
-      color: '#363c4b',
-      fontWeight: '500',
-      fontSize: '12px',
-      padding: '0 4px',
-      textTransform: 'uppercase'
-    };
-
 
     if (status.get('spoiler_text').length > 0) {
       const toggleText = hidden ? <FormattedMessage id='status.show_more' defaultMessage='Show more' /> : <FormattedMessage id='status.show_less' defaultMessage='Show less' />;
@@ -103,7 +104,7 @@ const StatusContent = React.createClass({
       return (
         <div className='status__content' style={{ cursor: 'pointer' }} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
           <p style={{ marginBottom: hidden ? '0px' : '' }} >
-            <span dangerouslySetInnerHTML={spoilerContent} /> <a style={spoilerStyle} onClick={this.handleSpoilerClick}>[{toggleText}]</a>
+            <span dangerouslySetInnerHTML={spoilerContent} /> <a className='status__content__spoiler-link' style={spoilerStyle} onClick={this.handleSpoilerClick}>{toggleText}</a>
           </p>
 
           <div style={{ display: hidden ? 'none' : 'block' }} dangerouslySetInnerHTML={content} />
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index 6014da5b6..663969c32 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -137,6 +137,15 @@
       }
     }
   }
+
+  .status__content__spoiler-link {
+    background: lighten($color1, 26%);
+
+    &:hover {
+      background: lighten($color1, 29%);
+      text-decoration: none;
+    }
+  }
 }
 
 .detailed-status {
diff --git a/app/models/notification.rb b/app/models/notification.rb
index b7e8c9e71..b7b474869 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -66,6 +66,8 @@ class Notification < ApplicationRecord
   private
 
   def set_from_account
+    return unless new_record?
+
     case activity_type
     when 'Status', 'Follow', 'Favourite', 'FollowRequest'
       self.from_account_id = activity(false)&.account_id