Merge branch 'bowlercaptain-mastoApiFix' (closes #8)

This commit is contained in:
Matt Behrens 2018-01-21 12:29:23 -05:00
commit a21abe3175
3 changed files with 14 additions and 7 deletions

View file

@ -9,8 +9,8 @@ name = "pypi"
cssselect = "==1.0.1"
lxml = "==4.1.1"
"Mastodon.py" = "==1.1.2"
youtube_dl = "==2017.11.26"
"mastodon.py" = "*"
youtube-dl = "==2017.11.26"
[dev-packages]

15
Pipfile.lock generated
View file

@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
"sha256": "9640097ff751e9453f527272cd00226c924c2a6a0e6f6162021c01b79a32521a"
"sha256": "a6105afa396f29f182d549d6d27598fa125214079f1483bd8883c79647717d9d"
},
"host-environment-markers": {
"implementation_name": "cpython",
@ -48,6 +48,13 @@
],
"version": "==1.0.1"
},
"decorator": {
"hashes": [
"sha256:94d1d8905f5010d74bbbd86c30471255661a14187c45f8d7f3e5aa8540fdb2e5",
"sha256:7d46dd9f3ea1cf5f06ee0e4e1277ae618cf48dfb10ada7c8427cd46c42702a0e"
],
"version": "==4.2.1"
},
"idna": {
"hashes": [
"sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4",
@ -90,10 +97,10 @@
},
"mastodon.py": {
"hashes": [
"sha256:b356726253291aad33bd64547f4d26721b643d938300b198446060e7d0454fe0",
"sha256:54f08160ec3f4da5fd0c23ad185e8079a3c19f6986c2c7a7dcafadbfc2e009e2"
"sha256:197b7a04b5daa47329355b427916099bf8ff38a6b1ec32670a9f085778a77ca0",
"sha256:b3ef52609a0159683d2898ec5afda2a0c36beae854c29e5af02b2866acb2e4db"
],
"version": "==1.1.2"
"version": "==1.2.1"
},
"python-dateutil": {
"hashes": [

View file

@ -72,7 +72,7 @@ def login(api_base_url, email, password):
def stream(api_base_url):
client = Mastodon(client_id='clientcred.secret', access_token='usercred.secret', api_base_url=api_base_url)
listener = StreamListener()
client.user_stream(listener)
client.stream_user(listener)
def extract_tags(toot):
return [tag['name'] for tag in toot['tags']]