@dongdev/fca-unofficial 0.0.4 → 0.0.5

package/src/getUserID.js

@@ -1,61 +1,66 @@
-"use strict";
-
-var utils = require("../utils");
-var log = require("npmlog");
-
-function formatData(data) {
-  return {
-    userID: utils.formatID(data.uid.toString()),
-    photoUrl: data.photo,
-    indexRank: data.index_rank,
-    name: data.text,
-    isVerified: data.is_verified,
-    profileUrl: data.path,
-    category: data.category,
-    score: data.score,
-    type: data.type
-  };
-}
-
-module.exports = function (defaultFuncs, api, ctx) {
-  return function getUserID(name, callback) {
-    var resolveFunc = function () { };
-    var rejectFunc = function () { };
-    var returnPromise = new Promise(function (resolve, reject) {
-      resolveFunc = resolve;
-      rejectFunc = reject;
-    });
-
-    if (!callback) {
-      callback = function (err, data) {
-        if (err) return rejectFunc(err);
-        resolveFunc(data);
-      };
-    }
-
-    var form = {
-      value: name.toLowerCase(),
-      viewer: ctx.userID,
-      rsp: "search",
-      context: "search",
-      path: "/home.php",
-      request_id: utils.getGUID()
-    };
-
-    defaultFuncs
-      .get("https://www.facebook.com/ajax/typeahead/search.php", ctx.jar, form)
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function (resData) {
-        if (resData.error) throw resData;
-
-        var data = resData.payload.entries;
-        callback(null, data.map(formatData));
-      })
-      .catch(function (err) {
-        log.error("getUserID", err);
-        return callback(err);
-      });
-
-    return returnPromise;
-  };
-};
+"use strict";
+
+const utils = require("../utils");
+const log = require("npmlog");
+
+function formatData(data) {
+	return {
+		userID: utils.formatID(data.uid.toString()),
+		photoUrl: data.photo,
+		indexRank: data.index_rank,
+		name: data.text,
+		isVerified: data.is_verified,
+		profileUrl: data.path,
+		category: data.category,
+		score: data.score,
+		type: data.type
+	};
+}
+
+module.exports = function (defaultFuncs, api, ctx) {
+	return function getUserID(name, callback) {
+		let resolveFunc = function () { };
+		let rejectFunc = function () { };
+		const returnPromise = new Promise(function (resolve, reject) {
+			resolveFunc = resolve;
+			rejectFunc = reject;
+		});
+
+		if (!callback) {
+			callback = function (err, friendList) {
+				if (err) {
+					return rejectFunc(err);
+				}
+				resolveFunc(friendList);
+			};
+		}
+
+		const form = {
+			value: name.toLowerCase(),
+			viewer: ctx.i_userID || ctx.userID,
+			rsp: "search",
+			context: "search",
+			path: "/home.php",
+			request_id: utils.getGUID()
+		};
+
+		defaultFuncs
+			.get("https://www.facebook.com/ajax/typeahead/search.php", ctx.jar, form)
+			.then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+			.then(function (resData) {
+				if (resData.error) {
+					throw resData;
+				}
+
+				const data = resData.payload.entries;
+
+				callback(null, data.map(formatData));
+			})
+			.catch(function (err) {
+				log.error("getUserID", err);
+				return callback(err);
+			});
+
+		return returnPromise;
+	};
+};

package/src/getUserInfo.js

