diff --git a/konata.sh b/konata.sh
index 3c56252..e6729f0 100755
--- a/konata.sh
+++ b/konata.sh
@@ -151,61 +151,6 @@ alive(){
sendmsg "Alive and well!"
}
-cv(){
- args
- stats=$(curl -s "https://disease.sh/v3/covid-19/countries/${args[*]}")
- mapfile -t cv <<< $(jq -cr '.[]' <<< $stats)
- if [ "${cv[4]}" == "0" ]
- then
- updated="Perhaps the stats are not updated yet?"
- fi
- if [ ! -z ${cv[1]} ]
- then
- vacf="/tmp/$(date +"%Y-%m-%d")-vaccinations.json"
- vacd="https://github.com/owid/covid-19-data/blob/master/public/data/vaccinations/vaccinations.json?raw=true"
- if [ ! -f $vacf ]
- then
- wget -O $vacf $vacd
- fi
- mapfile -t vac <<< $(jq -cr ".[] | select(.country==\"${cv[1]}\") | .data[-1] | .[]" < $vacf)
-
- pct(){ echo $(bc <<< "scale = 2; $1 * $2 / $3")%; }
- div(){
- if [ "$1" -gt "1000000" ]
- then
- echo $(bc <<< "scale = 3; $1 / 1000000")M
- else
- echo $(bc <<< "scale = 2; $1 / 1000")k
- fi
- }
-
- sendmsg "Today's COVID-19 stats for ${cv[1]}:
- Cases: ${cv[4]}
- Active: $(div ${cv[9]})
- Deaths: ${cv[6]}
- ($(div ${cv[5]}) t, $(pct 100 ${cv[5]} ${cv[3]}) c, $(pct 100 ${cv[5]} ${cv[15]}) p)
- Total: $(div ${cv[3]}) ($(pct 1 ${cv[11]} 10000))
- Tests: $(div ${cv[13]}) ($(pct 1 ${cv[14]} 10000))
- Population: $(div ${cv[15]})
- Data source: disease.sh
-
- Vaccination stats:
- 1st dose (part): $(div ${vac[2]}) ($(pct 100 ${vac[2]} ${cv[15]}))
- 2nd dose (full): $(div ${vac[3]}) ($(pct 100 ${vac[3]} ${cv[15]}))
- 3rd dose (boost): $(div ${vac[4]}) ($(pct 100 ${vac[4]} ${cv[15]}))
- Administered today: $(div ${vac[5]})
- Daily average (7d): $(div ${vac[6]})
- Last update: ${vac[0]}
- Data source: Our World in Data
-
- Queried at $(date +'%Y-%m-%d %H:%M %Z').
- Stay safe and get yourself vaccinated!
- $updated"
- else
- sendmsg "This country doesn't have any stats!"
- fi
-}
-
id(){
uid=$(jq -r '.message.from.id' <<< $input)
sendmsg "User ID: $uid
@@ -403,32 +348,31 @@ hack(){
# Match incoming messages
case "$cmd" in
# Public commands
- /help@$bot) help ;;
- /start@$bot) help ;;
- /alive@$bot) alive ;;
- /cv@$bot*) cv ;;
- /id@$bot) id ;;
- /ud@$bot*) ud ;;
- /konata@$bot) konata ;;
- /konachan@$bot*) konachan ;;
- /4c@$bot*) 4c ;;
- /lfy@$bot*) lfy ;;
- /ip@$bot*) ip ;;
- /wttr@$bot*) wttr ;;
- /repo@$bot) repo ;;
+ /help@$bot) help ;;
+ /start@$bot) help ;;
+ /alive@$bot) alive ;;
+ /id@$bot) id ;;
+ /ud@$bot*) ud ;;
+ /konata@$bot) konata ;;
+ /konachan@$bot*) konachan ;;
+ /4c@$bot*) 4c ;;
+ /lfy@$bot*) lfy ;;
+ /ip@$bot*) ip ;;
+ /wttr@$bot*) wttr ;;
+ /repo@$bot) repo ;;
# Administrative
- /mp3@$bot*) mp3 ;;
- /sys@$bot) sys ;;
- /neo@$bot) neo ;;
- /sh@$bot*) sh ;;
- /dump@$bot*) dump ;;
+ /mp3@$bot*) mp3 ;;
+ /sys@$bot) sys ;;
+ /neo@$bot) neo ;;
+ /sh@$bot*) sh ;;
+ /dump@$bot*) dump ;;
# Notes and such
- !anyone*) anyone ;;
+ !anyone*) anyone ;;
esac
case "$msg" in
# Miscellaneous
- *@vimicito*) tag ;;
- Konata\ say*) say ;;
- *hack*) hack ;;
+ *@vimicito*) tag ;;
+ Konata\ say*) say ;;
+ *hack*) hack ;;
esac