From de688a3cce727d50ab2e88749d278b61372c9ff0 Mon Sep 17 00:00:00 2001 From: Seb Seager Date: Tue, 5 Jan 2021 14:01:24 -0600 Subject: [PATCH] Fix for tombstone or hidden_by_limit files --- exporter.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/exporter.py b/exporter.py index a5b3a94..ffb186d 100644 --- a/exporter.py +++ b/exporter.py @@ -198,7 +198,11 @@ def parse_channel_history(msgs, users, check_thread=False): name_from_uid(u, users) for u in x['users'])) for x in rxns) if 'files' in msg: files = msg['files'] - entry += "\nFiles:\n" + '\n'.join(' - %s, %s' % (f['name'], f['url_private_download']) for f in files) + deleted = [f for f in files if 'name' not in f or 'url_private_download' not in f] + ok_files = [f for f in files if f not in deleted] + entry += "\nFiles:\n" + entry += '\n'.join(' - [%s] %s, %s' % (f['id'], f['name'], f['url_private_download']) for f in ok_files) + entry += '\n'.join(' - [%s] [deleted, oversize, or unavailable file]' % f['id'] for f in deleted) entry += '\n\n%s\n\n' % ('*' * 24)