diff --git a/Pipfile.lock b/Pipfile.lock index b25d8cf..da871d9 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "8a33069c534b31edf68ceda6be6b207b557f3d4457d208f64d9aa3864ae80d72" + "sha256": "2d5d1f1748d42fc3306f480226034fbf03839e67d7d3edd9f57f7ca7276bd666" }, "pipfile-spec": 6, "requires": { @@ -74,21 +74,12 @@ "index": "pypi", "version": "==1.0.0" }, - "discord": { - "hashes": [ - "sha256:9d4debb4a37845543bd4b92cb195bc53a302797333e768e70344222857ff1559", - "sha256:ff6653655e342e7721dfb3f10421345fd852c2a33f2cca912b1c39b3778a9429" - ], - "index": "pypi", - "py": "*", - "version": "==1.0.1" - }, "discord.py": { "hashes": [ "sha256:2367359e31f6527f8a936751fc20b09d7495dd6a76b28c8fb13d4ca6c55b7563", "sha256:def00dc50cf36d21346d71bc89f0cad8f18f9a3522978dc18c7796287d47de8b" ], - "markers": "python_full_version >= '3.5.3'", + "index": "pypi", "version": "==1.5.1" }, "idna": { @@ -201,47 +192,47 @@ }, "sqlalchemy": { "hashes": [ - "sha256:00d377c3fc069ba615091dee73b90446388091123a8d976c24376eb1044cba6f", - "sha256:0bc49cba55b01b6827d1c303486da1afaaaf65a7a4d0e2be2cbc31c0f56752dc", - "sha256:0f7b310fd84cf81d49c9aa1fb5eaeba2d16c490e8d3969586cd1eb8e4aedefbf", - "sha256:0f851547a28a4c2bd5b7fc6d05a306b9460d6f7a256989af11d8ddcdc386cc46", - "sha256:16de3aad992eddbce3204832947bafd92b5de50364aea353cd21127132cee2ca", - "sha256:20fd664489567d23eb049a0441ddc057cba46f704bb1980c2ac0c6a47a9c32c7", - "sha256:24c1dbc7089dc88fba12f1fdd0ea42f57d111a54a9071c745264c00e73152fe8", - "sha256:3c024c191e019bd673fe48cdf3bca1215f971bfd189838841903fa12ef206fb4", - "sha256:3f4c7463703030470f2af3e988681ab2fa08270282fc55ede448aed0854ca8ba", - "sha256:40c56eba051c504f85ea6cbc2cb4ec2bb83f06e8479041075a16b35f0bae3400", - "sha256:4329ca33a1c266ec9910ca697821f2a712d34089092fad9f9666ea193c5e02fa", - "sha256:4346ffc0a8756bfd8db4679c9bb52564f74fe1ffd60e6899db06823f111dbd9c", - "sha256:4a128f45f404d78bbb0a629cc58dd090bdfded37e568c4016cf2252585eb018a", - "sha256:4d35478f0dd39eb3439f5970cc2c8396bb5c4881c4f8e3900ba041b4103ed86b", - "sha256:561a6a3e799c59c6221e4e50deb18bc97434b480fb4a68da3623b609fb38f428", - "sha256:574e4da65e2f9cf083b24e34c10db2aeae8a7642628ef2c0e26ff202c1fd58f0", - "sha256:61bb5c71837845ee31c0cbe87b3c7f92652dbeafa10295f45610ea6bf349d887", - "sha256:6b3e85d513a3d59437047c262ff99d801f5727f6a25497aa6880da44f33d0170", - "sha256:7478f45f9b3cf2a2cb8808fd8ffe436e92f7332d4da1f4e8c559d5602189ac4b", - "sha256:7a1387fe4cd491122b49af565fb833b90dd1ecf360dd76173b75253981bea5bb", - "sha256:87b8314132081da1d3aa46dcd7b7a6ce7dc76cf7941471e659f740138a725a07", - "sha256:8952188c690e521ee2a33a7ff2b878a5dc475e389d85085e585104d819f2d8b1", - "sha256:8eef062f9dacc32b4d498a2822ce5a61badb041b202c448e829c253051d24ef0", - "sha256:94dbaf31729e2108050351b830b9f304bfa4838f8c60981b0b46cf257e528f17", - "sha256:b25856479c240e0ecf28562d3c4cf1b4786ad2c0a7825b9d67c1db6293156bae", - "sha256:bac445ed686fc0be02f6b4d64e5702ea5b4eef9849a7ad16522b2eea95d1dd3a", - "sha256:be4ac1036512db122964e4a41dc9bc08815ed772e37ac2a481fa825f58fcf5ee", - "sha256:c08baad28cb37dd35fa4c227fc4c312b1f65f7bb19a557995e160cce80b58b2c", - "sha256:c3651d8023a9bba79c9d2c80c745237fd7ee77f001bd6c9aab9350024f0e8d01", - "sha256:cf4977686e92f59cb965959dd2076e1a4c06f37ebb263a9674721aaec02684d4", - "sha256:d366bc4d0655a7926733e1b29258cc3c876b8520b61923e4838954eb0e3ec290", - "sha256:d45170c234e0294a2a46cdc46b487ccb708aaf927f54da1862c75d723f494e5e", - "sha256:d6090f68ba8db34864f9befd3aab60e60642443c57a65b781d43f4088514e4c6", - "sha256:dc87984befa099d42f1cd5ab9e298864af1acc568932716c33ba78dde8241a01", - "sha256:de707a9aa9395d44d427793ea77403698f9193b9fc7d81139c03f7239d88c4ae", - "sha256:dff61e81cbabdb4dd6dee421ae8842b3191468a602e909e23940890f553f7ac3", - "sha256:f462b59addafcf69570164bdfa1e7f44653653ae571b7964fad50132b8c1b608", - "sha256:f84c06915c752e25068151b834b3470307317a73ddae8b9def034face0e7ef37" + "sha256:04f995fcbf54e46cddeb4f75ce9dfc17075d6ae04ac23b2bacb44b3bc6f6bf11", + "sha256:0c6406a78a714a540d980a680b86654feadb81c8d0eecb59f3d6c554a4c69f19", + "sha256:0c72b90988be749e04eff0342dcc98c18a14461eb4b2ad59d611b57b31120f90", + "sha256:108580808803c7732f34798eb4a329d45b04c562ed83ee90f09f6a184a42b766", + "sha256:1418f5e71d6081aa1095a1d6b567a562d2761996710bdce9b6e6ba20a03d0864", + "sha256:17610d573e698bf395afbbff946544fbce7c5f4ee77b5bcb1f821b36345fae7a", + "sha256:216ba5b4299c95ed179b58f298bda885a476b16288ab7243e89f29f6aeced7e0", + "sha256:2ff132a379838b1abf83c065be54cef32b47c987aedd06b82fc76476c85225eb", + "sha256:314f5042c0b047438e19401d5f29757a511cfc2f0c40d28047ca0e4c95eabb5b", + "sha256:318b5b727e00662e5fc4b4cd2bf58a5116d7c1b4dd56ffaa7d68f43458a8d1ed", + "sha256:3ab5b44a07b8c562c6dcb7433c6a6c6e03266d19d64f87b3333eda34e3b9936b", + "sha256:426ece890153ccc52cc5151a1a0ed540a5a7825414139bb4c95a868d8da54a52", + "sha256:491fe48adc07d13e020a8b07ef82eefc227003a046809c121bea81d3dbf1832d", + "sha256:4a84c7c7658dd22a33dab2e2aa2d17c18cb004a42388246f2e87cb4085ef2811", + "sha256:54da615e5b92c339e339fe8536cce99fe823b6ed505d4ea344852aefa1c205fb", + "sha256:5a7f224cdb7233182cec2a45d4c633951268d6a9bcedac37abbf79dd07012aea", + "sha256:61628715931f4962e0cdb2a7c87ff39eea320d2aa96bd471a3c293d146f90394", + "sha256:62285607a5264d1f91590abd874d6a498e229d5840669bd7d9f654cfaa599bd0", + "sha256:62fb881ba51dbacba9af9b779211cf9acff3442d4f2993142015b22b3cd1f92a", + "sha256:68428818cf80c60dc04aa0f38da20ad39b28aba4d4d199f949e7d6e04444ea86", + "sha256:6aaa13ee40c4552d5f3a59f543f0db6e31712cc4009ec7385407be4627259d41", + "sha256:70121f0ae48b25ef3e56e477b88cd0b0af0e1f3a53b5554071aa6a93ef378a03", + "sha256:715b34578cc740b743361f7c3e5f584b04b0f1344f45afc4e87fbac4802eb0a0", + "sha256:758fc8c4d6c0336e617f9f6919f9daea3ab6bb9b07005eda9a1a682e24a6cacc", + "sha256:7d4b8de6bb0bc736161cb0bbd95366b11b3eb24dd6b814a143d8375e75af9990", + "sha256:81d8d099a49f83111cce55ec03cc87eef45eec0d90f9842b4fc674f860b857b0", + "sha256:888d5b4b5aeed0d3449de93ea80173653e939e916cc95fe8527079e50235c1d2", + "sha256:95bde07d19c146d608bccb9b16e144ec8f139bcfe7fd72331858698a71c9b4f5", + "sha256:9bf572e4f5aa23f88dd902f10bb103cb5979022a38eec684bfa6d61851173fec", + "sha256:bab5a1e15b9466a25c96cda19139f3beb3e669794373b9ce28c4cf158c6e841d", + "sha256:bd4b1af45fd322dcd1fb2a9195b4f93f570d1a5902a842e3e6051385fac88f9c", + "sha256:bde677047305fe76c7ee3e4492b545e0018918e44141cc154fe39e124e433991", + "sha256:c389d7cc2b821853fb018c85457da3e7941db64f4387720a329bc7ff06a27963", + "sha256:d055ff750fcab69ca4e57b656d9c6ad33682e9b8d564f2fbe667ab95c63591b0", + "sha256:d53f59744b01f1440a1b0973ed2c3a7de204135c593299ee997828aad5191693", + "sha256:f115150cc4361dd46153302a640c7fa1804ac207f9cc356228248e351a8b4676", + "sha256:f1e88b30da8163215eab643962ae9d9252e47b4ea53404f2c4f10f24e70ddc62", + "sha256:f8191fef303025879e6c3548ecd8a95aafc0728c764ab72ec51a0bdf0c91a341" ], "index": "pypi", - "version": "==1.3.21" + "version": "==1.3.22" }, "tzlocal": { "hashes": [ diff --git a/main.py b/main.py index 915b4ca..fb4b004 100644 --- a/main.py +++ b/main.py @@ -1,7 +1,5 @@ -import datetime import logging import os -import traceback import dateparser import discord @@ -25,11 +23,7 @@ logging.basicConfig(level=logging.DEBUG) @bot.event async def on_error(event): - embed = discord.Embed(title=":x: Event Error", colour=0xE74C3C) # Red - embed.add_field(name="Event", value=event) - embed.description = "```py\n%s\n```" % traceback.format_exc() - embed.timestamp = datetime.datetime.utcnow() - await bot.AppInfo.owner.send(embed=embed) + logging.error(f"{event}") @bot.event @@ -42,13 +36,12 @@ async def on_command_error(ctx, error): @bot.event async def on_ready(): - print(f"Logged in as {bot.user.name} ({bot.user.id})") + logging.info(f"Logged in as {bot.user.name} ({bot.user.id})") @bot.command(aliases=["reminder", "remindme", "at"]) async def remind(ctx, message_date: str, message_reason: str): - print("remind - ---------------------") - print(f"remind - Message: {ctx.message}") + logging.info(f"New Discord message: {ctx.message}") parsed_date = dateparser.parse( f"{message_date}", @@ -59,13 +52,13 @@ async def remind(ctx, message_date: str, message_reason: str): "%Y-%m-%d %H:%M:%S" ) - print(f"remind - Date from command: {message_date}") - print(f"remind - Reason from command: {message_reason}") - print(f"remind - Parsed Date: {parsed_date}") - print(f"remind - Converted date: {convert_date_to_our_timezone}") - print(f"remind - Date without timezone: {remove_timezone_from_date}") - print(f"remind - Channel ID: {ctx.channel.id}") - print(f"remind - Channel name: {ctx.channel.name}") + logging.debug(f"Date from command: {message_date}") + logging.debug(f"Reason from command: {message_reason}") + logging.debug(f"Parsed date: {parsed_date}") + logging.debug(f"Converted date: {convert_date_to_our_timezone}") + logging.debug(f"Date without timezone: {remove_timezone_from_date}") + logging.debug(f"Discord channel ID: {ctx.channel.id}") + logging.debug(f"Discord channel name: {ctx.channel.name}") job = scheduler.add_job( send_to_discord, @@ -76,17 +69,16 @@ async def remind(ctx, message_date: str, message_reason: str): "author_id": ctx.message.author.id, }, ) - print(f"remind - Id: {job.id}, Name: {job.name}, kwargs: {job.kwargs}") - message = f"Hello {ctx.message.author.name}, I will notify you at:\n**{remove_timezone_from_date}**\nWith " \ - f"message:\n**{message_reason}**. " - print(f"remind - Message we sent back to user in Discord: {message}") + logging.debug(f"Job id: '{job.id}', name: '{job.name}' and kwargs: '{job.kwargs}'") + message = f"Hello {ctx.message.author.name}, I will notify you at:\n" \ + f"**{remove_timezone_from_date}**\n" \ + f"With message:\n**{message_reason}**. " + logging.debug(f"Message we sent back to user in Discord:\n" + f"{message}") await ctx.send(message) async def send_to_discord(channel_id, message, author_id): - print(f"send_to_discord - Channel ID: {channel_id}") - print(f"send_to_discord - Author ID: {author_id}") - print(f"send_to_discord - Message: {message}") channel = bot.get_channel(int(channel_id)) await channel.send(f"<@{author_id}>\n{message}")