nichkara/ninachloe
1
0
Fork 0
mirror of https://github.com/nichkara/InfinitumBotty.git synced 2026-06-10 22:26:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

.give f-string and servier-fluff-text revert

Browse Source
This commit is contained in:
Context 77
2024-08-03 01:24:58 +02:00
parent bb8751ed7f
commit 5b5eb2b7ea
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
FaustBot/Modules/GiveDrinkToObserver.py
View File

@@ -11,17 +11,12 @@ from snacks import snacks
from kekse import kekseGoodOnes
def _servier(receiver,item,requester):
fluff_text = [" ohne zu kleckern",""," mit Begeisterung","",""," nach einer substantiellen Wartezeit"]
return "\001ACTION serviert {0} {1}{2}. Schöne Grüße von {3}\001".format(
receiver,item,random.choice(fluff_text),requester
)
def _servier(receiver, item, requester):
return f"\001ACTION serviert {receiver} {item}. Schöne Grüße von {requester}\001"
def _schenk(receiver,item,requester):
return "\001ACTION schenkt {0} {1} ein. Schöne Grüße von {2}\001".format(
receiver,item,requester
)
def _schenk(receiver, item, requester):
return f"\001ACTION schenkt {receiver} {item} ein. Schöne Grüße von {requester}\001"
non_good_serveables = getraenke + essen + icecream + giveextras + snacks
@@ -36,11 +31,11 @@ class GiveDrinkToObserver(PrivMsgObserverPrototype):
def help():
return ".give NUTZER - serviert jemand anderem Getränke oder Snacks"
def update_on_priv_msg(self,data ,connection: Connection):
if data["message"].find(".give") == -1:
def update_on_priv_msg(self, data, connection: Connection):
if not data["message"].startswith(".give"):
return
receiver = type = None
message_parts = data["message"].split()
message_parts = data["messageCaseSensitive"].split()
if len(message_parts) >= 2:
receiver = message_parts[1]
if len(message_parts) >= 3:
@@ -48,7 +43,7 @@ class GiveDrinkToObserver(PrivMsgObserverPrototype):
if receiver is None:
return
requester = data["nick"].lower()
if receiver == requester:
if receiver.lower() == requester:
if type == "kaffee":
connection.send_back("Fehler 418: Ich bin eine Teekanne",data)
else:
@@ -57,7 +52,7 @@ class GiveDrinkToObserver(PrivMsgObserverPrototype):
if type is None:
connection.send_back(_schenk(receiver,random.choice(getraenkegoodones),requester),data)
return
if type in ["drink","food","cookie","snack","massage","ice"]:
if type in ["drink", "food", "cookie", "snack", "massage", "ice"]:
if type == "drink":
connection.send_back(_schenk(receiver,random.choice(getraenke),requester),data)
elif type == "food":
@@ -70,9 +65,8 @@ class GiveDrinkToObserver(PrivMsgObserverPrototype):
connection.send_back(_servier(receiver,random.choice(icecream),requester),data)
elif type == "massage":
connection.send_back(
"\001ACTION knetet {0} feste den Rücken durch. {1} meinte ich solle dir was Gutes tun.\001".format(
receiver,requester
),data
f"\001ACTION knetet {receiver} feste den Rücken durch. {requester} meinte ich solle dir was Gutes tun.\001",
data,
)
return
matchingGoodDrinks = [drink for drink in getraenkegoodones if type in drink.lower()]
@@ -86,7 +80,5 @@ class GiveDrinkToObserver(PrivMsgObserverPrototype):
return
connection.send_back(
"Tut mir leid {0}, {1} haben wir nicht auf der Karte!".format(
requester,type
),data
f"Tut mir leid {requester}, {type} haben wir nicht auf der Karte!", data
)