Merge pull request #12 from Hjorthdx/Development-branch-v2

Development branch v2

Author: Hjorthdx

.gitignore

@@ -129,3 +129,4 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+*.pyc

Constants.py

@@ -0,0 +1,6 @@
+# CONSTANTS
+DEFAULT_WORKTIME = 50
+DEFAULT_BREAKTIME = 10
+DEFAULT_PLAYER_PATH = "C:/Program Files (x86)/ffmpeg/bin/ffmpeg.exe"
+SECONDS_IN_HOUR = 3600
+SECONDS_IN_MINUTE = 60

Player.py

@@ -0,0 +1,31 @@
+import discord, Constants
+
+async def play(message):
+    if "latex" in message.content:
+        channel = message.author.voice.channel
+        vc = await channel.connect()
+        vc.play(discord.FFmpegPCMAudio(executable=Constants.DEFAULT_PLAYER_PATH, source="C:/Users/Sren/Documents/GitHub/DiscordKarmaBot/mp3-files/LatexBusters.mp3"))
+        while vc.is_connected():
+            if not vc.is_playing():
+                await vc.disconnect()
+    elif "bamse" in message.content:
+        channel = message.author.voice.channel
+        vc = await channel.connect()
+        vc.play(discord.FFmpegPCMAudio(executable=Constants.DEFAULT_PLAYER_PATH, source="C:/Users/Sren/Documents/GitHub/DiscordKarmaBot/mp3-files/test.mp3"))
+        while vc.is_connected():
+            if not vc.is_playing():
+                await vc.disconnect()
+    elif "inspiration" in message.content:
+        channel = message.author.voice.channel
+        vc = await channel.connect()
+        vc.play(discord.FFmpegPCMAudio(executable=Constants.DEFAULT_PLAYER_PATH, source="C:/Users/Sren/Documents/GitHub/DiscordKarmaBot/mp3-files/Ole_Wedel.mp3"))
+        while vc.is_connected():
+            if not vc.is_playing():
+                await vc.disconnect()
+
+async def playTimerEnd(channel):
+    vc = await channel.connect()
+    vc.play(discord.FFmpegPCMAudio(executable=Constants.DEFAULT_PLAYER_PATH, source="C:/Users/Sren/Documents/GitHub/DiscordKarmaBot/mp3-files/test.mp3"))
+    while vc.is_connected():
+        if not vc.is_playing():
+            await vc.disconnect()

Pomodoro.py

@@ -1,15 +1,61 @@
-import time
-import datetime as dt
+import discord, asyncio, Constants, Player, datetime
 
-def startPomodoro(pomodoro_time, break_time):
-    print("Pomodoro started")
-    start_time = dt.datetime.now()
-    pomodoro_time = pomodoro_time
-    time_delta = dt.timedelta(0,pomodoro_time)
-    pomodoro_end_time = start_time + time_delta
-    break_time = break_time
+startingTime = 0
+workBool = False
 
-    if start_time < pomodoro_end_time:
-        print("Currently working")
+async def startTimers(message):
+    global workLength
+    global breakLength
+    workLength, breakLength = getLengths(message.content)
+    global startingTime
+    startingTime = datetime.datetime.now()
+    await workTimer(message, workLength, breakLength)
 
+async def workTimer(message, workLength, breakLength):
+    global workBool 
+    workBool = True
+    await asyncio.sleep(workLength)
+    await message.channel.send("WORKS OVER, STARTING BREAK")
+    await Player.playTimerEnd(message.author.voice.channel)
+    await breakTimer(message, breakLength)
 
+async def breakTimer(message, breakLength):
+    global workBool
+    workBool = False
+    await asyncio.sleep(breakLength)
+    await message.channel.send("BREAKS OVER")
+    await Player.playTimerEnd(message.author.voice.channel)
+
+def getLengths(content):
+    x = [int(s) for s in content.split() if s.isdigit()] # Gets all the digits from the string and saves in a list of integers.
+    if len(x) == 0:
+        return Constants.DEFAULT_WORKTIME * 60, Constants.DEFAULT_BREAKTIME * 60
+    elif len(x) == 2:
+        workLength = x[0]
+        breakLength = x[1]
+        return workLength * 60, breakLength * 60
+    else:
+        print('Wrong formatted user input')
+        # Should maybe text this to the user
+
+def calculateRemainingTime():
+    global startingTime
+    global workLength
+    global workLength
+    global workBool
+    hours = 0
+    duration = datetime.datetime.now() - startingTime
+    durationInSeconds = duration.total_seconds()
+
+    if workBool:
+        remainingTimeInSeconds = workLength - durationInSeconds
+    else:
+        remainingTimeInSeconds = breakLength - durationInSeconds
+    
+    if remainingTimeInSeconds > Constants.SECONDS_IN_HOUR:
+        hours, remainingTimeInSeconds = divmod(remainingTimeInSeconds, 3600)
+    if remainingTimeInSeconds > Constants.SECONDS_IN_MINUTE:
+        minutes, remainingTimeInSeconds = divmod(remainingTimeInSeconds, 60)
+
+    formattedRemainingTime=('%02d:%02d:%02d'%(hours,minutes,remainingTimeInSeconds))
+    return formattedRemainingTime

