From 98edc169626ad41d1921ba0e1115b2440ab608b1 Mon Sep 17 00:00:00 2001 From: Alex D <41419744+exituser@users.noreply.github.com> Date: Sun, 23 Apr 2023 19:01:06 +0300 Subject: [PATCH] cool edited files --- .gitignore | 264 +++++++++++++++++++++++++++++++++++++++++++++++ cogs/coins.py | 14 +-- cogs/commands.py | 7 +- cogs/magshar.py | 9 +- cogs/ping.py | 1 + cogs/test.py | 17 +-- main.py | 19 ++-- settings.py | 1 + 8 files changed, 304 insertions(+), 28 deletions(-) create mode 100644 .gitignore create mode 100644 settings.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a08bad4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,264 @@ +# Created by https://www.toptal.com/developers/gitignore/api/python,pycharm+all +# Edit at https://www.toptal.com/developers/gitignore?templates=python,pycharm+all + +### PyCharm+all ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### PyCharm+all Patch ### +# Ignore everything but code style settings and run configurations +# that are supposed to be shared within teams. + +.idea/* + +!.idea/codeStyles +!.idea/runConfigurations + +### Python ### +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ + +### Python Patch ### +# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration +poetry.toml + +# ruff +.ruff_cache/ + +# LSP config files +pyrightconfig.json + +# End of https://www.toptal.com/developers/gitignore/api/python,pycharm+all \ No newline at end of file diff --git a/cogs/coins.py b/cogs/coins.py index b870377..8b0d6b9 100644 --- a/cogs/coins.py +++ b/cogs/coins.py @@ -1,20 +1,22 @@ -from disnake.ext import commands -import random import asyncio +import random + +from disnake.ext import commands -class coins(commands.Cog): +class Coins(commands.Cog): def __init__(self, bot): self.bot = bot - @commands.slash_command() + @commands.slash_command(name="супер", description='Команда, которая возвращает орла или решку.') async def coins(self, ctx): coin = ["Орел", "Решка"] result = random.choice(coin) - await ctx.send(f"Орел или решка? Угадайте! Результат будет через 3 секунды...") + + info = await ctx.send(f"Орел или решка? Угадайте! Результат будет через 3 секунды...") await asyncio.sleep(3) await ctx.send(f"Результат: {result}!") def setup(bot): - bot.add_cog(coins(bot)) \ No newline at end of file + bot.add_cog(Coins(bot)) diff --git a/cogs/commands.py b/cogs/commands.py index e492f04..1b0f69e 100644 --- a/cogs/commands.py +++ b/cogs/commands.py @@ -1,11 +1,11 @@ import disnake from disnake.ext import commands -class help1(commands.Cog): + +class Help1(commands.Cog): def __init__(self, bot): self.bot = bot - @commands.slash_command() async def commands(self, ctx): embed = disnake.Embed(title="Помощь по командам", description="Вот список всех моих команд и их описания:") @@ -15,5 +15,6 @@ class help1(commands.Cog): embed.add_field(name="$mute", value="Выдает мут участнику на определенное время.") await ctx.send(embed=embed) + def setup(bot): - bot.add_cog(help1(bot)) \ No newline at end of file + bot.add_cog(Help1(bot)) diff --git a/cogs/magshar.py b/cogs/magshar.py index 28c8c3f..f2c7c18 100644 --- a/cogs/magshar.py +++ b/cogs/magshar.py @@ -2,13 +2,13 @@ import random from disnake.ext import commands -class shar(commands.Cog): + +class MagicBall(commands.Cog): def __init__(self, bot): self.bot = bot - @commands.slash_command() - async def шар(self,ctx, *, question): + async def ask_a_ball(self, ctx, *, question): answers = [ "Я не знаю.", "Да.", @@ -18,5 +18,6 @@ class shar(commands.Cog): ] await ctx.send(f"Ваш вопрос: {question}\nМой ответ: {random.choice(answers)}") + def setup(bot): - bot.add_cog(shar(bot)) \ No newline at end of file + bot.add_cog(MagicBall(bot)) diff --git a/cogs/ping.py b/cogs/ping.py index 22fa682..0c48b28 100644 --- a/cogs/ping.py +++ b/cogs/ping.py @@ -1,5 +1,6 @@ from disnake.ext import commands + class Ping(commands.Cog): def __init__(self, bot): self.bot = bot diff --git a/cogs/test.py b/cogs/test.py index 4d7b25b..92bad71 100644 --- a/cogs/test.py +++ b/cogs/test.py @@ -3,7 +3,8 @@ import asyncio import disnake from disnake.ext import commands -class mute(commands.Cog): + +class Mute(commands.Cog): def __init__(self, bot): self.bot = bot @@ -11,21 +12,21 @@ class mute(commands.Cog): @commands.has_permissions(manage_roles=True) async def mute(self, ctx, member: disnake.Member, time: int, *, reason=None): guild = ctx.guild - mutedRole = disnake.utils.get(guild.roles, name="Muted") + muted_role = disnake.utils.get(guild.roles, name="Muted") - if not mutedRole: - mutedRole = await guild.create_role(name="Muted") + if not muted_role: + muted_role = await guild.create_role(name="Muted") # Проверка роли на каждый чат for channel in guild.channels: - await channel.set_permissions(mutedRole, speak=False, send_messages=False) + await channel.set_permissions(muted_role, speak=False, send_messages=False) - await member.add_roles(mutedRole, reason=reason) + await member.add_roles(muted_role, reason=reason) await ctx.send(f"{member.mention} был замучен на {time} секунд. Причина: {reason}.") await asyncio.sleep(time) - await member.remove_roles(mutedRole) + await member.remove_roles(muted_role) await ctx.send(f"{member.mention} больше не замучен.") def setup(bot): - bot.add_cog(mute(bot)) \ No newline at end of file + bot.add_cog(Mute(bot)) diff --git a/main.py b/main.py index f0f3ad5..5255c91 100644 --- a/main.py +++ b/main.py @@ -1,39 +1,44 @@ +import os +import settings import disnake from disnake.ext import commands -import os intents = disnake.Intents.all() bot = commands.Bot(command_prefix="$", intents=intents) + @bot.event async def on_ready(): print("Bot is ready") @bot.command() -@commands.has_guild_permissions(administrator=True) # administrator=True - значит что использовать команду может человек только с правом администратора +@commands.has_guild_permissions( + administrator=True) # administrator=True - значит что использовать команду может человек только с правом администратора async def setmoderator(ctx, member: disnake.Member): member = member or ctx.message.author guild = bot.get_guild(1060537877982887957) role = guild.get_role(1060541642450411560) + await member.add_roles(role) await ctx.send(f"Пользователю {member.mention} была выдана роль {role.mention}") + @bot.command() -@commands.has_guild_permissions(administrator=True) # administrator=True - значит что использовать команду может человек только с правом администратора +@commands.has_guild_permissions( + administrator=True) # administrator=True - значит что использовать команду может человек только с правом администратора async def dellmoderator(ctx, member: disnake.Member, moder_level: int): member = member or ctx.message.author guild = bot.get_guild(1060537877982887957) role = guild.get_role(1060541642450411560) + await member.remove_roles(role) await ctx.send(f"Пользователю {member.mention} была снята роль {role.mention}") - - - for filename in os.listdir("./cogs"): if filename.endswith(".py"): bot.load_extension(f"cogs.{filename[:-3]}") -bot.run("MTA5ODk5MzExMjI5NjE5NDA3MA.GUj8WN.16iwjYtaouRXbsfJhCi1U7fa75ehLFb7YRbEnU") + +bot.run(settings.discord_token) diff --git a/settings.py b/settings.py new file mode 100644 index 0000000..a77b600 --- /dev/null +++ b/settings.py @@ -0,0 +1 @@ +discord_token = "MTA5ODk5MzExMjI5NjE5NDA3MA.GUj8WN.16iwjYtaouRXbsfJhCi1U7fa75ehLFb7YRbEnU"