cqrenet/relay
3
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-10 16:04:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify handle_set method for dictproxy subclasses

Browse Source
This commit is contained in:
holger krekel
2024-07-31 20:04:34 +02:00
parent 1f1d1fdf59
commit 888f7e669a
4 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
chatmaild/src/chatmaild/dictproxy.py
View File

@@ -44,7 +44,10 @@ class DictProxy:
elif short_command == "C":
return self.handle_commit_transaction(transaction_id, parts, transactions)
elif short_command == "S":
return self.handle_set(transaction_id, parts, transactions)
addr = transactions[transaction_id]["addr"]
if not self.handle_set(addr, parts):
transactions[transaction_id]["res"] = "F\n"
logging.error(f"dictproxy-set failed for {addr!r}: {msg!r}")
def handle_lookup(self, parts):
logging.warning(f"lookup ignored: {parts!r}")
@@ -59,11 +62,10 @@ class DictProxy:
addr = parts[1]
transactions[transaction_id] = dict(addr=addr, res="O\n")
def handle_set(self, transaction_id, parts, transactions):
def handle_set(self, addr, parts):
# For documentation on key structure see
# https://github.com/dovecot/core/blob/main/src/lib-storage/mailbox-attribute.h
transactions[transaction_id]["res"] = "F\n"
return False
def handle_commit_transaction(self, transaction_id, parts, transactions):
# return whatever "set" command(s) set as result.

11
chatmaild/src/chatmaild/lastlogin.py
View File

@@ -9,20 +9,19 @@ class LastLoginDictProxy(DictProxy):
super().__init__()
self.config = config
def handle_set(self, transaction_id, parts, transactions):
def handle_set(self, addr, parts):
keyname = parts[1].split("/")
value = parts[2] if len(parts) > 2 else ""
addr = transactions[transaction_id]["addr"]
if keyname[0] == "shared" and keyname[1] == "last-login":
if addr.startswith("echo@"):
return
return True
addr = keyname[2]
timestamp = int(value)
user = self.config.get_user(addr)
user.set_last_login_timestamp(timestamp)
else:
# Transaction failed.
transactions[transaction_id]["res"] = "F\n"
return True
return False
def main():

15
chatmaild/src/chatmaild/metadata.py
View File

@@ -62,24 +62,19 @@ class MetadataDictProxy(DictProxy):
logging.warning(f"lookup ignored: {parts!r}")
return "N\n"
def handle_set(self, transaction_id, parts, transactions):
def handle_set(self, addr, parts):
# For documentation on key structure see
# https://github.com/dovecot/core/blob/main/src/lib-storage/mailbox-attribute.h
keyname = parts[1].split("/")
value = parts[2] if len(parts) > 2 else ""
addr = transactions[transaction_id]["addr"]
if keyname[0] == "priv" and keyname[2] == self.metadata.DEVICETOKEN_KEY:
self.metadata.add_token_to_addr(addr, value)
return True
elif keyname[0] == "priv" and keyname[2] == "messagenew":
self.notifier.new_message_for_addr(addr, self.metadata)
else:
# Transaction failed.
try:
transactions[transaction_id]["res"] = "F\n"
except KeyError:
logging.error(
f"could not mark tx as failed: {transaction_id} {transactions}"
)
return True
return False
def main():