@@ -1,66 +1,74 @@
-"use strict";
-
-var utils = require("../utils");
-var log = require("npmlog");
-
-function formatData(data) {
-  var retObj = {};
-
-  for (var prop in data) {
-    // eslint-disable-next-line no-prototype-builtins
-    if (data.hasOwnProperty(prop)) {
-      var innerObj = data[prop];
-      retObj[prop] = {
-        name: innerObj.name,
-        firstName: innerObj.firstName,
-        vanity: innerObj.vanity,
-        thumbSrc: innerObj.thumbSrc,
-        profileUrl: innerObj.uri,
-        gender: innerObj.gender,
-        type: innerObj.type,
-        isFriend: innerObj.is_friend,
-        isBirthday: !!innerObj.is_birthday
-      };
-    }
-  }
-
-  return retObj;
-}
-
-module.exports = function (defaultFuncs, api, ctx) {
-  return function getUserInfo(id, callback) {
-    var resolveFunc = function () { };
-    var rejectFunc = function () { };
-    var returnPromise = new Promise(function (resolve, reject) {
-      resolveFunc = resolve;
-      rejectFunc = reject;
-    });
-
-    if (!callback) {
-      callback = function (err, userInfo) {
-        if (err) return rejectFunc(err);
-        resolveFunc(userInfo);
-      };
-    }
-
-    if (utils.getType(id) !== "Array") id = [id];
-
-    var form = {};
-    id.map(function (v, i) {
-      form["ids[" + i + "]"] = v;
-    });
-    defaultFuncs
-      .post("https://www.facebook.com/chat/user_info/", ctx.jar, form)
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function (resData) {
-        if (resData.error) throw resData;
-        return callback(null, formatData(resData.payload.profiles));
-      })
-      .catch(function (err) {
-        log.error("getUserInfo", err);
-        return callback(err);
-      });
-
-    return returnPromise;
-  };
-};
+"use strict";
+
+const utils = require("../utils");
+const log = require("npmlog");
+
+function formatData(data) {
+	const retObj = {};
+
+	for (const prop in data) {
+		// eslint-disable-next-line no-prototype-builtins
+		if (data.hasOwnProperty(prop)) {
+			const innerObj = data[prop];
+			retObj[prop] = {
+				name: innerObj.name,
+				firstName: innerObj.firstName,
+				vanity: innerObj.vanity,
+				thumbSrc: innerObj.thumbSrc,
+				profileUrl: innerObj.uri,
+				gender: innerObj.gender,
+				type: innerObj.type,
+				isFriend: innerObj.is_friend,
+				isBirthday: !!innerObj.is_birthday,
+				searchTokens: innerObj.searchTokens,
+				alternateName: innerObj.alternateName
+			};
+		}
+	}
+
+	return retObj;
+}
+
+module.exports = function (defaultFuncs, api, ctx) {
+	return function getUserInfo(id, callback) {
+		let resolveFunc = function () { };
+		let rejectFunc = function () { };
+		const returnPromise = new Promise(function (resolve, reject) {
+			resolveFunc = resolve;
+			rejectFunc = reject;
+		});
+
+		if (!callback) {
+			callback = function (err, friendList) {
+				if (err) {
+					return rejectFunc(err);
+				}
+				resolveFunc(friendList);
+			};
+		}
+
+		if (utils.getType(id) !== "Array") {
+			id = [id];
+		}
+
+		const form = {};
+		id.map(function (v, i) {
+			form["ids[" + i + "]"] = v;
+		});
+		defaultFuncs
+			.post("https://www.facebook.com/chat/user_info/", ctx.jar, form)
+			.then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+			.then(function (resData) {
+				if (resData.error) {
+					throw resData;
+				}
+				return callback(null, formatData(resData.payload.profiles));
+			})
+			.catch(function (err) {
+				log.error("getUserInfo", err);
+				return callback(err);
+			});
+
+		return returnPromise;
+	};
+};

package/src/handleFriendRequest.js

