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.

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

Anonymous attribute handing in Post API #35

Open
wants to merge 16 commits into
base: f24
Choose a base branch
from
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
417 changes: 417 additions & 0 deletions node_modules/nodebb-plugin-composer-default/static/scss/composer.scss

Large diffs are not rendered by default.

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

198 changes: 198 additions & 0 deletions package 2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
{
"name": "nodebb",
"license": "GPL-3.0",
"description": "NodeBB Forum",
"version": "3.8.4",
"homepage": "https://www.nodebb.org",
"repository": {
"type": "git",
"url": "https://github.com/NodeBB/NodeBB/"
},
"main": "app.js",
"scripts": {
"start": "node loader.js",
"lint": "eslint --cache ./nodebb .",
"test": "nyc --reporter=html --reporter=text-summary mocha",
"coverage": "nyc report --reporter=text-lcov > ./coverage/lcov.info",
"coveralls": "nyc report --reporter=text-lcov | coveralls && rm -r coverage"
},
"nyc": {
"exclude": [
"src/upgrades/*",
"test/*"
]
},
"lint-staged": {
"*.js": [
"eslint --fix"
]
},
"dependencies": {
"@adactive/bootstrap-tagsinput": "0.8.2",
"@fontsource/inter": "5.0.18",
"@fontsource/poppins": "5.0.14",
"@fortawesome/fontawesome-free": "6.5.2",
"@isaacs/ttlcache": "1.4.1",
"@nodebb/spider-detector": "2.0.3",
"@popperjs/core": "2.11.8",
"ace-builds": "1.33.2",
"archiver": "7.0.1",
"async": "3.2.5",
"autoprefixer": "10.4.19",
"bcryptjs": "2.4.3",
"benchpressjs": "2.5.1",
"body-parser": "1.20.2",
"bootbox": "6.0.0",
"bootstrap": "5.3.3",
"bootswatch": "5.3.3",
"chalk": "4.1.2",
"chart.js": "4.4.2",
"cli-graph": "3.2.2",
"clipboard": "2.0.11",
"colors": "1.4.0",
"commander": "12.0.0",
"compare-versions": "6.1.0",
"compression": "1.7.4",
"connect-flash": "0.1.1",
"connect-mongo": "5.1.0",
"connect-multiparty": "2.2.0",
"connect-pg-simple": "9.0.1",
"connect-redis": "7.1.1",
"cookie-parser": "1.4.6",
"cron": "3.1.7",
"cropperjs": "1.6.2",
"csrf-sync": "4.0.3",
"daemon": "1.1.0",
"diff": "5.2.0",
"esbuild": "0.21.2",
"express": "4.19.2",
"express-session": "1.18.0",
"express-useragent": "1.0.15",
"fetch-cookie": "3.0.1",
"file-loader": "6.2.0",
"fs-extra": "11.2.0",
"graceful-fs": "4.2.11",
"helmet": "7.1.0",
"html-to-text": "9.0.5",
"imagesloaded": "5.0.0",
"ipaddr.js": "2.2.0",
"jquery": "3.7.1",
"jquery-deserialize": "2.0.0",
"jquery-form": "4.3.0",
"jquery-serializeobject": "1.0.0",
"jquery-ui": "1.13.3",
"jsesc": "3.0.2",
"json2csv": "5.0.7",
"jsonwebtoken": "9.0.2",
"lodash": "4.17.21",
"logrotate-stream": "0.2.9",
"lru-cache": "10.2.2",
"mime": "3.0.0",
"mkdirp": "3.0.1",
"mongodb": "6.6.1",
"morgan": "1.10.0",
"mousetrap": "1.6.5",
"multiparty": "4.2.3",
"nconf": "0.12.1",
"nodebb-plugin-2factor": "7.5.3",
"nodebb-plugin-composer-default": "10.2.36",
"nodebb-plugin-dbsearch": "6.2.5",
"nodebb-plugin-emoji": "5.1.15",
"nodebb-plugin-emoji-android": "4.0.0",
"nodebb-plugin-markdown": "12.2.6",
"nodebb-plugin-mentions": "4.4.3",
"nodebb-plugin-ntfy": "1.7.4",
"nodebb-plugin-spam-be-gone": "2.2.2",
"nodebb-rewards-essentials": "1.0.0",
"nodebb-theme-harmony": "1.2.63",
"nodebb-theme-lavender": "7.1.8",
"nodebb-theme-peace": "2.2.6",
"nodebb-theme-persona": "13.3.25",
"nodebb-widget-essentials": "7.0.18",
"nodemailer": "6.9.13",
"nprogress": "0.2.0",
"passport": "0.7.0",
"passport-http-bearer": "1.0.1",
"passport-local": "1.0.0",
"pg": "8.11.5",
"pg-cursor": "2.10.5",
"postcss": "8.4.38",
"postcss-clean": "1.2.0",
"progress-webpack-plugin": "1.0.16",
"prompt": "1.3.0",
"ioredis": "5.4.1",
"rimraf": "5.0.7",
"rss": "1.2.2",
"rtlcss": "4.1.1",
"sanitize-html": "2.13.0",
"sass": "1.77.1",
"semver": "7.6.2",
"serve-favicon": "2.5.0",
"sharp": "0.32.6",
"sitemap": "7.1.1",
"socket.io": "4.7.5",
"socket.io-client": "4.7.5",
"@socket.io/redis-adapter": "8.3.0",
"sortablejs": "1.15.2",
"spdx-license-list": "6.9.0",
"terser-webpack-plugin": "5.3.10",
"textcomplete": "0.18.2",
"textcomplete.contenteditable": "0.1.1",
"timeago": "1.6.7",
"tinycon": "0.6.8",
"toobusy-js": "0.5.1",
"tough-cookie": "4.1.4",
"validator": "13.12.0",
"webpack": "5.91.0",
"webpack-merge": "5.10.0",
"winston": "3.13.0",
"workerpool": "9.1.1",
"xml": "1.0.1",
"xregexp": "5.1.1",
"yargs": "17.7.2",
"zxcvbn": "4.4.2"
},
"devDependencies": {
"@apidevtools/swagger-parser": "10.1.0",
"@commitlint/cli": "19.3.0",
"@commitlint/config-angular": "19.3.0",
"coveralls": "3.1.1",
"eslint": "8.57.0",
"eslint-config-nodebb": "0.2.1",
"eslint-plugin-import": "2.29.1",
"grunt": "1.6.1",
"grunt-contrib-watch": "1.1.0",
"husky": "8.0.3",
"jsdom": "24.0.0",
"lint-staged": "15.2.2",
"mocha": "10.4.0",
"mocha-lcov-reporter": "1.3.0",
"mockdate": "3.0.5",
"nyc": "15.1.0",
"smtp-server": "3.13.4"
},
"optionalDependencies": {
"sass-embedded": "1.77.1"
},
"resolutions": {
"*/jquery": "3.7.1"
},
"bugs": {
"url": "https://github.com/NodeBB/NodeBB/issues"
},
"engines": {
"node": ">=18"
},
"maintainers": [
{
"name": "Julian Lam",
"email": "[email protected]",
"url": "https://github.com/julianlam"
},
{
"name": "Barış Soner Uşaklı",
"email": "[email protected]",
"url": "https://github.com/barisusakli"
}
]
}
1 change: 1 addition & 0 deletions pidfile 2
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9553
2 changes: 1 addition & 1 deletion public/openapi/components/schemas/PostObject.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,4 @@ PostObject:
isMainPost:
type: boolean
replies:
type: number
type: number
4 changes: 3 additions & 1 deletion public/openapi/write/posts/pid.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ get:
type: number
bookmarks:
type: number
anonymous:
type: number
votes:
type: number
timestampISO:
Expand Down Expand Up @@ -138,4 +140,4 @@ delete:
$ref: ../../components/schemas/Status.yaml#/Status
response:
type: object
properties: {}
properties: {}
1 change: 0 additions & 1 deletion public/src/client/topic.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ define('forum/topic', [
$(window).on('scroll', utils.debounce(updateTopicTitle, 250));

handleTopicSearch();

hooks.fire('action:topic.loaded', ajaxify.data);
};

Expand Down
1 change: 0 additions & 1 deletion public/src/client/topic/postTools.js
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@ define('forum/topic/postTools', [
openChat($(this));
});
}

