Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extract annonymoustype as postsFields #37

Merged
merged 6 commits into from
Sep 26, 2024
Merged

Extract annonymoustype as postsFields #37

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a3cf468
Extract annonymoustype as postsFields
Tasnim1147 Sep 25, 2024
6e1a184
Fix lint issues at teaser.js
Tasnim1147 Sep 26, 2024
9ba685f
Remove node_modules/ from gitignore
Tasnim1147 Sep 26, 2024
0a0e853
Extract annonymoustype as user input
Tasnim1147 Sep 26, 2024
1950ffc
Merge branch 'f24' into connect-frontend-backend-db
Tasnim1147 Sep 26, 2024
47b9af5
Merge branch 'f24' into connect-frontend-backend-db
jdufitum Sep 26, 2024
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
2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ dist/
yarn.lock
npm-debug.log

node_modules/*
!node_modules/nodebb-plugin-composer-default
sftp-config.json
config.json
jsconfig.json
Expand Down
4 changes: 4 additions & 0 deletions node_modules/nodebb-plugin-composer-default/static/lib/composer.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/topics/teaser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ module.exports = function (Topics) {
});

const [allPostData, callerSettings] = await Promise.all([
posts.getPostsFields(teaserPids, ['pid', 'uid', 'timestamp', 'tid', 'content']),
posts.getPostsFields(teaserPids, ['pid', 'uid', 'timestamp', 'tid', 'content', 'annonymousType']),
user.getSettings(uid),
]);
let postData = allPostData.filter(post => post && post.pid);
Expand Down Expand Up @@ -142,7 +142,7 @@ module.exports = function (Topics) {
const mainPid = await Topics.getTopicField(postData.tid, 'mainPid');
pids = [mainPid];
}
const prevPosts = await posts.getPostsFields(pids, ['pid', 'uid', 'timestamp', 'tid', 'content']);
const prevPosts = await posts.getPostsFields(pids, ['pid', 'uid', 'timestamp', 'tid', 'content', 'annonymousType']);
isBlocked = prevPosts.every(checkBlocked);
start += postsPerIteration;
stop = start + postsPerIteration - 1;
Expand Down
Loading