Merge branch 'fix-missing-weight-column' into pleroma-support
This commit is contained in:
commit
fc45c688e8
3 changed files with 5 additions and 14 deletions
|
@ -51,7 +51,6 @@ def add_card(name: str, rarity: int, weight: float, image_url: str) -> tuple[int
|
||||||
card_id = db_utils.insert_card(
|
card_id = db_utils.insert_card(
|
||||||
stripped_name,
|
stripped_name,
|
||||||
rarity,
|
rarity,
|
||||||
float(weight),
|
|
||||||
file_id
|
file_id
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -150,12 +150,11 @@ def is_player_administrator(username: str) -> bool:
|
||||||
|
|
||||||
|
|
||||||
def insert_card(
|
def insert_card(
|
||||||
name: str, rarity: int, weight: float, file_id: str) -> int:
|
name: str, rarity: int, file_id: str) -> int:
|
||||||
'''Inserts a card'''
|
'''Inserts a card'''
|
||||||
CURSOR.execute(
|
CURSOR.execute(
|
||||||
'INSERT INTO cards (name, rarity, weight, file_id) VALUES \
|
'INSERT INTO cards (name, rarity, file_id) VALUES (?, ?, ?)',
|
||||||
(?, ?, ?, ?)',
|
(name, rarity, file_id)
|
||||||
(name, rarity, weight, file_id)
|
|
||||||
)
|
)
|
||||||
card_id = CURSOR.lastrowid
|
card_id = CURSOR.lastrowid
|
||||||
return card_id if card_id else 0
|
return card_id if card_id else 0
|
||||||
|
|
|
@ -107,10 +107,10 @@ dumbass.',
|
||||||
'attachment_urls': None
|
'attachment_urls': None
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(arguments) != 3:
|
if len(arguments) != 2:
|
||||||
return {
|
return {
|
||||||
'message': f'{author} Please specify the following attributes \
|
'message': f'{author} Please specify the following attributes \
|
||||||
in order: name, rarity, weight',
|
in order: name, rarity',
|
||||||
'attachment_urls': None
|
'attachment_urls': None
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -120,17 +120,10 @@ in order: name, rarity, weight',
|
||||||
be a number between 1 and 5',
|
be a number between 1 and 5',
|
||||||
'attachment_urls': None
|
'attachment_urls': None
|
||||||
}
|
}
|
||||||
if not (is_float(arguments[2]) and 0.0 < float(arguments[2]) <= 1.0):
|
|
||||||
return {
|
|
||||||
'message': f'{author} Invalid drop weight: \'{arguments[2]}\' \
|
|
||||||
must be a decimal value between 0.0 and 1.0',
|
|
||||||
'attachment_urls': None
|
|
||||||
}
|
|
||||||
|
|
||||||
card_id, file_id = add_card(
|
card_id, file_id = add_card(
|
||||||
name=arguments[0],
|
name=arguments[0],
|
||||||
rarity=int(arguments[1]),
|
rarity=int(arguments[1]),
|
||||||
weight=float(arguments[2]),
|
|
||||||
image_url=image_url
|
image_url=image_url
|
||||||
)
|
)
|
||||||
return {
|
return {
|
||||||
|
|
Loading…
Add table
Reference in a new issue