youtube: add support for /shorts/ URLs

This reverts commit ade97db922.

Link is down, so remove the trigger.

bot/ascii.py

@@ -9,33 +9,6 @@ from . import Plugin
 
 class Ascii(Plugin):
 
-    @command
-    def buddha(self, mask: IrcString, target: IrcString, args: Dict):
-        """prints a giant swastika
-
-        %%buddha
-        """
-        for line in (
-            '░░░░░░░░░░░░░░░▄▀▄░░░░░░░░░░░░░░░',
-            '░░░░░░░░░░░░░▄▀░░░▀▄░░░░░░░░░░░░░',
-            '░░░░░░░░░░░▄▀░░░░▄▀█░░░░░░░░░░░░░',
-            '░░░░░░░░░▄▀░░░░▄▀░▄▀░▄▀▄░░░░░░░░░',
-            '░░░░░░░▄▀░░░░▄▀░▄▀░▄▀░░░▀▄░░░░░░░',
-            '░░░░░░░█▀▄░░░░▀█░▄▀░░░░░░░▀▄░░░░░',
-            '░░░▄▀▄░▀▄░▀▄░░░░▀░░░░▄█▄░░░░▀▄░░░',
-            '░▄▀░░░▀▄░▀▄░▀▄░░░░░▄▀░█░▀▄░░░░▀▄░',
-            '░█▀▄░░░░▀▄░█▀░░░░░░░▀█░▀▄░▀▄░▄▀█░',
-            '░▀▄░▀▄░░░░▀░░░░▄█▄░░░░▀▄░▀▄░█░▄▀░',
-            '░░░▀▄░▀▄░░░░░▄▀░█░▀▄░░░░▀▄░▀█▀░░░',
-            '░░░░░▀▄░▀▄░▄▀░▄▀░█▀░░░░▄▀█░░░░░░░',
-            '░░░░░░░▀▄░█░▄▀░▄▀░░░░▄▀░▄▀░░░░░░░',
-            '░░░░░░░░░▀█▀░▄▀░░░░▄▀░▄▀░░░░░░░░░',
-            '░░░░░░░░░░░░░█▀▄░▄▀░▄▀░░░░░░░░░░░',
-            '░░░░░░░░░░░░░▀▄░█░▄▀░░░░░░░░░░░░░',
-            '░░░░░░░░░░░░░░░▀█▀░░░░░░░░░░░░░░░'
-        ):
-            self.bot.privmsg(target, line)
-
     @command
     def rotschwuchtel(self, mask: IrcString, target: IrcString, args: Dict):
         """prints a giant hammer and sickle

bot/coins.py

@@ -10,12 +10,12 @@ def _currency(name, prefix=None, suffix=None):
     def tostr(value):
         return '{prefix}{value:,.2f}{suffix}'.format(
                 prefix=prefix or '',
-                suffix=suffix or ('' if (prefix or suffix) else (' ' + name)),
+                suffix=suffix or ('' if (prefix or suffix) else (' ' + name.upper())),
                 value=value)
     return tostr
 
 class Coins(Plugin):
-    API_URL = 'https://api.cryptowat.ch/markets/{market}/{crypto}{currency}/summary'
+    API_URL = 'https://api.coingecko.com/api/v3/simple/price'
 
     CURRENCIES = {
         'usd': _currency('usd', prefix='$'),
@@ -23,60 +23,89 @@ class Coins(Plugin):
         'eth': _currency('eth', suffix='Ξ'),
         'btc': _currency('btc', suffix='฿'),
         'xmr': _currency('xmr'),
+        'xrp': _currency('xrp')
+    }
+
+    CRYPTO_IDS = {
+        'btc': 'bitcoin',
+        'eth': 'ethereum',
+        'xmr': 'monero',
+        'xrp': 'ripple'
     }
 
     @command
     def btc(self, mask: IrcString, target: IrcString, args: Dict):
-        """Gets the Bitcoin values from cryptowatch.
+        """Gets the Bitcoin values from coingecko.
 
         %%btc [<currency>]
         """
-        return self.cryptowat_summary('btc', 'coinbase', args)
+        return self.coingecko_summary('btc', args)
 
     @command
     def eth(self, mask: IrcString, target: IrcString, args: Dict):