README.md

@@ -1,2 +1,7 @@
 # DiscordKarmaBot
-Discord bot that can keep track of user reactions and add karma to each person based on the emojis that other users react to their posts with
+Discord bot that can keep track of user reactions. User reactions will be stored on a database in form of karma to see who is the meme lord.
+
+Incoming features:
+Pomodoro timer
+Bot joins and plays a mp3 file when the time is up
+

TODOS.txt

@@ -0,0 +1,39 @@
+# TODO
+    # BOT PART
+(X)    Bot skal forlade rummet selv efter mp3 fil er slut eller ved command måske.
+    Change on_message !karma so it only needs to include !karma, so you could see karma of other users.
+        E.g. !karma Hjorth - Would return the total karma of Hjorth no matter who the author is.
+    Needs to add highscores for both opdutter og neddutter.
+        Maybe give roles based on these, and let them update once someone else takes the lead.
+
+    # POMODORO PART
+(X)    Pomodoro basic timer funcionality.
+(X)    Pomodoro makes bot join and play sound when time is up.
+(X)    Pomodoro default timers hvis andet ikke er specified.
+(X)    Pomodoro !time så vi kan se hvor lang tid der er tilbage af en timer
+    Let user change default timers for pomodoro, maybe something like !defaultbreak = something.
+    User needs to be able to STOP the timer
+    User needs to be able to PAUSE the timer
+    
+    # PLAY PART
+(X)    !play latex bastards - FILE ADDED.
+(X)    !play bamse - DEN NYE POMODORO LYD.
+    !play pomodoro lyd start/slut.
+(X)    Maybe seperate file for alle playing, if it starts to grow any bigger.
+        Makes the code more reable.
+        It is growing out of hand, please make a new file that contains the playing part,
+        so the if statements in bot is not so big.
+            Maybe it can be abstracted more and the play document can handle which file to play.
+            if "something" in message.content
+                Player.Play(message) -> Some if chain in there that does the choosing of what to play. 
+                Only problem right now is that they are all different, !latex, !play, !inspiration etc.
+                MAYBE !p inspiration, then that would be a lot simpler and a lot less if in the bot file.
+    !play farvelsangen.
+(X)    # Figure out some way to make it choose the channel with users in
+(X)    !Motivationsbot - DU GØR DET OG DU GØR DET GODT.
+
+    # DB
+    Database skal sættes op til at være online - lav prio.
+    Reset all the data in the database, cause sten's id is different from everyone elses,
+        and it's pissing me off.
+    Add collection for work/time.

__pycache__/User.cpython-37.pyc

@@ -1,17 +1,7 @@
-import os
-import discord
-import pymongo
-import User
-import Db
-import Pomodoro
+import os, discord, pymongo, User, Db, threading, time, Pomodoro, Constants, Player
+from dotenv import load_dotenv
 
-# TODO
-# The enviorement file does not work either, so the bot token needs to be refreshed each time it is pushed to git
-# Add pomodoro timer
-# Add another collection in the database to track how long we are working for, just like lønnes ui in his 
-
-# Discord bot token
-TOKEN = 'NjkwNTM0MDI4MzE0NjczMTUy.XnzdwQ.xyP92St3lGIaA5IuIGNwHkCJ3lw'
+load_dotenv()
 
 # Emotes
 kurtApproved = 619818932475527210
@@ -93,20 +83,15 @@ async def on_message(message):
             if message.author.id == user.intUserID:
                 x = Db.mycol.find_one({ "Name": user.name })
                 await message.channel.send('{} has {} total karma. {} opdutter and {} neddutter'.format(x["Name"], x["Opdutter"] - x["Neddutter"], x["Opdutter"], x["Neddutter"]))
-    
 
-    # No checks at the moment, so will likely break with wrong inputs from user.
     if "!pomodoro" in message.content:
-        # Maybe if user is certain role on discord, so not everyone can fuck with this.
+        await Pomodoro.startTimers(message)
+
+    if "!time" in message.content:
+        await message.channel.send('Remaining time: {}'.format(Pomodoro.calculateRemainingTime()))
 
-        # This entire part is coded based on Kurts saying, I wish this was here.
-        x = message.content
-        string_pomodoro_time = x[10:]
-        string_break_time = x[-2:]
-        pomodoro_time = int(string_pomodoro_time)
-        break_time = int(string_break_time)
-        Pomodoro.startPomodoro(pomodoro_time, break_time)
-        
+    if "!p" in message.content:
+        await Player.play(message)
 
     # Hidden easter egg for the boys
     if message.content == "!bot":
@@ -116,7 +101,8 @@ async def on_message(message):
 async def on_ready():
     print(f'{client.user} has connected to Discord!')
 
+    # Fix db
     for document in Db.mycol.find():
         print(document)
 
-client.run(TOKEN)
+client.run(os.getenv("TOKEN"))