Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions extend.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@

(new Extend\Settings)
->serializeToForum('showBadgesOnUserCard', 'v17development-user-badges.show_badges_on_user_card', 'boolval')
->serializeToForum('showBadgesInDiscussion', 'v17development-user-badges.show_badges_in_discussion', 'boolval')
->serializeToForum('numberOfBadgesOnUserCard', 'v17development-user-badges.number_of_badges_on_user_card', 'intval')
->default('v17development-user-badges.number_of_badges_on_user_card', 5),
];
Expand Down
5 changes: 5 additions & 0 deletions js/src/admin/components/SettingsPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,11 @@ export default class SettingsPage extends ExtensionPage {
setting: 'v17development-user-badges.show_badges_on_user_card',
label: app.translator.trans('v17development-flarum-badges.admin.show_badges_on_user_card'),
})}
{this.buildSettingComponent({
type: 'switch',
setting: 'v17development-user-badges.show_badges_in_discussion',
label: app.translator.trans('v17development-flarum-badges.admin.show_badges_in_discussion'),
})}
{this.buildSettingComponent({
type: 'number',
setting: 'v17development-user-badges.number_of_badges_on_user_card',
Expand Down
47 changes: 47 additions & 0 deletions js/src/forum/addDiscussionUserBadge.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { extend } from 'flarum/extend';
import CommentPost from 'flarum/common/components/CommentPost';
import BadgeModal from './components/BadgeModal';
import UserBadge from '../common/components/UserBadge';

export default function addDiscussionUserBadge() {
extend(CommentPost.prototype, 'content', function(list){
const userID = this.attrs.post.data.relationships.user.data.id;
const user = this.attrs.post.store.data.users[userID];

if (!app.forum.attribute('showBadgesInDiscussion') || !user.userBadges) return;

const userBadges = user.userBadges() ?? [];

if (userBadges.length < 1 || !userBadges) return;

const limit = app.forum.attribute('numberOfBadgesOnUserCard');
let visibleBadges = userBadges.filter((userBadge) => {
return userBadge.inUserCard();
});

if (visibleBadges.length === 0) {
visibleBadges = userBadges.slice(0, limit);
}

const badges = visibleBadges.map((userBadge) => {
return (
<UserBadge
badge={userBadge.badge()}
onclick={() =>
app.modal.show(BadgeModal, {
badge: userBadge.badge(),
userBadgeData: userBadge,
})
}
/>
);
});

if(badges.length>0){
list[0].children.push(<div style="height:15px"></div>);
for(let i=0;i<badges.length;i++){
list[0].children.push(badges[i]);
}
}
});
}
2 changes: 2 additions & 0 deletions js/src/forum/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import UserBadgeListState from './states/UserBadgeListState';
import BadgeReceivedNotification from './notification/BadgeReceivedNotification';
import NotificationGrid from 'flarum/forum/components/NotificationGrid';
import addBadgeListUserCard from './addBadgeListUserCard';
import addDiscussionUserBadge from './addDiscussionUserBadge';
import DiscussionListState from 'flarum/forum/states/DiscussionListState';

app.initializers.add('v17development-flarum-badges', (app) => {
Expand Down Expand Up @@ -53,6 +54,7 @@ app.initializers.add('v17development-flarum-badges', (app) => {
};

addSidebarNav();
addDiscussionUserBadge();

app.userBadgeListState = new UserBadgeListState({});

Expand Down
3 changes: 2 additions & 1 deletion locale/en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ v17development-flarum-badges:
edit_category: Edit category
nothing_here_yet: You did not create any badges or categories yet.
show_badges_on_user_card: Show badges on user card
show_badges_in_discussion: Show badges in discussion
number_of_badges_on_user_card: Number of badges
number_of_badges_on_user_card_help: Number of badges to show on user card
number_of_badges_on_user_card_help: Number of badges to show on user card and in discussion

permissions:
badge_detail_users: Can see users on badge details page
Expand Down