-        """Gets the Ethereum values from cryptowatch.
+        """Gets the Ethereum values from coingecko.
 
         %%eth [<currency>]
         """
-        return self.cryptowat_summary('eth', 'coinbase', args)
+        return self.coingecko_summary('eth', args)
 
     @command
     def xmr(self, mask: IrcString, target: IrcString, args: Dict):
-        """Gets the Monero values from cryptowatch.
+        """Gets the Monero values from coingecko.
 
         %%xmr [<currency>]
         """
-        return self.cryptowat_summary('xmr', 'bitfinex', args)
+        return self.coingecko_summary('xmr', args)
+
+    @command
+    def xrp(self, mask: IrcString, target: IrcString, args: Dict):
+        """Gets the Ripple values from coingecko.
+
+        %%xrp [<currency>]
+        """
+        return self.coingecko_summary('xrp', args)
+
+    def coingecko_summary(self, crypto: str, args: Dict):
+        crypto_id = self.CRYPTO_IDS.get(crypto)
+        if crypto_id is None:
+            raise ValueError
 
-    def cryptowat_summary(self, crypto: str, market: str, args: Dict):
         currency = args.get('<currency>', 'eur').lower()
 
+        def format_response(response: str) -> str:
+            return f'\x02[{crypto.upper()}]\x02 {response}'
+
         if currency not in self.CURRENCIES or crypto == currency:
-            return '\x02[{}]\x02 Can\'t convert or invalid currency: {}'.format(crypto.upper(), currency)
+            return format_response(f'Can\'t convert or invalid currency: {currency}')
 
-        def get_data(cur):
+        res = requests.get(self.API_URL, params={
-            return requests.get(self.API_URL.format(crypto=crypto, market=market, currency=cur))
+            'ids': crypto_id,
+            'vs_currencies': currency,
+            'include_market_cap': 'true',
+            'include_24hr_vol': 'true',
+            'include_24hr_change': 'true'
+        })
 
-        data = get_data(currency)
+        if res.status_code == 429:
-        if not data and currency != 'usd':
+            return format_response('Rate Limit exceeded')
-            data = get_data('usd')
+
-            currency = 'usd'
+        if res.status_code != 200:
-        if not data:
+            return format_response('API Error')
-            return '\x02[{}]\x02 No data received'.format(crypto)
+
+        data = res.json()[crypto_id]
+
+        if currency not in data:
+            return format_response('No data received')
 
         to_currency = self.CURRENCIES[currency]
 
-        result = data.json()['result']
+        return format_response(
-        return '\x02[{crypto}]\x02 ' \
+               'Price: \x02\x0307{price}\x0F - ' \
-               'Current: \x02\x0307{last}\x0F - ' \
-               'High: \x02\x0303{high}\x0F - ' \
-               'Low: \x02\x0304{low}\x0F - ' \
                'Change: \x02\x0307{change:,.2f}%\x0F - ' \
-               'Volume: \x02\x0307{volume}\x0F' \
+               'Volume: \x02\x0307{volume}\x0F - ' \
+               'Market Cap: \x02\x0307{market_cap}\x0F' \
             .format(crypto=crypto.upper(),
-                    last=to_currency(result['price']['last']),
+                    price=to_currency(data[currency]),
-                    high=to_currency(result['price']['high']),
+                    change=data[f'{currency}_24h_change'],
-                    low=to_currency(result['price']['low']),
+                    volume=data[f'{currency}_24h_vol'],
-                    change=result['price']['change']['percentage'] * 100,
+                    market_cap=to_currency(data[f'{currency}_market_cap'])))
-                    volume=result['volume'])

bot/drugs.py

@@ -113,4 +113,4 @@ class Drugs(Plugin):
 
         %%meth [<nick>]
         """
-        self.bot.action(target, 'legt {} eine dicke Line Meth \________'.format(args.get('<nick>', mask.nick)))
+        self.bot.action(target, r'legt {} eine dicke Line Meth \________'.format(args.get('<nick>', mask.nick)))

bot/linux.py

@@ -2,7 +2,7 @@
 import random
 
 import irc3
-import feedparser
+import requests
 from docopt import Dict
 from irc3.plugins.command import command
 from irc3.utils import IrcString
@@ -19,18 +19,18 @@ GNU_LINUX = """I'd Just Like To Interject For A Moment. What you're referring
 
 
 class Linux(Plugin):
-    KERNEL_FEED = 'https://www.kernel.org/feeds/kdist.xml'
+    KERNEL_FEED = 'https://www.kernel.org/releases.json'
 
     @irc3.event(r'(?i)^:\S+ PRIVMSG (?P<target>\S+) :(?:.* )?(debian|ubuntu|apt|dpkg|flash)(?: .*|$)')
     def debillian(self, target: str):
         """Annoying RE trigger for debian with variable count of E."""
