jarno
/
hemppa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ig polling fixes - fixes #8

This commit is contained in:
Ville Ranki 2019-12-30 23:52:29 +02:00
parent 19057ec0c7
commit e7a7595731
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/ig.py
View File

@ -7,9 +7,8 @@ class MatrixModule:
instagram = Instagram() instagram = Instagram()
known_ids = set() known_ids = set()
first_run = True
account_rooms = dict() # Roomid -> [account, account..] account_rooms = dict() # Roomid -> [account, account..]
next_poll_time = dict() # Roomid -> datetime next_poll_time = dict() # Roomid -> datetime, None = not polled yet
async def matrix_poll(self, bot, pollcount): async def matrix_poll(self, bot, pollcount):
if len(self.account_rooms): if len(self.account_rooms):
@ -18,20 +17,28 @@ class MatrixModule:
async def poll_all_accounts(self, bot): async def poll_all_accounts(self, bot):
now = datetime.now() now = datetime.now()
for roomid in self.account_rooms: for roomid in self.account_rooms:
send_messages = True
if not self.next_poll_time.get(roomid, None): if not self.next_poll_time.get(roomid, None):
self.next_poll_time[roomid] = now self.next_poll_time[roomid] = now
send_messages = False
if now >= self.next_poll_time.get(roomid): if now >= self.next_poll_time.get(roomid):
accounts = self.account_rooms[roomid] accounts = self.account_rooms[roomid]
for account in accounts: for account in accounts:
await self.poll_account(bot, account, roomid) try:
await self.poll_account(bot, account, roomid, send_messages)
except InstagramNotFoundException:
print('ig error: there is ', account, ' account that does not exist - deleting from room')
self.account_rooms[roomid].remove(account)
bot.save_settings()
self.first_run = False self.first_run = False
async def poll_account(self, bot, account, roomid): async def poll_account(self, bot, account, roomid, send_messages):
print('polling', account, roomid, send_messages)
medias = self.instagram.get_medias(account, 5) medias = self.instagram.get_medias(account, 5)
for media in medias: for media in medias:
if not self.first_run: if send_messages:
if media.identifier not in self.known_ids: if media.identifier not in self.known_ids:
await bot.send_html(bot.get_room_by_id(roomid), f'<a href="{media.link}">Instagram {account}:</a> {media.caption}', f'{account}: {media.caption} {media.link}') await bot.send_html(bot.get_room_by_id(roomid), f'<a href="{media.link}">Instagram {account}:</a> {media.caption}', f'{account}: {media.caption} {media.link}')
self.known_ids.add(media.identifier) self.known_ids.add(media.identifier)
@ -46,6 +53,8 @@ class MatrixModule:
await bot.send_text(room, f'Instagram accounts in this room: {self.account_rooms.get(room.room_id) or []}') await bot.send_text(room, f'Instagram accounts in this room: {self.account_rooms.get(room.room_id) or []}')
elif args[1] == 'poll': elif args[1] == 'poll':
bot.must_be_owner(event) bot.must_be_owner(event)
for roomid in self.account_rooms:
self.next_poll_time[roomid] = datetime.now()
await self.poll_all_accounts(bot) await self.poll_all_accounts(bot)
elif args[1] == 'clear': elif args[1] == 'clear':
bot.must_be_admin(room, event) bot.must_be_admin(room, event)
@ -71,7 +80,7 @@ class MatrixModule:
print(f'Accounts now for this room {self.account_rooms.get(room.room_id)}') print(f'Accounts now for this room {self.account_rooms.get(room.room_id)}')
try: try:
await self.poll_account(bot, account, room.room_id) await self.poll_account(bot, account, room.room_id, False)
bot.save_settings() bot.save_settings()
await bot.send_text(room, 'Added new instagram account to this room') await bot.send_text(room, 'Added new instagram account to this room')
except InstagramNotFoundException: except InstagramNotFoundException: