Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-19 02:50:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into webpack5

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2022-03-02 15:28:50 -05:00
parent 594c6f3ec3 7ee4e4e004
commit 68a6e6b8bf
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/client/topic/posts.js
View File

@@ -132,7 +132,7 @@ define('forum/topic/posts', [
if (!isPreviousPostAdded && data.posts[0].selfPost) {
return ajaxify.go('post/' + data.posts[0].pid);
}
const repliesSelector = $('[component="post"]:not([data-index=0]), [component="topic/event"]');
const repliesSelector = $('[component="topic"]>[component="post"]:not([data-index=0]), [component="topic"]>[component="topic/event"]');
createNewPosts(data, repliesSelector, direction, false, function (html) {
if (html) {
html.addClass('new');

2
src/categories/topics.js
View File

@@ -163,7 +163,7 @@ module.exports = function (Categories) {
if (!topic.scheduled && topic.deleted && !topic.isOwner) {
topic.title = '[[topic:topic_is_deleted]]';
if (topic.hasOwnProperty('titleRaw')) {
topics.titleRaw = '[[topic:topic_is_deleted]]';
topic.titleRaw = '[[topic:topic_is_deleted]]';
}
topic.slug = topic.tid;
topic.teaser = null;

7
src/controllers/accounts/posts.js
View File

@@ -5,6 +5,7 @@ const user = require('../../user');
const posts = require('../../posts');
const topics = require('../../topics');
const categories = require('../../categories');
const privileges = require('../../privileges');
const pagination = require('../../pagination');
const helpers = require('../helpers');
const accountHelpers = require('./helpers');
@@ -56,7 +57,8 @@ const templateToData = {
return cids.map(c => `cid:${c}:uid:${userData.uid}:pids:votes`);
},
getTopics: async (sets, req, start, stop) => {
const pids = await db.getSortedSetRevRangeByScore(sets, start, stop - start + 1, '+inf', 1);
let pids = await db.getSortedSetRevRangeByScore(sets, start, stop - start + 1, '+inf', 1);
pids = await privileges.posts.filter('topics:read', pids, req.uid);
const postObjs = await posts.getPostSummaryByPids(pids, req.uid, { stripTags: false });
return { posts: postObjs, nextStart: stop + 1 };
},
@@ -74,7 +76,8 @@ const templateToData = {
return cids.map(c => `cid:${c}:uid:${userData.uid}:pids:votes`);
},
getTopics: async (sets, req, start, stop) => {
const pids = await db.getSortedSetRangeByScore(sets, start, stop - start + 1, '-inf', -1);
let pids = await db.getSortedSetRangeByScore(sets, start, stop - start + 1, '-inf', -1);
pids = await privileges.posts.filter('topics:read', pids, req.uid);
const postObjs = await posts.getPostSummaryByPids(pids, req.uid, { stripTags: false });
return { posts: postObjs, nextStart: stop + 1 };
},

4
src/controllers/accounts/uploads.js
View File

@@ -1,5 +1,7 @@
'use strict';
const path = require('path');
const nconf = require('nconf');
const db = require('../../database');
@@ -27,7 +29,7 @@ uploadsController.get = async function (req, res, next) {
userData.uploads = uploadNames.map(uploadName => ({
name: uploadName,
url: nconf.get('upload_url') + uploadName,
url: path.resolve(nconf.get('upload_url'), uploadName),
}));
const pageCount = Math.ceil(itemCount / itemsPerPage);
userData.pagination = pagination.create(page, pageCount, req.query);