bakatrouble/telegram_bots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

load last 10 messages on chat add

Browse Source
This commit is contained in:
bakatrouble 2019-01-28 00:30:40 +03:00
parent b7e68abb03
commit fbfe72c774
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
aggregator/client.py
View File

@ -15,7 +15,11 @@ Session.notice_displayed = True
def get_client(): def get_client():
config._reload_maybe() config._reload_maybe()
session_path = os.path.relpath(default_storage.path(config.pyrogram_session.replace('.session', ''))) pyrogram_sesssion = config.pyrogram_session.replace('.session', '')
if not pyrogram_sesssion or not config.pyrogram_app_id or config.pyrogram_app_hash:
raise RuntimeError('Pyrogram is not configured')
session_path = os.path.relpath(default_storage.path(pyrogram_sesssion))
return Client(session_path, config.pyrogram_app_id, config.pyrogram_app_hash) return Client(session_path, config.pyrogram_app_id, config.pyrogram_app_hash)

9
aggregator/models.py
View File

@ -5,8 +5,9 @@ from tempfile import TemporaryDirectory
import pytz import pytz
from django.conf import settings from django.conf import settings
from django.db import models from django.db import models
from pyrogram import Chat as PyrogramChat, Message as PyrogramMessage, ChatPhoto as PyrogramChatPhoto from pyrogram import Chat as PyrogramChat, Message as PyrogramMessage
from pyrogram.api.types.chat_photo import ChatPhoto as MTProtoChatPhoto
from aggregator.tasks import collect_new_messages
class AggregationSource(models.Model): class AggregationSource(models.Model):
@ -27,7 +28,7 @@ class Chat(models.Model):
@classmethod @classmethod
def from_obj(cls, chat: PyrogramChat, client): def from_obj(cls, chat: PyrogramChat, client):
obj, _ = Chat.objects.update_or_create( obj, created = Chat.objects.update_or_create(
chat_id=chat.id, chat_id=chat.id,
defaults={ defaults={
'title': chat.title or '{} {}'.format(chat.first_name, chat.last_name).rstrip(), 'title': chat.title or '{} {}'.format(chat.first_name, chat.last_name).rstrip(),
@ -47,6 +48,8 @@ class Chat(models.Model):
obj.photo.save(os.path.basename(path), f, save=True) obj.photo.save(os.path.basename(path), f, save=True)
obj.photo_id = chat.photo.small_file_id obj.photo_id = chat.photo.small_file_id
obj.save() obj.save()
if created:
collect_new_messages.delay(obj.pk)
return obj return obj
def __str__(self): def __str__(self):

14
aggregator/tasks.py Normal file
View File

@ -0,0 +1,14 @@
from celery_once import QueueOnce
from aggregator.client import get_client
from config.celery import app
from .models import Chat
from .client import collect_new_messages as _collect_new_messages
@app.task(base=QueueOnce, once={'keys': ['chat_id'], 'graceful': True})
def collect_new_messages(chat_id):
chat = Chat.objects.get(pk=chat_id)
with get_client() as client:
_collect_new_messages(client, chat)