Merge branch 'master' of https://github.com/bbedward/Graham_Nano_Tip_Bot

Author: bbedward

bot.py

@@ -12,6 +12,7 @@
 from db.tortoise_config import DBConfig
 from db.redis import RedisDB
 from server import GrahamServer
+from tortoise import Tortoise
 from util.discord.channel import ChannelUtil
 from util.env import Env
 from util.logger import setup_logger
@@ -103,7 +104,8 @@ async def on_message(message: discord.Message):
 		tasks = [
 			client.logout(),
 			RPCClient.close(),
-			RedisDB.close()
+			RedisDB.close(),
+			Tortoise.close_connections()
 		]
 		loop.run_until_complete(asyncio.wait(tasks))
 		loop.close()

cogs/favorites.py

@@ -39,7 +39,7 @@
     triggers = ["banfavorites" if Env.banano() else "ntipfavorites"],
     overview = "Tip all the favorites",
     details = f"Split a tip among all of the users in your favorites list - similar to a tipsplit. (**minimum tip is {Constants.TIP_MINIMUM} {Constants.TIP_UNIT}**)" +
-                "\nExample: `{config.Config.instance().command_prefix}{'banfavorites' if Env.banano() else 'ntipfavorites'} <amount>`"
+                f"\nExample: `{config.Config.instance().command_prefix}{'banfavorites' if Env.banano() else 'ntipfavorites'} <amount>`"
 )
 
 class FavoriteCog(commands.Cog):
@@ -317,4 +317,4 @@ async def tipfavorites_cmd(self, ctx: Context):
         # Update stats
         stats: Stats = await user.get_stats(server_id=msg.guild.id)
         if msg.channel.id not in config.Config.instance().get_no_stats_channels():
-            await stats.update_tip_stats(amount_needed)
+            await stats.update_tip_stats(amount_needed)

config.py

@@ -29,8 +29,7 @@ def instance(cls) -> 'Config':
             parser.add_argument('-p', '--prefix', type=str, help='Command prefix for bot commands', default='!')
             parser.add_argument('-l', '--log-file', type=str, help='Log file location', default='/tmp/graham_bot.log')
             parser.add_argument('-s', '--status', type=str, help="The bot's 'playing status'", default=None, required=False)
-            parser.add_argument('-u', '--node-url', type=str, help='URL of the node', default='[::1]')
-            parser.add_argument('-np', '--node-port', type=int, help='Port of the node', default=7072 if Env.banano() else 7076)
+            parser.add_argument('-u', '--node-url', type=str, help='URL of the node, e.g.: http://[::1]:7072', default='http://[::1]:7072' if Env.banano() else 'http://[::1]:7076')
             parser.add_argument('--debug', action='store_true', help='Runs in debug mode if specified', default=False)
             options, unknown = parser.parse_known_args()
 
@@ -53,7 +52,6 @@ def instance(cls) -> 'Config':
                 exit(1)
 
             cls.node_url = options.node_url
-            cls.node_port = options.node_port
         return cls._instance
 
     def has_yaml(self) -> bool:

db/redis.py

@@ -19,6 +19,7 @@ def instance(cls) -> 'RedisDB':
     @classmethod
     async def close(cls):
         if hasattr(cls, 'redis') and cls.redis is not None:
+            cls.redis.close()
             await cls.redis.wait_closed()
         if cls._instance is not None:
             cls._instance = None
@@ -76,4 +77,4 @@ async def is_paused(self) -> bool:
         """Return True if the bot is paused or not"""
         key = f"{Env.currency_name().lower()}:botpaused"
         redis = await self.get_redis()
-        return (await redis.get(key)) is not None
+        return (await redis.get(key)) is not None

rpc/client.py

@@ -14,11 +14,9 @@ def __init__(self):
     def instance(cls) -> 'RPCClient':
         if cls._instance is None:
             cls._instance = cls.__new__(cls)
-            cls.node_url = Config.instance().node_url
-            cls.node_port = Config.instance().node_port
             cls.wallet_id = Config.instance().wallet
-            cls.ipv6 = '::' in cls.node_url
-            cls.connector = aiohttp.TCPConnector(family=socket.AF_INET6 if cls.ipv6 else socket.AF_INET,resolver=aiohttp.AsyncResolver())
+            cls.node_url = Config.instance().node_url
+            cls.connector = aiohttp.TCPConnector(family=0 ,resolver=aiohttp.AsyncResolver())
             cls.session = aiohttp.ClientSession(connector=cls.connector, json_serialize=json.dumps)
         return cls._instance
 
@@ -30,7 +28,7 @@ async def close(cls):
             cls._instance = None
 
     async def make_request(self, req_json: dict):
-        async with self.session.post("http://{0}:{1}".format(self.node_url, self.node_port),json=req_json, timeout=300) as resp:
+        async with self.session.post(self.node_url ,json=req_json, timeout=300) as resp:
             return await resp.json()
 
     async def account_create(self) -> str: