jarno
/
hemppa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #102 from tswfi/url/fix_matrix_to_pill_spam 

url module: don't spam matrix.to urls, skip edited events, fixes #98
This commit is contained in:
Ville Ranki 2020-10-10 20:21:52 +03:00 committed by GitHub
parent a87b8b5934 8187bb5478
commit 2cc98e3524
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
modules/url.py
View File

@ -53,6 +53,12 @@ class MatrixModule(BotModule):
if len(event.body) < 1: if len(event.body) < 1:
return return
# skip edited content to prevent spamming the same thing multiple times
if "content" in event.source:
if "m.new_content" in event.source["content"]:
self.logger.debug(f"Skipping edited event to prevent spam")
return
# are we on in this room? # are we on in this room?
status = self.status.get(room.room_id, "OFF") status = self.status.get(room.room_id, "OFF")
if status not in self.STATUSES: if status not in self.STATUSES:
@ -69,10 +75,17 @@ class MatrixModule(BotModule):
# fetch the urls and if we can see a title spit it out # fetch the urls and if we can see a title spit it out
for url in urls: for url in urls:
# fix for #98 a bit ugly, but skip all matrix.to urls
# those are 99.99% pills and should not
# spam the channel with matrix.to titles
if url.startswith("https://matrix.to/#/"):
self.logger.debug(f"Skipping matrix.to url (#98): {url}")
continue
try: try:
title, description = self.get_content_from_url(url) title, description = self.get_content_from_url(url)
except Exception as e: except Exception as e:
self.logger.info(f"could not fetch url: {e}") self.logger.warning(f"could not fetch url: {e}")
# failed fetching, give up # failed fetching, give up
continue continue
@ -105,11 +118,13 @@ class MatrixModule(BotModule):
try: try:
r = httpx.get(url, timeout=timeout) r = httpx.get(url, timeout=timeout)
except Exception as e: except Exception as e:
self.logger.error(f"Failed fetching url {url}. Error: {e}") self.logger.warning(f"Failed fetching url {url}. Error: {e}")
return (title, description) return (title, description)
if r.status_code != 200: if r.status_code != 200:
self.logger.info(f"Failed fetching url {url}. Status code: {r.status_code}") self.logger.warning(
f"Failed fetching url {url}. Status code: {r.status_code}"
)
return (title, description) return (title, description)
# try parse and get the title # try parse and get the title
@ -125,14 +140,14 @@ class MatrixModule(BotModule):
if descr_tag: if descr_tag:
description = descr_tag.get("content", None) description = descr_tag.get("content", None)
except Exception as e: except Exception as e:
self.logger.error(f"Failed parsing response from url {url}. Error: {e}") self.logger.warning(f"Failed parsing response from url {url}. Error: {e}")
return (title, description) return (title, description)
# Issue 63 patch - Title should not contain newlines or tabs # Issue 63 patch - Title should not contain newlines or tabs
if title is not None: if title is not None:
assert isinstance(title, str) assert isinstance(title, str)
title = title.replace('\n', '') title = title.replace("\n", "")
title = title.replace('\t', '') title = title.replace("\t", "")
return (title, description) return (title, description)
async def matrix_message(self, bot, room, event): async def matrix_message(self, bot, room, event):
@ -165,9 +180,7 @@ class MatrixModule(BotModule):
bot.must_be_owner(event) bot.must_be_owner(event)
self.type = "m.notice" self.type = "m.notice"
bot.save_settings() bot.save_settings()
await bot.send_text( await bot.send_text(room, "Sending titles as notices from now on.")
room, "Sending titles as notices from now on."
)
return return
# show status # show status
@ -175,9 +188,7 @@ class MatrixModule(BotModule):
bot.must_be_owner(event) bot.must_be_owner(event)
self.type = "m.text" self.type = "m.text"
bot.save_settings() bot.save_settings()
await bot.send_text( await bot.send_text(room, "Sending titles as text from now on.")
room, "Sending titles as text from now on."
)
return return
# invalid command # invalid command
@ -190,8 +201,8 @@ class MatrixModule(BotModule):
def get_settings(self): def get_settings(self):
data = super().get_settings() data = super().get_settings()
data['status'] = self.status data["status"] = self.status
data['type'] = self.type data["type"] = self.type
return data return data
def set_settings(self, data): def set_settings(self, data):