From f54cd172b920d9411315ec0067d36a85d5d5da76 Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Tue, 21 Nov 2017 18:08:25 -0500
Subject: [PATCH 01/19] Updating Changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2f37c0..5a261f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+### Release
+### [0.3.1] - 2017-11-21
+
+#### Fixed
+- Compatibility with Mastodon 1.1.2 fix
+
 ### Release
 ### [0.3.0] - 2017-11-17
 ### Dedicated to the memory of Natalie Nguyen (aka Tipsy Tentacle). May she live on in our hearts and our changelog.

From 90b2958d2b2829fbf8eaabcccac06f9d5cb45a2b Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Wed, 22 Nov 2017 19:53:33 -0500
Subject: [PATCH 02/19] Change toots to only reply to everyone other than the
 logged-in user

---
 src/tootstream/toot.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/tootstream/toot.py b/src/tootstream/toot.py
index 437f55b..f3c90d5 100644
--- a/src/tootstream/toot.py
+++ b/src/tootstream/toot.py
@@ -758,13 +758,19 @@ def rep(mastodon, rest):
             fg('red'))
         return
 
-    # handle mentions
-    # TODO: reorder so parent author is first?
-    mentions = [i['acct'] for i in parent_toot['mentions']]
-    mentions.append(parent_toot['account']['acct'])
-
-    # Remove duplicates
-    mentions = ["@%s" % i for i in list(set(mentions))]
+    # Handle mentions text at the beginning:
+    mentions_set = set()
+    for i in parent_toot['mentions']:
+        mentions_set.add(i['acct'])
+    mentions_set.add(parent_toot['account']['acct'])
+
+    # Remove our account
+    # TODO: Better way to get this information?
+    my_user = mastodon.account_verify_credentials()
+    mentions_set.discard(my_user['username'])
+
+    # Format each using @username@host and add a space
+    mentions = ["@%s" % i for i in list(mentions_set)]
     mentions = ' '.join(mentions)
 
     # if user didn't set cw/spoiler, set it here

From 64a5c0391738ec6ac9c85da27ef15cc5b19188b4 Mon Sep 17 00:00:00 2001
From: Lain <erinolivia@users.noreply.github.com>
Date: Sat, 25 Nov 2017 15:59:16 -0800
Subject: [PATCH 03/19] Add link styles, emoji convertion, and link shortening
 to parser

Adds new features to toot_parser.  Styles for links, mentions and
hashtags are supported.  Standard emoji short codes can be converted
into unicode emoji. Links can be shortened and a list of urls contained
in the post can be retrieved.
---
 requirements.txt              |   1 +
 src/tootstream/toot.py        |   4 +-
 src/tootstream/toot_parser.py | 218 +++++++++++++++++++++++++++++++++-
 3 files changed, 216 insertions(+), 7 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 98703e5..0e1bd56 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,3 +2,4 @@ click>=6.7
 Mastodon.py==1.1.2
 colored>=1.3.5
 humanize>=0.5.1
+emoji>=0.4.5
diff --git a/src/tootstream/toot.py b/src/tootstream/toot.py
index f3c90d5..e7eef70 100644
--- a/src/tootstream/toot.py
+++ b/src/tootstream/toot.py
@@ -89,9 +89,7 @@ def on_update(self, status):
 #####################################
 def get_content(toot):
     html = toot['content']
-    toot_parser.reset()
-    toot_parser.feed(html)
-    toot_parser.close()
+    toot_parser.parse(html)
     return toot_parser.get_text()
 
 
diff --git a/src/tootstream/toot_parser.py b/src/tootstream/toot_parser.py
index 27636c8..92446f9 100644
--- a/src/tootstream/toot_parser.py
+++ b/src/tootstream/toot_parser.py
@@ -1,10 +1,96 @@
+import emoji
+from colored import attr
 from html.parser import HTMLParser
 from textwrap import TextWrapper
 
+
+def convert_emoji_shortcodes(text):
+    """Convert standard emoji short codes to unicode emoji in
+    the provided text.
+
+      text - The text to parse.
+      Returns the modified text.
+    """
+    return emoji.emojize(text, use_aliases = True)
+
+
+def find_attr(name, attrs):
+    """Find an attribute in an HTML tag by name.
+
+      name - The attribute name to search for.
+      attrs - The list of attributes to search.
+      Returns the matching attribute or None.
+    """
+    for attr, values in attrs:
+        if attr == name:
+            return values
+    return None
+
+
+def has_class(value, attrs):
+    """Return whether the HTML attributes contain a specific class name.
+
+      value - The class type to search for.
+      attrs - The list of attributes to search.
+      Returns true if the specified class type was found.
+    """
+    values = find_attr('class', attrs)
+    if values is None:
+        return False
+
+    return values.find(value) >= 0
+
+
 class TootParser(HTMLParser):
