Get snapshot of all configured camera ids with '\!cam now'. Fixed pre-event missing from send_text calls
This commit is contained in:
parent
9aedbef3a8
commit
5a6c560086
|
@ -52,26 +52,26 @@ class MatrixModule(BotModule):
|
||||||
bot.must_be_owner(event)
|
bot.must_be_owner(event)
|
||||||
self.motionurl = newurl
|
self.motionurl = newurl
|
||||||
bot.save_settings()
|
bot.save_settings()
|
||||||
await bot.send_text(room, f"Motion API URL set to {self.motionurl}")
|
await bot.send_text(room, f"Motion API URL set to {self.motionurl}", event)
|
||||||
elif args[1] == 'get':
|
elif args[1] == 'get':
|
||||||
await bot.send_text(room, f"Motion URL is currently {self.motionurl}")
|
await bot.send_text(room, f"Motion URL is currently {self.motionurl}", event)
|
||||||
|
|
||||||
elif args[0] == 'cameras':
|
elif args[0] == 'cameras':
|
||||||
if args[1] == 'set':
|
if args[1] == 'set':
|
||||||
bot.must_be_owner(event)
|
bot.must_be_owner(event)
|
||||||
self.cameras = args[2:]
|
self.cameras = args[2:]
|
||||||
bot.save_settings()
|
bot.save_settings()
|
||||||
await bot.send_text(room, "Updated camera id list")
|
await bot.send_text(room, "Updated camera id list", event)
|
||||||
elif args[1] == 'get':
|
elif args[1] == 'get':
|
||||||
camstr = ''
|
camstr = ''
|
||||||
if len(self.cameras) == 0:
|
if len(self.cameras) == 0:
|
||||||
await bot.send_text(room, "No camera ids configured")
|
await bot.send_text(room, "No camera ids configured", event)
|
||||||
else:
|
else:
|
||||||
for n, cam in enumerate(self.cameras):
|
for n, cam in enumerate(self.cameras):
|
||||||
camstr = camstr + cam
|
camstr = camstr + cam
|
||||||
if n < len(self.cameras) - 1:
|
if n < len(self.cameras) - 1:
|
||||||
camstr = camstr + ","
|
camstr = camstr + ","
|
||||||
await bot.send_text(room, f"Following camera ids are configured:\n{camstr}")
|
await bot.send_text(room, f"Following camera ids are configured:\n{camstr}", event)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
cmdindex = 1
|
cmdindex = 1
|
||||||
|
@ -85,7 +85,14 @@ class MatrixModule(BotModule):
|
||||||
category = args[cmdindex]
|
category = args[cmdindex]
|
||||||
## Quick commands start
|
## Quick commands start
|
||||||
if category == 'now':
|
if category == 'now':
|
||||||
|
if camid != '0':
|
||||||
await self.get_snapshot(camid, bot, room, event)
|
await self.get_snapshot(camid, bot, room, event)
|
||||||
|
elif camid == '0' and len(self.cameras) > 0:
|
||||||
|
for cam in self.cameras:
|
||||||
|
await self.get_snapshot(cam, bot, room, event)
|
||||||
|
else:
|
||||||
|
self.logger.info("User requested snapshots with id 0, but no camera id list configured")
|
||||||
|
await bot.send_text(room, "No camera ids configured", event)
|
||||||
return
|
return
|
||||||
## Quick commands end
|
## Quick commands end
|
||||||
if category not in self.allowed_cmds:
|
if category not in self.allowed_cmds:
|
||||||
|
|
Loading…
Reference in New Issue