Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-09 22:20:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

breaking: remove renderTopicEvents

Browse Source 
use partial template
This commit is contained in:
Barış Soner Uşaklı
2022-09-23 10:56:15 -04:00
parent 0930934200
commit 9510cc540a
2 changed files with 2 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
public/src/modules/helpers.common.js
View File

@@ -18,8 +18,6 @@ module.exports = function (utils, Benchpress, relative_path) {
spawnPrivilegeStates,
localeToHTML,
renderTopicImage,
renderTopicEvents,
renderEvents,
renderDigestAvatar,
userAgentIcons,
buildAvatar,
@@ -180,50 +178,6 @@ module.exports = function (utils, Benchpress, relative_path) {
return '<img component="user/picture" data-uid="' + topicObj.user.uid + '" src="' + topicObj.user.picture + '" class="user-img" title="' + topicObj.user.username + '" />';
}
function renderTopicEvents(index, sort) {
console.warn('[renderTopicEvents] deprecated, use a partial at partials/topic/event.tpl');
if (sort === 'most_votes') {
return '';
}
const start = this.posts[index].eventStart;
const end = this.posts[index].eventEnd;
const events = this.events.filter(event => event.timestamp >= start && event.timestamp < end);
if (!events.length) {
return '';
}
return renderEvents.call(this, events);
}
function renderEvents(events) {
return events.reduce((html, event) => {
html += `<li component="topic/event" class="timeline-event" data-topic-event-id="${event.id}" data-topic-event-type="${event.type}">
<div class="timeline-badge">
<i class="fa ${event.icon || 'fa-circle'}"></i>
</div>
<span class="timeline-text">
${event.href ? `<a href="${relative_path}${event.href}">${event.text}</a>` : event.text}&nbsp;
</span>
`;
if (event.user) {
if (!event.user.system) {
html += `<span><a href="${relative_path}/user/${event.user.userslug}">${buildAvatar(event.user, '16px', true)}&nbsp;${event.user.username}</a></span>&nbsp;`;
} else {
html += `<span class="timeline-text">[[global:system-user]]</span>&nbsp;`;
}
}
html += `<span class="timeago timeline-text" title="${event.timestampISO}"></span>`;
if (this.privileges.isAdminOrMod) {
html += `&nbsp;<span component="topic/event/delete" data-topic-event-id="${event.id}" data-topic-event-type="${event.type} class="timeline-text pointer" title="[[topic:delete-event]]"><i class="fa fa-trash"></i></span>`;
}
return html;
}, '');
}
function renderDigestAvatar(block) {
if (block.teaser) {
if (block.teaser.user.picture) {

2
src/topics/index.js
View File

@@ -189,6 +189,8 @@ Topics.getTopicWithPosts = async function (topicData, set, uid, start, stop, rev
p.events = events.filter(
event => event.timestamp >= p.eventStart && event.timestamp < p.eventEnd
);
p.eventStart = undefined;
p.eventEnd = undefined;
});
topicData.category = category;