+    """
+    TootParser is used to parse HTML based toots and convert them into
+    plain text versions.  By default the returned text is equivalent to the
+    source toot text with paragraph and br tags converted to line breaks.
+
+    The text can optionally be indented by passing a string to the indent
+    field which is prepended to every line in the source text.
+
+    The text can also have text wrapping enabled by passing in a max width to
+    the width parameter.  Note that the text wrapping is not perfect right
+    now and doesn't work well with terminal colors and a lot of unicode text
+    on one line.
+
+    Link shortening can be enabled by setting the shorten_links parameter.
+    This shortens links by using the link shortening helper HTML embedded in
+    the source toot.  This means links embedded from sources other than
+    mastodon may not be shortened.  The shortened urls will look like
+    example.org/areallylongur...
+
+    Emoji short codes can optionally be converted into unicode based emoji by
+    enabling the convert_emoji parameter.  This parses standard emoji short
+    code names and does not support custom emojo short codes.
+
+    Styles can also optionally be applied to links found in the source text.
+    Pass in the desired colored style to the link_style, mention_style, and
+    hashtag_style parameters.
+
+    To parse a toot, pass the toot source HTML to the parse() command. The
+    source text can then be retrieved with the get_text() command.  Parsed
+    link urls can also be retrieved by calling the get_links() command.
+
+      indent - A string to prepend to all lines in the output text.
+      width - The maximum number of characters to allow in a line of text.
+      shorten_links - Whether or not to shorten links.
+      convert_emoji - Whether or not to convert emoji short codes to unicode.
+      link_style - The colored style to apply to generic links.
+      mention_style - The colored style to apply to mentions.
+      hashtag_style - The colored style to apply to hashtags.
+
+    """
+
     def __init__(self,
             indent = '',
-            width = 0):
+            width = 0,
+            convert_emoji = False,
+            shorten_links = False,
+            link_style = None,
+            mention_style = None,
+            hashtag_style = None):
 
         super().__init__()
         self.reset()
