Compare commits
111 Commits
Author | SHA1 | Date |
---|---|---|
Michel Roux | d045afc9d8 | |
Renovate Bot | e8c6959ae5 | |
Michel Roux | 4c0314e7e6 | |
Michel Roux | d2e6a0284c | |
Renovate Bot | f8211686be | |
Renovate Bot | 4f24b29a0c | |
Michel Roux | 0ca5d79487 | |
Renovate Bot | 126c0872f6 | |
Michel Roux | 9d2d03514e | |
Renovate Bot | 6bb3775571 | |
Michel Roux | a3deadc28e | |
Renovate Bot | 9fc4012696 | |
Michel Roux | d9ad60075a | |
Renovate Bot | e3cdd89350 | |
Michel Roux | 7b518d4e99 | |
Renovate Bot | a71b1f7633 | |
Michel Roux | 6914cb8b90 | |
Renovate Bot | 547b108e0a | |
Michel Roux | a5e68a2751 | |
Renovate Bot | 1f6cff347f | |
Michel Roux | 155bd0aada | |
Michel Roux | 274b642c84 | |
Michel Roux | e14ecefcf8 | |
Renovate Bot | cea9a387c6 | |
Michel Roux | ba8befa3b0 | |
Renovate Bot | d73a88c102 | |
Michel Roux | b9b66d182b | |
Renovate Bot | 65722ba7c3 | |
Michel Roux | 59926c9b5d | |
Michel Roux | 304f80a3f5 | |
Michel Roux | 20b672df71 | |
Renovate Bot | 7f9b5c32b1 | |
Michel Roux | e9b57594cd | |
Renovate Bot | 9859863b80 | |
Michel Roux | 723595c94a | |
Renovate Bot | 0c29a9f040 | |
Michel Roux | 1a95628eb5 | |
Renovate Bot | 1a74e4428a | |
Michel Roux | b136784301 | |
Renovate Bot | ec88c636d8 | |
Michel Roux | cb5650c870 | |
Michel Roux | 596a261e00 | |
Michel Roux | 2db7b6bbf8 | |
Michel Roux | e38bfc7472 | |
Michel Roux | bedc1ed2e4 | |
Michel Roux | 831665232c | |
Michel Roux | 8ff7a6bd70 | |
Michel Roux | 226f2e1ef0 | |
Renovate Bot | cf7ef5a05b | |
Michel Roux | ad9a138a08 | |
Renovate Bot | b18864ef83 | |
Michel Roux | 73ab2891a6 | |
Renovate Bot | 5e92b511d2 | |
Michel Roux | 22fe3f8c44 | |
Renovate Bot | 7b45a22fe2 | |
Michel Roux | 753240d29e | |
Renovate Bot | 1342021398 | |
Michel Roux | e69f51b722 | |
Renovate Bot | 50fd741f9c | |
Michel Roux | 2aad442d51 | |
Michel Roux | 06797a344c | |
Renovate Bot | a84228a11c | |
Renovate Bot | b47b3de93d | |
Michel Roux | ff7576499d | |
Renovate Bot | d61b0648fc | |
Michel Roux | 95c9971d58 | |
Renovate Bot | 3f1684cf53 | |
Michel Roux | 9fa3abc5b9 | |
Renovate Bot | ef6fe70294 | |
Michel Roux | 0071466b3e | |
Renovate Bot | 42154aad48 | |
Michel Roux | 4d1cd317b9 | |
Renovate Bot | d8e2fa7504 | |
Michel Roux | 6072a3d5e6 | |
Renovate Bot | 12cd4bc38b | |
Michel Roux | 9f1e80ea0c | |
Michel Roux | 21ff9c0234 | |
Michel Roux | 21737c33e4 | |
Michel Roux | 842896642e | |
Michel Roux | 96ac519fde | |
Michel Roux | f7779ace60 | |
Michel Roux | f49f69cc79 | |
Michel Roux | 38bf85d255 | |
Michel Roux | 1d29557ab5 | |
Michel Roux | f795637848 | |
Michel Roux | 0f42bdc50b | |
Michel Roux | 14131d73ac | |
Michel Roux | a6025975a9 | |
Michel Roux | efc82c1931 | |
Michel Roux | 61987af73b | |
Renovate Bot | 25a978c1ef | |
Michel Roux | 22e440bcf4 | |
Renovate Bot | 313ce5dd41 | |
Michel Roux | d55e20a43b | |
Renovate Bot | 7204c0b382 | |
Michel Roux | a3321d0f63 | |
Michel Roux | e9ac0c0ffa | |
Renovate Bot | 8c7713e491 | |
Renovate Bot | 1f98d26734 | |
Michel Roux | 4f63c29e7c | |
Renovate Bot | fede022071 | |
Michel Roux | 6aae1a510f | |
Renovate Bot | 827c6f6e09 | |
Michel Roux | 2c60a2cd6a | |
Michel Roux | 25f4625e30 | |
Renovate Bot | cf2a35baee | |
Michel Roux | 63a8ad5e59 | |
Michel Roux | 0eb93aeee2 | |
Michel Roux | f4c2c26706 | |
Renovate Bot | 3aade97161 | |
Michel Roux | 56aacde61d |
|
@ -4,12 +4,12 @@ on: [push]
|
|||
jobs:
|
||||
lint:
|
||||
runs-on: ubuntu-latest
|
||||
container: python:3.11
|
||||
container: python:3.12.3
|
||||
steps:
|
||||
- run: apt-get update
|
||||
- run: apt-get install -y git nodejs
|
||||
- uses: actions/checkout@v3
|
||||
- uses: Gr1N/setup-poetry@v8
|
||||
- uses: actions/checkout@v4
|
||||
- uses: Gr1N/setup-poetry@v9
|
||||
- run: poetry install
|
||||
- run: poetry run flake8 .
|
||||
- run: poetry run mypy .
|
||||
|
@ -21,8 +21,8 @@ jobs:
|
|||
needs: [lint]
|
||||
steps:
|
||||
- run: apk add git nodejs
|
||||
- uses: actions/checkout@v3
|
||||
- uses: docker/metadata-action@v4
|
||||
- uses: actions/checkout@v4
|
||||
- uses: docker/metadata-action@v5
|
||||
id: meta
|
||||
with:
|
||||
images: xefir/divent
|
||||
|
@ -31,26 +31,26 @@ jobs:
|
|||
type=ref,event=tag
|
||||
type=ref,event=pr
|
||||
type=raw,value=latest,enable={{is_default_branch}}
|
||||
- uses: docker/login-action@v2
|
||||
- uses: docker/login-action@v3
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
- uses: docker/build-push-action@v4
|
||||
- uses: docker/build-push-action@v5
|
||||
with:
|
||||
push: ${{ gitea.ref == 'refs/heads/master' || startsWith(gitea.ref, 'refs/tags') }}
|
||||
push: ${{ gitea.ref_name == 'master' || gitea.ref_type == 'tag' }}
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
|
||||
pypi:
|
||||
runs-on: ubuntu-latest
|
||||
container: python:3.11
|
||||
container: python:3.12.3
|
||||
needs: [lint]
|
||||
if: startsWith(gitea.ref, 'refs/tags')
|
||||
if: gitea.ref_type == 'tag'
|
||||
env:
|
||||
POETRY_PYPI_TOKEN_PYPI: ${{ secrets.POETRY_PYPI_TOKEN_PYPI }}
|
||||
steps:
|
||||
- run: apt-get update
|
||||
- run: apt-get install -y git nodejs
|
||||
- uses: actions/checkout@v3
|
||||
- uses: Gr1N/setup-poetry@v8
|
||||
- uses: actions/checkout@v4
|
||||
- uses: Gr1N/setup-poetry@v9
|
||||
- run: poetry publish --build
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
FROM python:3.11.5 as build
|
||||
FROM python:3.12.3 as build
|
||||
|
||||
WORKDIR /app
|
||||
COPY . .
|
||||
RUN pip install poetry && poetry build
|
||||
|
||||
FROM python:3.11.5
|
||||
FROM python:3.12.3
|
||||
|
||||
COPY --from=build /app/dist /tmp/dist
|
||||
RUN pip install /tmp/dist/*.whl && rm -rf /tmp/dist
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
from divent.bot import run
|
||||
|
||||
run()
|
221
divent/bot.py
221
divent/bot.py
|
@ -3,9 +3,10 @@ import logging
|
|||
from datetime import datetime, timedelta
|
||||
from functools import wraps
|
||||
from os import getenv, path
|
||||
from typing import Dict, Optional
|
||||
from typing import Dict, Optional, Union
|
||||
|
||||
from disnake import Client, Guild
|
||||
from disnake import Asset, Client, Guild, Intents, Member, User
|
||||
from disnake.guild_scheduled_event import GuildScheduledEvent
|
||||
from dotenv import load_dotenv
|
||||
from ics import Calendar, ContentLine, Event
|
||||
from ics.alarm import DisplayAlarm
|
||||
|
@ -35,15 +36,50 @@ API_BASE_URL = getenv("API_BASE_URL", "https://discordapp.com/api")
|
|||
AUTHORIZATION_BASE_URL = f"{API_BASE_URL}/oauth2/authorize"
|
||||
TOKEN_URL = f"{API_BASE_URL}/oauth2/token"
|
||||
|
||||
CATALOG_CACHE = {}
|
||||
EVENTS_CACHE = {}
|
||||
|
||||
|
||||
class Discord(Client):
|
||||
async def on_ready(self):
|
||||
print(f"Logged on as {self.user}!", flush=True)
|
||||
|
||||
for guild in self.guilds:
|
||||
for scheduled_event in guild.scheduled_events:
|
||||
EVENTS_CACHE[scheduled_event.id] = [
|
||||
member.id
|
||||
for member in await scheduled_event.fetch_users().flatten()
|
||||
]
|
||||
|
||||
print("Events synchronised!", flush=True)
|
||||
|
||||
async def on_guild_scheduled_event_subscribe(
|
||||
self, event: GuildScheduledEvent, user: Union[Member, User]
|
||||
):
|
||||
EVENTS_CACHE[event.id].append(user.id)
|
||||
|
||||
async def on_guild_scheduled_event_unsubscribe(
|
||||
self, event: GuildScheduledEvent, user: Union[Member, User]
|
||||
):
|
||||
EVENTS_CACHE[event.id].remove(user.id)
|
||||
|
||||
async def on_guild_scheduled_event_create(self, event: GuildScheduledEvent):
|
||||
EVENTS_CACHE[event.id] = [
|
||||
member.id for member in await event.fetch_users().flatten()
|
||||
]
|
||||
|
||||
async def on_guild_scheduled_event_delete(self, event: GuildScheduledEvent):
|
||||
EVENTS_CACHE.pop(event.id)
|
||||
|
||||
|
||||
intents = Intents.default()
|
||||
intents.guild_scheduled_events = True
|
||||
intents.members = True
|
||||
client = Discord(intents=intents)
|
||||
|
||||
client = Discord()
|
||||
app = Quart(__name__)
|
||||
app.config["SECRET_KEY"] = OAUTH2_CLIENT_SECRET
|
||||
app.config["EXPLAIN_TEMPLATE_LOADING"] = QUART_DEBUG
|
||||
app.asgi_app = ProxyHeadersMiddleware(app.asgi_app, "*") # type: ignore
|
||||
|
||||
|
||||
|
@ -55,9 +91,6 @@ def get_guild_by_id(guild_id: str) -> Optional[Guild]:
|
|||
return None
|
||||
|
||||
|
||||
CATALOG_CACHE = {}
|
||||
|
||||
|
||||
@app.errorhandler(500)
|
||||
async def errorhandler(error: Exception):
|
||||
print(f"\33[31m{error}\33[m", flush=True)
|
||||
|
@ -115,17 +148,11 @@ def days_before_failure() -> int:
|
|||
return nextDelta.days
|
||||
|
||||
|
||||
def cdn_avatar_url(user_id: int, hash: str) -> str:
|
||||
ext = "gif" if hash.startswith("a_") else "png"
|
||||
return f"https://cdn.discordapp.com/avatars/{user_id}/{hash}.{ext}"
|
||||
|
||||
|
||||
@app.context_processor
|
||||
def context_processor():
|
||||
return dict(
|
||||
_=i18n,
|
||||
client=client,
|
||||
cdn_avatar_url=cdn_avatar_url,
|
||||
days_before_failure=days_before_failure(),
|
||||
)
|
||||
|
||||
|
@ -178,12 +205,10 @@ async def callback():
|
|||
@app.route("/guilds")
|
||||
@login_required
|
||||
async def guilds():
|
||||
guild = get_guild_by_id(request.args.get("guild"))
|
||||
guild = request.args.get("guild")
|
||||
|
||||
if guild:
|
||||
return redirect(
|
||||
url_for(".subscribe", guild_id=guild.vanity_url_code or guild.id)
|
||||
)
|
||||
return redirect(url_for(".subscribe", entity_id=guild))
|
||||
|
||||
try:
|
||||
discord = make_session(token=session.get("oauth2_token"))
|
||||
|
@ -199,72 +224,124 @@ async def guilds():
|
|||
common_guilds.append(bot_guild)
|
||||
|
||||
return await render_template(
|
||||
"guilds.html.j2", user=user, common_guilds=common_guilds
|
||||
"guilds.html.j2",
|
||||
user=user,
|
||||
avatar=Asset._from_avatar(None, user["id"], user["avatar"]),
|
||||
common_guilds=common_guilds,
|
||||
)
|
||||
|
||||
|
||||
@app.route("/subscribe/<guild_id>")
|
||||
@app.route("/subscribe/<entity_id>")
|
||||
@login_required
|
||||
async def subscribe(guild_id: str):
|
||||
guild = get_guild_by_id(guild_id)
|
||||
if guild is None:
|
||||
return redirect(url_for(".login"))
|
||||
async def subscribe(entity_id: str):
|
||||
guild = get_guild_by_id(entity_id)
|
||||
|
||||
try:
|
||||
discord = make_session(token=session.get("oauth2_token"))
|
||||
user_guilds = discord.get(f"{API_BASE_URL}/users/@me/guilds").json()
|
||||
except OAuth2Error:
|
||||
return redirect(url_for(".login"))
|
||||
if guild:
|
||||
try:
|
||||
discord = make_session(token=session.get("oauth2_token"))
|
||||
user_guilds = discord.get(f"{API_BASE_URL}/users/@me/guilds").json()
|
||||
except OAuth2Error:
|
||||
return redirect(url_for(".login"))
|
||||
|
||||
if not any(str(guild.id) == user_guild["id"] for user_guild in user_guilds):
|
||||
return redirect(url_for(".login"))
|
||||
if not any(str(guild.id) == user_guild["id"] for user_guild in user_guilds):
|
||||
return redirect(url_for(".login"))
|
||||
|
||||
return await render_template("subscribe.html.j2", guild=guild)
|
||||
|
||||
|
||||
@app.route("/<guild_id>.ics")
|
||||
async def ical(guild_id: str):
|
||||
guild = get_guild_by_id(guild_id)
|
||||
if guild is None:
|
||||
return redirect(url_for(".login"))
|
||||
|
||||
calendar = Calendar()
|
||||
|
||||
calendar.extra.append(ContentLine(name="REFRESH-INTERVAL", value="PT1H"))
|
||||
calendar.extra.append(ContentLine(name="X-PUBLISHED-TTL", value="PT1H"))
|
||||
|
||||
calendar.extra.append(ContentLine(name="NAME", value=guild.name))
|
||||
calendar.extra.append(ContentLine(name="X-WR-CALNAME", value=guild.name))
|
||||
|
||||
if guild.description:
|
||||
calendar.extra.append(ContentLine(name="DESCRIPTION", value=guild.description))
|
||||
calendar.extra.append(ContentLine(name="X-WR-CALDESC", value=guild.description))
|
||||
|
||||
for scheduled_event in guild.scheduled_events:
|
||||
event = Event()
|
||||
event.summary = scheduled_event.name
|
||||
event.begin = scheduled_event.scheduled_start_time
|
||||
event.end = scheduled_event.scheduled_end_time
|
||||
event.duration = timedelta(hours=2)
|
||||
event.uid = str(scheduled_event.id)
|
||||
event.description = scheduled_event.description
|
||||
event.url = f"https://discord.com/events/{guild_id}/{scheduled_event.id}"
|
||||
event.location = (
|
||||
scheduled_event.entity_metadata.location
|
||||
if scheduled_event.entity_metadata
|
||||
else None
|
||||
return await render_template(
|
||||
"subscribe.html.j2",
|
||||
avatar=guild.icon,
|
||||
entity_id=guild.vanity_url_code or guild.id,
|
||||
)
|
||||
|
||||
alarm = DisplayAlarm()
|
||||
alarm.trigger = timedelta(hours=-1)
|
||||
event.alarms.append(alarm)
|
||||
try:
|
||||
user = await client.get_or_fetch_user(int(entity_id))
|
||||
except ValueError:
|
||||
return redirect(url_for(".login"))
|
||||
|
||||
calendar.events.append(event)
|
||||
if user and str(user.id) == entity_id:
|
||||
return await render_template(
|
||||
"subscribe.html.j2", avatar=user.avatar, entity_id=user.id
|
||||
)
|
||||
|
||||
return calendar.serialize()
|
||||
return redirect(url_for(".login"))
|
||||
|
||||
|
||||
def __main__():
|
||||
quart_task = client.loop.create_task(app.run_task("0.0.0.0"))
|
||||
quart_task.add_done_callback(lambda f: client.loop.stop())
|
||||
client.run(DISCORD_TOKEN)
|
||||
def make_event(scheduled_event: GuildScheduledEvent) -> Event:
|
||||
event = Event()
|
||||
|
||||
event.summary = scheduled_event.name
|
||||
event.begin = scheduled_event.scheduled_start_time
|
||||
event.end = scheduled_event.scheduled_end_time
|
||||
event.duration = timedelta(hours=2)
|
||||
event.uid = str(scheduled_event.id)
|
||||
event.description = scheduled_event.description
|
||||
event.url = scheduled_event.url
|
||||
event.location = (
|
||||
scheduled_event.entity_metadata.location
|
||||
if scheduled_event.entity_metadata
|
||||
else None
|
||||
)
|
||||
|
||||
alarm = DisplayAlarm()
|
||||
alarm.trigger = timedelta(hours=-1)
|
||||
event.alarms.append(alarm)
|
||||
|
||||
return event
|
||||
|
||||
|
||||
@app.route("/<entity_id>.ics")
|
||||
async def ical(entity_id: str):
|
||||
guild = get_guild_by_id(entity_id)
|
||||
|
||||
if guild:
|
||||
calendar = Calendar()
|
||||
|
||||
calendar.extra.append(ContentLine(name="REFRESH-INTERVAL", value="PT1H"))
|
||||
calendar.extra.append(ContentLine(name="X-PUBLISHED-TTL", value="PT1H"))
|
||||
|
||||
calendar.extra.append(ContentLine(name="NAME", value=guild.name))
|
||||
calendar.extra.append(ContentLine(name="X-WR-CALNAME", value=guild.name))
|
||||
|
||||
if guild.description:
|
||||
calendar.extra.append(
|
||||
ContentLine(name="DESCRIPTION", value=guild.description)
|
||||
)
|
||||
calendar.extra.append(
|
||||
ContentLine(name="X-WR-CALDESC", value=guild.description)
|
||||
)
|
||||
|
||||
for scheduled_event in guild.scheduled_events:
|
||||
event = make_event(scheduled_event)
|
||||
calendar.events.append(event)
|
||||
|
||||
return calendar.serialize()
|
||||
|
||||
try:
|
||||
user = await client.get_or_fetch_user(int(entity_id))
|
||||
except ValueError:
|
||||
return redirect(url_for(".login"))
|
||||
|
||||
if user:
|
||||
calendar = Calendar()
|
||||
|
||||
calendar.extra.append(ContentLine(name="REFRESH-INTERVAL", value="PT1H"))
|
||||
calendar.extra.append(ContentLine(name="X-PUBLISHED-TTL", value="PT1H"))
|
||||
|
||||
calendar.extra.append(ContentLine(name="NAME", value=client.user.display_name))
|
||||
calendar.extra.append(
|
||||
ContentLine(name="X-WR-CALNAME", value=client.user.display_name)
|
||||
)
|
||||
|
||||
for guild in client.guilds:
|
||||
for scheduled_event in guild.scheduled_events:
|
||||
if user.id in EVENTS_CACHE[scheduled_event.id]:
|
||||
event = make_event(scheduled_event)
|
||||
calendar.events.append(event)
|
||||
|
||||
return calendar.serialize()
|
||||
|
||||
return redirect(url_for(".login"))
|
||||
|
||||
|
||||
def run():
|
||||
client.loop.create_task(client.start(DISCORD_TOKEN))
|
||||
app.run("0.0.0.0", loop=client.loop)
|
||||
|
|
|
@ -6,11 +6,11 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<meta name="description" content="" />
|
||||
<meta name="keywords" content="" />
|
||||
<title>{{ client.user.display_name }} - {{ _('The discord scheduled event calendar generator') }}</title>
|
||||
<title>{{ client.user.display_name }} - {{ _("The discord scheduled event calendar generator") }}</title>
|
||||
<link rel="stylesheet"
|
||||
href="{{ url_for('static', filename='css/font-awesome.min.css') }}"/>
|
||||
href="{{ url_for('static', filename='css/font-awesome.min.css') }}" />
|
||||
<link rel="stylesheet"
|
||||
href="{{ url_for('static', filename='css/global.css') }}"/>
|
||||
href="{{ url_for('static', filename='css/global.css') }}" />
|
||||
</head>
|
||||
<body>
|
||||
<div id="content">
|
||||
|
|
|
@ -3,17 +3,17 @@
|
|||
<div id="box">
|
||||
<div id="avatars">
|
||||
<img src="{{ url_for('static', filename='img/deadlink.png') }}"
|
||||
alt="{{ _('Link is dead') }}"
|
||||
alt="{{ _("Link is dead") }}"
|
||||
height="179"
|
||||
width="173"/>
|
||||
width="173" />
|
||||
</div>
|
||||
<hr />
|
||||
<span>{{ error }}</span>
|
||||
</div>
|
||||
<div id="buttons">
|
||||
<a href="{{ url_for('index') }}">
|
||||
<a href="{{ url_for("index") }}">
|
||||
<i class="fa fa-arrow-left"></i>
|
||||
{{ _('Back to the beginning') }}
|
||||
{{ _("Back to the beginning") }}
|
||||
</a>
|
||||
</div>
|
||||
{% endblock content %}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<li>
|
||||
<a href="https://discord.com/users/133305654512320513" target="_blank">
|
||||
<i class="fa fa-user-plus"></i>
|
||||
{{ _('Add author on Discord') }}
|
||||
{{ _("Add author on Discord") }}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
|
@ -16,17 +16,17 @@
|
|||
<li>
|
||||
<a href="https://git.crystalyx.net/Xefir/Divent" target="_blank">
|
||||
<i class="fa fa-code-fork"></i>
|
||||
{{ _('View the source code') }}
|
||||
{{ _("View the source code") }}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://hub.docker.com/r/xefir/divent" target="_blank">
|
||||
<i class="fa fa-cubes"></i>
|
||||
{{ _('Host it yourself') }}
|
||||
{{ _("Host it yourself") }}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<i class="fa fa-heartbeat"></i>
|
||||
{{ _('Next castastrophic life failure in about %days% days') | replace('%days%', days_before_failure) }}
|
||||
{{ _("Next castastrophic life failure in about %days% days") | replace('%days%', days_before_failure) }}
|
||||
</li>
|
||||
</ul>
|
||||
|
|
|
@ -4,32 +4,30 @@
|
|||
<div id="box">
|
||||
<div id="avatars">
|
||||
<img src="{{ client.user.display_avatar }}"
|
||||
alt="{{ _('Bot Logo') }}"
|
||||
alt="{{ _("Bot Logo") }}"
|
||||
width="80"
|
||||
height="80"/>
|
||||
height="80" />
|
||||
<span id="dots">…</span>
|
||||
<img src="{{ cdn_avatar_url(user.id, user.avatar) }}"
|
||||
alt="{{ _('User Avatar') }}"
|
||||
<img src="{{ avatar.url }}"
|
||||
alt="{{ _("User Avatar") }}"
|
||||
width="80"
|
||||
height="80"/>
|
||||
height="80" />
|
||||
</div>
|
||||
<h1>
|
||||
<a href="{{ url_for(".index") }}">{{ client.user.display_name }}</a>
|
||||
</h1>
|
||||
<h3>{{ _('Choose a server:') }}</h3>
|
||||
<select name="guild" class="black_input">
|
||||
<option>
|
||||
|
||||
</option>
|
||||
<h2>{{ _("The discord scheduled event calendar generator") }}</h2>
|
||||
<hr>
|
||||
<a class="button" href="{{ url_for(".guilds", guild=user.id) }}">{{ _("For all your servers") }}</a>
|
||||
<div class="hr-sect">{{ _("OR") }}</div>
|
||||
<select name="guild" class="black_input" onchange="this.form.submit()">
|
||||
<option> </option>
|
||||
{% for guild in common_guilds %}
|
||||
<option value="{{ guild.vanity_url_code|default(guild.id, True) }}">
|
||||
{{ guild.name }}
|
||||
</option>
|
||||
<option value="{{ guild.vanity_url_code|default(guild.id, True) }}">{{ guild.name }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<div class="hr-sect">{{ _("OR") }}</div>
|
||||
<a class="button"
|
||||
target="_blank"
|
||||
href="https://discord.com/api/oauth2/authorize?client_id={{ client.user.id }}&permissions=8589934592&scope=bot">
|
||||
{{ _("Add the bot on your server") }}
|
||||
</a>
|
||||
|
@ -48,8 +46,5 @@
|
|||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="buttons">
|
||||
<input type="submit" class="button" value="{{ _("Let's go!") }}"/>
|
||||
</div>
|
||||
</form>
|
||||
{% endblock content %}
|
||||
|
|
|
@ -4,24 +4,24 @@
|
|||
<div id="box">
|
||||
<div id="avatars">
|
||||
<img src="{{ client.user.display_avatar }}"
|
||||
alt="{{ _('Bot Logo') }}"
|
||||
alt="{{ _("Bot Logo") }}"
|
||||
width="80"
|
||||
height="80"/>
|
||||
height="80" />
|
||||
</div>
|
||||
<h1>
|
||||
<a href="{{ url_for(".index") }}">{{ client.user.display_name }}</a>
|
||||
</h1>
|
||||
<h2>{{ _('The discord scheduled event calendar generator') }}</h2>
|
||||
<h2>{{ _("The discord scheduled event calendar generator") }}</h2>
|
||||
<hr />
|
||||
<h3>{{ _('This will allow you to:') }}</h3>
|
||||
<h3>{{ _("This will allow you to:") }}</h3>
|
||||
<ul id="scopes">
|
||||
<li>
|
||||
<i class="fa fa-custom-circle fa-check"></i>
|
||||
{{ _('Subscribe to a calendar on Google, Outlook, Apple or any ICS complient software') }}
|
||||
{{ _("Subscribe to a calendar on Google, Outlook, Apple or any ICS complient software") }}
|
||||
</li>
|
||||
<li>
|
||||
<i class="fa fa-custom-circle fa-times"></i>
|
||||
{{ _('Throwing you to a new isekai world') }}
|
||||
{{ _("Throwing you to a new isekai world") }}
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
@ -3,25 +3,22 @@
|
|||
<div id="box">
|
||||
<div id="avatars">
|
||||
<img src="{{ client.user.display_avatar }}"
|
||||
alt="{{ _('Bot Logo') }}"
|
||||
alt="{{ _("Bot Logo") }}"
|
||||
width="80"
|
||||
height="80"/>
|
||||
height="80" />
|
||||
<span id="dots">…</span>
|
||||
<img src="{{ guild.icon.url }}"
|
||||
alt="{{ _('Guild Logo') }}"
|
||||
width="80"
|
||||
height="80"/>
|
||||
<img src="{{ avatar.url }}" alt="{{ _("Avatar") }}" width="80" height="80" />
|
||||
</div>
|
||||
<h1>
|
||||
<a href="{{ url_for(".index") }}">{{ client.user.display_name }}</a>
|
||||
</h1>
|
||||
<h2>{{ _('The discord scheduled event calendar generator') }}</h2>
|
||||
<h2>{{ _("The discord scheduled event calendar generator") }}</h2>
|
||||
<hr />
|
||||
<ul id="providers">
|
||||
<li>
|
||||
<a class="button"
|
||||
target="_blank"
|
||||
href="https://calendar.google.com/calendar/u/0/r?cid=webcal://{{ request.host }}/{{ guild.vanity_url_code|default(guild.id, True) }}.ics">
|
||||
href="https://calendar.google.com/calendar/u/0/r?cid=webcal://{{ request.host }}/{{ entity_id }}.ics">
|
||||
<i class="fa fa-google"></i>
|
||||
{{ _("Subscribe to") }} Google
|
||||
</a>
|
||||
|
@ -29,14 +26,14 @@
|
|||
<li>
|
||||
<a class="button"
|
||||
target="_blank"
|
||||
href="https://outlook.live.com/owa?path=/calendar/action/compose&rru=addsubscription&url=webcal://{{ request.host }}/{{ guild.vanity_url_code|default(guild.id, True) }}.ics">
|
||||
href="https://outlook.live.com/owa?path=/calendar/action/compose&rru=addsubscription&url=webcal://{{ request.host }}/{{ entity_id }}.ics">
|
||||
<i class="fa fa-windows"></i>
|
||||
{{ _("Subscribe to") }} Outlook
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
{# djlint:off #}
|
||||
<a class="button" target="_blank" href="webcal://{{ request.host }}/{{ guild.vanity_url_code|default(guild.id, True) }}.ics">
|
||||
<a class="button" target="_blank" href="webcal://{{ request.host }}/{{ entity_id }}.ics">
|
||||
<i class="fa fa-apple"></i>
|
||||
{{ _("Subscribe to") }} Apple
|
||||
</a>
|
||||
|
@ -47,7 +44,7 @@
|
|||
<div>
|
||||
<h3>{{ _("Use the direct link:") }}</h3>
|
||||
{# djlint:off #}
|
||||
<input type="text" readonly class="black_input" value="webcal://{{ request.host }}/{{ guild.vanity_url_code|default(guild.id, True) }}.ics"/>
|
||||
<input type="text" readonly class="black_input" value="webcal://{{ request.host }}/{{ entity_id }}.ics"/>
|
||||
{# djlint:on #}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
"This will allow you to:": "Ceci te permettra de :",
|
||||
"Subscribe to a calendar on Google, Outlook, Apple or any ICS complient software": "T'abonner à un calendrier sur Google, Outlook, Apple ou tout autre logiciel compatible",
|
||||
"Throwing you to a new isekai world": "T'envoyer dans un monde fantaisiste armée d'une poêle à frire",
|
||||
"Choose a server:": "Choisi un serveur :",
|
||||
"For all your servers": "Pour tous tes serveurs",
|
||||
"You must have": "Tu dois avoir la permission",
|
||||
"Manage Server": "Gérer le serveur",
|
||||
"permission on this server to perform this action": "sur ce serveur pour effectuer cette action",
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,6 +1,6 @@
|
|||
[tool.poetry]
|
||||
name = "divent"
|
||||
version = "3.4.3"
|
||||
version = "4.1.3"
|
||||
description = "The discord scheduled event calendar generator"
|
||||
authors = ["Xéfir Destiny <xefir@crystalyx.net>"]
|
||||
license = "WTFPL"
|
||||
|
@ -9,25 +9,29 @@ homepage = "https://divent.crystalyx.net/"
|
|||
repository = "https://git.crystalyx.net/Xefir/Divent"
|
||||
|
||||
[tool.poetry.scripts]
|
||||
divent = 'divent.bot:__main__'
|
||||
divent = 'divent.bot:run'
|
||||
|
||||
[tool.poetry.dependencies]
|
||||
python = "^3.8.1"
|
||||
disnake = "^2.9.0"
|
||||
python = ">=3.8.1,<4.0.0"
|
||||
disnake = "^2.9.1"
|
||||
ics = "0.8.0.dev0"
|
||||
python-dotenv = "^1.0.0"
|
||||
quart = "^0.18.4"
|
||||
requests-oauthlib = "^1.3.1"
|
||||
uvicorn = "^0.23.2"
|
||||
python-dotenv = "^1.0.1"
|
||||
quart = "^0.19.4"
|
||||
requests-oauthlib = "^2.0.0"
|
||||
uvicorn = "^0.29.0"
|
||||
|
||||
[tool.poetry.dev-dependencies]
|
||||
black = "^23.9.1"
|
||||
djlint = "^1.33.0"
|
||||
flake8 = "^6.1.0"
|
||||
black = "^24.2.0"
|
||||
djlint = "^1.34.1"
|
||||
flake8 = "^7.0.0"
|
||||
flake8-alphabetize = "^0.0.21"
|
||||
flake8-black = "^0.3.6"
|
||||
mypy = "^1.5.1"
|
||||
types-oauthlib = "^3.2.0.10"
|
||||
flake8-pyproject = "^1.2.3"
|
||||
mypy = "^1.8.0"
|
||||
types-oauthlib = "^3.2.0"
|
||||
|
||||
[tool.flake8]
|
||||
max-line-length = 88
|
||||
|
||||
[build-system]
|
||||
requires = ["poetry-core>=1.0.0"]
|
||||
|
|
Loading…
Reference in New Issue