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

Merge branch 'v1.0.0' into 'main'

Browse source 
V1.0.0

See merge request stark-industries/j.a.r.v.i.s.!6
This commit is contained in:
Zeva Rose 2021-07-14 17:35:58 +00:00
commit 61d4569832
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
jarvis/cogs/dbrand.py
View file

@ -1,11 +1,10 @@
import re import re
import aiohttp import aiohttp
import jarvis
from discord.ext import commands from discord.ext import commands
from discord_slash import cog_ext from discord_slash import cog_ext
from discord_slash.utils.manage_commands import create_option from discord_slash.utils.manage_commands import create_option
import jarvis
from jarvis.config import get_config from jarvis.config import get_config
from jarvis.data.dbrand import shipping_lookup from jarvis.data.dbrand import shipping_lookup
from jarvis.utils import build_embed from jarvis.utils import build_embed

2
jarvis/cogs/modlog.py
View file

@ -358,7 +358,7 @@ class ModlogCog(commands.Cog):
{"guild": after.guild.id, "setting": "modlog"} {"guild": after.guild.id, "setting": "modlog"}
) )
if modlog: if modlog:
if before.content == after.content: if before.content == after.content or before.content is None:
return return
channel = before.guild.get_channel(modlog["value"]) channel = before.guild.get_channel(modlog["value"])
fields = [ fields = [