From f790d73e66711664c695dcec3d887cda577a4e79 Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Tue, 23 Mar 2021 17:25:10 +0100 Subject: [PATCH] modules: process_update: ignore unknown update types --- bin/process_batch.sh | 4 ++-- modules/processUpdates.sh | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bin/process_batch.sh b/bin/process_batch.sh index da3ac88..f313619 100755 --- a/bin/process_batch.sh +++ b/bin/process_batch.sh @@ -21,7 +21,7 @@ USAGE='process_update.sh [-h|--help] [-s|--startbot] [-w|--watch] [-n|--lines n] # AUTHOR: KayM (gnadelwartz), kay@rrr.de # CREATED: 27.02.2021 13:14 # -#### $$VERSION$$ v1.51-dev-9-gcbd74a7 +#### $$VERSION$$ v1.50-13-g79fc511 #=============================================================================== #### @@ -76,7 +76,7 @@ fi # ready, do stuff here ----- # kill all sub processes on exit -trap 'printf "%(%c)T: %s\n" -1 "Bot in '"${mode}"' mode stopped!"; kill $(jobs -p) 2>/dev/null; send_normal_message "'"${BOTADMIN}"'" "Bot '"${BOTNAME} ${mode}"' stopped ..."' EXIT HUP QUIT +trap 'printf "%(%c)T: %s\n" -1 "Bot in '"${mode}"' mode stopped"; kill $(jobs -p) 2>/dev/null; send_normal_message "'"${BOTADMIN}"'" "Bot '"${BOTNAME} ${mode}"' stopped ..."' EXIT HUP QUIT # wait after (first) update to avoid processing to many in parallel UPDWAIT="0.5" diff --git a/modules/processUpdates.sh b/modules/processUpdates.sh index 7c96706..15e4d13 100644 --- a/modules/processUpdates.sh +++ b/modules/processUpdates.sh @@ -4,7 +4,7 @@ # File: processUpdates.sh # Note: DO NOT EDIT! this file will be overwritten on update # -#### $$VERSION$$ v1.51-dev-9-gcbd74a7 +#### $$VERSION$$ v1.50-13-g79fc511 ################################################################## ############## @@ -91,6 +91,10 @@ process_update() { printf "%(%c)T: update received FROM=%s CHAT=%s CMD=%s\n" -1 "${USER[USERNAME]:0:20} (${USER[ID]})"\ "${CHAT[USERNAME]:0:20}${CHAT[TITLE]:0:30} (${CHAT[ID]})"\ "${MESSAGE:0:30}${CAPTION:0:30}${URLS[*]}" >>"${UPDATELOG}" + if [[ -z "${USER[ID]}" || -z "${CHAT[ID]}" ]]; then + printf "%(%c)T: IGNORE unknown update type: %s\n" -1 "$(grep '\["result",'"${num}"'.*,"id"\]' <<<"${UPDATE}")" >>"${UPDATELOG}" + return 1 + fi fi ##### # process inline and message events