From 817fc074685b78e821c38f8f7108077391b1a9ed Mon Sep 17 00:00:00 2001 From: studplus Date: Thu, 3 Sep 2020 15:48:16 +0200 Subject: [PATCH 1/5] add function for setting up custom trainername --- bot/commands.php | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/bot/commands.php b/bot/commands.php index 988f9af..88a2a61 100644 --- a/bot/commands.php +++ b/bot/commands.php @@ -49,3 +49,44 @@ sendMessage($update['message']['chat']['id'], '' . getTranslation('not_supported') . ''); } } +else if($update['message']['chat']['type'] == 'private') +{ + $userid = $update['message']['from']['id']; + $rs = my_query( + " + SELECT user_id + FROM users + WHERE user_id = {$userid} + AND setname_time > NOW() + " + ); + $answer = $rs->fetch(); + if($answer['user_id'] == $userid) + { + $returnValue = preg_match('/^[A-Za-z0-9]{0,15}$/', $update['message']['text']); + if($returnValue) + { + sendMessage($userid, getTranslation('trainername_success').' '.$update['message']['text'].''); + $trainername = $update['message']['text']; + my_query( + " + UPDATE users + SET setname_time = NULL, + trainername = '{$trainername}' + WHERE user_id = {$userid} + " + ); + } + else + { + sendMessage($userid, getTranslation('trainername_fail')); + my_query( + " + UPDATE users + SET setname_time = DATE_ADD(NOW(), INTERVAL 1 HOUR) + WHERE user_id = {$userid} + " + ); + } + } +} From 2b5e428e71822ef921a0029345031d2d60b73694 Mon Sep 17 00:00:00 2001 From: studplus Date: Thu, 3 Sep 2020 16:29:51 +0200 Subject: [PATCH 2/5] Update DB-column setname_time to trainername_time --- bot/commands.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bot/commands.php b/bot/commands.php index 88a2a61..99c1052 100644 --- a/bot/commands.php +++ b/bot/commands.php @@ -57,7 +57,7 @@ SELECT user_id FROM users WHERE user_id = {$userid} - AND setname_time > NOW() + AND trainername_time > NOW() " ); $answer = $rs->fetch(); @@ -71,7 +71,7 @@ my_query( " UPDATE users - SET setname_time = NULL, + SET trainername_time = NULL, trainername = '{$trainername}' WHERE user_id = {$userid} " @@ -83,7 +83,7 @@ my_query( " UPDATE users - SET setname_time = DATE_ADD(NOW(), INTERVAL 1 HOUR) + SET trainername_time = DATE_ADD(NOW(), INTERVAL 1 HOUR) WHERE user_id = {$userid} " ); From 161af5b6dbcc11efcaf312eb72eed0c2ffb12e19 Mon Sep 17 00:00:00 2001 From: Mathias Todisco Date: Sun, 6 Sep 2020 16:50:52 +0200 Subject: [PATCH 3/5] added Comments --- bot/commands.php | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/bot/commands.php b/bot/commands.php index 99c1052..844afc9 100644 --- a/bot/commands.php +++ b/bot/commands.php @@ -49,29 +49,36 @@ sendMessage($update['message']['chat']['id'], '' . getTranslation('not_supported') . ''); } } +// IF a Message type is private and there is no leading '/' else if($update['message']['chat']['type'] == 'private') -{ +{ // Get Message from User sent to Bot + + // get UserID from Message $userid = $update['message']['from']['id']; + // Check if User requested a UserName Update via /team -> Name $rs = my_query( " - SELECT user_id - FROM users - WHERE user_id = {$userid} + SELECT user_id + FROM users + WHERE user_id = {$userid} AND trainername_time > NOW() " ); $answer = $rs->fetch(); - if($answer['user_id'] == $userid) + if($answer['user_id'] == $userid) // Check if Answer is for the right User { $returnValue = preg_match('/^[A-Za-z0-9]{0,15}$/', $update['message']['text']); + // Only numbers and alphabetic character allowed if($returnValue) { - sendMessage($userid, getTranslation('trainername_success').' '.$update['message']['text'].''); - $trainername = $update['message']['text']; + $trainername = $update['message']['text']; + // confirm Name-Change + sendMessage($userid, getTranslation('trainername_success').' '.$trainername.''); + // Store new Gamer-Name to DB my_query( " - UPDATE users - SET trainername_time = NULL, + UPDATE users + SET trainername_time = NULL, trainername = '{$trainername}' WHERE user_id = {$userid} " @@ -79,11 +86,13 @@ } else { + // Trainer Name got unallowed Chars -> Error-Message sendMessage($userid, getTranslation('trainername_fail')); + // Set trainername_time to 'still waiting for Name-Change' my_query( " - UPDATE users - SET trainername_time = DATE_ADD(NOW(), INTERVAL 1 HOUR) + UPDATE users + SET trainername_time = DATE_ADD(NOW(), INTERVAL 1 HOUR) WHERE user_id = {$userid} " ); From 1b3f8e257f1efc4a97459bca148a1a0c509f774b Mon Sep 17 00:00:00 2001 From: Mathias Todisco Date: Sun, 6 Sep 2020 17:09:05 +0200 Subject: [PATCH 4/5] fix comments --- bot/commands.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/commands.php b/bot/commands.php index 844afc9..92efb28 100644 --- a/bot/commands.php +++ b/bot/commands.php @@ -55,7 +55,7 @@ // get UserID from Message $userid = $update['message']['from']['id']; - // Check if User requested a UserName Update via /team -> Name + // Check if User requested a UserName Update via /trainer -> Name $rs = my_query( " SELECT user_id From 7d31b9007ec219276587e4121279a0d608c4bcad Mon Sep 17 00:00:00 2001 From: Mathias Todisco Date: Sun, 6 Sep 2020 23:52:43 +0200 Subject: [PATCH 5/5] cleanup commands and core --- bot/commands.php | 53 ++++-------------------------------------------- 1 file changed, 4 insertions(+), 49 deletions(-) diff --git a/bot/commands.php b/bot/commands.php index 92efb28..fe03532 100644 --- a/bot/commands.php +++ b/bot/commands.php @@ -50,52 +50,7 @@ } } // IF a Message type is private and there is no leading '/' -else if($update['message']['chat']['type'] == 'private') -{ // Get Message from User sent to Bot - - // get UserID from Message - $userid = $update['message']['from']['id']; - // Check if User requested a UserName Update via /trainer -> Name - $rs = my_query( - " - SELECT user_id - FROM users - WHERE user_id = {$userid} - AND trainername_time > NOW() - " - ); - $answer = $rs->fetch(); - if($answer['user_id'] == $userid) // Check if Answer is for the right User - { - $returnValue = preg_match('/^[A-Za-z0-9]{0,15}$/', $update['message']['text']); - // Only numbers and alphabetic character allowed - if($returnValue) - { - $trainername = $update['message']['text']; - // confirm Name-Change - sendMessage($userid, getTranslation('trainername_success').' '.$trainername.''); - // Store new Gamer-Name to DB - my_query( - " - UPDATE users - SET trainername_time = NULL, - trainername = '{$trainername}' - WHERE user_id = {$userid} - " - ); - } - else - { - // Trainer Name got unallowed Chars -> Error-Message - sendMessage($userid, getTranslation('trainername_fail')); - // Set trainername_time to 'still waiting for Name-Change' - my_query( - " - UPDATE users - SET trainername_time = DATE_ADD(NOW(), INTERVAL 1 HOUR) - WHERE user_id = {$userid} - " - ); - } - } -} +else if($update['message']['chat']['type'] == 'private'){ + // Get Message from User sent to Bot and check what to do + evaluate_priv_message($update); +} \ No newline at end of file