ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-23 19:44:20 +00:00
Code Activity

Removed even more login stuff

Browse source
This commit is contained in:
Steffo 2017-04-20 10:11:20 +02:00
parent f7a8fda245
commit 7024d442d0
1 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
royalbot.py
View file

@ -1,11 +1,6 @@
import asyncio import asyncio
import datetime
import json
import random import random
import aiohttp
import async_timeout
import extradiscord import extradiscord
import markovify
import database import database
import royalbotconfig import royalbotconfig
import telegram import telegram
@ -15,22 +10,6 @@ b = telegram.Bot(royalbotconfig.telegram_token)
d = extradiscord.ExtraClient(royalbotconfig.discord_token) d = extradiscord.ExtraClient(royalbotconfig.discord_token)
def currently_logged_in(thing):
"""Trova l'utente connesso all'account di Telegram che ha mandato l'update."""
# Create a new database session
session = database.Session()
# Check if thing is a Telegram update
if isinstance(thing, telegram.Update):
user = session.query(database.User).filter_by(telegram_id=thing.message.sent_from.user_id).first()
# Check if thing is a Discord message
elif isinstance(thing, extradiscord.discord.Message):
user = session.query(database.User).filter_by(discord_id=thing.author.id).first()
# I don't know what thing is.
else:
raise TypeError("thing must be either a telegram.Update or a discord.Message")
return user
async def answer(bot, thing, text): async def answer(bot, thing, text):
"""Rispondi al messaggio con il canale corretto.""" """Rispondi al messaggio con il canale corretto."""
# Answer on Telegram # Answer on Telegram
@ -55,7 +34,7 @@ async def status_typing(bot, thing):
raise TypeError("thing must be either a telegram.Update or a discord.Message") raise TypeError("thing must be either a telegram.Update or a discord.Message")
async def display_help(bot, thing, function): async def display_help(bot, thing, func: function):
"""Display the help command of a function""" """Display the help command of a function"""
# Telegram bot commands start with / # Telegram bot commands start with /
if isinstance(thing, telegram.Update): if isinstance(thing, telegram.Update):
@ -67,7 +46,7 @@ async def display_help(bot, thing, function):
else: else:
raise TypeError("thing must be either a telegram.Update or a discord.Message") raise TypeError("thing must be either a telegram.Update or a discord.Message")
# Display the help message # Display the help message
await answer(bot, thing, function.__doc__.format(symbol=symbol)) await answer(bot, thing, func.__doc__.format(symbol=symbol))
def find_date(thing): def find_date(thing):
@ -93,8 +72,6 @@ Sintassi: `{symbol}diario <frase>`"""
if len(arguments) == 0: if len(arguments) == 0:
await display_help(bot, thing, diario) await display_help(bot, thing, diario)
return return
# Find the user
user = currently_logged_in(thing)
# Prepare the text # Prepare the text
text = " ".join(arguments).strip() text = " ".join(arguments).strip()
# Add the new entry # Add the new entry