async function onReplyClicked(button, tid) {
const selectedNode = await getSelectedNode();

Expand Down
1 change: 0 additions & 1 deletion src/api/posts.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ postsAPI.get = async function (caller, data) {

Object.assign(post, voted);
post.ip = userPrivilege.isAdminOrMod ? post.ip : undefined;

const selfPost = caller.uid && caller.uid === parseInt(post.uid, 10);
if (post.deleted && !(userPrivilege.isAdminOrMod || selfPost)) {
post.content = '[[topic:post-is-deleted]]';
Expand Down
4 changes: 1 addition & 3 deletions src/api/topics.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ topicsAPI.create = async function (caller, data) {
if (!data) {
throw new Error('[[error:invalid-data]]');
}

const payload = { ...data };
const payload = { ...data, anonymous: data.anonymous || false };
payload.tags = payload.tags || [];
apiHelpers.setDefaultPostData(caller, payload);
const isScheduling = parseInt(data.timestamp, 10) > payload.timestamp;
Expand All @@ -72,7 +71,6 @@ topicsAPI.create = async function (caller, data) {
if (shouldQueue) {
return await posts.addToQueue(payload);
}

const result = await topics.post(payload);
await topics.thumbs.migrate(data.uuid, result.topicData.tid);

Expand Down
1 change: 0 additions & 1 deletion src/api/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ usersAPI.create = async function (caller, data) {
throw new Error('[[error:invalid-data]]');
}
await hasAdminPrivilege(caller.uid, 'users');

const uid = await user.create(data);
return await user.getUserData(uid);
};
Expand Down
5 changes: 4 additions & 1 deletion src/posts/data.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const utils = require('../utils');
const intFields = [
'uid', 'pid', 'tid', 'deleted', 'timestamp',
'upvotes', 'downvotes', 'deleterUid', 'edited',
'replies', 'bookmarks',
'replies', 'bookmarks', 'anonymous',
];

module.exports = function (Posts) {
Expand Down Expand Up @@ -42,6 +42,9 @@ module.exports = function (Posts) {

Posts.getPostFields = async function (pid, fields) {
const posts = await Posts.getPostsFields([pid], fields);
if (!fields.includes('anonymous')) {
fields.push('anonymous');
}
return posts ? posts[0] : null;
};

Expand Down
1 change: 1 addition & 0 deletions src/topics/data.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const intFields = [
];

module.exports = function (Topics) {
console.log(Topics);
Topics.getTopicsFields = async function (tids, fields) {
if (!Array.isArray(tids) || !tids.length) {
return [];
Expand Down
Loading
Loading