diff options
| -rw-r--r-- | geldschieberbot.py | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/geldschieberbot.py b/geldschieberbot.py index 27596cd..00558ff 100644 --- a/geldschieberbot.py +++ b/geldschieberbot.py @@ -116,7 +116,7 @@ def create_summary(user): if summary == "": summary = "\tAll fine :)" else: - summary += "\tBalance: {}".format(to_euro(total)) + summary += f"\tBalance: {to_euro(total)}" summary = user + ":\n" + summary return summary @@ -183,11 +183,11 @@ cmds = {} def register(sender, args, msg): if len(args) != 2: - return None, 'not in form "{} name"'.format(args[0]) + return None, f'not in form "{args[0]} name"' name = args[1] if name in name2num: - return None, "{} already registered".format(name) + return None, f"{name} already registered" if sender in num2name: return None,"you are already registered" @@ -199,7 +199,7 @@ def register(sender, args, msg): # add changes list changes[name] = [] - return "Happy geldschiebing {}!".format(name), None + return f"Happy geldschiebing {name}!", None cmds["reg"] = register cmds["register"] = register @@ -214,7 +214,7 @@ def summary(sender, args, msg): if name in name2num: msg += create_summary(name) + "\n" else: - err = 'name "{}" not registered'.format(name) + err = f'name "{name}" not registered' return msg, err cmds["sum"] = summary @@ -237,7 +237,7 @@ def split(sender, args, msg): return None, 'you must register first' if len(args) < 3: - return None, 'not in form "{} amount [name]+"'.format(args[0]) + return None, f'not in form "{args[0]} amount [name]+"' try: amount = to_cent(args[1]) @@ -253,9 +253,7 @@ def split(sender, args, msg): else: return None, "you must register first" - output = "Split {} between {} -> {} each\n".format(to_euro(amount), - persons, - to_euro(amount_per_person)) + output = f"Split {to_euro(amount)} between {persons} -> {to_euro(amount_per_person)} each\n" change = [args] for p in args[2:]: if not p in name2num: @@ -276,7 +274,7 @@ cmds["teil"] = split def transaction(sender, args, msg): if len(args) != 3: - return None, 'not in form "{} amount recipient"'.format(args[0]) + return None, f'not in form "{args[0]} amount recipient"' if not sender in balance: if sender not in num2name: @@ -318,7 +316,7 @@ cmds["nimm"] = transaction def transfer(sender, args, msg): if len(args) < 4: - return None, 'not in form "{} amount source destination"'.format(args[0]) + return None, f'not in form "{args[0]} amount source destination"' if not sender in num2name: return None, 'you must register first' @@ -333,10 +331,10 @@ def transfer(sender, args, msg): source, destination = args[2:4] if source not in balance: - return None, "source {} not known".format(source) + return None, f'source "{source}" not known' elif destination not in balance: - return None, "destination {} not known".format(destination) + return None, f'destination "{destination}" not known' output = "" global record_changes @@ -344,7 +342,7 @@ def transfer(sender, args, msg): record_changes = False change = [args] - ret, err = transaction(sender, "!zieh {} {}".format(source, amount_raw).split(), "") + ret, err = transaction(sender, ["!zieh", source, amount_raw], "") if err: # No changes yet we can fail return None, err @@ -352,7 +350,7 @@ def transfer(sender, args, msg): output += ret change.append((sender, source, amount_cent)) - ret, err = transaction(sender, "!schieb {} {}".format(destination, amount_raw).split(), "") + ret, err = transaction(sender, ["!schieb", destination, amount_raw], "") if err: output += err + "\nThe balance may be in a inconsistent state please take care manually" return output, None @@ -360,7 +358,7 @@ def transfer(sender, args, msg): output += ret change.append((sender, source, amount_cent)) - ret, err = transaction(source, "!zieh {} {}".format(destination, amount_raw).split(), "") + ret, err = transaction(source, ["!zieh", destination, amount_raw], "") if err: output += err + "\nThe balance may be in a inconsistent state please take care manually" return output, None @@ -383,7 +381,7 @@ def cars(sender, args, msg): return "No cars registered yet.", None ret_msg = "" - header_fmt = "{} - service charge {}ct/km\n" + if len(args) > 2: cars_to_list = args[2:] else: @@ -391,23 +389,23 @@ def cars(sender, args, msg): for car in cars_to_list: if car in available_cars: - ret_msg += header_fmt.format(car, available_cars[car]) + ret_msg += f"{car} - service charge {available_cars[car]}ct/km\n" ret_msg += create_summary(car) + "\n" else: - return None, '"{}" is no available car\n'.format(car) + return None, f'"{car}" is no available car\n' return ret_msg[:-1], None # add car elif args[1] in ["add", "new"]: if len(args) < 4: - return None, 'not in form "{} {} car-name service-charge"'.format(args[0], args[1]) + return None, f'not in form "{args[0]} {args[1]} car-name service-charge"' car = args[2] if car in available_cars: return None, '"{}" already registered'.format(car) if car in balance: - return None, 'A user named "{}" already exists. Please use a different name for this car'.format(car) + return None, f'A user named "{car}" already exists. Please use a different name for this car' try: service_charge = to_cent(args[3]) @@ -416,11 +414,11 @@ def cars(sender, args, msg): available_cars[car] = service_charge add_to_balance(car) - return 'added "{}" as an available car'.format(car), None + return f'added "{car}" as an available car', None # pay bill elif args[1] in ["pay"]: if len(args) < 4: - return None, 'not in form "{} {} car-name amount"'.format(args[0], args[1]) + return None, f'not in form "{args[0]} {args[1]} car-name amount"' if not sender in num2name: return None, "you must register first" @@ -429,7 +427,7 @@ def cars(sender, args, msg): car = args[2] if car not in available_cars: - return None, 'car "{}" not known'.format(car) + return None, f'car "{car}" not known' try: amount = to_cent(args[3]) |