random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes

Browse Source 
Fixes
This commit is contained in:
mgabdev 2020-12-22 16:15:19 -05:00
parent 73ee16b943
commit 0bf305019a
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/api/v1/timelines/group_collection_controller.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
class Api::V1::Timelines::GroupCollectionController < EmptyController class Api::V1::Timelines::GroupCollectionController < Api::BaseController
before_action :set_collection_type before_action :set_collection_type
before_action :set_sort_type before_action :set_sort_type
before_action :set_statuses before_action :set_statuses
@ -10,10 +10,10 @@ class Api::V1::Timelines::GroupCollectionController < EmptyController
} }
def show def show
if current_user if current_account
render json: @statuses, render json: @statuses,
each_serializer: REST::StatusSerializer, each_serializer: REST::StatusSerializer,
relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id) relationships: StatusRelationshipsPresenter.new(@statuses, current_account.id)
else else
render json: @statuses, each_serializer: REST::StatusSerializer render json: @statuses, each_serializer: REST::StatusSerializer
end end
@ -64,12 +64,10 @@ class Api::V1::Timelines::GroupCollectionController < EmptyController
@groupIds = [] @groupIds = []
if @collection_type == 'featured' if @collection_type == 'featured'
@groupIds = FetchGroupsService.new.call("featured") @groupIds = FetchGroupsService.new.call("featured")
elsif @collection_type == 'member' && !current_user.nil? elsif @collection_type == 'member' && !current_account.nil?
@groupIds = current_user.account.groups.pluck(:id) @groupIds = current_account.groups.pluck(:id)
else
return []
end end
if current_account if current_account
SortingQueryBuilder.new.call(@sort_type, params[:max_id], @groupIds).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) } SortingQueryBuilder.new.call(@sort_type, params[:max_id], @groupIds).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
else else

13
app/javascript/gabsocial/features/compose/components/compose_form.js
View File

@ -286,12 +286,6 @@ class ComposeForm extends ImmutablePureComponent {
<ComposeDestinationHeader formLocation={formLocation} account={account} isModal={isModalOpen} /> <ComposeDestinationHeader formLocation={formLocation} account={account} isModal={isModalOpen} />
<div className={containerClasses} ref={this.setForm} onClick={this.handleClick}> <div className={containerClasses} ref={this.setForm} onClick={this.handleClick}>
{
!!reduxReplyToId && isModalOpen && isMatch &&
<div className={[_s.d, _s.px15, _s.py10, _s.mt5].join(' ')}>
<StatusContainer contextType='compose' id={reduxReplyToId} isChild />
</div>
}
{ {
!!spoiler && !!spoiler &&
@ -325,6 +319,13 @@ class ComposeForm extends ImmutablePureComponent {
</div> </div>
} }
{
!!reduxReplyToId && isModalOpen && isMatch &&
<div className={[_s.d, _s.px15, _s.py10, _s.mt5].join(' ')}>
<StatusContainer contextType='compose' id={reduxReplyToId} isChild />
</div>
}
{ {
!!quoteOfId && isModalOpen && isMatch && !!quoteOfId && isModalOpen && isMatch &&
<div className={[_s.d, _s.px15, _s.py10, _s.mt5].join(' ')}> <div className={[_s.d, _s.px15, _s.py10, _s.mt5].join(' ')}>

4
app/javascript/gabsocial/features/messages/components/chat_conversation_request_approve_bar.js
View File

@ -20,8 +20,8 @@ class ChatConversationRequestApproveBar extends React.PureComponent {
} }
render () { render () {
if (!chatConversationId) return null if (!this.props.chatConversationId) return null
return ( return (
<div className={[_s.d, _s.z4, _s.minH53PX, _s.w100PC].join(' ')}> <div className={[_s.d, _s.z4, _s.minH53PX, _s.w100PC].join(' ')}>
<div className={[_s.d, _s.minH53PX, _s.bgNavigation, _s.aiCenter, _s.z3, _s.bottom0, _s.right0, _s.left0, _s.posFixed].join(' ')} > <div className={[_s.d, _s.minH53PX, _s.bgNavigation, _s.aiCenter, _s.z3, _s.bottom0, _s.right0, _s.left0, _s.posFixed].join(' ')} >