Merge branch 'feature/show-group-in-status-component' into 'develop'

Show group in status component

See merge request gab/social/gab-social!23

app/javascript/gabsocial/components/status.js

@@ -88,6 +88,7 @@ class Status extends ImmutablePureComponent {
     updateScrollBottom: PropTypes.func,
     cacheMediaWidth: PropTypes.func,
     cachedMediaWidth: PropTypes.number,
+    group: ImmutablePropTypes.map,
   };
 
   // Avoid checking props that are functions (and whose equality will always
@@ -257,7 +258,7 @@ class Status extends ImmutablePureComponent {
     let media = null;
     let statusAvatar, prepend, rebloggedByText, reblogContent;
 
-    const { intl, hidden, featured, otherAccounts, unread, showThread } = this.props;
+    const { intl, hidden, featured, otherAccounts, unread, showThread, group } = this.props;
 
     let { status, account, ...other } = this.props;
 
@@ -426,6 +427,12 @@ class Status extends ImmutablePureComponent {
               </NavLink>
             </div>
 
+            {!group && status.get('group') && (
+              <div className='status__meta'>
+                Posted in <NavLink to={`/groups/${status.getIn(['group', 'id'])}`}>{status.getIn(['group', 'title'])}</NavLink>
+              </div>
+            )}
+
             <StatusContent
               status={status}
               reblogContent={reblogContent}

app/javascript/gabsocial/components/status_action_bar.js

@@ -173,13 +173,13 @@ class StatusActionBar extends ImmutablePureComponent {
   handleGroupRemoveAccount = () => {
     const { status } = this.props;
 
-    this.props.onGroupRemoveAccount(status.get('group_id'), status.getIn(['account', 'id']));
+    this.props.onGroupRemoveAccount(status.getIn(['group', 'id']), status.getIn(['account', 'id']));
   }
 
   handleGroupRemovePost = () => {
     const { status } = this.props;
 
-    this.props.onGroupRemoveStatus(status.get('group_id'), status.get('id'));
+    this.props.onGroupRemoveStatus(status.getIn(['group', 'id']), status.get('id'));
   }
 
   _makeMenu = (publicStatus) => {

app/javascript/gabsocial/components/status_list.js

@@ -25,6 +25,7 @@ export default class StatusList extends ImmutablePureComponent {
     timelineId: PropTypes.string,
     queuedItemSize: PropTypes.number,
     onDequeueTimeline: PropTypes.func,
+    group: ImmutablePropTypes.map,
     withGroupAdmin: PropTypes.bool,
     onScrollToTop: PropTypes.func,
     onScroll: PropTypes.func,
@@ -85,7 +86,7 @@ export default class StatusList extends ImmutablePureComponent {
   }
 
   render () {
-    const { statusIds, featuredStatusIds, onLoadMore, timelineId, totalQueuedItemsCount, isLoading, isPartial, withGroupAdmin, ...other }  = this.props;
+    const { statusIds, featuredStatusIds, onLoadMore, timelineId, totalQueuedItemsCount, isLoading, isPartial, withGroupAdmin, group, ...other }  = this.props;
 
     if (isPartial) {
       return (
@@ -115,6 +116,7 @@ export default class StatusList extends ImmutablePureComponent {
           onMoveUp={this.handleMoveUp}
           onMoveDown={this.handleMoveDown}
           contextType={timelineId}
+          group={group}
           withGroupAdmin={withGroupAdmin}
           showThread
         />

app/javascript/gabsocial/features/groups/timeline/index.js

@@ -94,6 +94,7 @@ class GroupTimeline extends React.PureComponent {
 						scrollKey={`group_timeline-${columnId}`}
 						timelineId={`group:${id}`}
 						onLoadMore={this.handleLoadMore}
+						group={group}
 						withGroupAdmin={relationships && relationships.get('admin')}
 						emptyMessage={<FormattedMessage id='empty_column.group' defaultMessage='There is nothing in this group yet. When members of this group post new statuses, they will appear here.' />}
 					/>

app/javascript/styles/gabsocial/components.scss

@@ -565,6 +565,21 @@
 			}
 		}
 	}
+
+	&__meta {
+		font-size: 14px;
+		color: $gab-secondary-text;
+
+		a {
+			color: $gab-brand-default;
+			font-weight: bold;
+			text-decoration: none;
+
+			&:hover {
+				text-decoration: underline;
+			}
+		}
+	}
 }
 
 .notification-favourite {

app/models/status.rb

@@ -104,6 +104,7 @@ class Status < ApplicationRecord
 
   cache_associated :application,
                    :media_attachments,
+                   :group,
                    :conversation,
                    :status_stat,
                    :tags,

app/serializers/rest/status_serializer.rb

@@ -4,7 +4,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
   attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id,
              :sensitive, :spoiler_text, :visibility, :language,
              :uri, :url, :replies_count, :reblogs_count,
-             :favourites_count, :group_id
+             :favourites_count
 
   attribute :favourited, if: :current_user?
   attribute :reblogged, if: :current_user?
@@ -17,6 +17,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
   belongs_to :reblog, serializer: REST::StatusSerializer
   belongs_to :application, if: :show_application?
   belongs_to :account, serializer: REST::AccountSerializer
+  belongs_to :group, serializer: REST::GroupSerializer
 
   has_many :media_attachments, serializer: REST::MediaAttachmentSerializer
   has_many :ordered_mentions, key: :mentions