X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Frainbow.py;h=b1c66674a81dfbc0fb9f3752c94a3ea169d1fc80;hp=e7eede6a765dd1dacd6e3ff3a61863f031e7c8b1;hb=5caaaccb2d980189b0e1362fc66d44b9cc2932a1;hpb=fd2da0c3ea222efdbc582e25299b08ebbe7ed45f;ds=sidebyside diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py index e7eede6..b1c6667 100644 --- a/rainbowstream/rainbow.py +++ b/rainbowstream/rainbow.py @@ -242,6 +242,8 @@ def init(args): set_config('IMAGE_ON_TERM', str(c['IMAGE_ON_TERM'])) # Use 24 bit color c['24BIT'] = args.color_24bit + # Resize images based on the current terminal size + set_config('IMAGE_RESIZE_TO_FIT', str(c.get('IMAGE_RESIZE_TO_FIT', False))) # Check type of ONLY_LIST and IGNORE_LIST if not isinstance(c['ONLY_LIST'], list): printNicely(red('ONLY_LIST is not a valid list value.')) @@ -868,7 +870,7 @@ def mute(): rel = t.mutes.users.create(screen_name=screen_name[1:]) if isinstance(rel, dict): printNicely(green(screen_name + ' is muted.')) - c['IGNORE_LIST'] += [unc(screen_name)] + c['IGNORE_LIST'] += [screen_name] c['IGNORE_LIST'] = list(set(c['IGNORE_LIST'])) else: printNicely(red(rel)) @@ -1950,33 +1952,22 @@ def listen(): # Save cmd to global variable and call process g['stuff'] = ' '.join(line.split()[1:]) # Check tweet length - if check_tweet_length(): - # Process the command - process(cmd)() - # Not re-display - if cmd in ['switch', 't', 'rt', 'rep']: - g['prefix'] = False - else: - g['prefix'] = True + # Process the command + process(cmd)() + # Not re-display + if cmd in ['switch', 't', 'rt', 'rep']: + g['prefix'] = False + else: + g['prefix'] = True # Release the semaphore lock c['lock'] = False except EOFError: printNicely('') + except TwitterHTTPError as e: + detail_twitter_error(e) except Exception: debug_option() - printNicely(red('OMG something is wrong with Twitter right now.')) - - -def check_tweet_length(): - """ - Check tweet length (should be <= 140 chars) - """ - length = len(g['stuff']) - if length <= 140: - return True - - printNicely(red("Message is too long: %s chars" % length)) - return False + printNicely(red('OMG something is wrong with Twitter API right now.')) def reconn_notice():