jarvis/jarvis-bot
jarvis/jarvis-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: jarvis:main
Branches Tags
jarvis:main
jarvis:dev
..
compare: jarvis:dev
Branches Tags
jarvis:dev
jarvis:main

6 commits
main ... dev

Author SHA1 Message Date
zevaryx
4b09f99e94 Fix clear 2025-06-26 16:33:28 -06:00
zevaryx
5280f33e28 Fix settings set and delete 2025-06-26 16:26:40 -06:00
zevaryx
55776fe122 Bump version to 2.5.5 2025-06-26 16:14:57 -06:00
zevaryx
5781877e4a Fix noinvite bug 2025-06-26 16:14:00 -06:00
Zevaryx
aae1276a80 [chore] Update i.py 2024-06-26 06:03:57 -06:00
Zevaryx
da571a51ad Update interactions.py 2024-05-05 23:22:14 -06:00
5 changed files with 702 additions and 594 deletions
Show stats Expand all files Collapse all files

10
jarvis/client/events/message.py
View file

@ -68,17 +68,11 @@ class MessageEventMixin:
async def checks(self, message: Message) -> None: async def checks(self, message: Message) -> None:
"""Other message checks.""" """Other message checks."""
# #tech
# channel = find(lambda x: x.id == 599068193339736096, message._mention_ids)
# if channel and message.author.id == 293795462752894976:
# await channel.send(
# content="https://cdn.discordapp.com/attachments/664621130044407838/805218508866453554/tech.gif"
# )
content = re.sub(r"\s+", "", message.content) content = re.sub(r"\s+", "", message.content)
match = invites.search(content) match = invites.search(content)
setting = await Setting.find_one(Setting.guild == message.guild.id, Setting.setting == "noinvite") setting = await Setting.find_one(Setting.guild == str(message.guild.id), Setting.setting == "noinvite")
if not setting: if not setting:
setting = Setting(guild=message.guild.id, setting="noinvite", value=True) setting = Setting(guild=str(message.guild.id), setting="noinvite", value=False)
await setting.save() await setting.save()
if match: if match:
guild_invites = [x.code for x in await message.guild.fetch_invites()] guild_invites = [x.code for x in await message.guild.fetch_invites()]

8
jarvis/cogs/core/admin/settings.py
View file

@ -32,9 +32,9 @@ class SettingsCog(Extension):
async def update_settings(self, setting: str, value: Any, guild: int) -> bool: async def update_settings(self, setting: str, value: Any, guild: int) -> bool:
"""Update a guild setting.""" """Update a guild setting."""
existing = await Setting.find_one(Setting.setting == setting, Setting.guild == guild) existing = await Setting.find_one(Setting.setting == setting, Setting.guild == str(guild))
if not existing: if not existing:
existing = Setting(setting=setting, guild=guild, value=value) existing = Setting(setting=setting, guild=str(guild), value=value)
existing.value = value existing.value = value
updated = await existing.save() updated = await existing.save()
@ -42,7 +42,7 @@ class SettingsCog(Extension):
async def delete_settings(self, setting: str, guild: int) -> bool: async def delete_settings(self, setting: str, guild: int) -> bool:
"""Delete a guild setting.""" """Delete a guild setting."""
existing = await Setting.find_one(Setting.setting == setting, Setting.guild == guild) existing = await Setting.find_one(Setting.setting == setting, Setting.guild == str(guild))
if existing: if existing:
return await existing.delete() return await existing.delete()
return False return False
@ -305,7 +305,7 @@ class SettingsCog(Extension):
timeout=60 * 5, timeout=60 * 5,
) )
if context.ctx.custom_id == f"{ctx.guild.id}|set_clear|yes": if context.ctx.custom_id == f"{ctx.guild.id}|set_clear|yes":
async for setting in Setting.find(Setting.guild == ctx.guild.id): async for setting in Setting.find(Setting.guild == str(ctx.guild.id)):
await setting.delete() await setting.delete()
content = "Guild settings cleared" content = "Guild settings cleared"
else: else:

2
jarvis/const.py
View file

@ -1,3 +1,3 @@
"""JARVIS constants.""" """JARVIS constants."""
__version__ = "2.5.4" __version__ = "2.5.5"

1266
poetry.lock generated
View file

File diff suppressed because it is too large Load diff

10
pyproject.toml
View file

@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "jarvis" name = "jarvis"
version = "2.5.4" version = "2.5.5"
description = "JARVIS admin bot" description = "JARVIS admin bot"
authors = ["Zevaryx <zevaryx@gmail.com>"] authors = ["Zevaryx <zevaryx@gmail.com>"]
@ -10,7 +10,7 @@ opencv-python = "^4.9.0.80"
Pillow = "^10.3.0" Pillow = "^10.3.0"
psutil = "^5.9.8" psutil = "^5.9.8"
ulid-py = "^1.1.0" ulid-py = "^1.1.0"
jarvis-core = { git = "https://git.zevaryx.com/stark-industries/jarvis/jarvis-core.git", rev = "main" } # Mine jarvis-core = { git = "https://git.zevs.me/stark-industries/jarvis/jarvis-core.git", rev = "main" } # Mine
aiohttp = ">=3.9.0b0" aiohttp = ">=3.9.0b0"
pastypy = "^1.0.3.post1" # Mine pastypy = "^1.0.3.post1" # Mine
dateparser = "^1.2.0" dateparser = "^1.2.0"
@ -23,15 +23,15 @@ thefuzz = { extras = [
"speedup", "speedup",
], git = "https://github.com/zevaryx/thefuzz.git", rev = "master" } # Forked ], git = "https://github.com/zevaryx/thefuzz.git", rev = "master" } # Forked
beautifulsoup4 = "^4.12.3" beautifulsoup4 = "^4.12.3"
calculator = { git = "https://git.zevaryx.com/zevaryx/calculator.git" } # Mine calculator = { git = "https://github.com/zevaryx/calculator.git" } # Mine
redis = "^5.0.4" redis = "^5.0.4"
interactions-py = ">=5.12,<6" interactions-py = ">=5.13,<6"
statipy = { git = "https://github.com/zevaryx/statipy", rev = "main" } statipy = { git = "https://github.com/zevaryx/statipy", rev = "main" }
beanie = "^1.25.0" beanie = "^1.25.0"
pydantic = ">=2.7.1,<3" pydantic = ">=2.7.1,<3"
orjson = "^3.10.1" orjson = "^3.10.1"
croniter = "^2.0.5" croniter = "^2.0.5"
erapi = { git = "https://git.zevaryx.com/zevaryx-technologies/erapi.git" } erapi = { git = "https://git.zevs.me/zevaryx-technologies/erapi.git" }
pydantic-settings = "^2.2.1" pydantic-settings = "^2.2.1"
[tool.poetry.group.dev.dependencies] [tool.poetry.group.dev.dependencies]