From 974b3c70b5e12e5658ca78fdc902b4de84e2fcf2 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Tue, 30 Jun 2015 19:12:29 +0900
Subject: [PATCH] clean up

---
 packages/telescope-comments/lib/callbacks.js | 11 ++--
 packages/telescope-users/lib/callbacks.js    | 67 ++++++++++++++++++++
 packages/telescope-users/lib/users.js        | 64 -------------------
 3 files changed, 74 insertions(+), 68 deletions(-)

diff --git a/packages/telescope-comments/lib/callbacks.js b/packages/telescope-comments/lib/callbacks.js
index 672579cbf..0cc4d7b3f 100644
--- a/packages/telescope-comments/lib/callbacks.js
+++ b/packages/telescope-comments/lib/callbacks.js
@@ -1,7 +1,6 @@
-
-// ------------------------------------------------------------------------------------------- //
-// ------------------------------------------ Hooks ------------------------------------------ //
-// ------------------------------------------------------------------------------------------- //
+//////////////////////////////////////////////////////
+// Collection Hooks                                 //
+//////////////////////////////////////////////////////
 
 Comments.before.insert(function (userId, doc) {
   // note: only actually sanitizes on the server
@@ -25,6 +24,10 @@ Comments.before.update(function (userId, doc, fieldNames, modifier) {
   }
 });
 
+//////////////////////////////////////////////////////
+// Callbacks                                        //
+//////////////////////////////////////////////////////
+
 function afterCommentOperations (comment) {
 
   var userId = comment.userId;
diff --git a/packages/telescope-users/lib/callbacks.js b/packages/telescope-users/lib/callbacks.js
index 5b2eff043..8b114150b 100644
--- a/packages/telescope-users/lib/callbacks.js
+++ b/packages/telescope-users/lib/callbacks.js
@@ -1,3 +1,70 @@
+//////////////////////////////////////////////////////
+// Collection Hooks                                 //
+//////////////////////////////////////////////////////
+
+/**
+ * Generate HTML body from Markdown on user bio insert
+ */
+Users.after.insert(function (userId, user) {
+
+  // run create user async callbacks
+  Telescope.callbacks.runAsync("onCreateUserAsync", user);
+
+  // check if all required fields have been filled in. If so, run profile completion callbacks
+  if (Users.hasCompletedProfile(user)) {
+    Telescope.callbacks.runAsync("profileCompletedAsync", user);
+  }
+  
+});
+
+/**
+ * Generate HTML body from Markdown when user bio is updated
+ */
+Users.before.update(function (userId, doc, fieldNames, modifier) {
+  // if bio is being modified, update htmlBio too
+  if (Meteor.isServer && modifier.$set && modifier.$set["telescope.bio"]) {
+    modifier.$set["telescope.htmlBio"] = Telescope.utils.sanitize(marked(modifier.$set["telescope.bio"]));
+  }
+});
+
+/**
+ * Disallow $rename
+ */
+Users.before.update(function (userId, doc, fieldNames, modifier) {
+  if (!!modifier.$rename) {
+    throw new Meteor.Error("illegal $rename operator detected!");
+  }
+});
+
+/**
+ * If user.telescope.email has changed, check for existing emails and change user.emails if needed
+ */
+ if (Meteor.isServer) {
+  Users.before.update(function (userId, doc, fieldNames, modifier) {
+    var user = doc;
+    // if email is being modified, update user.emails too
+    if (Meteor.isServer && modifier.$set && modifier.$set["telescope.email"]) {
+      var newEmail = modifier.$set["telescope.email"];
+      // check for existing emails and throw error if necessary
+      var userWithSameEmail = Users.findByEmail(newEmail);
+      if (userWithSameEmail && userWithSameEmail._id !== doc._id) {
+        throw new Meteor.Error("email_taken2", i18n.t("this_email_is_already_taken") + " (" + newEmail + ")");
+      }
+
+      // if user.emails exists, change it too
+      if (!!user.emails) {
+        user.emails[0].address = newEmail;
+        modifier.$set.emails = user.emails;
+      }
+
+    }
+  });
+}
+
+//////////////////////////////////////////////////////
+// Callbacks                                        //
+//////////////////////////////////////////////////////
+
 /**
  * Set up user object on creation
  * @param {Object} user – the user object being iterated on and returned
diff --git a/packages/telescope-users/lib/users.js b/packages/telescope-users/lib/users.js
index 63a286b26..d7a127702 100644
--- a/packages/telescope-users/lib/users.js
+++ b/packages/telescope-users/lib/users.js
@@ -249,67 +249,3 @@ Users.allow({
   remove: _.partial(Telescope.allowCheck, Meteor.users)
 });
 
-
-//////////////////////////////////////////////////////
-// Collection Hooks                                 //
-// https://atmospherejs.com/matb33/collection-hooks //
-//////////////////////////////////////////////////////
-
-/**
- * Generate HTML body from Markdown on user bio insert
- */
-Users.after.insert(function (userId, user) {
-
-  // run create user async callbacks
-  Telescope.callbacks.runAsync("onCreateUserAsync", user);
-
-  // check if all required fields have been filled in. If so, run profile completion callbacks
-  if (Users.hasCompletedProfile(user)) {
-    Telescope.callbacks.runAsync("profileCompletedAsync", user);
-  }
-  
-});
-
-/**
- * Generate HTML body from Markdown when user bio is updated
- */
-Users.before.update(function (userId, doc, fieldNames, modifier) {
-  // if bio is being modified, update htmlBio too
-  if (Meteor.isServer && modifier.$set && modifier.$set["telescope.bio"]) {
-    modifier.$set["telescope.htmlBio"] = Telescope.utils.sanitize(marked(modifier.$set["telescope.bio"]));
-  }
-});
-
-/**
- * Disallow $rename
- */
-Users.before.update(function (userId, doc, fieldNames, modifier) {
-  if (!!modifier.$rename) {
-    throw new Meteor.Error("illegal $rename operator detected!");
-  }
-});
-
-/**
- * If user.telescope.email has changed, check for existing emails and change user.emails if needed
- */
- if (Meteor.isServer) {
-  Users.before.update(function (userId, doc, fieldNames, modifier) {
-    var user = doc;
-    // if email is being modified, update user.emails too
-    if (Meteor.isServer && modifier.$set && modifier.$set["telescope.email"]) {
-      var newEmail = modifier.$set["telescope.email"];
-      // check for existing emails and throw error if necessary
-      var userWithSameEmail = Users.findByEmail(newEmail);
-      if (userWithSameEmail && userWithSameEmail._id !== doc._id) {
-        throw new Meteor.Error("email_taken2", i18n.t("this_email_is_already_taken") + " (" + newEmail + ")");
-      }
-
-      // if user.emails exists, change it too
-      if (!!user.emails) {
-        user.emails[0].address = newEmail;
-        modifier.$set.emails = user.emails;
-      }
-
-    }
-  });
-}
\ No newline at end of file