@@ -140,6 +140,32 @@ def entry_comment(request, entry): } return render_to_response('comment.html', extra_context, context_instance=RequestContext(request)) +def entry_hide(request, entry): + '''Hide an entry. + + Authentication is required. + + entry is the entry id to be hidden. + ''' + if not request.session.get('nickname', None): + return HttpResponseRedirect(reverse('login')) + f = friendfeed.FriendFeed(request.session['nickname'], + request.session['key']) + try: + f.hide_entry(entry) + except Exception, e: + if e[0] == 401: + del request.session['nickname'] + del request.session['key'] + return HttpResponseRedirect(reverse(str(e))) + next = request.GET.get('next', '/') + if '?' in next: + next = next + '&message=hidden&entry=%s' % entry + else: + next = next + '?message=hidden&entry=%s' % entry + next = next + '#%s' % entry + return HttpResponseRedirect(next) + def entry_like(request, entry): '''Like an entry. @@ -166,6 +192,33 @@ def entry_like(request, entry): next = next + '#%s' % entry return HttpResponseRedirect(next) +def entry_unhide(request, entry): + '''Un-hide an entry. + + Authentication is required. + + entry is the entry id to be un-hidden. + ''' + if not request.session.get('nickname', None): + return HttpResponseRedirect(reverse('login')) + f = friendfeed.FriendFeed(request.session['nickname'], + request.session['key']) + try: + f.unhide_entry(entry) + except Exception, e: + if e[0] == 401: + del request.session['nickname'] + del request.session['key'] + return HttpResponseRedirect(reverse(str(e))) + next = request.GET.get('next', '/') + if '?' in next: + next = next + '&message=un-hidden&entry=%s' % entry + else: + next = next + '?message=un-hidden&entry=%s' % entry + next = next + '#%s' % entry + return HttpResponseRedirect(next) + + def entry_unlike(request, entry): '''Un-like an entry. fftogo/views.py @@ -65,6 +65,31 @@ class FriendFeed(object): self.auth_nickname = auth_nickname self.auth_key = auth_key + def validate(self,): + return self._fetch_feed("/api/validate") + + def hide_entry(self, entry_id): + return self._fetch_feed("/api/entry/hide", { + "entry": entry_id, + }) + + def unhide_entry(self, entry_id): + return self._fetch_feed("/api/entry/hide", { + "entry": entry_id, + "unhide": '1', + }) + + def delete_entry(self, entry_id): + return self._fetch_feed("/api/entry/delete", { + "entry": entry_id, + }) + + def undelete_entry(self, entry_id): + return self._fetch_feed("/api/entry/delete", { + "entry": entry_id, + "undelete": '1', + }) + def fetch_user_profile(self, nickname, **kwargs): """Returns a users profile for the given nickname. friendfeed.py @@ -38,6 +38,16 @@ - <a href="{% url entry_like request.entry %}?next={{ request.path }}">Undo</a> {% endifequal %} + {% ifequal request.message 'hidden' %} + Entry hidden + - + <a href="{% url entry_unhide request.entry %}?next={{ request.path }}">Undo</a> + {% endifequal %} + {% ifequal request.message 'un-hidden' %} + Entry un-hidden + - + <a href="{% url entry_hide request.entry %}?next={{ request.path }}">Undo</a> + {% endifequal %} </div> {% endif %} {% block share %} @@ -107,6 +117,12 @@ <a href="{% url entry_like entry.id %}?next={{ request.path }}">Like</a> {% endif %} {% endif %} + {% if not entry.room %} + {% ifnotequal entry.user.nickname request.session.nickname %} + - + <a href="{% url entry_hide entry.id %}?next={{ request.path }}">Hide</a> + {% endifnotequal %} + {% endif %} {% endif %} {% if entry.likes %} - templates/entries.html @@ -24,4 +24,6 @@ urlpatterns = patterns('', url(r'^e/(?P<entry>[\w-]+)/c/(?P<comment>[\w-]+)/restore/$', 'fftogo.views.comment_restore', name='comment_restore'), url(r'^e/(?P<entry>[\w-]+)/like/$', 'fftogo.views.entry_like', name='entry_like'), url(r'^e/(?P<entry>[\w-]+)/unlike/$', 'fftogo.views.entry_unlike', name='entry_unlike'), + url(r'^e/(?P<entry>[\w-]+)/hide/$', 'fftogo.views.entry_hide', name='entry_hide'), + url(r'^e/(?P<entry>[\w-]+)/unhide/$', 'fftogo.views.entry_unhide', name='entry_unhide'), ) urls.py 2df9028d6949a39d4572ed558409973af12cbd86 Benjamin Golub bgolub@benjamingolub.com http://github.com/bgolub/fftogo/commit/799e5184415b5ec0dc8d20ff246591daae7a7fcf 799e5184415b5ec0dc8d20ff246591daae7a7fcf 2008-07-06T18:19:24-07:00 2008-07-06T18:19:24-07:00 hide/unhide 4f09630d14aac34c21cdcc216652e6d656bbe6a2 Benjamin Golub bgolub@benjamingolub.com