Merge branch 'main' into aurora-hybrid
This commit is contained in:
commit
b4ffd213dd
14 changed files with 165 additions and 31 deletions
|
@ -1,3 +1,4 @@
|
|||
# pylint: disable=cyclic-import
|
||||
import json
|
||||
import sqlite3
|
||||
import time
|
||||
|
@ -7,7 +8,8 @@ from discord import Guild
|
|||
from redbot.core import data_manager
|
||||
|
||||
from .logger import logger
|
||||
from .utils import convert_timedelta_to_str, generate_dict, get_next_case_number
|
||||
from .utils import (convert_timedelta_to_str, generate_dict,
|
||||
get_next_case_number)
|
||||
|
||||
|
||||
def connect() -> sqlite3.Connection:
|
||||
|
@ -117,8 +119,8 @@ async def mysql_log(
|
|||
resolved_by: str = None,
|
||||
resolved_reason: str = None,
|
||||
expired: bool = None,
|
||||
changes: list = [],
|
||||
metadata: dict = {},
|
||||
changes: list = None,
|
||||
metadata: dict = None,
|
||||
) -> int:
|
||||
if not timestamp:
|
||||
timestamp = int(time.time())
|
||||
|
@ -168,8 +170,8 @@ async def mysql_log(
|
|||
resolved_by,
|
||||
resolved_reason,
|
||||
expired,
|
||||
json.dumps(changes),
|
||||
json.dumps(metadata),
|
||||
json.dumps(changes if changes else []),
|
||||
json.dumps(metadata if metadata else {}),
|
||||
)
|
||||
cursor.execute(sql, val)
|
||||
|
||||
|
|
|
@ -1,14 +1,16 @@
|
|||
# pylint: disable=cyclic-import
|
||||
from datetime import datetime, timedelta
|
||||
from typing import Union
|
||||
|
||||
import humanize
|
||||
from discord import Color, Embed, Guild, Member, Message, Role, User
|
||||
from discord import Color, Embed, Guild, Member, Role, User
|
||||
from redbot.core import commands
|
||||
from redbot.core.utils.chat_formatting import bold, box, error, warning
|
||||
|
||||
from aurora.utilities.config import config
|
||||
from aurora.utilities.utils import fetch_channel_dict, fetch_user_dict, get_bool_emoji, get_next_case_number, get_pagesize_str
|
||||
|
||||
|
||||
async def message_factory(
|
||||
color: Color,
|
||||
guild: Guild,
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
# pylint: disable=cyclic-import
|
||||
import json
|
||||
from datetime import timedelta as td
|
||||
from typing import Union
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue