Skip to content

Commit

Permalink
Merge branch 'release/0.3.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
craigmaloney committed Aug 9, 2018
2 parents 2e3bcb5 + ecc4402 commit 14b2a85
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 8 deletions.
14 changes: 12 additions & 2 deletions CHANGELOG.md
Expand Up @@ -5,7 +5,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

### Release
### [0.3.4] - TBD
### [0.3.5] - 2018-08-08

#### Added
- Updated to Mastodon.py 1.3 (no additional features yet)

#### Fixed
- List renames did not work


### Release
### [0.3.4] - 2018-05-30

#### Added
- Added ability to execute commands while streaming (toot, fav, rep, etc.)
Expand All @@ -15,7 +25,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Display media links by default
- Display message when no notifications are present

### Fixed
#### Fixed
- Privacy settings now default to server privacy settings for toots
- CTRL-C in streaming adds a linefeed to preserve prompt spacing
- Streaming now supports lists with spaces
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
@@ -1,5 +1,5 @@
click>=6.7
Mastodon.py==1.2.2
Mastodon.py==1.3
colored>=1.3.5
humanize>=0.5.1
emoji>=0.4.5
2 changes: 1 addition & 1 deletion setup.py
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
setup(
name="tootstream",
version="0.3.4",
version="0.3.5",
python_requires=">=3",
install_requires=[line.strip() for line in open('requirements.txt')],

Expand Down
8 changes: 4 additions & 4 deletions src/tootstream/toot.py
Expand Up @@ -1279,11 +1279,11 @@ def say_error(*args, **kwargs):

try:
if rest == "home" or rest == "":
handle = mastodon.stream_user(toot_listener, async=True)
handle = mastodon.stream_user(toot_listener, run_async=True)
elif rest == "fed" or rest == "public":
handle = mastodon.stream_public(toot_listener, async=True)
handle = mastodon.stream_public(toot_listener, run_async=True)
elif rest == "local":
handle = mastodon.stream_local(toot_listener, async=True)
handle = mastodon.stream_local(toot_listener, run_async=True)
elif rest.startswith('list'):
# Remove list from the rest string
items = rest.split('list ')
Expand Down Expand Up @@ -1880,7 +1880,7 @@ def listcreate(mastodon, rest):
def listrename(mastodon, rest):
"""Rename a list.
ex: listrename oldlist newlist"""
if not(list_supportmastodon()):
if not(list_support(mastodon)):
return
rest = rest.strip()
if not rest:
Expand Down

0 comments on commit 14b2a85

Please sign in to comment.