summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-11 22:35:17 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-11 22:35:17 +0300
commite597401af5d0005f3f6039cc0e76d8ecfaae66ef (patch)
tree1116a3f4fd59c0a8819bb86b21db413e26d189e6
parentbe214fb83a0207e6675f08d299cd30d575371794 (diff)
downloadmanaplus-e597401af5d0005f3f6039cc0e76d8ecfaae66ef.tar.gz
manaplus-e597401af5d0005f3f6039cc0e76d8ecfaae66ef.tar.bz2
manaplus-e597401af5d0005f3f6039cc0e76d8ecfaae66ef.tar.xz
manaplus-e597401af5d0005f3f6039cc0e76d8ecfaae66ef.zip
Add whisper commands for server side ignore/unignore whispers.
New chat commands: /serverignore NICK - ignore whispers on server from NICK. /serverunignore NICK - unignore whispers on server from NICK.
-rw-r--r--src/actions/commands.cpp20
-rw-r--r--src/actions/commands.h2
-rw-r--r--src/input/inputaction.h2
-rw-r--r--src/input/inputactionmap.h18
4 files changed, 42 insertions, 0 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 5a7e16334..541a09aa0 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -668,4 +668,24 @@ impHandler(debugSpawn)
return true;
}
+impHandler0(serverIgnoreWhisper)
+{
+ std::string args = getNick(event);
+ if (args.empty())
+ return false;
+
+ Net::getChatHandler()->ignore(args);
+ return true;
+}
+
+impHandler0(serverUnIgnoreWhisper)
+{
+ std::string args = getNick(event);
+ if (args.empty())
+ return false;
+
+ Net::getChatHandler()->unIgnore(args);
+ return true;
+}
+
} // namespace Actions
diff --git a/src/actions/commands.h b/src/actions/commands.h
index 46932681c..333afc9eb 100644
--- a/src/actions/commands.h
+++ b/src/actions/commands.h
@@ -71,6 +71,8 @@ namespace Actions
decHandler(gm);
decHandler(hack);
decHandler(debugSpawn);
+ decHandler(serverIgnoreWhisper);
+ decHandler(serverUnIgnoreWhisper);
} // namespace Actions
#undef decHandler
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index e272cefd4..2ce0518cc 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -478,6 +478,8 @@ namespace InputAction
PET_EMOTE_47,
PET_EMOTE_48,
CATCH_PET,
+ IGNORE_WHISPER,
+ UNIGNORE_WHISPER,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index a355c33ba..3e95f4291 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -4044,6 +4044,24 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputCondition::INGAME,
"catchpet|catch",
true},
+ {"keyChatServerIgnoreWhisper",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT | Input::GRP_GUI,
+ &Actions::serverIgnoreWhisper,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "serverignore",
+ false},
+ {"keyChatServerUnIgnoreWhisper",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT | Input::GRP_GUI,
+ &Actions::serverUnIgnoreWhisper,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "serverunignore",
+ false},
};
#endif // INPUT_INPUTACTIONMAP_H