Merge pull request #13 from Hjorthdx/Development-branch-v2.1

Development branch v2.1

Author: Hjorthdx

Constants.py

@@ -1,6 +1 @@
-# 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
+WIKIPEDIA_RANDOM_LINK = "https://en.wikipedia.org/wiki/Special:Random"

Db.py

@@ -3,6 +3,10 @@
 myClient = pymongo.MongoClient("mongodb://localhost:27017")
 mydb = myClient["mydatabase"]
 mycol = mydb["UserKarma"]
+pomodoroCol = mydb["Pomodoro"]
+
+for document in mycol.find():
+    print(document)  
 
 if not mycol.find():
     karmaList = [

Player.py

@@ -1,5 +1,5 @@
 # DiscordKarmaBot
-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.
-A player has been implemented that can play mp3 files to the users.
-Pomodoro timer is implemented, giving the users the ability to start timers, while working. When the time is up, the bot will join the room and play a mp3 files to alert the user, that the timer has ended.
-
+Discord bot that can keep track of user reactions. User reactions will be stored on a database in form of karma.
+Can keep track of multiple pomodoro timers. Saves the timers in a database. Notifies when timer is up by playing mp3 files.
+Player cog that can play local mp3 files aswell as youtube links.
+Watch2gether cog to create watch2gether rooms with the desired video.

Pomodoro.py

@@ -1,39 +1,56 @@
 # TODO
+    # General things
+        Tolower all user inputs, so they are not change sensitive.
+        Make installation guide to use the bot
+
+    # USER CLASS
+        Add default values for pomodoro timers, so every user can change their default with the !change default command.
+        I think database, needs to keep track of the timer aswell, if that needs to be changed.
+
     # 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
-    
+    Make bot ask if you've forgotten to start timer. If there are like 5+ people in voice channel, then it should ask if a timer is needed
+        Could be very helpful cause we always forgot those stupid timers
+        https://discordpy.readthedocs.io/en/latest/api.html#voicechannel -> Members returns a list of all the users in a specific voice channel,
+            maybe have some loop.wait_for(members.count >= 7) -> if timer not started, ask user if they want a timer started.
+            https://discordpy.readthedocs.io/en/latest/api.html#discord.on_member_update USE THIS
+                TALKED TO SIMON ABOUT THIS. THIS SHOULD WORK
+    Comment inside pomodoro doucment needs to be done
+    @everyone when timers are up.
+    Needs to play in every room that there are peopple in
+    When there is a break play the lofi radio
+
     # 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.
+    !p let me in
+    Boomer alert
+    Lofi radio
+
+    Player class that has playing status. If playing - then add it to queue, so it doesnt cause error everytime multiple people play audio clip.
+    
 
     # 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.
+
+    # Wikipedia speedrun
+        https://en.wikipedia.org/wiki/special:random - Gives a random wikipedia article
+        Let players join the game before it starts.
+        Start a timer on !start command
+        !done command, that returns the time it has run.
+            Possibly save this in database so we can have roles for this aswell.
+        Et array med mulige ting vi skal finde - !add til listen.
+        '
+
+Add timer per user instead of name.
+
+
+# Notes to self
+    # Help command
+        Thing that deletes !help is in: class _HelpCommandImpl(Command): (line 182) in the prepare method.
+        The thing that deletes the help message itself is in: class DefaultHelpCommand(HelpCommand): (line 996) in async def send_pages(self):

README.md

@@ -0,0 +1,21 @@
+"""
+import Constants
+
+class Speedrun:
+
+    def __init__(self, startingLink):
+        self.startingLink = startingLink
+        self.endLink = endLink
+        self.participants = []
+    
+    
+
+    def addParticipant(self, user):
+        self.participants.append(user)
+
+    def removeParticipant(self, user):
+        self.participants.remove(user)
+    
+    
+
+"""

TODOS.txt

@@ -1,108 +1,32 @@
-import os, discord, pymongo, User, Db, threading, time, Pomodoro, Constants, Player
+import os, discord
 from dotenv import load_dotenv
-
+from discord.ext import commands
 load_dotenv()
 
-# Emotes
-kurtApproved = 619818932475527210
-kurtDisapproved = 651028634945060864
-
-#Instantiating all the users
-Adil = User.User('Adil', 100552145421467648, '100552145421467648')
-Chrille = User.User('Chrille', 279307446009462784, '279307446009462784')
-Hjorth = User.User('Hjorth', 140195461519769601, '140195461519769601')
-Martin = User.User('Martin', 103033943464353792, '502882469721407509')
-Magnus = User.User('Magnus', 272507977984901120, '272507977984901120')
-Simon = User.User('Simon', 619105357473775636, '619105357473775636')
-Sten = User.User('Sten', 502882469721407509, '502882469721407509')
-
-users = [
-    Adil,
-    Chrille,
-    Hjorth,
-    Martin,
-    Magnus,
-    Simon,
-    Sten
-]
-
-client = discord.Client()
-
-@client.event
-async def on_raw_reaction_add(payload):
-    if payload.channel_id == 619105859615719434: 
-        if payload.emoji.id == kurtApproved:
-            message = await client.http.get_message(payload.channel_id, payload.message_id) # Dictionary
-            authorDict = message["author"]
-            authorID = authorDict["id"] # String
-
-            for user in users:
-                if user.strUserID == authorID and user.intUserID != payload.user_id:
-                    user.AddOpdut()
-                elif user.strUserID == authorID and user.intUserID == payload.user_id:
-                    user.removeOpdut()
-                    user.removeOpdut()
-
-        elif payload.emoji.id == kurtDisapproved:
-            message = await client.http.get_message(payload.channel_id, payload.message_id) # Dictionary
-            authorDict = message["author"]
-            authorID = authorDict["id"] # String
-
-            for user in users:
-                if user.strUserID == authorID:
-                    user.AddNeddut()
-
-@client.event
-async def on_raw_reaction_remove(payload):
-    if payload.channel_id == 619105859615719434:
-        if payload.emoji.id == kurtApproved:
-            message = await client.http.get_message(payload.channel_id, payload.message_id) # Dictionary
-            authorDict = message["author"]
-            authorID = authorDict["id"] # String
-
-            for user in users:
-                if user.strUserID == authorID and user.intUserID != payload.user_id:
-                    user.removeOpdut()
-                elif user.strUserID == authorID and user.intUserID == payload.user_id:
-                    user.AddOpdut()
-                    user.AddOpdut()
-
-        elif payload.emoji.id == kurtDisapproved:
-            message = await client.http.get_message(payload.channel_id, payload.message_id) # Dictionary
-            authorDict = message["author"]
-            authorID = authorDict["id"] # String
-
-            for user in users:
-                if user.strUserID == authorID:
-                    user.removeNeddut()
-
-@client.event
-async def on_message(message):
-    if message.content == "!karma":
-        for user in users:
-            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"]))
-
-    if "!pomodoro" in message.content:
-        await Pomodoro.startTimers(message)
+bot = commands.Bot(command_prefix='!')
 
-    if "!time" in message.content:
-        await message.channel.send('Remaining time: {}'.format(Pomodoro.calculateRemainingTime()))
+@bot.command(hidden=True)
+async def load(ctx, extension):
+    bot.load_extension(f'cogs.{extension}')
+    await ctx.message.delete()
 
-    if "!p" in message.content:
-        await Player.play(message)
+@bot.command(hidden=True)
+async def unload(ctx, extension):
+    bot.unload_extension(f'cogs.{extension}')
+    await ctx.message.delete()
 
-    # Hidden easter egg for the boys
-    if message.content == "!bot":
-        await message.channel.send('Botten er så tæt på at være færdig :pinching_hand:')
+@bot.command(hidden=True)
+async def reload(ctx, extension):
+    bot.unload_extension(f'cogs.{extension}')
+    bot.load_extension(f'cogs.{extension}')
+    await ctx.message.delete()
 
-@client.event
+@bot.event
 async def on_ready():
-    print(f'{client.user} has connected to Discord!')
+    print(f'{bot.user} has connected to Discord!')
 
-    # Fix db
-    for document in Db.mycol.find():
-        print(document)
+for filename in os.listdir('./DiscordKarmaBot/cogs'):
+    if filename.endswith('.py'):
+        bot.load_extension(f'cogs.{filename[:-3]}')
 
-client.run(os.getenv("TOKEN"))
+bot.run(os.getenv("TOKEN"))