Frisk/RcGcDw
1
0
Fork 0
mirror of https://gitlab.com/chicken-riders/RcGcDw.git synced 2025-02-22 00:14:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'testing'

Browse source 
# Conflicts:
#   src/configloader.py
#   src/discord/message.py
#   src/discussions.py
This commit is contained in:
Frisk 2024-09-20 15:33:07 +00:00
parent ecfc859392 42e809bfec
commit d19c7df5b2
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
setup.py
View file

@ -2,7 +2,7 @@ from setuptools import setup
setup( setup(
name='RcGcDw', name='RcGcDw',
version='1.14.0.1', version='1.15.0.2',
url='https://gitlab.com/piotrex43/RcGcDw/', url='https://gitlab.com/piotrex43/RcGcDw/',
license='GNU GPLv3', license='GNU GPLv3',
author='Frisk', author='Frisk',

4
src/discord/message.py
View file

@ -77,6 +77,8 @@ class DiscordMessage:
self.embed["author"]["icon_url"] = settings["event_appearance"][self.event_type]["icon"] self.embed["author"]["icon_url"] = settings["event_appearance"][self.event_type]["icon"]
if len(self.embed["title"]) > 254: if len(self.embed["title"]) > 254:
self.embed["title"] = self.embed["title"][0:253] + "…" self.embed["title"] = self.embed["title"][0:253] + "…"
if not self.embed["author"].get("icon_url", None) and self.embed["author"].get("icon_url", None) is not None:
self.embed["author"]["icon_url"] = None
def set_author(self, name, url, icon_url=None): def set_author(self, name, url, icon_url=None):
self.embed["author"]["name"] = name self.embed["author"]["name"] = name
@ -89,7 +91,7 @@ class DiscordMessage:
self.embed["fields"].append(dict(name=name, value=value, inline=inline)) self.embed["fields"].append(dict(name=name, value=value, inline=inline))
def set_avatar(self, url): def set_avatar(self, url):
self.webhook_object["avatar_url"] = url self.webhook_object["avatar_url"] = url or None
def set_name(self, name): def set_name(self, name):
self.webhook_object["username"] = name self.webhook_object["username"] = name

1
src/discussions.py
View file

@ -32,6 +32,7 @@ from src.api.hooks import formatter_hooks, pre_hooks, post_hooks
from src.i18n import formatters_i18n from src.i18n import formatters_i18n
# Create a custom logger # Create a custom logger
discussion_logger = logging.getLogger("rcgcdw.disc") discussion_logger = logging.getLogger("rcgcdw.disc")