Mentions légales du service

Skip to content
Snippets Groups Projects
Commit cff22ef4 authored by Lior Diler's avatar Lior Diler
Browse files

fix all commands with default value

parent 4816c379
No related branches found
No related tags found
No related merge requests found
......@@ -110,11 +110,11 @@ async function ExecuteQuitSession(data, userMediaID)
const groupName = await databaseManager.findGroupNameByGroupID(targetGroup);
data.text = "session with group " + groupName + " was closed.";
data.text = "You are currently not connected to a group.";
}
else if(userState === "sendingToUser")
{
const userDatabase = await databaseManager.findUserByMediaID(userMediaID);
await databaseManager.changeUserStateByMediaID(userMediaID, "sendingToGroup");
await databaseManager.changeMemberGroupTargetByMediaID(userMediaID, "");
const targetUser = await databaseManager.findUserByUserID(userDatabase.userTarget);
......@@ -163,16 +163,13 @@ async function ExecuteOpenSessionToGroup(data, targetGroupID, userMediaID)
async function ExecuteOpenSessionToMember(data, targetMemberID, userMediaID)
{
const targetMember = await databaseManager.findUserByUserID(targetMemberID)
const userDatabase = await databaseManager.findUserByMediaID(userMediaID);
const targetGroup = await databaseManager.findGroupByGroupID(userDatabase.target);
const targetMemberNickNameInGroup = await databaseManager.findUserNicknameByUserIDInGroup(targetGroup, targetMemberID);
await databaseManager.changeUserStateByID(userDatabase._id, "sendingToUser");
await databaseManager.changeMemberGroupTargetByMediaID(userMediaID, targetMember._id);
await databaseManager.changeMemberGroupTargetByMediaID(userMediaID, targetMemberID);
data.text = "Opened session to user " + targetMemberNickNameInGroup + ".\ntype \"quitSession\" to close the " +
"session to the user and talk to everyone in the group.";
......@@ -201,7 +198,7 @@ async function VerifyAndExecuteOpenSessionToMember(data, userDatabase, userMedia
}
}
return await commandHelper.executeCommandOnGroupMember(data.text, ExecuteOpenSessionToMember,
return await commandHelper.executeCommandOnGroupMember(data.message, ExecuteOpenSessionToMember,
{
"type":"talkToGroup",
"command":"DS",
......
......@@ -162,7 +162,7 @@ async function executeCommandOnGroupMember(command, action, buttonTemplate, data
}
if(connectedUsers.length === 1)
return action(data, connectedUsers[0], userMediaID);
return action(data, connectedUsers[0].userID, userMediaID);
else if(words.length === 0)
changedData.buttonTemplate = buttonTemplate;
......@@ -172,7 +172,7 @@ async function executeCommandOnGroupMember(command, action, buttonTemplate, data
const memberNameArray = connectedUsers[i].groupName.split(" ");
if(memberNameArray.every(name => words.includes(name)))
{
targetUser = connectedUsers[i];
targetUser = connectedUsers[i].userID;
break;
}
}
......
......@@ -37,11 +37,11 @@ async function sendMessage(serverData, isUser)
}
else if(!isCommand)
{
data = commandExecutor.ExecuteNotACommand(data, userMediaID);
data = await commandExecutor.ExecuteNotACommand(data, userMediaID);
}
else if(userText === "quitsession")
{
data = commandExecutor.ExecuteQuitSession(data, userMediaID);
data = await commandExecutor.ExecuteQuitSession(data, userMediaID);
}
else if(userText.includes("getallmembers"))
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment