diff --git a/inc/lektor/commands.h b/inc/lektor/commands.h index 53067fe5f6c6752625b7d1d1e0bc08dae8444828..9309062fc9e30febb5f1b20b026445f84ddbe1a0 100644 --- a/inc/lektor/commands.h +++ b/inc/lektor/commands.h @@ -89,4 +89,3 @@ bool command_rescan (struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARG bool command_sticker_get (struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]); bool command_sticker_set (struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]); bool command_sticker_delete(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]); -bool command_sticker_list (struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]); diff --git a/src/commands.c b/src/commands.c index f3337062feb3b3712edbe6f2a553996ab9c548c5..81a65c06d791970b3844117b5f8fc13e5697219d 100644 --- a/src/commands.c +++ b/src/commands.c @@ -736,6 +736,7 @@ sticker_send(struct lkt_state *srv, size_t c, char *name, int id, int value) return true; } +/* bool command_sticker_get(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]) { @@ -758,6 +759,7 @@ command_sticker_get(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS continue; return true; } +*/ bool command_sticker_set(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]) @@ -775,7 +777,7 @@ command_sticker_set(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS } bool -command_sticker_list(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]) +command_sticker_get(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]) { struct lkt_search callback = { .srv = srv, diff --git a/src/net/listen.c b/src/net/listen.c index 01389c300c467881a113920f753388ba11d44bd0..427a9793e9b1b91cc73f3a5ebc18d3bf98acf749 100644 --- a/src/net/listen.c +++ b/src/net/listen.c @@ -200,14 +200,12 @@ handle_simple_command(struct lkt_state *srv, size_t c, struct lkt_command cmd) err = ! command_find(srv, c, cmd.args, cmd.cont, database_search_queue_init); else if (STR_MATCH(cmd.name, "sticker") && cmd.args[0]) { - if (STR_MATCH(cmd.args[0], "get")) + if (STR_MATCH(cmd.args[0], "get") || STR_MATCH(cmd.args[0], "list") || STR_MATCH(cmd.args[0], "find")) err = ! command_sticker_get(srv, c, &cmd.args[1]); else if (STR_MATCH(cmd.args[0], "set")) err = ! command_sticker_set(srv, c, &cmd.args[1]); else if (STR_MATCH(cmd.args[0], "delete")) err = ! command_sticker_delete(srv, c, &cmd.args[1]); - else if (STR_MATCH(cmd.args[0], "list") || STR_MATCH(cmd.args[0], "find")) - err = ! command_sticker_delete(srv, c, &cmd.args[1]); } else if (STR_MATCH(cmd.name, "help"))