first push
This commit is contained in:
parent
8bb1e1aa3e
commit
cd02852691
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
secret.txt
|
||||
16
Dockerfile
Normal file
16
Dockerfile
Normal file
@ -0,0 +1,16 @@
|
||||
FROM python:3.11-slim
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY requirements.txt requirements.txt
|
||||
RUN /usr/local/bin/python -m pip install --upgrade pip
|
||||
RUN pip3 install -r requirements.txt
|
||||
RUN rm requirements.txt
|
||||
|
||||
COPY ./src/ .
|
||||
|
||||
RUN mkdir ./data
|
||||
RUN mkdir ./data/log
|
||||
RUN mkdir ./data/config
|
||||
|
||||
CMD [ "python3", "main.py" ]
|
||||
86
README.md
86
README.md
@ -4,89 +4,3 @@
|
||||
|
||||
## Getting started
|
||||
|
||||
To make it easy for you to get started with GitLab, here's a list of recommended next steps.
|
||||
|
||||
Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
|
||||
|
||||
## Add your files
|
||||
|
||||
- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
|
||||
- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
|
||||
|
||||
```
|
||||
cd existing_repo
|
||||
git remote add origin https://gitlab.com/HendrikHeine/it-discord-bot.git
|
||||
git branch -M main
|
||||
git push -uf origin main
|
||||
```
|
||||
|
||||
## Integrate with your tools
|
||||
|
||||
- [ ] [Set up project integrations](https://gitlab.com/HendrikHeine/it-discord-bot/-/settings/integrations)
|
||||
|
||||
## Collaborate with your team
|
||||
|
||||
- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
|
||||
- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
|
||||
- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
|
||||
- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
|
||||
- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
|
||||
|
||||
## Test and Deploy
|
||||
|
||||
Use the built-in continuous integration in GitLab.
|
||||
|
||||
- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
|
||||
- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
|
||||
- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
|
||||
- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
|
||||
- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
|
||||
|
||||
***
|
||||
|
||||
# Editing this README
|
||||
|
||||
When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
|
||||
|
||||
## Suggestions for a good README
|
||||
Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
|
||||
|
||||
## Name
|
||||
Choose a self-explaining name for your project.
|
||||
|
||||
## Description
|
||||
Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
|
||||
|
||||
## Badges
|
||||
On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
|
||||
|
||||
## Visuals
|
||||
Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
|
||||
|
||||
## Installation
|
||||
Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
|
||||
|
||||
## Usage
|
||||
Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
|
||||
|
||||
## Support
|
||||
Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
|
||||
|
||||
## Roadmap
|
||||
If you have ideas for releases in the future, it is a good idea to list them in the README.
|
||||
|
||||
## Contributing
|
||||
State if you are open to contributions and what your requirements are for accepting them.
|
||||
|
||||
For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
|
||||
|
||||
You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
|
||||
|
||||
## Authors and acknowledgment
|
||||
Show your appreciation to those who have contributed to the project.
|
||||
|
||||
## License
|
||||
For open source projects, say how it is licensed.
|
||||
|
||||
## Project status
|
||||
If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
|
||||
|
||||
11
docker-compose.yml
Normal file
11
docker-compose.yml
Normal file
@ -0,0 +1,11 @@
|
||||
version: '3'
|
||||
services:
|
||||
app:
|
||||
container_name: TuxDiscordBot
|
||||
image: 'tux-discord-bot:beta'
|
||||
restart: unless-stopped
|
||||
build: .
|
||||
volumes:
|
||||
- ./data/log:/app/data/log
|
||||
- ./data/config:/app/data/config
|
||||
- ./secret.txt:/app/secret.txt
|
||||
BIN
icon/icon.png
Normal file
BIN
icon/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 96 KiB |
3
requirements.txt
Normal file
3
requirements.txt
Normal file
@ -0,0 +1,3 @@
|
||||
discord
|
||||
requests
|
||||
PyNaCl
|
||||
24
src/addons.py
Normal file
24
src/addons.py
Normal file
@ -0,0 +1,24 @@
|
||||
import requests
|
||||
|
||||
class ProgrammerExcuses:
|
||||
def __init__(self) -> None:
|
||||
self.__url = "http://programmingexcuses.com"
|
||||
|
||||
def getExcuse(self):
|
||||
page = requests.get(url=self.__url)
|
||||
content = page.content.decode().split("\n")
|
||||
for html in content:
|
||||
if 'href="/"' in html:
|
||||
start_index = html.find('3;">')
|
||||
end_index = html.find("</a></center>")
|
||||
return html[start_index+4:end_index]
|
||||
|
||||
class XKCD:
|
||||
def __init__(self) -> None:
|
||||
self.__url = "https://xkcd.com"
|
||||
|
||||
def getRandomComic(self):
|
||||
pass
|
||||
|
||||
def getLastComic(self):
|
||||
pass
|
||||
146
src/main.py
Normal file
146
src/main.py
Normal file
@ -0,0 +1,146 @@
|
||||
import time as t
|
||||
import asyncio
|
||||
import logging
|
||||
import datetime
|
||||
from unicodedata import category
|
||||
import secretHandler
|
||||
from addons import ProgrammerExcuses
|
||||
from addons import XKCD
|
||||
|
||||
import discord
|
||||
from discord import Status
|
||||
from discord import app_commands
|
||||
from discord import Interaction
|
||||
from discord import Embed
|
||||
from discord import Guild
|
||||
from discord import Color
|
||||
from discord.activity import Game
|
||||
|
||||
botVersion = "1.0.1"
|
||||
botDate = "03.02.2023"
|
||||
|
||||
secret = secretHandler.secret()
|
||||
token = secret.loadSecret("secret.txt")
|
||||
if token[0] != 0:
|
||||
exit(f"Cannot load token. Error Code {token[0]}")
|
||||
botToken = token[1]
|
||||
|
||||
# Init Logger
|
||||
logger = logging.getLogger('discord')
|
||||
logger.setLevel(logging.DEBUG)
|
||||
handler = logging.FileHandler(filename='discord.log', encoding='utf-8', mode='a')
|
||||
handler.setFormatter(logging.Formatter('%(asctime)s|%(levelname)s|%(name)s|:%(message)s'))
|
||||
logger.addHandler(handler)
|
||||
|
||||
#Init Addons
|
||||
programmerExcuses = ProgrammerExcuses()
|
||||
xkcd = XKCD()
|
||||
|
||||
class client(discord.Client):
|
||||
async def startup(self):
|
||||
await self.wait_until_ready()
|
||||
|
||||
def getDateTime():
|
||||
dateNow = datetime.datetime.now()
|
||||
dateNow = str(dateNow).split(" ")
|
||||
unix = t.time()
|
||||
time = dateNow[1]
|
||||
time = time.split(".")
|
||||
time = time[0]
|
||||
dateNow = dateNow[0]
|
||||
return dateNow, time, unix
|
||||
|
||||
startTime = getDateTime()[2]
|
||||
|
||||
bot = client(intents=discord.Intents.all())
|
||||
tree = app_commands.CommandTree(client=bot)
|
||||
|
||||
async def chnagePresence():
|
||||
while True:
|
||||
await bot.change_presence(activity=Game(name="with penguins"), status=Status.online)
|
||||
await asyncio.sleep(20)
|
||||
|
||||
countGuilds = 0
|
||||
async for guild in bot.fetch_guilds():
|
||||
countGuilds += 1
|
||||
|
||||
await bot.change_presence(activity=Game(name=f"on {countGuilds} Servers"), status=Status.online)
|
||||
await asyncio.sleep(20)
|
||||
|
||||
@bot.event
|
||||
async def on_ready():
|
||||
startTime = getDateTime()[2]
|
||||
bot.loop.create_task(chnagePresence())
|
||||
logger.info(f"Logged in as: {bot.user.name} with ID {bot.user.id}")
|
||||
await bot.change_presence(activity=Game(name="with penguins"), status=Status.online)
|
||||
await tree.sync()
|
||||
|
||||
@bot.event
|
||||
async def on_guild_join(guild: Guild):
|
||||
logger.info("Added to Guild")
|
||||
await guild.system_channel.send("Hii^^")
|
||||
|
||||
|
||||
|
||||
@tree.command(name='excuse', description='Get a random excuse from programmer excuses')
|
||||
async def slash(interaction: Interaction):
|
||||
await interaction.response.send_message(programmerExcuses.getExcuse())
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@tree.command(name="info", description="get info about this server")
|
||||
async def slash(interaction: Interaction):
|
||||
logger.info("Command: info")
|
||||
timeNow = getDateTime()[2]
|
||||
uptime = timeNow - startTime
|
||||
|
||||
serverString = \
|
||||
f"""\
|
||||
Owner: {interaction.guild.owner}
|
||||
Name: {interaction.guild.name}
|
||||
"""
|
||||
botString = \
|
||||
f"""\
|
||||
Uptime: {int(round(uptime/60, 1))}m
|
||||
Version: {botVersion} from {botDate}
|
||||
Developer: DasMoorhuhn.py#2604
|
||||
Sourcecode: https://gitlab.com/HendrikHeine/it-discord-bot
|
||||
"""
|
||||
|
||||
embed = discord.Embed(title=f"Info", description="about this Server", timestamp=datetime.datetime.utcnow(), color=Color.blue())
|
||||
#embed.set_thumbnail(url=interaction.guild.icon)
|
||||
embed.add_field(name="Server", value=serverString, inline=False)
|
||||
embed.add_field(name="Bot", value=botString, inline=False)
|
||||
await interaction.response.send_message(embed=embed)
|
||||
|
||||
@tree.command(name="help", description="List of all Commands")
|
||||
async def slash(interaction: Interaction):
|
||||
logger.info("Command: help")
|
||||
commandListString = \
|
||||
"""\
|
||||
`/info`: Get infos about the server and the Bot
|
||||
`/help`: Get this view
|
||||
"""
|
||||
embed = discord.Embed(title=f"Help", description="List of commands", color=Color.blue())
|
||||
#embed.set_thumbnail(url=interaction.guild.icon)
|
||||
embed.add_field(name="Commands", value=commandListString, inline=True)
|
||||
|
||||
await interaction.response.send_message(embed=embed)
|
||||
|
||||
@tree.error
|
||||
async def on_app_command_error(interaction: Interaction, error):
|
||||
if isinstance(error, app_commands.MissingPermissions):
|
||||
await interaction.response.send_message(content="Du hast keine Adminrechte", ephemeral=True)
|
||||
else:
|
||||
raise error
|
||||
|
||||
#Prevent Gateway Heartbeat Block
|
||||
try:
|
||||
bot.run(token=botToken)
|
||||
except Exception as err:
|
||||
raise err
|
||||
exit(1)
|
||||
finally:
|
||||
logger.info("Stopped")
|
||||
69
src/secretHandler.py
Normal file
69
src/secretHandler.py
Normal file
@ -0,0 +1,69 @@
|
||||
'''https://gitlab.com/HendrikHeine/py-secret-handler'''
|
||||
|
||||
import json
|
||||
|
||||
class __fileType:
|
||||
def __init__(self) -> None:
|
||||
pass
|
||||
|
||||
def _loadFromTXT(self, fileName:str):
|
||||
'''!!!DONT USE!!!'''
|
||||
try:
|
||||
with open(file=fileName, mode="r") as file:
|
||||
return [0, str(file.readlines()[0].strip("\n"))]
|
||||
except:
|
||||
return [1]
|
||||
|
||||
def _loadFromJSON(self, fileName:str, item:str):
|
||||
'''!!!DONT USE!!!'''
|
||||
if item == "":
|
||||
return [2]
|
||||
else:
|
||||
try:
|
||||
with open(file=fileName, mode="r") as file:
|
||||
try:return [0, json.loads(file.read())[item]]
|
||||
except:return [5]
|
||||
except:
|
||||
return [1]
|
||||
|
||||
class secret(__fileType):
|
||||
'''Class for load secrets like API keys or tokens'''
|
||||
def __init__(self) -> None:
|
||||
super().__init__()
|
||||
|
||||
def loadSecret(self, fileName:str, item=""):
|
||||
'''
|
||||
fileName(str)
|
||||
the name of the secret file.
|
||||
Valid formats: .json and .txt
|
||||
|
||||
item(str)
|
||||
name of the item in the JSON file. By default empty
|
||||
|
||||
Return Values(list):
|
||||
0: Ok
|
||||
1: File could not load
|
||||
2: No item given for JSON
|
||||
3: Invalid file format (for example .exe, .csv)
|
||||
4: No format for file given
|
||||
5: Invalid item for JSON
|
||||
'''
|
||||
try:fileType = fileName.split(".")[1]
|
||||
except:return [4]
|
||||
|
||||
if fileType == "json":
|
||||
result = self._loadFromJSON(fileName=fileName, item=item)
|
||||
if result[0] == 0:
|
||||
return result
|
||||
else:
|
||||
return [result[0]]
|
||||
|
||||
elif fileType == "txt":
|
||||
result = self._loadFromTXT(fileName=fileName)
|
||||
if result[0] == 0:
|
||||
return result
|
||||
else:
|
||||
return [result[0]]
|
||||
|
||||
else:
|
||||
return [3]
|
||||
Loading…
x
Reference in New Issue
Block a user