templates/error.html templates/list.html templates/lists.html @@ -468,6 +468,64 @@ def room(request, nickname): return atom(entries) return render_to_response('room.html', extra_context, context_instance=RequestContext(request)) +def list(request, nickname): + '''Render a list feed. + + Authentication is required. + ''' + if not request.session.get('nickname', None): + return HttpResponseRedirect(reverse('login')) + f = friendfeed.FriendFeed(request.session['nickname'], + request.session['key']) + try: + start = max(int(request.GET.get('start', 0)), 0) + except: + start = 0 + service = request.GET.get('service', None) + num = int(request.session.get('num', NUM)) + data = f.fetch_list_feed(nickname, num=num, start=start, service=service) + if 'errorCode' in data: + if data['statusCode'] == 401: + del request.session['nickname'] + del request.session['key'] + return render_to_response('error.html', data, context_instance=RequestContext(request)) + profile = f.fetch_list_profile(nickname) + entries = [entry for entry in data['entries'] if not entry['hidden']] + hidden = [entry for entry in data['entries'] if entry['hidden']] + extra_context = { + 'entries': entries, + 'next': start + num, + 'hidden': hidden, + 'profile': profile, + 'list': nickname, + } + if start > 0: + extra_context['has_previous'] = True + extra_context['previous'] = max(start - num, 0) + if request.GET.get('output', 'html') == 'atom': + return atom(entries) + return render_to_response('list.html', extra_context, context_instance=RequestContext(request)) + +def lists(request): + '''Display the authenticated users lists + + Authentication is required. + ''' + if not request.session.get('nickname', None): + return HttpResponseRedirect(reverse('login')) + f = friendfeed.FriendFeed(request.session['nickname'], + request.session['key']) + data = f.fetch_user_profile(request.session['nickname']) + if 'errorCode' in data: + if data['statusCode'] == 401: + del request.session['nickname'] + del request.session['key'] + return render_to_response('error.html', data, context_instance=RequestContext(request)) + extra_context = { + 'lists': data['lists'], + } + return render_to_response('lists.html', extra_context, context_instance=RequestContext(request)) + def rooms(request): '''Display the authenticated users rooms page or a list of the users rooms fftogo/views.py @@ -106,7 +106,24 @@ class FriendFeed(object): Authentication is required for private users. """ return self._fetch( - "/api/user/" + urllib.quote_plus(nickname) + "/profile", None) + "/api/user/" + urllib.quote_plus(nickname) + "/profile", None, beta=1) + + def fetch_list_profile(self, nickname): + """Returns a lists profile for the given nickname. + + Authentication is required. + """ + return self._fetch( + "/api/list/" + urllib.quote_plus(nickname) + "/profile", None, beta=1) + + def fetch_list_feed(self, nickname, **kwargs): + """Returns a list feed for the given nickname. + + Authentication is required. + """ + kwargs["beta"] = 1 + return self._fetch_feed( + "/api/feed/list/" + urllib.quote_plus(nickname), **kwargs) def fetch_room_profile(self, nickname): """Returns a rooms profile for the given nickname. @@ -179,6 +196,7 @@ class FriendFeed(object): Authentication is always required. """ + kwargs["beta"] = 1 return self._fetch_feed("/api/feed/home", **kwargs) def search(self, q, **kwargs): @@ -331,8 +349,13 @@ class FriendFeed(object): from django.utils.http import urlencode url_args["format"] = "json" url_args["apikey"] = settings.APIKEY + if "beta" in url_args: + url = "http://beta.friendfeed.com" + del url_args["beta"] + else: + url = "http://friendfeed.com" args = urlencode(url_args) - url = "http://friendfeed.com" + uri + "?" + args + url += uri + "?" + args headers = {} if post_args is not None: # If we are POSTing then set the method/content-type (urllib2 friendfeed.py @@ -26,7 +26,7 @@ .profile img.picture { float: left; margin-bottom: 10px; margin-right: 10px; } .profile .section { margin-top: 5px; } ul.entries { clear: both; margin-top: 10px; } - ul.entries li.entry, ul.rooms li.room { margin-bottom: 10px; } + ul.entries li.entry, ul.rooms li.room, ul.lists li.list { margin-bottom: 10px; } ul.comments li { margin-top: 5px; padding-left: 20px ;} ul.comments li.comment { background: url('/static/images/quote.png') 2px 2px no-repeat; } ul.comments li.permalink { font-style: italic; } @@ -64,7 +64,11 @@ </li> <li> 2 - <a href="{% url user request.session.nickname %}" accesskey="2">Me</a> + <a href="{% url lists %}" accesskey="2">Lists</a> + </li> + <li> + 3 + <a href="{% url user request.session.nickname %}" accesskey="3">Me</a> </li> {% else %} <li> @@ -73,12 +77,12 @@ </li> {% endif %} <li> - 3 - <a href="{% url public %}" accesskey="3">Everyone</a> + 4 + <a href="{% url public %}" accesskey="4">Everyone</a> </li> <li> - 4 - <a href="{% url search %}" accesskey="4">Search</a> + 5 + <a href="{% url search %}" accesskey="5">Search</a> </li> </ul> </div> templates/base.html @@ -14,6 +14,8 @@ urlpatterns = patterns('', url(r'^logout/$', 'fftogo.views.logout', name='logout'), url(r'^rooms/(?P<nickname>[\w-]+)/$', 'fftogo.views.room', name='room'), url(r'^rooms/$', 'fftogo.views.rooms', name='rooms'), + url(r'^lists/(?P<nickname>[\w-]+)/$', 'fftogo.views.list', name='list'), + url(r'^lists/$', 'fftogo.views.lists', name='lists'), url(r'^settings/$', 'fftogo.views.settings', name='settings'), url(r'^share/$', 'fftogo.views.share', name='share'), url(r'^search/$', 'fftogo.views.search', name='search'), urls.py f4d3fec9b669f2fea1c6fc9c7d3a9557923333ea Benjamin Golub bgolub@benjamin-golubs-macbook-pro.local http://github.com/bgolub/fftogo/commit/bb2d8fcc55558b7eff52e426b3d651402e7eedd0 bb2d8fcc55558b7eff52e426b3d651402e7eedd0 2008-08-25T19:27:07-07:00 2008-08-25T19:27:07-07:00 lists b58756b517619fcc3ffd1685467b111f7f6fa36f Benjamin Golub bgolub@benjamin-golubs-macbook-pro.local