@@ -12,6 +98,11 @@ def __init__(self,
         self.convert_charrefs = True
 
         self.indent = indent
+        self.convert_emoji = convert_emoji
+        self.shorten_links = shorten_links
+        self.link_style = link_style
+        self.mention_style = mention_style
+        self.hashtag_style = hashtag_style
 
         if width > 0:
             self.wrap = TextWrapper()
@@ -21,38 +112,157 @@ def __init__(self,
         else:
             self.wrap = None
 
+
     def reset(self):
+        """Resets the parser so a new toot can be parsed."""
         super().reset()
         self.fed = []
         self.lines = []
+        self.links = []
         self.cur_type = None
+        self.hide = False
+        self.ellipsis = False
+
 
     def pop_line(self):
+        """Take the current text scratchpad and return it as a
+        line of text and reset the scratchpad."""
         line = ''.join(self.fed)
         self.fed = []
         return line
 
+
     def handle_data(self, data):
+        """Processes plain text data.
+          data - The text to process
+        """
+        if self.hide:
+            return
+
+        if self.convert_emoji:
+            data = convert_emoji_shortcodes(data)
+
         self.fed.append(data)
 
+
+    def parse_link(self, attrs):
+        """Processes a link tag.
+          attrs - A list of attributes contained in the link tag.
+        """
+
+        # Save the link url
+        self.links.append(find_attr('href', attrs))
+
+        if has_class('hashtag', attrs):
+            self.cur_type = 'hashtag'
+            if self.hashtag_style != None:
+                self.fed.append(self.hashtag_style)
+        elif has_class('mention', attrs):
+            self.cur_type = 'mention'
+            if self.mention_style != None:
+                self.fed.append(self.mention_style)
+        else:
+            self.cur_type = 'link'
+            if self.link_style != None:
+                self.fed.append(self.link_style)
+
+
+    def parse_span(self, attrs):
+        """Processes a span tag.
+          attrs - A list of attributes contained in the span tag.
+        """
+
+        # Right now we only support spans used to shorten links.
+        # Mastodon links contain <span class="hidden"> tags around
+        # text that should be omitted in the shorted link version
+        # and <span class="ellipsis"> tags around text that should
+        # be terminated with an ellipsis.
+        if not self.shorten_links or self.cur_type != 'link':
+            return
+
+        if has_class('invisible', attrs):
+            # Mark that any text in the tag should be omitted
+            self.hide = True
+
+        elif has_class('ellipsis', attrs):
+            # Mark the any text in the tag should be terminated
+            # with ellipsis
+            self.ellipsis = True
+
+
     def handle_starttag(self, tag, attrs):
-        if tag == 'br':
+        """Parses a new HTML tag.
+          tag - The name of the new tag.
+          attrs - The attributes contained in the tag.
+        """
+        if tag == 'a':
+            self.parse_link(attrs)
+
+        elif tag == 'span':
+            self.parse_span(attrs)
+
+        elif tag == 'br':
             self.lines.append(self.pop_line())
-        if tag == 'p' and len(self.fed) > 0:
+
+        elif tag == 'p' and len(self.fed) > 0:
             self.lines.append(self.pop_line())
             self.lines.append('')
 
+
+    def handle_endtag(self, tag):
+        """Parses a closing tag.
+          tag - The tag to parse.
+        """
+        if tag == 'a':
+            # Reset if we are applying a style
+            if ((self.cur_type == 'link' and self.link_style != None) or
+                (self.cur_type == 'mention' and self.mention_style != None) or
+                (self.cur_type == 'hashtag' and self.hashtag_style != None)):
+                self.fed.append(attr('reset'))
+
+            # Only types associated with 'a' tags are tracked at the moment
+            self.cur_type = None
+
+        if tag == 'span' and self.hide:
+            # Allow text to be shown now that the hide span
+            # has finished
+            self.hide = False
+
+        if tag == 'span' and self.ellipsis:
+            # Add ellipsis to the text if we have finished a
+            # <span class="ellipsis"> tag.
+            self.fed.append('...')
+            self.ellipsis = False
+
+
+    def parse(self, html):
+        """Parses a single source toot.
+          html - The source HTML of the toot.
+        """
+        self.reset()
+        self.feed(html)
+        self.close()
+
+
     def get_text(self):
+        """Returns a plain text version of the source HTML toot."""
+
+        # Add the last line from the scratchpad.
         self.lines.append(self.pop_line())
 
         if self.wrap == None:
             return self.indent + ('\n' + self.indent).join(self.lines)
 
+        # Text wrap the lines by feeding them to TextWrapper first.
         out = []
         for line in self.lines:
             if len(line) == 0:
                 out.append(line)
             else:
                 out.append(self.wrap.fill(line))
-
         return '\n'.join(out)
+
+
+    def get_links(self):
+        """Returns an array of links parsed from the source HTML toot."""
+        return self.links

From 130bf5d6ce313701a7fe1182523c3bd6d645af3a Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Sat, 25 Nov 2017 22:21:10 -0500
Subject: [PATCH 04/19] Update Changelog

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a261f9..2bed7a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+### Release
+### [0.3.2] - TBD
+
+#### Fixed
+- Replies no longer include the logged-in user
+
+#### Added
+- Reworked the Tootstream Parser to add styling, link-shortening, link retrieval, and emoji code shortening.
+
 ### Release
 ### [0.3.1] - 2017-11-21
 

From 9b417244c25e220ba7fa7ba92dd37c591fea4827 Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Sat, 25 Nov 2017 22:29:16 -0500
Subject: [PATCH 05/19] Adding instructions for getting Unicode symbols under
 Ubuntu

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 89aa975..fe61589 100644
--- a/README.md
+++ b/README.md
@@ -62,6 +62,14 @@ $ tootstream
 ```
 3: Close the environment with `$ deactivate`
 
+## Ubuntu and Unicode
+
+Tootstream relies heavily on Unicode fonts. The best experience can be had by installing the following package:
+
+```
+$ sudo apt-get install ttf-ancient-fonts
+```
+
 ## Contributing
 
 Contributions welcome! Please read the [contributing guidelines](CONTRIBUTING.md) before getting started.

From d02ad28bc89eef1ac97eaecc6b2e5db792f46b41 Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Sat, 25 Nov 2017 22:57:31 -0500
Subject: [PATCH 06/19] Get the size of the terminal when invoked

---
 src/tootstream/toot.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/tootstream/toot.py b/src/tootstream/toot.py
index e7eef70..d0de9c7 100644
--- a/src/tootstream/toot.py
+++ b/src/tootstream/toot.py
@@ -14,6 +14,7 @@
 import humanize
 import datetime
 import dateutil
+import shutil
 
 
 #Looks best with black background.
@@ -80,7 +81,9 @@ def on_update(self, status):
 
 IDS = IdDict();
 
-toot_parser = TootParser(indent='  ')
+# Get the current width of the terminal
+terminal_size = shutil.get_terminal_size((80, 20))
+toot_parser = TootParser(indent='  ', width=int(terminal_size.columns))
 
 toot_listener = TootListener()
 

From 322abc2643bcd19e74dc4f41f07b4236880c5f11 Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Sat, 25 Nov 2017 23:30:17 -0500
Subject: [PATCH 07/19] Adding about command

---
 src/tootstream/toot.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/tootstream/toot.py b/src/tootstream/toot.py
index d0de9c7..df907b5 100644
--- a/src/tootstream/toot.py
+++ b/src/tootstream/toot.py
@@ -16,6 +16,9 @@
 import dateutil
 import shutil
 
+# Get the version of Tootstream
+import pkg_resources  # part of setuptools
+version = pkg_resources.require("tootstream")[0].version
 
 #Looks best with black background.
 #TODO: Set color list in config file
@@ -1450,6 +1453,15 @@ def me(mastodon, rest):
 me.__argstr__ = '[<N>]'
 me.__section__ = "Profile"
 
+@command
+def about(mastodon, rest):
+    """Shows version information and connected instance """
+    print("Tootstream version: %s" % version)
+    print("You are connected to ", end="")
+    cprint(mastodon.api_base_url, fg('green') + attr('bold'))
+about.__argstr__ = ''
+about.__section__ = 'Profile'
+
 
 @command
 def quit(mastodon, rest):
@@ -1501,7 +1513,7 @@ def main(instance, config, profile):
         config.add_section(profile)
 
     instance, client_id, client_secret, token = \
-                            get_or_input_profile(config, profile, instance)
+        get_or_input_profile(config, profile, instance)
 
     if not token:
         cprint("Could not log you in.  Please try again later.", fg('red'))
@@ -1527,8 +1539,8 @@ def main(instance, config, profile):
     say_error = lambda a, b: cprint("Invalid command. Use 'help' for a list of commands.",
             fg('white') + bg('red'))
 
-    print("You are connected to ", end="")
-    cprint(instance, fg('green') + attr('bold'))
+    about(mastodon, '')
+
     print("Enter a command. Use 'help' for a list of commands.")
     print("\n")
 

From c2a756e34c75fe702821cf947af218e25f9f8e7d Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Sat, 25 Nov 2017 23:33:25 -0500
Subject: [PATCH 08/19] Updated Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bed7a3..dc1341f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 #### Added
 - Reworked the Tootstream Parser to add styling, link-shortening, link retrieval, and emoji code shortening.
+- About shows current version of Tootstream and the connected instance.
 
 ### Release
 ### [0.3.1] - 2017-11-21

From 53edbb76619a5e1f4b4b95ff8ad1adb067293e92 Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Sun, 26 Nov 2017 00:46:45 -0500
Subject: [PATCH 09/19] Adding note flags for filtering out notifications

---
 src/tootstream/toot.py | 128 ++++++++++++++++++++++++++++-------------
 1 file changed, 89 insertions(+), 39 deletions(-)

diff --git a/src/tootstream/toot.py b/src/tootstream/toot.py
index d0de9c7..51294eb 100644
--- a/src/tootstream/toot.py
+++ b/src/tootstream/toot.py
@@ -133,6 +133,39 @@ def get_userid(mastodon, rest):
     else:
         return users[0]['id']
 
+def flaghandler_note(mastodon, rest):
+    """Parse input for flagsr. """
+
+    # initialize kwargs to default values
+    kwargs = {'mention': True,
+              'favourite': True,
+              'reblog': True,
+              'follow': True}
+
+    flags = {'m': False,
+             'f': False,
+             'b': False,
+             'F': False}
+
+    # token-grabbing loop
+    # recognize `note -m -f -b -F` as well as `note -mfbF`
+    while rest.startswith('-'):
+        # get the next token
+        (args, _, rest) = rest.partition(' ')
+        # traditional unix "ignore flags after this" syntax
+        if args == '--':
+            break
+        if 'm' in args:
+            kwargs['mention'] = False
+        if 'f' in args:
+            kwargs['favourite'] = False
+        if 'b' in args:
+            kwargs['reblog'] = False
+        if 'F' in args:
+            kwargs['follow'] = False
+
+    return (rest, kwargs)
+
 
 def flaghandler_tootreply(mastodon, rest):
     """Parse input for flags and prompt user.  On success, returns
@@ -987,7 +1020,22 @@ def stream(mastodon, rest):
 
 @command
 def note(mastodon, rest):
-    """Displays the Notifications timeline."""
+    """Displays the Notifications timeline.
+
+    Options:
+        -b    Filter boosts
+        -f    Filter favourites
+        -F    Filter follows
+        -m    Filter mentions
+"""
+
+    # Fill in Content fields first.
+    try:
+        (text, kwargs) = flaghandler_note(mastodon, rest)
+    except KeyboardInterrupt:
+        # user abort, return to main prompt
+        print('')
+        return
 
     for note in reversed(mastodon.notifications()):
         display_name = "  " + note['account']['display_name']
@@ -996,44 +1044,46 @@ def note(mastodon, rest):
 
         random.seed(display_name)
 
-        # Display Note ID
-        cprint(" note: " + note_id, fg('magenta'))
-
-        # Mentions
-        if note['type'] == 'mention':
-            time = " " + stylize(format_time(note['status']['created_at']), attr('dim'))
-            cprint(display_name + username, fg('magenta'))
-            print("  " + format_toot_idline(note['status']) + "  " + time)
-            cprint(get_content(note['status']), attr('bold'), fg('white'))
-            print(stylize("", attr('dim')))
-
-        # Favorites
-        elif note['type'] == 'favourite':
-            tz_info = note['status']['created_at'].tzinfo
-            note_time_diff = datetime.datetime.now(tz_info) - note['status']['created_at']
-            countsline = format_toot_idline(note['status'])
-            format_time(note['status']['created_at'])
-            time = " " + stylize(format_time(note['status']['created_at']), attr('dim'))
-            content = get_content(note['status'])
-            cprint(display_name + username, fg(random.choice(COLORS)), end="")
-            cprint(" favorited your status:", fg('yellow'))
-            print("  "+countsline + stylize(time, attr('dim')))
-            cprint(content, attr('dim'))
-
-
-        # Boosts
-        elif note['type'] == 'reblog':
-            cprint(display_name + username + " boosted your status:", fg('yellow'))
-            cprint(get_content(note['status']), attr('dim'))
-
-        # Follows
-        elif note['type'] == 'follow':
-            print("  ", end="")
-            cprint(display_name + username + " followed you!", fg('yellow'))
-
-        # blank line
-        print()
-note.__argstr__ = ''
+        # Check if we should even display this note type
+        if kwargs[note['type']]:
+            # Display Note ID
+            cprint(" note: " + note_id, fg('magenta'))
+
+            # Mentions
+            if note['type'] == 'mention':
+                time = " " + stylize(format_time(note['status']['created_at']), attr('dim'))
+                cprint(display_name + username, fg('magenta'))
+                print("  " + format_toot_idline(note['status']) + "  " + time)
+                cprint(get_content(note['status']), attr('bold'), fg('white'))
+                print(stylize("", attr('dim')))
+
+            # Favorites
+            elif note['type'] == 'favourite':
+                tz_info = note['status']['created_at'].tzinfo
+                note_time_diff = datetime.datetime.now(tz_info) - note['status']['created_at']
+                countsline = format_toot_idline(note['status'])
+                format_time(note['status']['created_at'])
+                time = " " + stylize(format_time(note['status']['created_at']), attr('dim'))
+                content = get_content(note['status'])
+                cprint(display_name + username, fg(random.choice(COLORS)), end="")
+                cprint(" favorited your status:", fg('yellow'))
+                print("  "+countsline + stylize(time, attr('dim')))
+                cprint(content, attr('dim'))
+
+
+            # Boosts
+            elif note['type'] == 'reblog':
+                cprint(display_name + username + " boosted your status:", fg('yellow'))
+                cprint(get_content(note['status']), attr('dim'))
+
+            # Follows
+            elif note['type'] == 'follow':
+                print("  ", end="")
+                cprint(display_name + username + " followed you!", fg('yellow'))
+
+            # blank line
+            print()
+note.__argstr__ = '[<filter>]'
 note.__section__ = 'Timeline'
 
 @command

From f28edbbab7195ccfe4681042d13fba111a9f0181 Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Sun, 26 Nov 2017 00:48:58 -0500
Subject: [PATCH 10/19] Updated Changelog

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc1341f..1037a33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,8 +11,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Replies no longer include the logged-in user
 
 #### Added
-- Reworked the Tootstream Parser to add styling, link-shortening, link retrieval, and emoji code shortening.
-- About shows current version of Tootstream and the connected instance.
+- Reworked the Tootstream Parser to add styling, link-shortening, link retrieval, and emoji code shortening
+- About shows current version of Tootstream and the connected instance
+- Notifications may now be filtered
 
 ### Release
 ### [0.3.1] - 2017-11-21

From f91c503bfe493d77a7e8294587f2acc194da7e9d Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Sun, 26 Nov 2017 01:15:59 -0500
Subject: [PATCH 11/19] Adding better help

---
 src/tootstream/toot.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/tootstream/toot.py b/src/tootstream/toot.py
index efb7373..f59d4ec 100644
--- a/src/tootstream/toot.py
+++ b/src/tootstream/toot.py
@@ -1025,6 +1025,13 @@ def stream(mastodon, rest):
 def note(mastodon, rest):
     """Displays the Notifications timeline.
 
+    ex: 'note'
+                 will show all notifications
+        'note -b'
+                 will show all notifications minus boosts
+        'note -f -F -b' (or 'note -fFb')
+                will only show mentions
+
     Options:
         -b    Filter boosts
         -f    Filter favourites

From c4779e4c3e73cc3ec97983bc2c59006c96a14f91 Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Sun, 26 Nov 2017 21:21:41 -0500
Subject: [PATCH 12/19] Set the width to not go to the complete edge

---
 src/tootstream/toot.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tootstream/toot.py b/src/tootstream/toot.py
index df907b5..06fbef0 100644
--- a/src/tootstream/toot.py
+++ b/src/tootstream/toot.py
@@ -86,7 +86,7 @@ def on_update(self, status):
 
 # Get the current width of the terminal
 terminal_size = shutil.get_terminal_size((80, 20))
-toot_parser = TootParser(indent='  ', width=int(terminal_size.columns))
+toot_parser = TootParser(indent='  ', width=int(terminal_size.columns) - 2)
 
 toot_listener = TootListener()
 

From a31db1b419ddd74fdbc34eb73ab73803a1b6c16c Mon Sep 17 00:00:00 2001
From: Lain <erinolivia@noreply.users.github.com>
Date: Mon, 27 Nov 2017 23:16:42 -0800
Subject: [PATCH 13/19] Add 'links <id>' command to print urls in a toot

Add a 'links' command that takes an id and prints out any links
contained in the source toot including links to hashtag pages
and account pages.
---
 src/tootstream/toot.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/tootstream/toot.py b/src/tootstream/toot.py
index 06fbef0..17837ed 100644
--- a/src/tootstream/toot.py
+++ b/src/tootstream/toot.py
@@ -926,6 +926,33 @@ def thread(mastodon, rest):
 thread.__section__ = 'Toots'
 
 
+@command
+def links(mastodon, rest):
+    """Show the urls of any links, hashtags, or mentions by ID.
+
+    ex: links 23"""
+
+    status_id = IDS.to_global(rest)
+    if status_id is None:
+        return
+
+    try:
+        toot = mastodon.status(status_id)
+        toot_parser.parse(toot['content'])
+        links = toot_parser.get_links()
+
+        for link in links:
+            print(link)
+
+    except Exception as e:
+        cprint("{}: please try again later".format(
+            type(e).__name__),
+            fg('red'))
+
+links.__argstr__ = '<id>'
+links.__section__ = 'Toots'
+
+
 @command
 def home(mastodon, rest):
     """Displays the Home timeline."""

From 4b246b1c27ed4b6c7a138d9b3dc95cc2a1aba1e7 Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Tue, 12 Dec 2017 19:29:57 -0500
Subject: [PATCH 14/19] Add a way to edit a toot if there is an error

---
 src/tootstream/toot.py | 64 ++++++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 21 deletions(-)

diff --git a/src/tootstream/toot.py b/src/tootstream/toot.py
index 17837ed..4cad55b 100644
--- a/src/tootstream/toot.py
+++ b/src/tootstream/toot.py
@@ -562,8 +562,8 @@ def printToot(toot):
     print()
 
 
-def edittoot():
-    edited_message = click.edit()
+def edittoot(text):
+    edited_message = click.edit(text)
     if edited_message:
         return edited_message
     return ''
@@ -689,6 +689,7 @@ def toot(mastodon, rest):
         -c     Prompt for Content Warning / spoiler text
         -m     Prompt for media files and NSFW
     """
+    posted = False
     # Fill in Content fields first.
     try:
         (text, kwargs) = flaghandler_tootreply(mastodon, rest)
@@ -698,16 +699,26 @@ def toot(mastodon, rest):
         return
 
     if text == '':
-        text = edittoot()
-    try:
-        resp = mastodon.status_post(text, **kwargs)
-        cprint("You tooted: ", fg('white') + attr('bold'), end="\n")
-        if resp['sensitive']:
-            cprint('CW: ' + resp['spoiler_text'], fg('red'))
-        cprint(text, fg('magenta') + attr('bold') + attr('underlined'))
-    except Exception as e:
-        cprint("Received error: ", fg('red') + attr('bold'), end="")
-        cprint(e, fg('magenta') + attr('bold') + attr('underlined'))
+        text = edittoot(text="")
+
+    while posted is False:
+        try:
+            resp = mastodon.status_post(text, **kwargs)
+            cprint("You tooted: ", fg('white') + attr('bold'), end="\n")
+            if resp['sensitive']:
+                cprint('CW: ' + resp['spoiler_text'], fg('red'))
+            cprint(text, fg('magenta') + attr('bold') + attr('underlined'))
+            posted = True
+        except Exception as e:
+            cprint("Received error: ", fg('red') + attr('bold'), end="")
+            cprint(e, fg('magenta') + attr('bold') + attr('underlined'))
+        
+        if posted is False:
+            retry = input("Edit toot and re-try? [Y/N]: ")
+            if retry.lower() == 'y':
+                text = edittoot(text=text)
+            else:
+                posted = True
 
 toot.__argstr__ = '[<text>]'
 toot.__section__ = 'Toots'
@@ -734,6 +745,7 @@ def rep(mastodon, rest):
 
     """
 
+    posted = False
     try:
         (text, kwargs) = flaghandler_tootreply(mastodon, rest)
     except KeyboardInterrupt:
@@ -749,7 +761,7 @@ def rep(mastodon, rest):
         return
 
     if not text:
-        text = edittoot()
+        text = edittoot(text="")
 
     if parent_id is None or not text:
         return
@@ -784,14 +796,24 @@ def rep(mastodon, rest):
     if kwargs['visibility'] == '' and parent_toot['visibility'] != 'public':
         kwargs['visibility'] = parent_toot['visibility']
 
-    try:
-        reply_toot = mastodon.status_post('%s %s' % (mentions, text),
-                                          in_reply_to_id=int(parent_id),
-                                          **kwargs)
-        msg = "  Replied with: " + get_content(reply_toot)
-        cprint(msg, fg('red'))
-    except Exception as e:
-        cprint("error while posting: {}".format(type(e).__name__), fg('red'))
+    while posted is False:
+        try:
+            reply_toot = mastodon.status_post('%s %s' % (mentions, text),
+                                            in_reply_to_id=int(parent_id),
+                                            **kwargs)
+            msg = "  Replied with: " + get_content(reply_toot)
+            cprint(msg, fg('red'))
+            posted = True
+        except Exception as e:
+            cprint("error while posting: {}".format(type(e).__name__), fg('red'))
+
+        if posted is False:
+            retry = input("Edit toot and re-try? [Y/N]: ")
+            if retry.lower() == 'y':
+                text = edittoot(text=text)
+            else:
+                posted = True
+
 rep.__argstr__ = '<id> [<text>]'
 rep.__section__ = 'Toots'
 

From 2ce06e9d2f852c2ce4f3ee0dd6809725d51bc195 Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Fri, 15 Dec 2017 01:02:29 -0500
Subject: [PATCH 15/19] Mastodon.py updates the streaming API with the next
 release. Fixed.

---
 src/tootstream/toot.py | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/tootstream/toot.py b/src/tootstream/toot.py
index 17837ed..6f94bc8 100644
--- a/src/tootstream/toot.py
+++ b/src/tootstream/toot.py
@@ -992,21 +992,14 @@ def stream(mastodon, rest):
     print("Use ctrl+C to end streaming")
     try:
         if rest == "home" or rest == "":
-            mastodon.user_stream(toot_listener)
+            mastodon.stream_user(toot_listener)
         elif rest == "fed" or rest == "public":
-            mastodon.public_stream(toot_listener)
+            mastodon.stream_public(toot_listener)
         elif rest == "local":
-            # TODO: no corresponding Mastodon method yet, will probably be
-            #mastodon.local_stream(TootListener())
-            # for now use the stream helper directly
-            mastodon._Mastodon__stream('/api/v1/streaming/public/local', TootListener())
+            mastodon.stream_local(toot_listener)
         elif rest.startswith('#'):
             tag = rest[1:]
-            # TODO: this should work but currently broken
-            #mastodon.hashtag_stream(tag, TootListener())
-            # for now use the stream helper directly
-            endpt = "/api/v1/streaming/hashtag?tag={}".format(tag)
-            mastodon._Mastodon__stream(endpt, TootListener())
+            mastodon.stream_hashtag(tag, toot_listener)
         else:
             print("Only 'home', 'fed', 'local', and '#hashtag' streams are supported.")
     except KeyboardInterrupt:

From 78aa39844763d5c74de865a59925fbbeb1be73a9 Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Thu, 21 Dec 2017 08:21:37 -0500
Subject: [PATCH 16/19] Updating to Mastodon 1.2.1

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 0e1bd56..5ab4b94 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 click>=6.7
-Mastodon.py==1.1.2
+Mastodon.py==1.2.1
 colored>=1.3.5
 humanize>=0.5.1
 emoji>=0.4.5

From c66191221425543a63922a0dcdc4ab699ee63e60 Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Thu, 21 Dec 2017 08:24:42 -0500
Subject: [PATCH 17/19] Changing spelling to be more consistent

---
 src/tootstream/toot.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tootstream/toot.py b/src/tootstream/toot.py
index cfc6d95..b571a80 100644
--- a/src/tootstream/toot.py
+++ b/src/tootstream/toot.py
@@ -1061,7 +1061,7 @@ def note(mastodon, rest):
 
     Options:
         -b    Filter boosts
-        -f    Filter favourites
+        -f    Filter favorites
         -F    Filter follows
         -m    Filter mentions
 """

From c4c5750f00432005e4a90fb4191b158d4be84b04 Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Thu, 21 Dec 2017 08:38:23 -0500
Subject: [PATCH 18/19] Updating for 0.3.2 release

---
 CHANGELOG.md | 2 ++
 setup.py     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1037a33..d4d85ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 #### Fixed
 - Replies no longer include the logged-in user
+- Allow user to edit a toot when an API error occurs
+- Compatibility with Mastodon.py 1.2.1
 
 #### Added
 - Reworked the Tootstream Parser to add styling, link-shortening, link retrieval, and emoji code shortening
diff --git a/setup.py b/setup.py
index 2eb61ea..8616f02 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 setup(
     name="tootstream",
-    version="0.3.1",
+    version="0.3.2",
     python_requires=">=3",
     install_requires=[line.strip() for line in open('requirements.txt')],
 
@@ -12,7 +12,7 @@
 
     author="Sara Murray",
     author_email="saramurray@protonmail.com",
-    description="A command line interface for interacting with Mastodon instances",
+    description="A command line interface for interacting with Mastodon instances",  # nopep8
     license="MIT",
     keywords="mastodon, mastodon.social, toot, tootstream",
     url="http://www.github.com/magicalraccoon/tootstream",

From 61cd4b1b631942e04e24ec7c3a9841bb3e6c4b7d Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Sat, 23 Dec 2017 10:26:12 -0500
Subject: [PATCH 19/19] Updated Changelog

---
 CHANGELOG.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4d85ef..c1e8f63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,16 +7,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Release
 ### [0.3.2] - TBD
 
-#### Fixed
-- Replies no longer include the logged-in user
-- Allow user to edit a toot when an API error occurs
-- Compatibility with Mastodon.py 1.2.1
-
 #### Added
 - Reworked the Tootstream Parser to add styling, link-shortening, link retrieval, and emoji code shortening
 - About shows current version of Tootstream and the connected instance
 - Notifications may now be filtered
 
+#### Fixed
+- Replies no longer include the logged-in user
+- Allow user to edit a toot when an API error occurs
+- Compatibility with Mastodon.py 1.2.1
+
 ### Release
 ### [0.3.1] - 2017-11-21