steffo/greed
steffo/greed
1
Fork 0
mirror of https://github.com/Steffo99/greed.git synced 2025-03-13 12:17:27 +00:00
Code Activity

clean up code

Browse source
This commit is contained in:
Darren 2020-01-29 14:03:01 +02:00
parent 30ae2cf481
commit f5867405af
3 changed files with 2 additions and 18 deletions

5
database.py
View file

@ -187,7 +187,7 @@ class Transaction(TableDeclarativeBase):
return f"<Transaction {self.transaction_id} for User {self.user_id} {str(self)}>"
class BtcTransaction(TableDeclarativeBase):
"""A greed wallet transaction.
"""A btc wallet transaction.
Wallet credit ISN'T calculated from these, but they can be used to recalculate it."""
# TODO: split this into multiple tables
@ -199,7 +199,6 @@ class BtcTransaction(TableDeclarativeBase):
# The value of this transaction. Can be both negative and positive.
price = Column(Float)
value = Column(Float)
satoshi = Column(Integer, nullable=False)
currency = Column(Text)
status = Column(Integer, nullable=False)
timestamp = Column(Integer)
@ -212,8 +211,6 @@ class BtcTransaction(TableDeclarativeBase):
def __str__(self):
string = f"<b>T{self.transaction_id}</b> | {str(self.user)} | {str(self.price)} | {str(self.value)} | {str(self.currency)} | {str(self.status)} | {str(self.timestamp)} | {str(self.address)}"
if self.satoshi:
string += f" | {self.satoshi}"
if self.txid:
string += f" | {self.txid}"
return string

2
utils.py
View file

@ -219,7 +219,7 @@ class DuckBot:
@catch_telegram_errors
def send_message_markdown(self, *args, **kwargs):
# All messages are sent in HTML parse mode
# Send message in markdown parse mode
return self.bot.send_message(parse_mode="Markdown", *args, **kwargs)
# More methods can be added here

13
worker.py
View file

@ -228,8 +228,6 @@ class ChatWorker(threading.Thread):
def __wait_for_websocket(self, address, amount):
# Start the websocket
ws = create_connection("wss://www.blockonomics.co/payment/" + address)
print("Connected to websocket...")
#inline_keyboard = telegram.InlineKeyboardMarkup([[telegram.InlineKeyboardButton("Open In Wallet",url="https://google.com")]])
# Create the keyboard with the cancel button
inline_keyboard = telegram.InlineKeyboardMarkup([[telegram.InlineKeyboardButton(strings.menu_cancel,
callback_data="cart_cancel")]])
@ -263,7 +261,6 @@ class ChatWorker(threading.Thread):
while not stop_event.is_set():
result = ws.recv()
if result:
print("Received '%s'" % result)
result = json.loads(result)
# fund the account instantly
status = result['status']
@ -285,7 +282,6 @@ class ChatWorker(threading.Thread):
# Convert satoshi to fiat
received_btc = value/1.0e8
received_value = received_btc*transaction.price
print ("Recieved "+str(received_value)+" "+configloader.config["Payments"]["currency"]+" on address "+address)
# Add the credit to the user account
user = self.session.query(db.User).filter(db.User.user_id == transaction.user_id).one_or_none()
@ -322,7 +318,6 @@ class ChatWorker(threading.Thread):
# wait for an event
while not a_stop_event.is_set():
time.sleep(0.1)
print ("At least one thread is done")
return
run_threads()
@ -831,12 +826,6 @@ class ChatWorker(threading.Thread):
return
# Set the invoice active invoice payload
self.invoice_payload = str(uuid.uuid4())
# Create the price array
prices = [telegram.LabeledPrice(label=strings.payment_invoice_label, amount=int(value))]
# Create the invoice keyboard
inline_keyboard = telegram.InlineKeyboardMarkup([[telegram.InlineKeyboardButton(strings.menu_pay, pay=True)],
[telegram.InlineKeyboardButton(strings.menu_cancel,
callback_data="cmd_cancel")]])
# The amount is valid, fetch btc amount and address
btc_price = Blockonomics.fetch_new_btc_price()
satoshi_amount = int(1.0e8*float(raw_value)/float(btc_price))
@ -867,8 +856,6 @@ class ChatWorker(threading.Thread):
self.session.commit()
# Wait for the bitcoin payment
self.__wait_for_successfulbtcpayment(btc_address, btc_amount)
# successfulpayment = {"status": 0, "timestamp": 1578567378, "value": "100000", "txid": "WarningThisIsAGeneratedTestPaymentAndNotARealBitcoinTransaction"}
print("completed")
def __bot_info(self):
"""Send information about the bot."""