@@ -1,46 +1,61 @@
-"use strict";
-
-var utils = require("../utils");
-var log = require("npmlog");
-
-module.exports = function (defaultFuncs, api, ctx) {
-  return function handleFriendRequest(userID, accept, callback) {
-    if (utils.getType(accept) !== "Boolean") throw { error: "Please pass a boolean as a second argument." };
-
-    var resolveFunc = function () { };
-    var rejectFunc = function () { };
-    var returnPromise = new Promise(function (resolve, reject) {
-      resolveFunc = resolve;
-      rejectFunc = reject;
-    });
-
-    if (!callback) {
-      callback = function (err, data) {
-        if (err) return rejectFunc(err);
-        resolveFunc(data);
-      };
-    }
-
-    var form = {
-      viewer_id: ctx.userID,
-      "frefs[0]": "jwl",
-      floc: "friend_center_requests",
-      ref: "/reqs.php",
-      action: (accept ? "confirm" : "reject")
-    };
-
-    defaultFuncs
-      .post("https://www.facebook.com/requests/friends/ajax/", ctx.jar, form)
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function (resData) {
-        if (resData.payload.err) throw { err: resData.payload.err };
-        return callback();
-      })
-      .catch(function (err) {
-        log.error("handleFriendRequest", err);
-        return callback(err);
-      });
-
-    return returnPromise;
-  };
-};
+"use strict";
+
+const utils = require("../utils");
+const log = require("npmlog");
+
+module.exports = function (defaultFuncs, api, ctx) {
+	return function handleFriendRequest(userID, accept, callback) {
+		if (utils.getType(accept) !== "Boolean") {
+			throw {
+				error: "Please pass a boolean as a second argument."
+			};
+		}
+
+		let resolveFunc = function () { };
+		let rejectFunc = function () { };
+		const returnPromise = new Promise(function (resolve, reject) {
+			resolveFunc = resolve;
+			rejectFunc = reject;
+		});
+
+		if (!callback) {
+			callback = function (err, friendList) {
+				if (err) {
+					return rejectFunc(err);
+				}
+				resolveFunc(friendList);
+			};
+		}
+
+		const form = {
+			viewer_id: ctx.i_userID || ctx.userID,
+			"frefs[0]": "jwl",
+			floc: "friend_center_requests",
+			ref: "/reqs.php",
+			action: (accept ? "confirm" : "reject")
+		};
+
+		defaultFuncs
+			.post(
+				"https://www.facebook.com/requests/friends/ajax/",
+				ctx.jar,
+				form
+			)
+			.then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+			.then(function (resData) {
+				if (resData.payload.err) {
+					throw {
+						err: resData.payload.err
+					};
+				}
+
+				return callback();
+			})
+			.catch(function (err) {
+				log.error("handleFriendRequest", err);
+				return callback(err);
+			});
+
+		return returnPromise;
+	};
+};

package/src/handleMessageRequest.js

@@ -1,47 +1,65 @@
-"use strict";
-
-var utils = require("../utils");
-var log = require("npmlog");
-
-module.exports = function (defaultFuncs, api, ctx) {
-  return function handleMessageRequest(threadID, accept, callback) {
-    if (utils.getType(accept) !== "Boolean") throw { error: "Please pass a boolean as a second argument." };
-
-    var resolveFunc = function () { };
-    var rejectFunc = function () { };
-    var returnPromise = new Promise(function (resolve, reject) {
-      resolveFunc = resolve;
-      rejectFunc = reject;
-    });
-
-    if (!callback) {
-      callback = function (err, data) {
-        if (err) return rejectFunc(err);
-        resolveFunc(data);
-      };
-    }
-
-    var form = {
-      client: "mercury"
-    };
-
-    if (utils.getType(threadID) !== "Array") threadID = [threadID];
-
-    var messageBox = accept ? "inbox" : "other";
-    for (var i = 0; i < threadID.length; i++) form[messageBox + "[" + i + "]"] = threadID[i];
-
-    defaultFuncs
-      .post("https://www.facebook.com/ajax/mercury/move_thread.php", ctx.jar, form)
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function (resData) {
-        if (resData.error) throw resData;
-        return callback();
-      })
-      .catch(function (err) {
-        log.error("handleMessageRequest", err);
-        return callback(err);
-      });
-
-    return returnPromise;
-  };
-};
+"use strict";
+
+const utils = require("../utils");
+const log = require("npmlog");
+
+module.exports = function (defaultFuncs, api, ctx) {
+	return function handleMessageRequest(threadID, accept, callback) {
+		if (utils.getType(accept) !== "Boolean") {
+			throw {
+				error: "Please pass a boolean as a second argument."
+			};
+		}
+
+		let resolveFunc = function () { };
+		let rejectFunc = function () { };
+		const returnPromise = new Promise(function (resolve, reject) {
+			resolveFunc = resolve;
+			rejectFunc = reject;
+		});
+
+		if (!callback) {
+			callback = function (err, friendList) {
+				if (err) {
+					return rejectFunc(err);
+				}
+				resolveFunc(friendList);
+			};
+		}
+
+		const form = {
+			client: "mercury"
+		};
+
+		if (utils.getType(threadID) !== "Array") {
+			threadID = [threadID];
+		}
+
+		const messageBox = accept ? "inbox" : "other";
+
+		for (let i = 0; i < threadID.length; i++) {
+			form[messageBox + "[" + i + "]"] = threadID[i];
+		}
+
+		defaultFuncs
+			.post(
+				"https://www.facebook.com/ajax/mercury/move_thread.php",
+				ctx.jar,
+				form
+			)
+			.then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+			.then(function (resData) {
+				if (resData.error) {
+					throw resData;
+				}
+
+				return callback();
+			})
+			.catch(function (err) {
+				log.error("handleMessageRequest", err);
+				return callback(err);
+			});
+
+		return returnPromise;
+	};
+};

