From d7629d7e037a7b53c1b161c60a3f4b18dedc10f2 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Sat, 9 May 2020 09:57:04 +0200
Subject: [PATCH] Correct sticker set
---
src/commands.c | 6 +++---
src/database/stickers.c | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/commands.c b/src/commands.c
index 196fe658..b098144d 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -753,10 +753,10 @@ bool
command_sticker_set(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX])
{
RETURN_UNLESS(argv[0] && argv[1] && argv[2] && argv[3] && !argv[4], "Invalid argument", false);
- int uri, value, err1, err2;
- char *endptr;
+ long uri, value;
+ char *endptr, err1, err2;
STRTOL(uri, argv[1], endptr, err1);
- STRTOL(value, argv[4], endptr, err2);
+ STRTOL(value, argv[3], endptr, err2);
RETURN_IF(err1 || err2, "STRTOL failed", false);
LOG_INFO_SCT("COMMAND", "Client %ld is using the sticker set command", c);
RETURN_UNLESS(database_sticker_set(srv->db, argv[0], argv[2], uri, value), "Failed to get sticker", false);
diff --git a/src/database/stickers.c b/src/database/stickers.c
index 149be88f..b87991e2 100644
--- a/src/database/stickers.c
+++ b/src/database/stickers.c
@@ -61,14 +61,14 @@ database_sticker_set(volatile sqlite3 *db, const char *type, const char *name, i
SQL =
"INSERT OR REPLACE INTO 'stickers.kara' (id, sticker, value) "
"SELECT ?, 'stickers'.id, ? "
- "FROM 'stickers'"
- "WHERE 'stickers'.id = ?;\n";
+ "FROM 'stickers' "
+ "WHERE 'stickers'.name = ?;";
else if (!strcasecmp(type, "plt"))
SQL =
"INSERT OR REPLACE INTO 'stickers.plt' (id, sticker, value) "
"SELECT ?, 'stickers'.id, ? "
- "FROM 'stickers'"
- "WHERE 'stickers'.id = ?;\n";
+ "FROM 'stickers' "
+ "WHERE 'stickers'.name = ?;";
else {
LOG_ERROR_SCT("DB", "Type '%s' is invalid", type);
return false;
--
GitLab