Bitmessage/PyBitmessage-2025-02-02
Archived
2
0
Fork 0
Code Issues 167 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Change to @bm.addr

Browse Source
This commit is contained in:
Chuck 2013-07-12 18:32:17 +07:00
parent 08d38ee22b
commit 51edef7665
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/class_pop3Server.py
View File

@ -357,16 +357,16 @@ class bitmessagePOP3Server(asyncore.dispatcher):
if not body_is_valid: if not body_is_valid:
if broadcast: if broadcast:
if ostensiblyFrom is not None: if ostensiblyFrom is not None:
fromLabel = '{} <{}@default>'.format(ostensiblyFrom, ostensiblyFrom) fromLabel = '{} <{}@bm.addr>'.format(ostensiblyFrom, ostensiblyFrom)
# TODO - check address book for label? # TODO - check address book for label?
else: else:
fromLabel = '{}@default'.format(fromAddress) fromLabel = '{}@bm.addr'.format(fromAddress)
if mailingListName is not None: if mailingListName is not None:
fromLabel = '{} <{}>'.format(mailingListName, fromLabel) fromLabel = '{} <{}>'.format(mailingListName, fromLabel)
else: else:
fromLabel = '{} <{}>'.format(fromAddress, fromLabel) fromLabel = '{} <{}>'.format(fromAddress, fromLabel)
else: else:
fromLabel = '{}@default'.format(fromAddress) fromLabel = '{}@bm.addr'.format(fromAddress)
with shared.sqlLock: with shared.sqlLock:
t = (fromAddress,) t = (fromAddress,)
@ -393,7 +393,7 @@ class bitmessagePOP3Server(asyncore.dispatcher):
if broadcast: if broadcast:
# The To: field on a broadcast is the mailing list, not you # The To: field on a broadcast is the mailing list, not you
toLabel = '{}@default'.format(fromAddress) toLabel = '{}@bm.addr'.format(fromAddress)
if mailingListName is not None: if mailingListName is not None:
toLabel = '{} <{}>'.format(mailingListName, toLabel) toLabel = '{} <{}>'.format(mailingListName, toLabel)
if 'To' in message: if 'To' in message:
@ -404,7 +404,7 @@ class bitmessagePOP3Server(asyncore.dispatcher):
message['Reply-To'] = toLabel message['Reply-To'] = toLabel
else: else:
if 'To' not in message: if 'To' not in message:
toLabel = '{}@default'.format(toAddress) toLabel = '{}@bm.addr'.format(toAddress)
try: try:
toLabel = '{} <{}>'.format(shared.config.get(toAddress, 'label'), toLabel) toLabel = '{} <{}>'.format(shared.config.get(toAddress, 'label'), toLabel)
except: except:
@ -413,11 +413,11 @@ class bitmessagePOP3Server(asyncore.dispatcher):
message['To'] = toLabel message['To'] = toLabel
# Return-Path # Return-Path
returnPath = "{}@default".format(fromAddress) returnPath = "{}@bm.addr".format(fromAddress)
message['Return-Path'] = returnPath message['Return-Path'] = returnPath
# X-Delivered-To # X-Delivered-To
deliveredTo = "{}@default".format(toAddress) deliveredTo = "{}@bm.addr".format(toAddress)
message['X-Delivered-To'] = deliveredTo message['X-Delivered-To'] = deliveredTo
# X-Bitmessage-Receiving-Version # X-Bitmessage-Receiving-Version
@ -446,7 +446,7 @@ class bitmessagePOP3Server(asyncore.dispatcher):
del message['X-Bitmessage-Flags'] del message['X-Bitmessage-Flags']
# The mailing list code will override some headers, including Date and From # The mailing list code will override some headers, including Date and From
fromLabel = '{}@default'.format(fromAddress) fromLabel = '{}@bm.addr'.format(fromAddress)
if 'From' in message: if 'From' in message:
originalFrom = message['From'] originalFrom = message['From']
@ -475,7 +475,7 @@ class bitmessagePOP3Server(asyncore.dispatcher):
del message['Subject'] del message['Subject']
message['Subject'] = bitmessagePOP3Server.addMailingListNameToSubject(s, mailingListName) message['Subject'] = bitmessagePOP3Server.addMailingListNameToSubject(s, mailingListName)
toLabel = '"{}" <{}@default>'.format(mailingListName, toAddress) toLabel = '"{}" <{}@bm.addr>'.format(mailingListName, toAddress)
if 'To' in message: if 'To' in message:
message['X-Original-To'] = message['To'] message['X-Original-To'] = message['To']
del message['To'] del message['To']