Skip to content
This repository has been archived by the owner on Feb 2, 2024. It is now read-only.

Commit

Permalink
Refactored some code from voice to channel_mangement.. To seperate fu…
Browse files Browse the repository at this point in the history 
…nctions from eachother.. renamed gambling to blackjack.. because it is a big function and deserves to be in a seperate class. Added function to lookup every flagged channel games...
  • Loading branch information
Christian Moen committed Apr 14, 2017
1 parent ae04a8f commit 39768a8
Show file tree
Hide file tree
Showing 4 changed files with 147 additions and 92 deletions.
0 BuffBot/gambling.py → BuffBot/blackjack.py
View file
File renamed without changes.
146 changes: 146 additions & 0 deletions BuffBot/channel_mangement.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
import botconfig
from discord.ext import commands
import database
import botconfig

'''
This module is for handling for channel management.
'''

class Channel_manager:
def __init__(self, bot):
self.bot = bot # The bot object.
self.database = database.Database(self.bot) # database object -> used to update and get coin amount
self.owners = botconfig.owners
pass

@commands.group(name="man", pass_context=True, help="Please check {!help man} in order to check the commands")
async def channel_mangement(self, ctx):
if ctx.invoked_subcommand is None:
await self.bot.say('Please lookup !help man for commands in this group')

@channel_mangement.group(name="flags", pass_context=True, help="Will give you a list of all flagged games for this channel")
async def get_channel_flags(self, ctx):
trigger_channel = ctx.message.author.voice.voice_channel
if trigger_channel == None :
await self.respond("You're not in a voice channel", ctx.message.author.mention)
return None
games = self.database.get_flagged_games(trigger_channel.id)

output = "This channel is flagged for these games: \n"
for game in games : output += game + "\n"

await self.bot.say(output)
pass

@channel_mangement.command(name="patrol", pass_context=True, help="Will start the patrolling")
async def patrol_channels(self, ctx):
'''Patrol all voice channels from the calling channel.
This method will go trough every channel and check each user.
-> check if listed game is in the database
-> if not: move player to move queue.
-> if it is: Do nothing.
'''

if ctx.message.author.id not in self.owners: # Check if user is authorised to perform command.
self.bot.say("You're not a big guy. :thinking: ")
return None

# User is authorised to perform command.. -> now perform actions.

good_members = []
move_queue = [] # to store the queue for later to move them.
jail = self.get_jail(ctx) # grab the jail, if not jail.. create one.

# start to check channels.
for channel in ctx.message.server.channels:
if channel != jail:
# If this returns 0, it means that either the room is empty or it isn't a voice channel
if len(channel.voice_members) != 0:
voice_members = channel.voice_members

for member in voice_members: # for each member in the channel
if (len(self.database.get_flagged_games(channel_id=channel.id)) > 0) \
and self.database.get_flagged_games(channel_id=channel.id)[0] == "free":
# member is allowed.
pass
else:
print(self.database.get_flagged_games(channel.id))

if member.game not in self.database.get_flagged_games(channel.id):

if (not move_queue.__contains__(member)):
move_queue.append(member)
print("added to move")

else:
good_members.append(member.mention) # Add member too good boy list

await self.sort_members_to_channels(members=move_queue, jail=jail)

@channel_mangement.command(name="wipe", pass_context=True, help="Will wipe clean all flags from this channel")
async def remove_channel_flags(self, ctx):
self.database.remove_flagged_games(ctx.message.author.voice.voice_channel.id)

@channel_mangement.command(name="addgame", pass_context=True,
help="Flag channels for games only. If you enter free, there is no restriction on the selected channel")
async def flag_channel(self, ctx, free=None):
if (free == "free"):
# remove all restriction on selected channel and parse in free.
self.database.remove_flagged_games(ctx.message.author.voice.voice_channel.id)

# add free in as a title.
self.database.flag_gaming_channel(ctx.message.author.voice.voice_channel.id, "free", 1)
pass

else:
self.database.flag_gaming_channel(ctx.message.author.voice.voice_channel.id, ctx.message.author.game, 1)
pass

async def sort_members_to_channels(self, members, jail):
'''For handling the move queue for patrol_channels..
Move queue
this is a queue for members that need to be moved to other channels because their has broken the game rule.
-> For each item of the move queue. Grab the game title and check it up with the database.
-> if no game match
-> move to jail.
-> if game match one channel..
-> move member to that channel.
:param members: The move queue
:param jail: Jail channel
:return: amount of moved members.
'''
for member in members:
print("Handling " + member.mention)
channel = self.database.get_game_channel(title=member.game)
if (len(channel) == 0):
await self.bot.move_member(member, jail)
else:
await self.bot.move_member(member, self.bot.get_channel(channel[0]))
pass

