From 77bf12f2514ef5c445318e6284bc3f45e2a826d8 Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 27 Jan 2020 07:30:42 +0000 Subject: [PATCH] Clean up formatting --- argondjbot.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/argondjbot.py b/argondjbot.py index 6b35847..5faaf15 100644 --- a/argondjbot.py +++ b/argondjbot.py @@ -1,17 +1,14 @@ #!/usr/bin/env python3 import asyncio -import configparser import datetime -import isodate -import logging import random import re import time -from apiclient.discovery import build - +import isodate import yaboli -from yaboli.util import * +from apiclient.discovery import build +from yaboli.util import asyncify, mention class Video: @@ -25,6 +22,7 @@ class Video: self.blocked = list(sorted(blocked)) if blocked is not None else None self.allowed = list(sorted(allowed)) if allowed is not None else None + class YouTube: def __init__(self, api_key): self.service = build("youtube", "v3", developerKey=api_key) @@ -47,6 +45,7 @@ class YouTube: return videos + class Playlist: COUNTRIES = { # according to en.wikipedia.org/wiki/ISO_3166-1_alpha-2, 2018-08-17 18:12:15 UTC "AD", "AE", "AF", "AG", "AI", "AL", "AM", "AO", "AQ", "AR", "AS", "AT", "AU", @@ -273,6 +272,7 @@ class Playlist: video_sum = sum((video.duration for video, _ in videos), datetime.timedelta()) return self.playtime_left() + video_sum + class ArgonDJBot(yaboli.Bot): HELP_GENERAL = ["Keeps track of the video queue. !q to queue a new video."] HELP_SPECIFIC = [ @@ -354,8 +354,8 @@ class ArgonDJBot(yaboli.Bot): "LlFmBB8wzg0", # It's soup "ne-gcy--MeY", # Crow on webcam "1s04tEDJVjY", # Smooth criminal cat - "P4JDgK6ib6Q", # Pigeon in river - "vJqiq0Feqng", # Charles Cornell quack + "P4JDgK6ib6Q", # Pigeon in river + "vJqiq0Feqng", # Charles Cornell quack ] DRAMATICSKIP_VIDEOS = [ "VHkP88fx164", # animated video @@ -626,4 +626,3 @@ def main(): if __name__ == "__main__": main() -