Skip to content

fixed some minor items from the refactor to get it working again #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mitchcapper wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed some minor items from the refactor to get it working again #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/facebot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ Facebot.prototype.respondToCreateChatMessages = function(message) {
.fail(err => {
return this.postMessage(
message.channel,
`Unable to connect the chat: ${err.error}`,
`Unable to connect the chat: ${err.message}`,
{ as_user: true }
);
});
Expand Down
7 changes: 2 additions & 5 deletions lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@ async function findFBUser(api, search_str, allowNonFriends) {
// If the search string isnt a userID, we should search
// for the user by name
if (!USER_ID_REGEX.test(search_str)) {
let userData = await Q.nfcall(api.getUserID, name);
let userData = await Q.nfcall(api.getUserID, search_str);
userID = userData[0].userID;
}

const userInfoMap = await getFBUserInfoByID(api, userID);
const userInfo = userInfoMap[userID];

if (!userInfo.isFriend && !allowNonFriends)
throw new Error(
'User not your friend, they may not be your top ' +
Expand All @@ -28,8 +26,7 @@ async function findFBUser(api, search_str, allowNonFriends) {
);

// The userinfo object doesnt have an id with it, so add it as its useful
userID.id = userID;

userInfo.id = userID;
return userInfo;
}

Expand Down