From d543bb71eb3a46f2cbe9d4622ac094b844b3da64 Mon Sep 17 00:00:00 2001 From: nemesis Date: Thu, 9 Apr 2020 10:08:33 +0200 Subject: [PATCH] titre --- asmodee.ini | 4 ++-- asmodee.py | 34 +++++++++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/asmodee.ini b/asmodee.ini index 2724648..2431b65 100644 --- a/asmodee.ini +++ b/asmodee.ini @@ -5,8 +5,8 @@ server = https://instance.tld admin = @mxid:intance.tld [MOD] -# liste = roll,quote,biere,stats,liste,horloge,carte,card,cristal,welcome,salut,jdr,gens,va,salon,kick -liste = roll,quote,biere,stats,liste,horloge,carte,card,cristal,welcome,salut,jdr,gens,va,salon,kick +# liste = roll,quote,biere,stats,liste,horloge,carte,card,cristal,welcome,salut,jdr,gens,va,salon,kick,mails,titre +liste = roll,quote,biere,stats,liste,horloge,carte,card,cristal,welcome,salut,jdr,gens,va,salon,kick,mails,titre [MAIL] malt = 0 diff --git a/asmodee.py b/asmodee.py index c2a5742..0e8454a 100755 --- a/asmodee.py +++ b/asmodee.py @@ -13,6 +13,7 @@ import json from datetime import datetime,timedelta import smtplib import os +import requests from matrix_bot_api.matrix_bot_api import MatrixBotAPI from matrix_bot_api.mregex_handler import MRegexHandler @@ -1991,10 +1992,10 @@ def invitations(room_id, state): # Reponse aux invitations def kick(room, event): # kick une liste de membres global modules try: - rmod = modules[room.room_id, 'biere'] + rmod = modules[room.room_id, 'kick'] except: - modules[room.room_id, 'biere'] = False - if (modules[room.room_id, 'biere']): + modules[room.room_id, 'kick'] = False + if (modules[room.room_id, 'kick']): lmod = [] try: lmod = modos[room.room_id] @@ -2011,6 +2012,25 @@ def kick(room, event): # kick une liste de membres args.pop(0) else: msg(room,"Vous n'êtes pas autorisés à kicker des membres de ce salon.",event['sender']) + + +def titre(room, event): # cherche le titre d'une page + global modules + try: + rmod = modules[room.room_id, 'titre'] + except: + modules[room.room_id, 'titre'] = False + if (modules[room.room_id, 'titre']): + args = event['content']['body'].split() + args.pop(0) + url=args[0] + r = requests.get(url) + res = re.search(r"(.*)",r.text) + if (res is not None): + msg(room,re.sub("", "", res.group()),event['sender']) + else: + msg(room,"Titre non trouvé",event['sender']) + def main(): @@ -2020,7 +2040,7 @@ def main(): USERNAME = "" # Bot's username PASSWORD = "" # Bot's password SERVER = "" # Matrix server URL - mods = ["roll", "quote", "biere", "stats", "liste", "horloge", "carte", "card", "cristal", "welcome", "salut", "jdr", "gens", "va", "salon", "kick", "mails"] + mods = ["roll", "quote", "biere", "stats", "liste", "horloge", "carte", "card", "cristal", "welcome", "salut", "jdr", "gens", "va", "salon", "kick", "mails", "titre"] global admins if ('AUTH' in config): USERNAME = config['AUTH']['username'] # Bot's username @@ -2171,7 +2191,11 @@ def main(): bot.add_handler(mails_handler) envoi_mail_handler = MAllHandler(envoi_mail) bot.add_handler(envoi_mail_handler) - + # Titre + if ('titre' in liste_mod): + titre_handler = MCommandHandler("titre", titre) + bot.add_handler(titre_handler) + # Definition des moderateurs modos_read() modos_handler = MCommandHandler("modo", modo)