chg: [telegram fedeer] use meta of the new feeder

This commit is contained in:
Terrtia 2023-08-02 15:49:12 +02:00
parent 859591b53f
commit 2691000d0c
No known key found for this signature in database
GPG key ID: 1E1B1F50D84613D0

View file

@ -29,8 +29,8 @@ class TelegramFeeder(DefaultFeeder):
def get_item_id(self): def get_item_id(self):
# TODO use telegram message date # TODO use telegram message date
date = datetime.date.today().strftime("%Y/%m/%d") date = datetime.date.today().strftime("%Y/%m/%d")
channel_id = str(self.json_data['meta']['channel_id']) channel_id = str(self.json_data['meta']['chat']['id'])
message_id = str(self.json_data['meta']['message_id']) message_id = str(self.json_data['meta']['id'])
item_id = f'{channel_id}_{message_id}' item_id = f'{channel_id}_{message_id}'
item_id = os.path.join('telegram', date, item_id) item_id = os.path.join('telegram', date, item_id)
self.item_id = f'{item_id}.gz' self.item_id = f'{item_id}.gz'
@ -40,15 +40,19 @@ class TelegramFeeder(DefaultFeeder):
""" """
Process JSON meta field. Process JSON meta field.
""" """
# channel_id = str(self.json_data['meta']['channel_id']) # message chat
# message_id = str(self.json_data['meta']['message_id']) meta = self.json_data['meta']
# telegram_id = f'{channel_id}_{message_id}' if meta.get('chat'):
# item_basic.add_map_obj_id_item_id(telegram_id, item_id, 'telegram_id') ######################################### if meta['chat'].get('username'):
user = None user = meta['chat']['username']
if self.json_data['meta'].get('user'): if user:
user = str(self.json_data['meta']['user']) date = item_basic.get_item_date(self.item_id)
elif self.json_data['meta'].get('channel'): username = Username(user, 'telegram')
user = str(self.json_data['meta']['channel'].get('username')) username.add(date, self.item_id)
# message sender
if meta.get('sender'):
if meta['sender'].get('username'):
user = meta['sender']['username']
if user: if user:
date = item_basic.get_item_date(self.item_id) date = item_basic.get_item_date(self.item_id)
username = Username(user, 'telegram') username = Username(user, 'telegram')