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

Merge branch 'master' of https://github.com/NodeBB/NodeBB

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-01-23 22:13:07 -05:00
parent f799f017ab 418c174d56
commit ee4304b443
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/socket.io/flags.js
View File

@@ -21,7 +21,7 @@ SocketFlags.create = async function (socket, data) {
const flagObj = await flags.create(data.type, data.id, socket.uid, data.reason); const flagObj = await flags.create(data.type, data.id, socket.uid, data.reason);
await flags.notify(flagObj, socket.uid); await flags.notify(flagObj, socket.uid);
return flagObj; return flagObj.flagId;
}; };
SocketFlags.update = async function (socket, data) { SocketFlags.update = async function (socket, data) {

4
test/controllers-admin.js
View File

@@ -684,10 +684,10 @@ describe('Admin Controllers', function () {
var socketFlags = require('../src/socket.io/flags'); var socketFlags = require('../src/socket.io/flags');
var oldValue = meta.config['min:rep:flag']; var oldValue = meta.config['min:rep:flag'];
meta.config['min:rep:flag'] = 0; meta.config['min:rep:flag'] = 0;
socketFlags.create({ uid: regularUid }, { id: pid, type: 'post', reason: 'spam' }, function (err, data) { socketFlags.create({ uid: regularUid }, { id: pid, type: 'post', reason: 'spam' }, function (err, flagId) {
meta.config['min:rep:flag'] = oldValue; meta.config['min:rep:flag'] = oldValue;
assert.ifError(err); assert.ifError(err);
request(nconf.get('url') + '/api/flags/' + data.flagId, { jar: moderatorJar, json: true }, function (err, res, body) { request(nconf.get('url') + '/api/flags/' + flagId, { jar: moderatorJar, json: true }, function (err, res, body) {
assert.ifError(err); assert.ifError(err);
assert(body); assert(body);
assert.equal(body.reporter.username, 'regular'); assert.equal(body.reporter.username, 'regular');

6
test/flags.js
View File

@@ -596,9 +596,7 @@ describe('Flags', function () {
describe('(websockets)', function () { describe('(websockets)', function () {
var SocketFlags = require('../src/socket.io/flags.js'); var SocketFlags = require('../src/socket.io/flags.js');
var tid;
var pid; var pid;
var flag;
before(function (done) { before(function (done) {
Topics.post({ Topics.post({
@@ -607,7 +605,6 @@ describe('Flags', function () {
title: 'Another topic', title: 'Another topic',
content: 'This is flaggable content', content: 'This is flaggable content',
}, function (err, topic) { }, function (err, topic) {
tid = topic.postData.tid;
pid = topic.postData.pid; pid = topic.postData.pid;
done(err); done(err);
@@ -620,8 +617,7 @@ describe('Flags', function () {
type: 'post', type: 'post',
id: pid, id: pid,
reason: 'foobar', reason: 'foobar',
}, function (err, flagObj) { }, function (err) {
flag = flagObj;
assert.ifError(err); assert.ifError(err);
Flags.exists('post', pid, 1, function (err, exists) { Flags.exists('post', pid, 1, function (err, exists) {