wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-05 07:56:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'user-sort' of ssh://github.com/coralproject/talk into user-sort

Browse Source
This commit is contained in:
Chi Vinh Le
2017-08-25 20:22:09 +07:00
parent e51e8c543f 308449a67c
commit 38c290958c
3 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vscode/settings.json
Vendored
-8
View File
@@ -1,8 +0,0 @@
{
"eslint.autoFixOnSave": true,
"editor.tabSize": 2,
"editor.rulers": [
80
],
"files.trimTrailingWhitespace": true
}
bin/verifications/database/comments.js
+6 -6
View File
@@ -21,7 +21,7 @@ module.exports = async ({fix, limit, batch}) => {
let comments = [];
let commentIDs = [];
debug(`Processing ${totalCount} comments...`);
console.log(`Processing ${totalCount} comments in batches of ${limit}...`);
// Keep processing documents until there are is none left.
while (offset < totalCount) {
@@ -166,13 +166,13 @@ module.exports = async ({fix, limit, batch}) => {
const OPERATIONS_LENGTH = operations.length;
if (limit < Infinity && offset + comments.length < totalCount) {
debug(`Processed ${offset + comments.length}/${totalCount} comments because we reached the update limit of ${limit}.`);
debug(`Fixing ${OPERATIONS_LENGTH} documents.`);
console.log(`Processed ${offset + comments.length}/${totalCount} comments because we reached the update limit of ${limit}.`);
} else {
debug(`Processed all ${totalCount} comments.`);
debug(`${OPERATIONS_LENGTH} documents need fixing.`);
console.log(`Processed all ${totalCount} comments.`);
}
console.log(`${OPERATIONS_LENGTH} documents need fixing.`);
// If fix was enabled, execute the batch writes.
if (OPERATIONS_LENGTH > 0) {
if (fix) {
@@ -185,7 +185,7 @@ module.exports = async ({fix, limit, batch}) => {
debug(`Fixed batch of ${result.modifiedCount} documents.`);
}
debug(`Applied all ${OPERATIONS_LENGTH} fixes.`);
console.log(`Applied all ${OPERATIONS_LENGTH} fixes.`);
} else {
console.warn('Skipping fixing, --fix was not enabled, pass --fix to fix these errors');
}
graph/resolvers/user.js
+1 -1
View File
@@ -42,7 +42,7 @@ const User = {
return null;
},
tokens({id, tokens}, args, {user}) {
if (!user || ((user.id !== id) && !user.can(LIST_OWN_TOKENS))) {
if (!user || ((user.id !== id) && !user.can(LIST_OWN_TOKENS))) {
return null;
}