Merge branch 'feature/group-posts-in-timeline' of https://code.gab.com/gab/social/gab-social into develop

This commit is contained in:
Rob Colbert
2019-08-20 19:31:58 -04:00
7 changed files with 49 additions and 1 deletions

View File

@@ -20,6 +20,11 @@ class Api::V1::Groups::AccountsController < Api::BaseController
authorize @group, :join?
@group.accounts << current_account
if current_user.allows_group_in_home_feed?
current_user.force_regeneration!
end
render json: @group, serializer: REST::GroupRelationshipSerializer, relationships: relationships
end
@@ -35,6 +40,11 @@ class Api::V1::Groups::AccountsController < Api::BaseController
authorize @group, :leave?
GroupAccount.where(group: @group, account_id: current_account.id).destroy_all
if current_user.allows_group_in_home_feed?
current_user.force_regeneration!
end
render json: @group, serializer: REST::GroupRelationshipSerializer, relationships: relationships
end