-        if random.randint(0, 3) is 0:
+        if random.randint(0, 3) == 0:
             self.bot.privmsg(target, re_generator())
 
     @irc3.event(r'(?i)^:\S+ PRIVMSG (?P<target>\S+) :.*(?<!gnu[/+])linux(?! kernel).*')
     def linux(self, target: str):
         """Super annoying, useless 'Stallman is mad' trigger."""
-        if random.randint(0, 12) is 0:
+        if random.randint(0, 12) == 0:
             self.bot.privmsg(target, GNU_LINUX)
 
     @command
@@ -39,21 +39,17 @@ class Linux(Plugin):
 
         %%kernel
         """
-        feed = feedparser.parse(self.KERNEL_FEED)
+        try:
-
+            res = requests.get(self.KERNEL_FEED, timeout=10).json()
-        # Cancel if no feed or entries
+        except requests.exceptions.RequestException:
-        if not feed or not feed.get('entries'):
+            return '\x02[Kernel]\x02 Error fetching kernel.org releases'
-            self.log.error('Error fetching kernel.org releases feed')
+        except requests.exceptions.JSONDecodeError:
-            return
+            return '\x02[Kernel]\x02 Error decoding kernel.org releases'
 
         # Make list of releases
         releases = []
-        for e in feed['entries']:
+        for release in res['releases']:
-            version, branch = e['title'].split(': ')
+            releases.append('\x02{}\x02 ({}{})'.format(release['version'], release['moniker'],
-
+                                                       ', \x1DEOL\x1D' if release['iseol'] else ''))
-            if '(EOL)' in e['description']:
-                branch = '{}, \x1DEOL\x1D'.format(branch)
-
-            releases.append('\x02{}\x02 ({})'.format(version, branch))
 
         return '\x02[Kernel]\x02 {}'.format(', '.join(releases))

bot/mcmaniac.py

@@ -49,8 +49,8 @@ class McManiac(DatabasePlugin):
             if result:
                 return '[{rank}/{total}] {item}'.format(**result)
 
-    @irc3.event(r'^:(?P<mask>\S+) PRIVMSG \S+ :.*?\b(?P<item>Mc\S+iaC)\b.*')
+    @irc3.event(r'^:(?P<mask>\S+) PRIVMSG (?P<channel>#\S+) :.*?\b(?P<item>Mc\S+iaC)\b.*')
-    def save(self, mask: str, item: str):
+    def save(self, mask: str, channel: str, item: str):
         if IrcString(mask).nick != self.bot.nick:
             with self.con.cursor() as cur:
                 cur.execute('''
@@ -59,5 +59,11 @@ class McManiac(DatabasePlugin):
                 VALUES
                   (%s)
                 ON CONFLICT DO NOTHING
+                RETURNING
+                  (SELECT (count(*) + 1) AS total FROM mcmaniacs)
                 ''', [item])
                 self.con.commit()
+                result = cur.fetchone()
+            if result is None:
+                return
+            self.bot.privmsg(channel, f"{result['total']}. mcmaniac added: {item}")

bot/quotes.py

@@ -87,7 +87,7 @@ class Quotes(DatabasePlugin):
                 self.con.commit()
             except Error as ex:
                 # Rollback transaction on error
-                print(ex)
+                self.log.error(ex)
                 self.con.rollback()
         else:
             query = None

bot/urlinfo.py

@@ -9,17 +9,17 @@ from . import Plugin
 
 class URLInfo(Plugin):
     BLACKLIST = [
-        "^https?:\/\/(?:www\.)?youtube\.com",
+        r"^https?:\/\/(?:www\.)?youtube\.com",
-        "^https?:\/\/youtu\.be",
+        r"^https?:\/\/youtu\.be",
-        "^https?:\/\/w0bm\.com",
+        r"^https?:\/\/w0bm\.com",
-        "^https?:\/\/f0ck\.me",
+        r"^https?:\/\/f0ck\.me",
-        "^https?:\/\/(?:(?:vid|img|thumb)\.)?pr0gramm\.com"
+        r"^https?:\/\/(?:(?:vid|img|thumb)\.)?pr0gramm\.com"
     ]
 
     # set the size limit to 2 MB so we don't fully download too large resources
     SIZE_LIMIT = 2 * 1024 ** 2
 
-    @irc3.event(r'(?i)^:\S+ PRIVMSG (?P<target>\S+) :.*(?P<url>https?:\/\/\S+\.\S+).*')
+    @irc3.event(r'(?i)^:\S+ PRIVMSG (?P<target>\S+) :.*?(?P<url>https?:\/\/\S+\.\S+).*')
     def url_parser(self, target: str, url: str):
         for regex in self.BLACKLIST:
             if re.match(regex, url):
@@ -39,7 +39,7 @@ class URLInfo(Plugin):
                     if size >= self.SIZE_LIMIT:
                         return
                     bytes_io.write(chunk)
-        except (requests.exceptions.ConnectionError, requests.exceptions.HTTPError, requests.exceptions.ReadTimeout, requests.exceptions.TooManyRedirects):
+        except requests.exceptions.RequestException:
             return
 
         bytes_io.seek(0)

bot/useless.py

@@ -471,14 +471,6 @@ class Useless(DatabasePlugin):
         nick = args.get('<nick>', mask.nick)
         self.bot.action(target, 'hustet {0} in\'s Gesicht'.format(nick, nick))
 
-    @command
-    def vampir(self, mask: IrcString, target: IrcString, args: Dict):
-        """Sends a url with the cute vampire cat :3
-        
-        %%vampir
-        """
-        return 'https://files.catbox.moe/ma2dfs.png'
-
     @command
     def hebamme(self, mask: IrcString, target: IrcString, args: Dict):
         """Tells you to get the fuck outta this group

