Merge branch 'master' into dp/add-bokken-connection

Author: danielsp45

.python-version

@@ -1 +1 @@
-3.10.4
+3.10.7

:w

@@ -10,6 +10,39 @@ cd "${BASE_DIR}/.." || exit 127
 # shellcheck source=../scripts/utils.sh
 . scripts/utils.sh
 
+PROGRAM=$(basename "${BASH_SOURCE[0]:-$0}")
+VERSION=0.7.0
+
+function display_help() {
+  cat <<EOF
+  $(help_title_section Usage)
+    ${PROGRAM} [options]
+
+  $(help_title_section Options)
+    -h --help         Show this screen.
+    -v --version      Show version.
+EOF
+}
+
+while [ ! $# -eq 0 ]; do
+  case "$1" in
+    -h | --help)
+      display_help
+      exit 0
+      ;;
+    -v | --version)
+      display_version "${VERSION}" "${PROGRAM}"
+      exit 0
+      ;;
+    *)
+      display_help >&2
+      exit 1
+      ;;
+  esac
+
+  shift
+done
+
 source .venv/bin/activate
 
 python3 -m bot

bin/server

@@ -10,6 +10,39 @@ cd "${BASE_DIR}/.." || exit 127
 # shellcheck source=../scripts/utils.sh
 . scripts/utils.sh
 
+PROGRAM=$(basename "${BASH_SOURCE[0]:-$0}")
+VERSION=0.7.0
+
+function display_help() {
+  cat <<EOF
+  $(help_title_section Usage)
+    ${PROGRAM} [options]
+
+  $(help_title_section Options)
+    -h --help         Show this screen.
+    -v --version      Show version.
+EOF
+}
+
+while [ ! $# -eq 0 ]; do
+  case "$1" in
+    -h | --help)
+      display_help
+      exit 0
+      ;;
+    -v | --version)
+      display_version "${VERSION}" "${PROGRAM}"
+      exit 0
+      ;;
+    *)
+      display_help >&2
+      exit 1
+      ;;
+  esac
+
+  shift
+done
+
 if not_installed "asdf"; then
   echo_warning "
     We are using asdf (https://github.com/asdf-vm/asdf) to manage tool
@@ -28,7 +61,7 @@ fi
 log_info "setup" "Setting up the env file..."
 if [ ! -f .env ]; then
   cp .env.sample .env
-  log_done "env file created, you might want to open .env and set the correct values..."
+  log_success "env file created, you might want to open .env and set the correct values..."
   echo
 else
   log_warn ".env file already exists, skipping..."

bin/setup

@@ -1,4 +1,5 @@
 import logging
+import sys
 
 import discord
 from discord.ext import commands
@@ -13,7 +14,7 @@
     case_insensitive=True,
 )
 
-# Logging setup
+# Logging to file
 logger = logging.getLogger("discord")
 logger.setLevel(logging.INFO)
 handler = logging.FileHandler(
@@ -24,14 +25,21 @@
 )
 logger.addHandler(handler)
 
+# Logging to stdout
+stdout_handler = logging.StreamHandler(sys.stdout)
+stdout_handler.setFormatter(
+    logging.Formatter("%(asctime)s:%(levelname)s:%(name)s: %(message)s")
+)
+logger.addHandler(stdout_handler)
+
 
 @client.event
 async def on_ready():
     """Client event that run when the program is ready."""
 
-    logger.info("The bot was logged in")
+    logger.info("The bot was logged in ✨")
     DailyReport(client).report.start()
-    logger.info("The task has been loaded")
+    logger.info("The bot is ready 🚀")
 
 
 @client.command()

bot/client.py

@@ -61,7 +61,7 @@ async def promove(
                 # Adding the log to the database
                 asyncio.create_task(self.log(ctx, member, belt))
             else:
-                await ctx.send(
+                await ctx.reply(
                     f"Ocorreu um erro ao atualizar o cinturão do ninja {user} no site :(\nPor favor tente mais tarde."
                 )
 

bot/cogs/belts.py

@@ -3,6 +3,6 @@ ipython==8.4.0
 isort==5.10.1
 mypy==0.971
 mypy-extensions==0.4.3
-pre-commit==2.20.0
+pre-commit==3.1.1
 pylint==2.14.5
 python-dotenv==0.20.0

requirements-dev.txt

@@ -1,3 +1,5 @@
+#!/bin/sh -n
+
 RED=$(tput setaf 1)
 ORANGE=$(tput setaf 3)
 GREEN=$(tput setaf 2)

scripts/colors.sh

@@ -133,4 +133,4 @@ function execute() {
   return $exitCode
 }
 
-[ "$0" = "${BASH_SOURCE[0]}" ] && display_version 0.5.6 || true
+[ "$0" = "${BASH_SOURCE[0]}" ] && display_version 0.7.0 || true

scripts/extras.sh

@@ -129,4 +129,4 @@ function format() {
   fi
 }
 
-[ "$0" = "${BASH_SOURCE[0]}" ] && display_version 0.5.6 || true
+[ "$0" = "${BASH_SOURCE[0]}" ] && display_version 0.7.0 || true