async def respond(self, msg, author):
await self.bot.say("{}, {}".format(msg, author))

# To check if the channel got a jail, return the channel. If channel do not have a jail voice channel.. create one.
def get_jail(self, ctx):
#########
# Collect the jail channel, if no channel found -> create one.
#########
jail = None
for channel in ctx.message.server.channels:
if channel.name == "Jail":
jail = channel
break
if jail is None: # if no jail exists
self.bot.create_channel(name="Jail", server=ctx.message.server, type='voice') # create jail
for channel in ctx.message.server.channels: # find the new channel
if channel.name == "Jail":
jail = channel
break
return jail

def setup(bot):
bot.add_cog(Channel_manager(bot))
2 changes: 1 addition & 1 deletion BuffBot/main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
bot = commands.Bot(command_prefix='!')
currency = Currency()

startup_extensions = ['commands', 'voice', 'coins', 'gambling']
startup_extensions = ['commands', 'voice', 'coins', 'blackjack', "channel_mangement"]


@bot.event
Expand Down
91 changes: 0 additions & 91 deletions BuffBot/voice.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,97 +92,6 @@ async def set_volume(self, ctx, volume: int):
else:
await self.bot.say("I'm not playing anything right now, but I set the volume to {}% for next time".format(volume))

@commands.command(name="flagChan", pass_context=True, help="Flag channels for games only. If you enter free, there is no restriction on the selected channel")
async def flag_channel(self, ctx, free=None):
if (free == "free") :
# remove all restriction on selected channel and parse in free.
self.database.remove_flagged_games(ctx.message.author.voice.voice_channel.id)

# add free in as a title.
self.database.flag_gaming_channel(ctx.message.author.voice.voice_channel.id, "free", 1)
pass

else :
self.database.flag_gaming_channel(ctx.message.author.voice.voice_channel.id, ctx.message.author.game, 1)
pass

@commands.command(name="removeFlags", pass_context=True)
async def remove_channel_flags(self, ctx):
self.database.remove_flagged_games(ctx.message.author.voice.voice_channel.id)

@commands.command(name="patrol", pass_context=True)
async def patrol_channels(self, ctx):
'''Patrol all voice channels from the calling channel.
This method will go trough every channel and check each user.
-> check if listed game is in the database
-> if not: move player to move queue.
-> if it is: Do nothing.
'''

if ctx.message.author.id not in self.owners: # Check if user is authorised to perform command.
self.bot.say("You're not a big guy. :thinking: ")
return None

# User is authorised to perform command.. -> now perform actions.

good_members = []
move_queue = [] # to store the queue for later to move them.
jail = self.get_jail(ctx) # grab the jail, if not jail.. create one.

# start to check channels.
for channel in ctx.message.server.channels:
if channel != jail:
# If this returns 0, it means that either the room is empty or it isn't a voice channel
if len(channel.voice_members) != 0:
voice_members = channel.voice_members

for member in voice_members: # for each member in the channel
if (len(self.database.get_flagged_games(channel_id=channel.id)) > 0) \
and self.database.get_flagged_games(channel_id=channel.id)[0] == "free":
#member is allowed.
pass
else :
print(self.database.get_flagged_games(channel.id))

if member.game not in self.database.get_flagged_games(channel.id):

if (not move_queue.__contains__(member)) :
move_queue.append(member)
print("added to move")

else:
good_members.append(member.mention) # Add member too good boy list

await self.sort_members_to_channels(members= move_queue, jail=jail)


async def sort_members_to_channels(self, members, jail):
'''For handling the move queue for patrol_channels..
Move queue
this is a queue for members that need to be moved to other channels because their has broken the game rule.
-> For each item of the move queue. Grab the game title and check it up with the database.
-> if no game match
-> move to jail.
-> if game match one channel..
-> move member to that channel.
:param members: The move queue
:param jail: Jail channel
:return: amount of moved members.
'''
for member in members :
print("Handling " + member.mention)
channel = self.database.get_game_channel(title=member.game)
if (len(channel) == 0) :
await self.bot.move_member(member, jail)
else :
await self.bot.move_member(member, self.bot.get_channel(channel[0]))
pass





async def respond(self, msg, author):
await self.bot.say("{}, {}".format(msg, author))

Expand Down

0 comments on commit 39768a8

Please sign in to comment.