copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Save last archive timestamps in DB 

- A Migration from last_mam_id config value is included
This commit is contained in:
Philipp Hörist 2017-11-13 21:58:20 +01:00
parent 95357361bf
commit 40f537cda9
2 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gajim/common/config.py
View File

@ -409,8 +409,6 @@ class Config:
'oauth2_client_id': [ opt_str, '0000000044077801', _('client_id for OAuth 2.0 authentication.')], 'oauth2_client_id': [ opt_str, '0000000044077801', _('client_id for OAuth 2.0 authentication.')],
'oauth2_redirect_url': [ opt_str, 'https%3A%2F%2Fgajim.org%2Fmsnauth%2Findex.cgi', _('redirect_url for OAuth 2.0 authentication.')], 'oauth2_redirect_url': [ opt_str, 'https%3A%2F%2Fgajim.org%2Fmsnauth%2Findex.cgi', _('redirect_url for OAuth 2.0 authentication.')],
'opened_chat_controls': [opt_str, '', _('Space separated list of JIDs for which we want to re-open a chat window on next startup.')], 'opened_chat_controls': [opt_str, '', _('Space separated list of JIDs for which we want to re-open a chat window on next startup.')],
'last_mam_id': [opt_str, '', _('Last MAM id we are syncronized with')],
'mam_start_date': [opt_int, 0, _('The earliest date we requested MAM history for')],
}, {}), }, {}),
'statusmsg': ({ 'statusmsg': ({
'message': [ opt_str, '' ], 'message': [ opt_str, '' ],

56
gajim/common/message_archiving.py
View File

@ -115,21 +115,25 @@ class ConnectionArchive313:
return return
last = set_.getTagData('last') last = set_.getTagData('last')
complete = fin.getAttr('complete') if last is None:
if last is not None: log.info('End of MAM query, no items retrieved')
if not groupchat: return
app.config.set_per('accounts', self.name, 'last_mam_id', last)
if complete != 'true':
query_id = self.get_query_id()
query = self.get_archive_query(query_id, after=last)
self.send_archive_query(query, query_id, groupchat=groupchat)
if complete == 'true': jid = str(stanza.getFrom())
complete = fin.getAttr('complete')
app.logger.set_archive_timestamp(jid, last_mam_id=last)
if complete != 'true':
query_id = self.get_query_id()
query = self.get_archive_query(query_id, after=last)
self.send_archive_query(query, query_id, groupchat=groupchat)
else:
self.mam_query_ids.remove(query_id) self.mam_query_ids.remove(query_id)
if not groupchat and start_date is not None: if start_date is not None:
app.config.set_per( app.logger.set_archive_timestamp(
'accounts', self.name, jid,
'mam_start_date', start_date.timestamp()) last_mam_id=last,
oldest_mam_timestamp=start_date.timestamp())
log.info('End of MAM query, last mam id: %s', last)
def _nec_mam_decrypted_message_received(self, obj): def _nec_mam_decrypted_message_received(self, obj):
if obj.conn.name != self.name: if obj.conn.name != self.name:
@ -157,7 +161,15 @@ class ConnectionArchive313:
return query_id return query_id
def request_archive_on_signin(self): def request_archive_on_signin(self):
mam_id = app.config.get_per('accounts', self.name, 'last_mam_id') own_jid = self.get_own_jid().getStripped()
archive = app.logger.get_archive_timestamp(own_jid)
# Migration of last_mam_id from config to DB
if archive is not None:
mam_id = archive.last_mam_id
else:
mam_id = app.config.get_per('accounts', self.name, 'last_mam_id')
start_date = None start_date = None
query_id = self.get_query_id() query_id = self.get_query_id()
if mam_id: if mam_id:
@ -171,11 +183,19 @@ class ConnectionArchive313:
self.send_archive_query(query, query_id, start_date) self.send_archive_query(query, query_id, start_date)
def request_archive_on_muc_join(self, jid): def request_archive_on_muc_join(self, jid):
# First Start, we request one month archive = app.logger.get_archive_timestamp(jid)
start_date = datetime.utcnow() - timedelta(days=30)
query_id = self.get_query_id() query_id = self.get_query_id()
log.info('First join: query archive start: %s', start_date) start_date = None
query = self.get_archive_query(query_id, jid=jid, start=start_date) if archive is not None:
log.info('Query Groupchat MAM Archive %s after %s:',
jid, archive.last_mam_id)
query = self.get_archive_query(
query_id, jid=jid, after=archive.last_mam_id)
else:
# First Start, we request one month
start_date = datetime.utcnow() - timedelta(days=30)
log.info('First join: query archive %s from: %s', jid, start_date)
query = self.get_archive_query(query_id, jid=jid, start=start_date)
self.send_archive_query(query, query_id, start_date, groupchat=True) self.send_archive_query(query, query_id, start_date, groupchat=True)
def send_archive_query(self, query, query_id, start_date=None, def send_archive_query(self, query, query_id, start_date=None,