Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MOLLY-296 - replaced Twitter's URL in deskto app (from user to screen…

…_name)
  • Loading branch information...
commit 31b2bbb063d1451f33965cb03563e00e2b28d5ca 1 parent 772a9a8
@martinfilliau martinfilliau authored
Showing with 5 additions and 3 deletions.
  1. +4 −2 docs/source/ref/apps/desktop.txt
  2. +1 −1  molly/apps/desktop/views.py
View
6 docs/source/ref/apps/desktop.txt
@@ -10,7 +10,9 @@ Configuration
-------------
* ``twitter_username`` (optional): If set, this imports a Twitter feed which
- the desktop templates can display
+ the desktop templates can display (this settings refers to Twitter's screen_name,
+ not the user_id as `precised in Twitter's documentation
+ <https://dev.twitter.com/docs/api/1/get/statuses/user_timeline>`_)
* ``twitter_ignore_urls`` (optional): If set, this filters out tweets in the
Twitter feed which contain this URL prefix - this can be used, for example,
if you're importing a news blog to your Twitter feed to avoid duplicate
@@ -30,4 +32,4 @@ Sample::
Views
-----
-.. todo::
+.. todo::
View
2  molly/apps/desktop/views.py
@@ -54,7 +54,7 @@ def _cache(self, f, key, args=None, kwargs=None, timeout=None):
return value
_TWITTER_URL = 'http://api.twitter.com/1/statuses/user_timeline.json?' \
- + 'user=%s&include_entities=true'
+ + 'screen_name=%s&include_entities=true'
def _get_twitter_feed(self, username):
if not username:
Please sign in to comment.
Something went wrong with that request. Please try again.