From 5354720d2dd6568c5df5ec6891f7bad6db957473 Mon Sep 17 00:00:00 2001 From: XANTRONIX Development Date: Thu, 28 Nov 2024 07:59:06 -0500 Subject: [PATCH] Rename parent_id to reference_ids --- db/newsgroup.sql | 16 ++++++++-------- lib/nntp/tiny/message.py | 28 ++++++++++++++-------------- lib/nntp/tiny/session.py | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/db/newsgroup.sql b/db/newsgroup.sql index ba24933..98d13e2 100644 --- a/db/newsgroup.sql +++ b/db/newsgroup.sql @@ -9,14 +9,14 @@ create table newsgroup ( ); create table newsgroup_message ( - id INTEGER PRIMARY KEY NOT NULL, - created_on DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, - newsgroup_id INTEGER NOT NULL, - message_id TEXT NOT NULL UNIQUE, - parent_id TEXT, - sender TEXT NOT NULL, - subject TEXT NOT NULL, - content TEXT NOT NULL, + id INTEGER PRIMARY KEY NOT NULL, + created_on DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + newsgroup_id INTEGER NOT NULL, + message_id TEXT NOT NULL UNIQUE, + reference_ids TEXT, + sender TEXT NOT NULL, + subject TEXT NOT NULL, + content TEXT NOT NULL, FOREIGN KEY(newsgroup_id) REFERENCES newsgroup(id) ); diff --git a/lib/nntp/tiny/message.py b/lib/nntp/tiny/message.py index b353ccc..6d8fe69 100644 --- a/lib/nntp/tiny/message.py +++ b/lib/nntp/tiny/message.py @@ -140,7 +140,7 @@ class Message(DatabaseTable): 'newsgroup_id', 'created_on', 'message_id', - 'parent_id', + 'reference_ids', 'sender', 'subject', 'content' @@ -170,13 +170,13 @@ class Message(DatabaseTable): # message.content = row['content'] - message.id = row['id'] - message.newsgroup_id = row['newsgroup_id'] - message.created_on = row['created_on'] - message.message_id = row['message_id'] - message.parent_id = row['parent_id'] - message.sender = row['sender'] - message.subject = row['subject'] + message.id = row['id'] + message.newsgroup_id = row['newsgroup_id'] + message.created_on = row['created_on'] + message.message_id = row['message_id'] + message.reference_ids = row['reference_ids'] + message.sender = row['sender'] + message.subject = row['subject'] return message @@ -185,7 +185,7 @@ class Message(DatabaseTable): self.newsgroup_id, self.created_on, self.message_id, - self.parent_id, + self.reference_ids, self.sender, self.subject, self.content @@ -263,16 +263,16 @@ class Message(DatabaseTable): self._header_set('Message-ID', Header(value).encode()) @property - def parent_id(self) -> str: + def reference_ids(self) -> str: if self._headers is None: - return self._cache.get('parent_id') + return self._cache.get('reference_ids') return self.header('References') - @parent_id.setter - def parent_id(self, value): + @reference_ids.setter + def reference_ids(self, value): if self._headers is None: - self._cache['parent_id'] = value + self._cache['reference_ids'] = value elif value is not None: self._header_set('References', Header(value).encode()) diff --git a/lib/nntp/tiny/session.py b/lib/nntp/tiny/session.py index 7f3eaad..443a65a 100644 --- a/lib/nntp/tiny/session.py +++ b/lib/nntp/tiny/session.py @@ -620,7 +620,7 @@ class Session(): email.header.Header(message.sender).encode(), email.utils.format_datetime(message.created_on), message.message_id, - message.parent_id or '', + message.reference_ids or '', str(len(message.content)), str(message.content.count('\n') + 1), ]