xep-0107: code review
* Remarks in the Merge Request (ac_reset, help) * Defines in iq.c * Mood help and null check * Added additional information about tab key in CMD_DESC. * Added additional null check
This commit is contained in:
committed by
Michael Vetter
parent
e745b4af60
commit
2f3de0eb0d
@@ -1460,6 +1460,7 @@ cmd_ac_reset(ProfWin* window)
|
||||
autocomplete_reset(executable_ac);
|
||||
autocomplete_reset(intype_ac);
|
||||
autocomplete_reset(mood_ac);
|
||||
autocomplete_reset(mood_type_ac);
|
||||
|
||||
autocomplete_reset(script_ac);
|
||||
if (script_show_ac) {
|
||||
@@ -4247,17 +4248,10 @@ _mood_autocomplete(ProfWin* window, const char* const input, gboolean previous)
|
||||
return result;
|
||||
}
|
||||
|
||||
//jabber_conn_status_t conn_status = connection_get_status();
|
||||
//if (conn_status == JABBER_CONNECTED) {
|
||||
result = autocomplete_param_with_ac(input, "/mood set", mood_type_ac, FALSE, previous);
|
||||
if (result) {
|
||||
return result;
|
||||
}
|
||||
|
||||
// result = autocomplete_param_with_func(input, "/mood get", roster_barejid_autocomplete, previous, NULL);
|
||||
// if (result) {
|
||||
// return result;
|
||||
// }
|
||||
//}
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -2688,9 +2688,12 @@ static struct cmd_t command_defs[] = {
|
||||
CMD_SYN(
|
||||
"/mood set <mood> [\"Text\"]")
|
||||
CMD_DESC(
|
||||
"Set your mood")
|
||||
CMD_NOARGS
|
||||
CMD_NOEXAMPLES
|
||||
"Set your mood. Use the tab key to switch through the available moods")
|
||||
CMD_ARGS(
|
||||
{ "set <mood>", "Your mood" },
|
||||
{ "<text>", "Additional Text" })
|
||||
CMD_EXAMPLES(
|
||||
"/mood set happy \"I'm happy\"")
|
||||
},
|
||||
// NEXT-COMMAND (search helper)
|
||||
};
|
||||
|
||||
@@ -9649,13 +9649,14 @@ cmd_register(ProfWin* window, const char* const command, gchar** args)
|
||||
gboolean
|
||||
cmd_mood(ProfWin* window, const char* const command, gchar** args)
|
||||
{
|
||||
|
||||
if (g_strcmp0(args[0], "set") == 0) {
|
||||
cons_show("Your mood: %s", args[1]);
|
||||
if (args[2]) {
|
||||
publish_user_mood(args[1], args[2]);
|
||||
} else {
|
||||
publish_user_mood(args[1], args[1]);
|
||||
if(args[1]) {
|
||||
cons_show("Your mood: %s", args[1]);
|
||||
if (args[2]) {
|
||||
publish_user_mood(args[1], args[2]);
|
||||
} else {
|
||||
publish_user_mood(args[1], args[1]);
|
||||
}
|
||||
}
|
||||
}
|
||||
return TRUE;
|
||||
|
||||
Reference in New Issue
Block a user