moony/Gab-Social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added new role for moderator to Groups

Browse Source 
• Added:
- new role for moderator to Groups
This commit is contained in:
mgabdev 2020-09-02 18:06:38 -05:00
parent cc224d7659
commit ac9b9e8448
8 changed files with 61 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/javascript/gabsocial/components/group_collection_item.js
View File

@ -24,6 +24,7 @@ class GroupCollectionItem extends ImmutablePureComponent {
const isMember = relationships.get('member')
const isAdmin = relationships.get('admin')
const isModerator = relationships.get('moderator')
const coverSrc = group.get('cover_image_url') || ''
const coverMissing = coverSrc.indexOf(PLACEHOLDER_MISSING_HEADER_SRC) > -1 || !coverSrc
@ -34,6 +35,7 @@ class GroupCollectionItem extends ImmutablePureComponent {
{group.get('title')}
{isMember && intl.formatMessage(messages.member)}
{isAdmin && intl.formatMessage(messages.admin)}
{isModerator && intl.formatMessage(messages.moderator)}
</React.Fragment>
)
}
@ -69,12 +71,12 @@ class GroupCollectionItem extends ImmutablePureComponent {
}
{
(!coverSrc || coverMissing) && (isMember || isAdmin) &&
(!coverSrc || coverMissing) && (isMember || isAdmin || isModerator) &&
<div className={[_s.d, _s.h40PX, _s.bgSubtle, _s.borderColorSecondary, _s.borderBottom1PX].join(' ')} />
}
{
(isMember || isAdmin) &&
(isMember || isAdmin || isModerator) &&
<div className={[_s.d, _s.flexRow, _s.posAbs, _s.top0, _s.right0, _s.pt10, _s.mr10].join(' ')}>
{
isMember &&
@ -98,6 +100,17 @@ class GroupCollectionItem extends ImmutablePureComponent {
{intl.formatMessage(messages.admin)}
</Text>
}
{
isModerator &&
<Text
isBadge
className={[_s.bgBlack, _s.ml5].join(' ')}
size='extraSmall'
color='white'
>
{intl.formatMessage(messages.moderator)}
</Text>
}
</div>
}
@ -127,6 +140,7 @@ const messages = defineMessages({
viewGroup: { id: 'view_group', defaultMessage: 'View Group' },
member: { id: 'member', defaultMessage: 'Member' },
admin: { id: 'admin', defaultMessage: 'Admin' },
moderator: { id: 'moderator', defaultMessage: 'Moderator' },
})
const mapStateToProps = (state, { id }) => ({

25
app/javascript/gabsocial/components/popover/group_member_options_popover.js
View File

@ -15,8 +15,8 @@ class GroupMemberOptionsPopover extends React.PureComponent {
this.props.onCreateRemovedAccount(this.props.groupId, this.props.accountId)
}
handleOnMakeAdmin = () => {
this.props.onUpdateRole(this.props.groupId, this.props.accountId, 'admin')
handleOnUpdateRole = (role) => {
this.props.onUpdateRole(this.props.groupId, this.props.accountId, role)
}
handleOnClosePopover = () => {
@ -24,7 +24,7 @@ class GroupMemberOptionsPopover extends React.PureComponent {
}
render() {
const { isXS } = this.props
const { isModerator, isXS } = this.props
const listItems = [
{
@ -33,13 +33,23 @@ class GroupMemberOptionsPopover extends React.PureComponent {
title: 'Remove from group',
onClick: this.handleOnRemoveFromGroup,
},
{
]
if (!isModerator) {
listItems.push({
hideArrow: true,
icon: 'group',
title: 'Make group moderator',
onClick: () => this.handleOnUpdateRole('moderator'),
})
listItems.push({
hideArrow: true,
icon: 'group',
title: 'Make group admin',
onClick: this.handleOnMakeAdmin,
},
]
onClick: () => this.handleOnUpdateRole('admin'),
})
}
return (
<PopoverLayout
@ -77,6 +87,7 @@ GroupMemberOptionsPopover.defaultProps = {
onClosePopover: PropTypes.func.isRequired,
onCreateRemovedAccount: PropTypes.func.isRequired,
onUpdateRole: PropTypes.func.isRequired,
isModerator: PropTypes.bool,
}
export default connect(null, mapDispatchToProps)(GroupMemberOptionsPopover)

2
app/javascript/gabsocial/components/popover/status_options_popover.js
View File

@ -149,7 +149,7 @@ class StatusOptionsPopover extends ImmutablePureComponent {
const mutingConversation = status.get('muted')
const publicStatus = ['public', 'unlisted'].includes(status.get('visibility'))
const isReply = !!status.get('in_reply_to_id')
const withGroupAdmin = !!groupRelationships ? groupRelationships.get('admin') : false
const withGroupAdmin = !!groupRelationships ? (groupRelationships.get('admin') || groupRelationships.get('moderator')) : false
const mailToHref = !status ? undefined : `mailto:?subject=Gab&body=${status.get('url')}`
let menu = []

17
app/javascript/gabsocial/features/group_members.js
View File

@ -34,7 +34,10 @@ class GroupMembers extends ImmutablePureComponent {
}
handleOpenGroupMemberOptions = (e, accountId) => {
this.props.onOpenGroupMemberOptions(e.currentTarget, accountId, this.props.groupId)
const { relationships, groupId } = this.props
const isMod = relationships ? relationships.get('moderator') : true
this.props.onOpenGroupMemberOptions(e.currentTarget, accountId, groupId, isMod)
}
handleLoadMore = debounce(() => {
@ -51,9 +54,9 @@ class GroupMembers extends ImmutablePureComponent {
if (!group || !relationships) return <ColumnIndicator type='loading' />
const isAdmin = relationships ? relationships.get('admin') : false
const isAdminOrMod = relationships ? (relationships.get('admin') || relationships.get('moderator')) : false
if (!isAdmin) return <ColumnIndicator type='missing' />
if (!isAdminOrMod) return <ColumnIndicator type='missing' />
return (
<Block>
@ -86,13 +89,14 @@ class GroupMembers extends ImmutablePureComponent {
>
{
accountIds && accountIds.map((id) => (
// : todo : add badges for isAdmin, isModerator
<Account
compact
key={id}
id={id}
actionIcon={(!isAdmin || id === me) ? undefined : 'ellipsis'}
actionIcon={(!isAdminOrMod || id === me) ? undefined : 'ellipsis'}
onActionClick={(data, event) => {
return !isAdmin ? false : this.handleOpenGroupMemberOptions(event, id)
return !isAdminOrMod ? false : this.handleOpenGroupMemberOptions(event, id)
}}
/>
))
@ -125,11 +129,12 @@ const mapDispatchToProps = (dispatch) => ({
onExpandMembers(groupId) {
dispatch(expandMembers(groupId))
},
onOpenGroupMemberOptions(targetRef, accountId, groupId) {
onOpenGroupMemberOptions(targetRef, accountId, groupId, isModerator) {
dispatch(openPopover('GROUP_MEMBER_OPTIONS', {
targetRef,
accountId,
groupId,
isModerator,
position: 'top',
}))
},

4
app/models/concerns/group_interactions.rb
View File

@ -13,6 +13,10 @@ module GroupInteractions
follow_mapping(GroupAccount.where(group_id: target_group_ids, account_id: account_id, role: :admin), :group_id)
end
def moderator_map(target_group_ids, account_id)
follow_mapping(GroupAccount.where(group_id: target_group_ids, account_id: account_id, role: :moderator), :group_id)
end
private
def follow_mapping(query, field)

5
app/models/group_account.rb
View File

@ -13,7 +13,10 @@
class GroupAccount < ApplicationRecord
self.ignored_columns = ["unread_count"]
enum role: { admin: "admin" }
enum role: {
admin: "admin",
moderator: "moderator"
}
belongs_to :group
belongs_to :account

3
app/presenters/group_relationships_presenter.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
class GroupRelationshipsPresenter
attr_reader :member, :admin
attr_reader :member, :admin, :moderator
def initialize(group_ids, current_account_id, **options)
@group_ids = group_ids.map { |a| a.is_a?(Group) ? a.id : a }
@ -9,6 +9,7 @@ class GroupRelationshipsPresenter
@member = Group.member_map(@group_ids, @current_account_id)
@admin = Group.admin_map(@group_ids, @current_account_id)
@moderator = Group.moderator_map(@group_ids, @current_account_id)
end
end

6
app/serializers/rest/group_relationship_serializer.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
class REST::GroupRelationshipSerializer < ActiveModel::Serializer
attributes :id, :member, :admin
attributes :id, :member, :admin, :moderator
def id
object.id.to_s
@ -15,4 +15,8 @@ class REST::GroupRelationshipSerializer < ActiveModel::Serializer
instance_options[:relationships].admin[object.id] ? true : false
end
def moderator
instance_options[:relationships].moderator[object.id] ? true : false
end
end