From 70d8f4f918f0b067afb35ff3faf4db152aa1e282 Mon Sep 17 00:00:00 2001 From: HonusBot Date: Sun, 8 Mar 2020 23:06:37 +0100 Subject: [PATCH 1/5] Aggiornare 'inline.py' --- inline.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inline.py b/inline.py index 58bcee5..dcfca7f 100644 --- a/inline.py +++ b/inline.py @@ -86,7 +86,7 @@ class InlineBot: results.append(self.makeResult("Loli", "Cute lolis", self.callRequest("loli", senderid, query))) results.append(self.makeResult("Yiff", "Yiff", self.callRequest("yiff", senderid, query))) results.append(self.makeResult("Lewd", "Say hi to the police", self.callRequest("lewd", senderid, query))) - results.append(self.makeResult("Rasoio", "Dai facciamogli lo scherzo del rasoio!1!!", "https://www.youtube.com/watch?v=sj8kNDOpvWI")) + results.append(self.makeResult("Rasoio", "Dai facciamogli lo scherzo del rasoio!1!!", self.callRequest("rasoio", senderid, query))) else: results.append(self.makeResult("Cancer", "Search cancer about " + query, self.callRequest("cancer", senderid, query))) context.bot.answer_inline_query(update.inline_query.id, results, 1, False) From db8bac435fb887db3d33bec264161e61bce32b6c Mon Sep 17 00:00:00 2001 From: HonusBot Date: Mon, 9 Mar 2020 00:18:09 +0100 Subject: [PATCH 2/5] Aggiornare 'inline.py' --- inline.py | 56 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/inline.py b/inline.py index dcfca7f..8acfdc3 100644 --- a/inline.py +++ b/inline.py @@ -16,7 +16,7 @@ class InlineBot: self.errorText = "Sowwy mawster, an ewror occuwed. ;;w;;" - def callRequest(self, command, senderid, text): + def callRequest(self, command, requiredField, senderid, text): r = requests.get(self.apiUrl, headers={ "botid":password.BOT_ID, @@ -32,13 +32,13 @@ class InlineBot: if not r: return self.errorText - if not "authorized" in r.headers or not "success" in r.headers or not "htmldescription" in r.headers or not "imageurl" in r.headers: + if not "authorized" in r.headers or not "success" in r.headers or not "htmldescription" in r.headers or not "imageurl" in r.headers or not requiredField in r.headers: return self.errorText - if r.headers["authorized"] != "true" or r.headers["success"] != "true" or r.headers["imageurl"] == "": + if r.headers["authorized"] != "true" or r.headers["success"] != "true" or r.headers[requiredField] == "": return self.errorText - return r.headers["imageurl"] + return r.headers[requiredField] def start(self): self.bot = Bot(token=password.BOT_TOKEN) @@ -66,29 +66,45 @@ class InlineBot: def commandStart(self, update, context): context.bot.send_message(chat_id=update.effective_chat.id, text="Inline cancer, clop, furry spammer (h0nus)",parse_mode="HTML") - def makeResult(self, qTitle, qDesc, picUrl): - return InlineQueryResultArticle( - id=uuid.uuid4().hex, - type="article", - title=qTitle, - input_message_content=InputTextMessageContent("H0nusBot", "HTML"), - description=qDesc - ) + def makeResult(self, qTitle, qMode, qDesc, qValue): + if qMode == "text": + return InlineQueryResultArticle( + id=uuid.uuid4().hex, + type="article", + title=qTitle, + input_message_content=InputTextMessageContent("HonusBot", "HTML"), + description=qDesc + ) + if qMode == "image": + return InlineQueryResultArticle( + id=uuid.uuid4().hex, + type="article", + title=qTitle, + input_message_content=InputTextMessageContent("Scherzo del rasoio", "HTML"), + description=qDesc + ) + return InlineQueryResultArticle( + id=uuid.uuid4().hex, + type="article", + title=qTitle, + input_message_content=InputTextMessageContent("Unknown result type!", "HTML"), + description=qDesc + ) def inlineQuery(self, update, context): senderid = str(update.inline_query.from_user.id) query = update.inline_query.query results = list() if not query: - results.append(self.makeResult("Pony", "yay, ponies!", self.callRequest("pony", senderid, query))) - results.append(self.makeResult("Clop", "NSFW ponies", self.callRequest("clop", senderid, query))) - results.append(self.makeResult("Furry", "Furries", self.callRequest("furry", senderid, query))) - results.append(self.makeResult("Loli", "Cute lolis", self.callRequest("loli", senderid, query))) - results.append(self.makeResult("Yiff", "Yiff", self.callRequest("yiff", senderid, query))) - results.append(self.makeResult("Lewd", "Say hi to the police", self.callRequest("lewd", senderid, query))) - results.append(self.makeResult("Rasoio", "Dai facciamogli lo scherzo del rasoio!1!!", self.callRequest("rasoio", senderid, query))) + results.append(self.makeResult("Pony", "image", "yay, ponies!", self.callRequest("pony", "imageurl", senderid, query))) + results.append(self.makeResult("Clop", "image", "NSFW ponies", self.callRequest("clop", "imageurl", senderid, query))) + results.append(self.makeResult("Furry", "image", "Furries", self.callRequest("furry", "imageurl", senderid, query))) + results.append(self.makeResult("Loli", "image", "Cute lolis", self.callRequest("loli", "imageurl", senderid, query))) + results.append(self.makeResult("Yiff", "image", "Yiff", self.callRequest("yiff", "imageurl", senderid, query))) + results.append(self.makeResult("Lewd", "image", "Say hi to the police", self.callRequest("lewd", "imageurl", senderid, query))) + results.append(self.makeResult("Rasoio", "html", "Dai facciamogli lo scherzo del rasoio!1!!", self.callRequest("rasoio", "htmldescription", senderid, query))) else: - results.append(self.makeResult("Cancer", "Search cancer about " + query, self.callRequest("cancer", senderid, query))) + results.append(self.makeResult("Cancer", "image", "Search cancer about " + query, self.callRequest("cancer", "imageurl", senderid, query))) context.bot.answer_inline_query(update.inline_query.id, results, 1, False) InlineBot().start() From aa1c165117080a72cdd438807da2bcbcdd475978 Mon Sep 17 00:00:00 2001 From: HonusBot Date: Mon, 9 Mar 2020 00:19:42 +0100 Subject: [PATCH 3/5] Aggiornare 'inline.py' --- inline.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/inline.py b/inline.py index 8acfdc3..dc946db 100644 --- a/inline.py +++ b/inline.py @@ -68,27 +68,27 @@ class InlineBot: def makeResult(self, qTitle, qMode, qDesc, qValue): if qMode == "text": - return InlineQueryResultArticle( - id=uuid.uuid4().hex, - type="article", - title=qTitle, - input_message_content=InputTextMessageContent("HonusBot", "HTML"), - description=qDesc - ) + return InlineQueryResultArticle( + id=uuid.uuid4().hex, + type="article", + title=qTitle, + input_message_content=InputTextMessageContent("HonusBot", "HTML"), + description=qDesc + ) if qMode == "image": - return InlineQueryResultArticle( - id=uuid.uuid4().hex, - type="article", - title=qTitle, - input_message_content=InputTextMessageContent("Scherzo del rasoio", "HTML"), - description=qDesc - ) + return InlineQueryResultArticle( + id=uuid.uuid4().hex, + type="article", + title=qTitle, + input_message_content=InputTextMessageContent("Scherzo del rasoio", "HTML"), + description=qDesc + ) return InlineQueryResultArticle( - id=uuid.uuid4().hex, - type="article", - title=qTitle, - input_message_content=InputTextMessageContent("Unknown result type!", "HTML"), - description=qDesc + id=uuid.uuid4().hex, + type="article", + title=qTitle, + input_message_content=InputTextMessageContent("Unknown result type!", "HTML"), + description=qDesc ) def inlineQuery(self, update, context): From 33d2609a6c453930be74e64070b9e061db655273 Mon Sep 17 00:00:00 2001 From: HonusBot Date: Mon, 9 Mar 2020 00:20:40 +0100 Subject: [PATCH 4/5] Aggiornare 'inline.py' --- inline.py | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/inline.py b/inline.py index dc946db..b34053d 100644 --- a/inline.py +++ b/inline.py @@ -68,28 +68,28 @@ class InlineBot: def makeResult(self, qTitle, qMode, qDesc, qValue): if qMode == "text": - return InlineQueryResultArticle( - id=uuid.uuid4().hex, - type="article", - title=qTitle, - input_message_content=InputTextMessageContent("HonusBot", "HTML"), - description=qDesc - ) - if qMode == "image": - return InlineQueryResultArticle( - id=uuid.uuid4().hex, - type="article", - title=qTitle, - input_message_content=InputTextMessageContent("Scherzo del rasoio", "HTML"), - description=qDesc - ) - return InlineQueryResultArticle( - id=uuid.uuid4().hex, - type="article", - title=qTitle, - input_message_content=InputTextMessageContent("Unknown result type!", "HTML"), - description=qDesc - ) + return InlineQueryResultArticle( + id=uuid.uuid4().hex, + type="article", + title=qTitle, + input_message_content=InputTextMessageContent("HonusBot", "HTML"), + description=qDesc + ) + if qMode == "image": + return InlineQueryResultArticle( + id=uuid.uuid4().hex, + type="article", + title=qTitle, + input_message_content=InputTextMessageContent("Scherzo del rasoio", "HTML"), + description=qDesc + ) + return InlineQueryResultArticle( + id=uuid.uuid4().hex, + type="article", + title=qTitle, + input_message_content=InputTextMessageContent("Unknown result type!", "HTML"), + description=qDesc + ) def inlineQuery(self, update, context): senderid = str(update.inline_query.from_user.id) From 8295eb46a8d9410f9ee95462532ce90e9b2b51e8 Mon Sep 17 00:00:00 2001 From: HonusBot Date: Mon, 9 Mar 2020 00:21:55 +0100 Subject: [PATCH 5/5] Aggiornare 'inline.py' --- inline.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/inline.py b/inline.py index b34053d..afe8ad2 100644 --- a/inline.py +++ b/inline.py @@ -67,7 +67,7 @@ class InlineBot: context.bot.send_message(chat_id=update.effective_chat.id, text="Inline cancer, clop, furry spammer (h0nus)",parse_mode="HTML") def makeResult(self, qTitle, qMode, qDesc, qValue): - if qMode == "text": + if qMode == "imageurl": return InlineQueryResultArticle( id=uuid.uuid4().hex, type="article", @@ -75,12 +75,12 @@ class InlineBot: input_message_content=InputTextMessageContent("HonusBot", "HTML"), description=qDesc ) - if qMode == "image": + if qMode == "genericurl": return InlineQueryResultArticle( id=uuid.uuid4().hex, type="article", title=qTitle, - input_message_content=InputTextMessageContent("Scherzo del rasoio", "HTML"), + input_message_content=InputTextMessageContent("link", "HTML"), description=qDesc ) return InlineQueryResultArticle( @@ -96,15 +96,15 @@ class InlineBot: query = update.inline_query.query results = list() if not query: - results.append(self.makeResult("Pony", "image", "yay, ponies!", self.callRequest("pony", "imageurl", senderid, query))) - results.append(self.makeResult("Clop", "image", "NSFW ponies", self.callRequest("clop", "imageurl", senderid, query))) - results.append(self.makeResult("Furry", "image", "Furries", self.callRequest("furry", "imageurl", senderid, query))) - results.append(self.makeResult("Loli", "image", "Cute lolis", self.callRequest("loli", "imageurl", senderid, query))) - results.append(self.makeResult("Yiff", "image", "Yiff", self.callRequest("yiff", "imageurl", senderid, query))) - results.append(self.makeResult("Lewd", "image", "Say hi to the police", self.callRequest("lewd", "imageurl", senderid, query))) - results.append(self.makeResult("Rasoio", "html", "Dai facciamogli lo scherzo del rasoio!1!!", self.callRequest("rasoio", "htmldescription", senderid, query))) + results.append(self.makeResult("Pony", "imageurl", "yay, ponies!", self.callRequest("pony", "imageurl", senderid, query))) + results.append(self.makeResult("Clop", "imageurl", "NSFW ponies", self.callRequest("clop", "imageurl", senderid, query))) + results.append(self.makeResult("Furry", "imageurl", "Furries", self.callRequest("furry", "imageurl", senderid, query))) + results.append(self.makeResult("Loli", "imageurl", "Cute lolis", self.callRequest("loli", "imageurl", senderid, query))) + results.append(self.makeResult("Yiff", "imageurl", "Yiff", self.callRequest("yiff", "imageurl", senderid, query))) + results.append(self.makeResult("Lewd", "imageurl", "Say hi to the police", self.callRequest("lewd", "imageurl", senderid, query))) + results.append(self.makeResult("Rasoio", "genericurl", "Dai facciamogli lo scherzo del rasoio!1!!", self.callRequest("rasoio", "htmldescription", senderid, query))) else: - results.append(self.makeResult("Cancer", "image", "Search cancer about " + query, self.callRequest("cancer", "imageurl", senderid, query))) + results.append(self.makeResult("Cancer", "imageurl", "Search cancer about " + query, self.callRequest("cancer", "imageurl", senderid, query))) context.bot.answer_inline_query(update.inline_query.id, results, 1, False) InlineBot().start()