bot/youtube.py

@@ -15,7 +15,8 @@ from .utils import date_from_iso
 class YouTube(Plugin):
     URL = 'https://www.googleapis.com/youtube/v3'
     API = '{}/videos?part=snippet,statistics,contentDetails'.format(URL)
-    SEARCH = '{}/search?part=id'.format(URL)
+    SEARCH = '{}/search?type=video&maxResults=1&part=id'.format(URL)
+    RETURN_YOUTUBE_DISLIKE_API = 'https://returnyoutubedislikeapi.com/votes'
 
     def get_video_data(self, video_id: str):
         """Requests the infos for a video id and formats them."""
@@ -24,13 +25,15 @@ class YouTube(Plugin):
         if not data.get('items'):
             return
 
+        return_youtube_dislike_response = requests.get(self.RETURN_YOUTUBE_DISLIKE_API, params={'videoId': video_id}).json()
+
         item = data['items'][0]
         date = date_from_iso(item['snippet']['publishedAt'])
-        length = re.findall('(\d+[DHMS])', item['contentDetails']['duration'])
+        length = re.findall(r'(\d+[DHMS])', item['contentDetails']['duration'])
 
         views = int(item['statistics'].get('viewCount', 0))
         likes = int(item['statistics'].get('likeCount', 0))
-        dislikes = int(item['statistics'].get('dislikeCount', 0))
+        dislikes = int(return_youtube_dislike_response.get('dislikes', 0))
 
         try:
             score = 100 * float(likes) / (likes + dislikes)
@@ -50,7 +53,7 @@ class YouTube(Plugin):
                     views=views,
                     date=date.strftime('%d.%m.%Y %H:%M:%S UTC'))
 
-    @irc3.event(r'(?i)^:\S+ PRIVMSG (?P<target>\S+) :.*(?:youtube.*?(?:v=|/v/)'
+    @irc3.event(r'(?i)^:\S+ PRIVMSG (?P<target>\S+) :.*(?:youtube.*?(?:v=|/v/|/live/|/shorts/)'
                 r'|youtu\.be/)(?P<video_id>[-_a-zA-Z0-9]+).*')
     def youtube_parser(self, target: str, video_id: str):
         data = self.get_video_data(video_id)
@@ -67,7 +70,7 @@ class YouTube(Plugin):
 
         if 'error' in data:
             return '\x02[YouTube]\x02 Error performing search'
-        elif data['pageInfo']['totalResults'] is 0:
+        elif data['pageInfo']['totalResults'] == 0:
             return '\x02[YouTube]\x02 No results found'
         else:
             video_id = data['items'][0]['id']['videoId']

requirements.txt

@@ -6,6 +6,5 @@ aiocron~=1.3
 psycopg2~=2.8
 requests~=2.22
 GitPython~=3.0
-feedparser~=5.2
 python-dotenv~=0.17.1
-lxml~=4.6
+lxml~=5.3