steffo/greed
steffo/greed
1
Fork 0
mirror of https://github.com/Steffo99/greed.git synced 2024-11-21 21:44:19 +00:00
Code Activity

First user on the bot becomes admin

Browse source
This commit is contained in:
Steffo 2018-04-26 09:59:47 +02:00
parent 9e5b2ac472
commit 12da94eea2
3 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
database.py
View file

@ -253,7 +253,7 @@ class Order(TableDeclarativeBase):
else: else:
status_emoji = strings.emoji_not_processed status_emoji = strings.emoji_not_processed
status_text = strings.text_not_processed status_text = strings.text_not_processed
if user and configloader.config["Appearance"]["full_order_info"] == "yes": if user and configloader.config["Appearance"]["full_order_info"] == "no":
return strings.user_order_format_string.format(status_emoji=status_emoji, return strings.user_order_format_string.format(status_emoji=status_emoji,
status_text=status_text, status_text=status_text,
items=items, items=items,

8
strings.py
View file

@ -28,16 +28,16 @@ order_format_string = "di {user}\n" \
"Creato {date}\n" \ "Creato {date}\n" \
"\n" \ "\n" \
"{items}\n" \ "{items}\n" \
"TOTALE: {value}\n" \ "TOTALE: <b>{value}</b>\n" \
"\n" \ "\n" \
"Note del cliente: {notes}" "Note del cliente: {notes}\n"
# Order info string, shown to the user # Order info string, shown to the user
user_order_format_string = "{status_emoji} <b>Ordine {status_text}</b>\n" \ user_order_format_string = "{status_emoji} <b>Ordine {status_text}</b>\n" \
"{items}\n" \ "{items}\n" \
"TOTALE: {value}\n" \ "TOTALE: <b>{value}</b>\n" \
"\n" \ "\n" \
"Note: {notes}" "Note: {notes}\n"
# Transaction page is loading # Transaction page is loading
loading_transactions = "<i>Caricamento delle transazioni in corso...\n" \ loading_transactions = "<i>Caricamento delle transazioni in corso...\n" \

20
worker.py
View file

@ -65,10 +65,24 @@ class ChatWorker(threading.Thread):
self.admin = self.session.query(db.Admin).filter(db.Admin.user_id == self.chat.id).one_or_none() self.admin = self.session.query(db.Admin).filter(db.Admin.user_id == self.chat.id).one_or_none()
# If the user isn't registered, create a new record and add it to the db # If the user isn't registered, create a new record and add it to the db
if self.user is None: if self.user is None:
# Check if there are other registered users: if there aren't any, the first user will be owner of the bot
will_be_owner = (self.session.query(db.User).first() is None)
# Create the new record # Create the new record
self.user = db.User(self.chat) self.user = db.User(self.chat)
# Add the new record to the db # Add the new record to the db
self.session.add(self.user) self.session.add(self.user)
# Flush the session to get an userid
self.session.flush()
# If the will be owner flag is set
if will_be_owner:
# Become owner
self.admin = db.Admin(user_id=self.user.user_id,
edit_products=True,
receive_orders=True,
create_transactions=True,
display_on_help=True,
is_owner=True,
live_mode=False)
# Commit the transaction # Commit the transaction
self.session.commit() self.session.commit()
# Capture exceptions that occour during the conversation # Capture exceptions that occour during the conversation
@ -873,7 +887,8 @@ class ChatWorker(threading.Thread):
message_id=update.message.message_id) message_id=update.message.message_id)
# Notify the user of the completition # Notify the user of the completition
self.bot.send_message(order.user_id, self.bot.send_message(order.user_id,
strings.notification_order_completed.format(order=order.get_text(self.session))) strings.notification_order_completed.format(order=order.get_text(self.session,
user=True)))
# If the user pressed the refund order button, refund the order... # If the user pressed the refund order button, refund the order...
elif update.data == "order_refund": elif update.data == "order_refund":
# Ask for a refund reason # Ask for a refund reason
@ -902,7 +917,8 @@ class ChatWorker(threading.Thread):
message_id=update.message.message_id) message_id=update.message.message_id)
# Notify the user of the refund # Notify the user of the refund
self.bot.send_message(order.user_id, self.bot.send_message(order.user_id,
strings.notification_order_refunded.format(order=order.get_text(self.session))) strings.notification_order_refunded.format(order=order.get_text(self.session,
user=True)))
# Notify the admin of the refund # Notify the admin of the refund
self.bot.send_message(self.chat.id, strings.success_order_refunded.format(order_id=order.order_id)) self.bot.send_message(self.chat.id, strings.success_order_refunded.format(order_id=order.order_id))