kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix indenting etc

Browse Source
This commit is contained in:
Yaman Qalieh 2016-08-31 07:05:23 -04:00
parent 1e830e8439
commit 8542caec04
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hourglass/server/main.js
View File

@ -11,7 +11,7 @@ import {
var superadmins = [ var superadmins = [
"ybq987@gmail.com", "ybq987@gmail.com",
"ksjdragon@gmail.com", "ksjdragon@gmail.com",
"aravagarwal3073@gmail.com" //"aravagarwal3073@gmail.com"
]; ];
var worktype = ["test", "quiz", "project", "normal", "other"]; var worktype = ["test", "quiz", "project", "normal", "other"];
@ -137,8 +137,8 @@ Meteor.methods({
if (privacy) { if (privacy) {
var currcode = Math.random().toString(36).substr(2, 6); var currcode = Math.random().toString(36).substr(2, 6);
while (classes.findOne({ while (classes.findOne({
code: currcode code: currcode
})) { })) {
currcode = Math.random().toString(36).substr(2, 6); currcode = Math.random().toString(36).substr(2, 6);
} }
return currcode; return currcode;
@ -224,8 +224,8 @@ Meteor.methods({
if (Roles.userIsInRole(Meteor.userId(), ['superadmin', 'admin']) || if (Roles.userIsInRole(Meteor.userId(), ['superadmin', 'admin']) ||
(found && foundclass && foundclass.admin == Meteor.userId() && (found && foundclass && foundclass.admin == Meteor.userId() &&
!_.contains(foundclass.banned, userId) && !_.contains(foundclass.banned, userId) &&
_.contains(foundclass.subscribers, userId) _.contains(foundclass.subscribers, userId)
)) { )) {
classes.update({ classes.update({
_id: classId _id: classId
@ -263,8 +263,8 @@ Meteor.methods({
if (Roles.userIsInRole(Meteor.userId(), ['superadmin', 'admin']) || if (Roles.userIsInRole(Meteor.userId(), ['superadmin', 'admin']) ||
(foundclass && foundclass.admin == Meteor.userId() && index !== -1 && (foundclass && foundclass.admin == Meteor.userId() && index !== -1 &&
(index === 0 ^ _.contains(foundclass.moderators, Meteor.userId())) && (index === 0 ^ _.contains(foundclass.moderators, Meteor.userId())) &&
(!_.contains(classlist, userId) ^ presence))) { (!_.contains(classlist, userId) ^ presence))) {
classes.update({ classes.update({
_id: classId _id: classId
}, { }, {
@ -363,8 +363,8 @@ Meteor.methods({
}); });
} }
} else if (Meteor.userId() === work.findOne({ } else if (Meteor.userId() === work.findOne({
_id: change._id _id: change._id
}).creator) { }).creator) {
if (change.name.length <= 50 && _.contains(worktype, change.type) && if (change.name.length <= 50 && _.contains(worktype, change.type) &&
change.dueDate instanceof Date && change.dueDate.getTime() >= ref) { change.dueDate instanceof Date && change.dueDate.getTime() >= ref) {
work.update({ work.update({
@ -397,8 +397,8 @@ Meteor.methods({
_.contains(foundsubs, Meteor.userId()) && _.contains(foundsubs, Meteor.userId()) &&
_.contains(currentclass.banned, Meteor.userId())) { _.contains(currentclass.banned, Meteor.userId())) {
var commentInfo = { var commentInfo = {
"comment":input[0], "comment": input[0],
"user":user, "user": user,
"date": new Date() "date": new Date()
}; };
var comments = workobject.comments.concat(commentInfo); var comments = workobject.comments.concat(commentInfo);
@ -429,7 +429,7 @@ Meteor.methods({
_.contains(workobject.reports, Meteor.userId())) { _.contains(workobject.reports, Meteor.userId())) {
workobject.reports.splice(userindex, 1); workobject.reports.splice(userindex, 1);
} else if (input[1] === "reports" && } else if (input[1] === "reports" &&
_.contains(workobject.confirmations, Meteor.userId())) { _.contains(workobject.confirmations, Meteor.userId())) {
workobject.confirmations.splice(userindex, 1); workobject.confirmations.splice(userindex, 1);
} }
} else { } else {
@ -476,8 +476,8 @@ Meteor.methods({
current.banner = change.banner; current.banner = change.banner;
current.preferences = change.preferences; current.preferences = change.preferences;
if (schools.findOne({ if (schools.findOne({
name: current.school name: current.school
}) !== null && }) !== null &&
Number.isInteger(current.grade) && Number.isInteger(current.grade) &&
current.grade >= 9 && current.grade <= 12) { current.grade >= 9 && current.grade <= 12) {
@ -508,7 +508,9 @@ Meteor.methods({
profile: current profile: current
} }
}); });
return classes.find({_id: null}); return classes.find({
_id: null
});
}, },
'joinClass': function(input) { 'joinClass': function(input) {
var change = input[0]; var change = input[0];
@ -579,8 +581,8 @@ Meteor.methods({
var index = current.classes.indexOf(change); var index = current.classes.indexOf(change);
if (index >= 0) { if (index >= 0) {
if (classes.findOne({ if (classes.findOne({
_id: change _id: change
}).admin != Meteor.userId()) { }).admin != Meteor.userId()) {
current.classes.splice(index, 1); current.classes.splice(index, 1);
Meteor.users.update({ Meteor.users.update({
_id: Meteor.userId() _id: Meteor.userId()