mirror of
https://github.com/Fluffy-Bean/Lynxie.git
synced 2025-05-28 22:33:14 +00:00
Add animals command
Fix Youtube playback Add Database file
This commit is contained in:
parent
d7953e9808
commit
0c1909807a
12 changed files with 623 additions and 126 deletions
|
|
@ -2,12 +2,12 @@ from .help import Help
|
|||
from .ping import Ping
|
||||
from .hello import Hello
|
||||
from .music import Music
|
||||
from .e621 import E621
|
||||
from .animals import Animals
|
||||
|
||||
__all__ = [
|
||||
"Help",
|
||||
"Ping",
|
||||
"Hello",
|
||||
"Music",
|
||||
"E621",
|
||||
"Animals",
|
||||
]
|
||||
|
|
|
|||
48
lynxie/commands/animals.py
Normal file
48
lynxie/commands/animals.py
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
import requests
|
||||
from io import BytesIO
|
||||
|
||||
import discord
|
||||
from discord.ext import commands
|
||||
|
||||
from lynxie.config import TINYFOX_ANIMALS
|
||||
from lynxie.utils import error_message
|
||||
|
||||
|
||||
class Animals(commands.Cog):
|
||||
def __init__(self, bot):
|
||||
self.bot = bot
|
||||
|
||||
|
||||
@commands.command()
|
||||
async def animal(self, ctx, animal):
|
||||
animal = animal.lower().strip() or "racc"
|
||||
animal_filename = f"{animal}.png"
|
||||
|
||||
if animal not in TINYFOX_ANIMALS:
|
||||
await ctx.reply(
|
||||
embed=error_message(
|
||||
f"That animal doesn't exist! Try one of these:\n"
|
||||
f"`{', '.join(TINYFOX_ANIMALS)}`"
|
||||
)
|
||||
)
|
||||
return
|
||||
|
||||
async with ctx.typing():
|
||||
animal_image_request = requests.get(f"https://api.tinyfox.dev/img?animal={animal}").content
|
||||
animal_image = BytesIO(animal_image_request)
|
||||
animal_image.seek(0)
|
||||
animal_file = discord.File(animal_image, filename=animal_filename)
|
||||
|
||||
embed = discord.Embed(
|
||||
title="Animal",
|
||||
description=f"Here's a random {animal}!",
|
||||
colour=discord.Colour.orange(),
|
||||
).set_image(
|
||||
url="attachment://" + animal_filename
|
||||
)
|
||||
|
||||
await ctx.reply(
|
||||
embed=embed,
|
||||
file=animal_file,
|
||||
mention_author=False
|
||||
)
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
from selenium import webdriver
|
||||
from bs4 import BeautifulSoup
|
||||
import discord
|
||||
from discord.ext import commands
|
||||
|
||||
|
||||
class E621(commands.Cog):
|
||||
def __init__(self, bot):
|
||||
self.bot = bot
|
||||
|
||||
@commands.command()
|
||||
async def e621(self, ctx):
|
||||
embed = discord.Embed(
|
||||
title="Search Results",
|
||||
description="Here's a list of jobs I found on Indeed, just for you!",
|
||||
colour=discord.Colour.orange(),
|
||||
)
|
||||
|
||||
browser = webdriver.Firefox()
|
||||
browser.get("https://www.indeed.com/jobs?q=cleaner&l=New%20York")
|
||||
soup = BeautifulSoup(browser.page_source, "html.parser")
|
||||
browser.close()
|
||||
|
||||
for job in soup.find_all("div", {"class": "job_seen_beacon"}):
|
||||
job_title = (
|
||||
job.find("h2", {"class": "jobTitle"}).find("span").text.strip()
|
||||
or "Job Title"
|
||||
)
|
||||
company_name = (
|
||||
job.find("span", {"class": "companyName"}).text.strip()
|
||||
or "Company Name"
|
||||
)
|
||||
company_location = (
|
||||
job.find("div", {"class": "companyLocation"}).text.strip() or "Location"
|
||||
)
|
||||
|
||||
embed.add_field(
|
||||
name=job_title,
|
||||
value=f"{company_name} - {company_location}",
|
||||
inline=False,
|
||||
)
|
||||
|
||||
await ctx.send(embed=embed)
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
import discord
|
||||
from discord.ext import commands
|
||||
from lynxie.config import LYNXIE_PREFIX
|
||||
|
||||
|
||||
class Help(commands.Cog):
|
||||
|
|
@ -19,7 +20,7 @@ class Help(commands.Cog):
|
|||
async def help(self, ctx):
|
||||
embed = discord.Embed(
|
||||
title="Help",
|
||||
description="Lynxie's prefix is `AAAA `",
|
||||
description=f"Lynxie's prefix is `{LYNXIE_PREFIX}`",
|
||||
colour=discord.Colour.orange(),
|
||||
)
|
||||
|
||||
|
|
@ -30,4 +31,4 @@ class Help(commands.Cog):
|
|||
inline=False,
|
||||
)
|
||||
|
||||
await ctx.send(embed=embed)
|
||||
await ctx.reply(embed=embed)
|
||||
|
|
|
|||
|
|
@ -1,46 +1,12 @@
|
|||
import asyncio
|
||||
import youtube_dl
|
||||
import yt_dlp
|
||||
import discord
|
||||
from discord.ext import commands
|
||||
from lynxie.utils import error_message
|
||||
|
||||
|
||||
youtube_dl.utils.bug_reports_message = lambda: ""
|
||||
ytdl = youtube_dl.YoutubeDL({
|
||||
"format": "bestaudio/best",
|
||||
"outtmpl": "%(extractor)s-%(id)s-%(title)s.%(ext)s",
|
||||
"restrictfilenames": True,
|
||||
"noplaylist": True,
|
||||
"nocheckcertificate": True,
|
||||
"ignoreerrors": False,
|
||||
"logtostderr": False,
|
||||
"quiet": True,
|
||||
"no_warnings": True,
|
||||
"default_search": "auto",
|
||||
})
|
||||
|
||||
|
||||
class YTDLSource(discord.PCMVolumeTransformer):
|
||||
def __init__(self, source, *, data, volume=0.5):
|
||||
super().__init__(source, volume)
|
||||
|
||||
self.data = data
|
||||
|
||||
self.title = data.get("title")
|
||||
self.url = data.get("url")
|
||||
|
||||
@classmethod
|
||||
async def from_url(cls, url, *, loop=None, stream=False):
|
||||
loop = loop or asyncio.get_event_loop()
|
||||
data = await loop.run_in_executor(
|
||||
None, lambda: ytdl.extract_info(url, download=not stream)
|
||||
)
|
||||
|
||||
if "entries" in data:
|
||||
# take first item from a playlist
|
||||
data = data["entries"][0]
|
||||
|
||||
filename = data["url"] if stream else ytdl.prepare_filename(data)
|
||||
return cls(discord.FFmpegPCMAudio(filename, options='-vn'), data=data)
|
||||
ffmpeg_options = {'options': '-vn'}
|
||||
ydl_opts = {'format': 'bestaudio'}
|
||||
ytdl = yt_dlp.YoutubeDL(ydl_opts)
|
||||
|
||||
|
||||
class Music(commands.Cog):
|
||||
|
|
@ -49,33 +15,30 @@ class Music(commands.Cog):
|
|||
|
||||
@commands.command()
|
||||
async def join(self, ctx, *, channel: discord.VoiceChannel):
|
||||
"""Joins a voice channel"""
|
||||
|
||||
if ctx.voice_client is not None:
|
||||
return await ctx.voice_client.move_to(channel)
|
||||
|
||||
await channel.connect()
|
||||
|
||||
@commands.command()
|
||||
async def play(self, ctx, *, url):
|
||||
"""Streams from a url (same as yt, but doesn't predownload)"""
|
||||
|
||||
async with ctx.typing():
|
||||
try:
|
||||
player = await YTDLSource.from_url(url, loop=self.bot.loop, stream=True)
|
||||
ctx.voice_client.play(
|
||||
player, after=lambda e: print(f"Player error: {e}") if e else None
|
||||
)
|
||||
song_info = ytdl.extract_info(url, download=False)
|
||||
print(song_info["url"])
|
||||
ctx.voice_client.play(discord.FFmpegPCMAudio(song_info["url"], **ffmpeg_options))
|
||||
except Exception:
|
||||
await ctx.send("Sorry, I can't play that video.")
|
||||
await ctx.reply(
|
||||
embed=error_message(
|
||||
"An error occurred while processing this request."
|
||||
),
|
||||
mention_author=False
|
||||
)
|
||||
return
|
||||
|
||||
await ctx.send(f"Now playing: {player.title}")
|
||||
await ctx.send(f"Now playing: {song_info['title']}")
|
||||
|
||||
@commands.command()
|
||||
async def stop(self, ctx):
|
||||
"""Stops and disconnects the bot from voice"""
|
||||
|
||||
await ctx.voice_client.disconnect()
|
||||
|
||||
@play.before_invoke
|
||||
|
|
@ -84,7 +47,9 @@ class Music(commands.Cog):
|
|||
if ctx.author.voice:
|
||||
await ctx.author.voice.channel.connect()
|
||||
else:
|
||||
await ctx.send("You are not connected to a voice channel.")
|
||||
raise commands.CommandError("Author not connected to a voice channel.")
|
||||
await ctx.reply(
|
||||
embed=error_message("You are not connected to a voice channel!"),
|
||||
mention_author=False
|
||||
)
|
||||
elif ctx.voice_client.is_playing():
|
||||
ctx.voice_client.stop()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue