mirror of
git://git.acid.vegas/scroll.git
synced 2024-11-21 23:56:39 +00:00
Fixed character decoding (reported by ab3800, cheers)
This commit is contained in:
parent
2d0600dd71
commit
4f4e3446bc
15
scroll.py
15
scroll.py
@ -169,16 +169,21 @@ class Bot():
|
||||
ascii = get_url(f'https://raw.githubusercontent.com/ircart/ircart/master/ircart/{name}.txt')
|
||||
if ascii.getcode() == 200:
|
||||
if img:
|
||||
ascii = img2irc.convert(ascii.read(), img, int(self.settings['png_width']), self.settings['png_palette'], int(self.settings['png_quantize']))
|
||||
ascii = img2irc.convert(ascii.read(), img, int(self.settings['png_width']), self.settings['png_palette'], int(self.settings['png_quantize_colors']))
|
||||
else:
|
||||
ascii = ascii.read().decode(chardet.detect(ascii.read())['encoding'])
|
||||
if len(ascii.splitlines()) > int(self.settings['lines']) and chan != '#scroll':
|
||||
ascii = ascii.readlines()
|
||||
if len(ascii) > int(self.settings['lines']) and chan != '#scroll':
|
||||
await self.irc_error(chan, 'file is too big', f'take those {len(ascii):,} lines to #scroll')
|
||||
else:
|
||||
if not img and not paste:
|
||||
await self.action(chan, 'the ascii gods have chosen... ' + color(name, cyan))
|
||||
for line in ascii.splitlines():
|
||||
line = line.replace('\n','').replace('\r','') # do we need this
|
||||
for line in ascii:
|
||||
if type(line) == bytes:
|
||||
try:
|
||||
line = line.decode()
|
||||
except UnicodeError:
|
||||
line = line.decode(chardet.detect(line)['encoding']).encode().decode() # TODO: Do we need to re-encode/decode in UTF-8?
|
||||
line = line.replace('\n','').replace('\r','')
|
||||
await self.sendmsg(chan, line + reset)
|
||||
await asyncio.sleep(self.settings['msg'])
|
||||
else:
|
||||
|
Loading…
Reference in New Issue
Block a user