xan/xenu_nntp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename parent_id to reference_ids

Browse source
This commit is contained in:
XANTRONIX Development 2024-11-28 07:59:06 -05:00
parent 6038746439
commit 5354720d2d
3 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
db/newsgroup.sql
View file

@ -9,14 +9,14 @@ create table newsgroup (
); );
create table newsgroup_message ( create table newsgroup_message (
id INTEGER PRIMARY KEY NOT NULL, id INTEGER PRIMARY KEY NOT NULL,
created_on DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, created_on DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
newsgroup_id INTEGER NOT NULL, newsgroup_id INTEGER NOT NULL,
message_id TEXT NOT NULL UNIQUE, message_id TEXT NOT NULL UNIQUE,
parent_id TEXT, reference_ids TEXT,
sender TEXT NOT NULL, sender TEXT NOT NULL,
subject TEXT NOT NULL, subject TEXT NOT NULL,
content TEXT NOT NULL, content TEXT NOT NULL,
FOREIGN KEY(newsgroup_id) REFERENCES newsgroup(id) FOREIGN KEY(newsgroup_id) REFERENCES newsgroup(id)
); );

28
lib/nntp/tiny/message.py
View file

@ -140,7 +140,7 @@ class Message(DatabaseTable):
'newsgroup_id', 'newsgroup_id',
'created_on', 'created_on',
'message_id', 'message_id',
'parent_id', 'reference_ids',
'sender', 'sender',
'subject', 'subject',
'content' 'content'
@ -170,13 +170,13 @@ class Message(DatabaseTable):
# #
message.content = row['content'] message.content = row['content']
message.id = row['id'] message.id = row['id']
message.newsgroup_id = row['newsgroup_id'] message.newsgroup_id = row['newsgroup_id']
message.created_on = row['created_on'] message.created_on = row['created_on']
message.message_id = row['message_id'] message.message_id = row['message_id']
message.parent_id = row['parent_id'] message.reference_ids = row['reference_ids']
message.sender = row['sender'] message.sender = row['sender']
message.subject = row['subject'] message.subject = row['subject']
return message return message
@ -185,7 +185,7 @@ class Message(DatabaseTable):
self.newsgroup_id, self.newsgroup_id,
self.created_on, self.created_on,
self.message_id, self.message_id,
self.parent_id, self.reference_ids,
self.sender, self.sender,
self.subject, self.subject,
self.content self.content
@ -263,16 +263,16 @@ class Message(DatabaseTable):
self._header_set('Message-ID', Header(value).encode()) self._header_set('Message-ID', Header(value).encode())
@property @property
def parent_id(self) -> str: def reference_ids(self) -> str:
if self._headers is None: if self._headers is None:
return self._cache.get('parent_id') return self._cache.get('reference_ids')
return self.header('References') return self.header('References')
@parent_id.setter @reference_ids.setter
def parent_id(self, value): def reference_ids(self, value):
if self._headers is None: if self._headers is None:
self._cache['parent_id'] = value self._cache['reference_ids'] = value
elif value is not None: elif value is not None:
self._header_set('References', Header(value).encode()) self._header_set('References', Header(value).encode())

2
lib/nntp/tiny/session.py
View file

@ -620,7 +620,7 @@ class Session():
email.header.Header(message.sender).encode(), email.header.Header(message.sender).encode(),
email.utils.format_datetime(message.created_on), email.utils.format_datetime(message.created_on),
message.message_id, message.message_id,
message.parent_id or '', message.reference_ids or '',
str(len(message.content)), str(len(message.content)),
str(message.content.count('\n') + 1), str(message.content.count('\n') + 1),
] ]