From 63971b7bd44431733c22f7632a68e6e81fcdd510 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Wed, 9 Dec 2020 04:33:54 +0100 Subject: [PATCH] Don't obfuscate sounded URLs. --- plomrogue/things.py | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/plomrogue/things.py b/plomrogue/things.py index 7234d8e..ab54e30 100644 --- a/plomrogue/things.py +++ b/plomrogue/things.py @@ -41,21 +41,29 @@ class Thing(ThingBase): def sound(self, name, msg): from plomrogue.mapping import DijkstraMap + import re - def lower_msg_by_volume(msg, volume, largest_audible_distance): + def lower_msg_by_volume(msg, volume, largest_audible_distance, + url_limits = []): import random factor = largest_audible_distance / 4 lowered_msg = '' + in_url = False + i = 0 for c in msg: c = c - while random.random() > volume * factor: - if c.isupper(): - c = c.lower() - elif c != '.' and c != ' ': - c = '.' - else: - c = ' ' + if i in url_limits: + in_url = False if in_url else True + if not in_url: + while random.random() > volume * factor: + if c.isupper(): + c = c.lower() + elif c != '.' and c != ' ': + c = '.' + else: + c = ' ' lowered_msg += c + i += 1 return lowered_msg largest_audible_distance = 20 @@ -63,6 +71,9 @@ class Thing(ThingBase): things = [t for t in self.game.things if t.type_ != 'Player'] dijkstra_map = DijkstraMap(things, self.game.maps, self.position, largest_audible_distance, self.game.get_map) + url_limits = [] + for m in re.finditer('https?://[^\s]+', msg): + url_limits += [m.start(), m.end()] for c_id in self.game.sessions: listener = self.game.get_player(c_id) target_yx = dijkstra_map.target_yx(*listener.position, True) @@ -73,7 +84,8 @@ class Thing(ThingBase): continue volume = 1 / max(1, listener_distance) lowered_msg = lower_msg_by_volume(msg, volume, - largest_audible_distance) + largest_audible_distance, + url_limits) lowered_nick = lower_msg_by_volume(name, volume, largest_audible_distance) self.game.io.send('CHAT ' + -- 2.30.2