Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-22 00:10:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Async refactor in place (#7736)

Browse Source 
* feat: allow both callback&and await

* feat: ignore async key

* feat: callbackify and promisify in same file

* Revert "feat: callbackify and promisify in same file"

This reverts commit cea206a9b8.

* feat: no need to store .callbackify

* feat: change getTopics to async

* feat: remove .async

* fix: byScore

* feat: rewrite topics/index and social with async/await

* fix: rewrite topics/data.js

fix issue with async.waterfall, only pass result if its not undefined

* feat: add callbackify to redis/psql

* feat: psql use await

* fix: redis 🌋

* feat: less returns

* feat: more await rewrite

* fix: redis tests

* feat: convert sortedSetAdd

rewrite psql transaction to async/await

* feat: 🐶

* feat: test

* feat: log client and query

* feat: log bind

* feat: more logs

* feat: more logs

* feat: check perform

* feat: dont callbackify transaction

* feat: remove logs

* fix: main functions

* feat: more logs

* fix: increment

* fix: rename

* feat: remove cls

* fix: remove console.log

* feat: add deprecation message to .async usage

* feat: update more dbal methods

* fix: redis :voodoo:

* feat:  fix redis zrem, convert setObject

* feat: upgrade getObject methods

* fix: psql getObjectField

* fix: redis tests

* feat: getObjectKeys

* feat: getObjectValues

* feat: isObjectField

* fix: add missing return

* feat: delObjectField

* feat: incrObjectField

* fix: add missing await

* feat: remove exposed helpers

* feat: list methods

* feat: flush/empty

* feat: delete

* fix: redis delete all

* feat: get/set

* feat: incr/rename

* feat: type

* feat: expire

* feat: setAdd

* feat: setRemove

* feat: isSetMember

* feat: getSetMembers

* feat: setCount, setRemoveRandom

* feat: zcard,zcount

* feat: sortedSetRank

* feat: isSortedSetMember

* feat: zincrby

* feat: sortedSetLex

* feat: processSortedSet

* fix: add mising await

* feat: debug psql

* fix: psql test

* fix: test

* fix: another test

* fix: test fix

* fix: psql tests

* feat: remove logs

* feat: user arrow func

use builtin async promises

* feat: topic bookmarks

* feat: topic.delete

* feat: topic.restore

* feat: topics.purge

* feat: merge

* feat: suggested

* feat: topics/user.js

* feat: topics modules

* feat: topics/follow

* fix: deprecation msg

* feat: fork

* feat: topics/posts

* feat: sorted/recent

* feat: topic/teaser

* feat: topics/tools

* feat: topics/unread

* feat: add back node versions

disable deprecation notice
wrap async controllers in try/catch

* feat: use db directly

* feat: promisify in place

* fix: redis/psql

* feat: deprecation message

logs for psql

* feat: more logs

* feat: more logs

* feat: logs again

* feat: more logs

* fix: call release

* feat: restore travis, remove logs

* fix: loops

* feat: remove .async. usage
This commit is contained in:
Barış Soner Uşaklı
2019-07-09 12:46:49 -04:00
committed by GitHub
parent 43ce5f8af3
commit 805dcd7ca2
73 changed files with 4030 additions and 6110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/controllers/topics.js
View File

@@ -31,10 +31,10 @@ topicsController.get = async function getTopic(req, res, callback) {
topicData,
rssToken,
] = await Promise.all([
privileges.async.topics.get(tid, req.uid),
user.async.getSettings(req.uid),
topics.async.getTopicData(tid),
user.async.auth.getFeedToken(req.uid),
privileges.topics.get(tid, req.uid),
user.getSettings(req.uid),
topics.getTopicData(tid),
user.auth.getFeedToken(req.uid),
]);
var currentPage = parseInt(req.query.page, 10) || 1;
@@ -52,7 +52,7 @@ topicsController.get = async function getTopic(req, res, callback) {
}
if (postIndex === 'unread') {
postIndex = await topics.async.getUserBookmark(tid, req.uid);
postIndex = await topics.getUserBookmark(tid, req.uid);
}
if (utils.isNumber(postIndex) && (postIndex < 1 || postIndex > topicData.postcount)) {
@@ -67,11 +67,11 @@ topicsController.get = async function getTopic(req, res, callback) {
}
const { start, stop } = calculateStartStop(currentPage, postIndex, settings);
await topics.async.getTopicWithPosts(topicData, set, req.uid, start, stop, reverse);
await topics.getTopicWithPosts(topicData, set, req.uid, start, stop, reverse);
topics.modifyPostsByPrivilege(topicData, userPrivileges);
const hookData = await plugins.async.fireHook('filter:controllers.topic.get', { topicData: topicData, uid: req.uid });
const hookData = await plugins.fireHook('filter:controllers.topic.get', { topicData: topicData, uid: req.uid });
await Promise.all([
buildBreadcrumbs(hookData.topicData),
addTags(topicData, req, res),
@@ -161,7 +161,7 @@ async function buildBreadcrumbs(topicData) {
text: topicData.title,
},
];
const parentCrumbs = await helpers.async.buildCategoryBreadcrumbs(topicData.category.parentCid);
const parentCrumbs = await helpers.buildCategoryBreadcrumbs(topicData.category.parentCid);
topicData.breadcrumbs = parentCrumbs.concat(breadcrumbs);
}
@@ -239,7 +239,7 @@ async function addTags(topicData, req, res) {
}
async function addOGImageTags(res, topicData, postAtIndex) {
const uploads = postAtIndex ? await posts.async.uploads.listWithSizes(postAtIndex.pid) : [];
const uploads = postAtIndex ? await posts.uploads.listWithSizes(postAtIndex.pid) : [];
const images = uploads.map((upload) => {
upload.name = nconf.get('url') + nconf.get('upload_url') + '/files/' + upload.name;
return upload;