package/src/httpGet.js

@@ -1,49 +1,57 @@
 "use strict";
 
-var utils = require("../utils");
-var log = require("npmlog");
+const utils = require("../utils");
+const log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
-  return function httpGet(url, form, callback, notAPI) {
-    var resolveFunc = function () { };
-    var rejectFunc = function () { };
-
-    var returnPromise = new Promise(function (resolve, reject) {
-      resolveFunc = resolve;
-      rejectFunc = reject;
-    });
-
-    if (!callback && (utils.getType(form) == "Function" || utils.getType(form) == "AsyncFunction")) {
-      callback = form;
-      form = {};
-    }
-
-    form = form || {};
-
-    callback = callback || function (err, data) {
-      if (err) return rejectFunc(err);
-      resolveFunc(data);
-    };
-
-    if (notAPI) {
-      utils
-        .get(url, ctx.jar, form, ctx.globalOptions)
-        .then(resData => callback(null, resData.body.toString()))
-        .catch(function (err) {
-          log.error("httpGet", err);
-          return callback(err);
-        });
-    }
-    else {
-      defaultFuncs
-        .get(url, ctx.jar, form)
-        .then(resData => callback(null, resData.body.toString()))
-        .catch(function (err) {
-          log.error("httpGet", err);
-          return callback(err);
-        });
-    }
-
-    return returnPromise;
-  };
+	return function httpGet(url, form, customHeader, callback, notAPI) {
+		let resolveFunc = function () { };
+		let rejectFunc = function () { };
+
+		const returnPromise = new Promise(function (resolve, reject) {
+			resolveFunc = resolve;
+			rejectFunc = reject;
+		});
+
+		if (utils.getType(form) == "Function" || utils.getType(form) == "AsyncFunction") {
+			callback = form;
+			form = {};
+		}
+
+		if (utils.getType(customHeader) == "Function" || utils.getType(customHeader) == "AsyncFunction") {
+			callback = customHeader;
+			customHeader = {};
+		}
+
+		customHeader = customHeader || {};
+
+		callback = callback || function (err, data) {
+			if (err) return rejectFunc(err);
+			resolveFunc(data);
+		};
+
+		if (notAPI) {
+			utils
+				.get(url, ctx.jar, form, ctx.globalOptions, ctx, customHeader)
+				.then(function (resData) {
+					callback(null, resData.body.toString());
+				})
+				.catch(function (err) {
+					log.error("httpGet", err);
+					return callback(err);
+				});
+		} else {
+			defaultFuncs
+				.get(url, ctx.jar, form, null, customHeader)
+				.then(function (resData) {
+					callback(null, resData.body.toString());
+				})
+				.catch(function (err) {
+					log.error("httpGet", err);
+					return callback(err);
+				});
+		}
+
+		return returnPromise;
+	};
 };