|
@ -301,14 +301,16 @@ def msg(room,msg,sender,content=False): |
|
|
if (sender not in admins and sender not in lmod): |
|
|
if (sender not in admins and sender not in lmod): |
|
|
msg = msg.replace('@room', 'tout le monde') |
|
|
msg = msg.replace('@room', 'tout le monde') |
|
|
except: |
|
|
except: |
|
|
msg = msg.replace('@room', 'tout le monde') |
|
|
try: |
|
|
|
|
|
msg = msg.replace('@room', 'tout le monde') |
|
|
|
|
|
except |
|
|
|
|
|
print(msg) |
|
|
if content: |
|
|
if content: |
|
|
bot.client.api.send_message_event(room.room_id, 'm.room.message', msg, None, None) |
|
|
bot.client.api.send_message_event(room.room_id, 'm.room.message', msg, None, None) |
|
|
else: |
|
|
else: |
|
|
room.send_text(msg) |
|
|
room.send_text(msg) |
|
|
except: |
|
|
except: |
|
|
room.send_text("Impossible d'envoyer le message") |
|
|
room.send_text("Impossible d'envoyer le message") |
|
|
print(msg) |
|
|
|
|
|
|
|
|
|
|
|
def verifPMRoom(room, event): # Pour obtenir ou créer un salon pour les messages privés avec l'utilisateur |
|
|
def verifPMRoom(room, event): # Pour obtenir ou créer un salon pour les messages privés avec l'utilisateur |
|
|
global bot |
|
|
global bot |
|
@ -1864,7 +1866,10 @@ def envoi_mail(room,event): # envoi des messages aux abonnés par mail |
|
|
except: |
|
|
except: |
|
|
lmails = [] |
|
|
lmails = [] |
|
|
sender = event['sender'] |
|
|
sender = event['sender'] |
|
|
body = event['content']['body'] |
|
|
try: |
|
|
|
|
|
body = event['content']['body'] |
|
|
|
|
|
except: |
|
|
|
|
|
body = "" |
|
|
for mail in lmails: |
|
|
for mail in lmails: |
|
|
if (malt == "1"): |
|
|
if (malt == "1"): |
|
|
os.system('echo ' + body + ' | mailx -s ' + sender + ' -r ' + msender + ' ' + mail) |
|
|
os.system('echo ' + body + ' | mailx -s ' + sender + ' -r ' + msender + ' ' + mail) |
|
|