0
@@ -140,6 +140,58 @@ def entry_comment(request, entry):
0
     }
0
     return render_to_response('comment.html', extra_context, context_instance=RequestContext(request))
0
 
0
+def entry_delete(request, entry):
0
+    '''Delete an entry.
0
+
0
+    Authentcation is required.
0
+
0
+    entry is the entry id.
0
+    '''
0
+    if not request.session.get('nickname', None):
0
+        return HttpResponseRedirect(reverse('login'))
0
+    f = friendfeed.FriendFeed(request.session['nickname'],
0
+        request.session['key'])
0
+    try:
0
+        f.delete_entry(entry)
0
+    except Exception, e:
0
+        if e[0] == 401:
0
+            del request.session['nickname']
0
+            del request.session['key']
0
+        return HttpResponseRedirect(reverse(str(e)))
0
+    next = request.GET.get('next', '/')
0
+    if '?' in next:
0
+        next = next + '&message=deleted&entry=%s' % entry
0
+    else:
0
+        next = next + '?message=deleted&entry=%s' % entry
0
+    next = next + '#%s' % entry
0
+    return HttpResponseRedirect(next)
0
+
0
+def entry_undelete(request, entry):
0
+    '''Un-delete an entry.
0
+
0
+    Authentcation is required.
0
+
0
+    entry is the entry id.
0
+    '''
0
+    if not request.session.get('nickname', None):
0
+        return HttpResponseRedirect(reverse('login'))
0
+    f = friendfeed.FriendFeed(request.session['nickname'],
0
+        request.session['key'])
0
+    try:
0
+        f.undelete_entry(entry)
0
+    except Exception, e:
0
+        if e[0] == 401:
0
+            del request.session['nickname']
0
+            del request.session['key']
0
+        return HttpResponseRedirect(reverse(str(e)))
0
+    next = request.GET.get('next', '/')
0
+    if '?' in next:
0
+        next = next + '&message=shared&entry=%s' % entry
0
+    else:
0
+        next = next + '?message=shared&entry=%s' % entry
0
+    next = next + '#%s' % entry
0
+    return HttpResponseRedirect(next)
0
+
0
 def entry_hide(request, entry):
0
     '''Hide an entry.
0
 
0
@@ -521,9 +573,9 @@ def share(request):
0
                 return HttpResponseRedirect(reverse(str(e)))
0
     next = request.POST.get('next', '/')
0
     if '?' in next:
0
-        next = next + '&message=created'
0
+        next = next + '&message=shared&entry=%s' % entry['id']
0
     else:
0
-        next = next + '?message=created'
0
+        next = next + '?message=shared&entry=%s' % entry['id']
0
     next += '#%s' % entry['id'] 
0
     return HttpResponseRedirect(next)
0
 

0
@@ -15,13 +15,21 @@
0
             {% ifequal request.message 'settings' %}
0
                 Did you know that you can <a href="{% url settings %}">change your font size and other settings</a>?
0
             {% endifequal %}
0
-            {% ifequal request.message 'created' %}
0
+            {% ifequal request.message 'shared' %}
0
                 Entry created
0
+                -
0
+                <a href="{% url entry_delete request.entry %}"?next={{ request.path }}">Undo</a>
0
             {% endifequal %}
0
             {% ifequal request.message 'deleted' %}
0
-                Comment deleted
0
-                -
0
-                <a href="{% url comment_undelete request.entry,request.comment %}?next={{ request.path }}">Undo</a>
0
+                {% if request.comment %}
0
+                    Comment deleted
0
+                    -
0
+                    <a href="{% url comment_undelete request.entry,request.comment %}?next={{ request.path }}">Undo</a>
0
+                {% else %}
0
+                    Entry deleted
0
+                    -
0
+                    <a href="{% url entry_undelete request.entry %}"?next={{ request.path }}">Undo</a>
0
+                {% endif %}
0
             {% endifequal %}
0
             {% ifequal request.message 'commented' %}
0
                 Comment created
0
@@ -123,6 +131,10 @@
0
                                 <a href="{% url entry_hide entry.id %}?next={{ request.path }}">Hide</a>
0
                             {% endifnotequal %}
0
                         {% endif %}
0
+                        {% ifequal entry.user.nickname request.session.nickname %}
0
+                            -
0
+                            <a href="{% url entry_delete entry.id %}?next={{ request.path }}">Delete</a>
0
+                        {% endifequal %}
0
                     {% endif %}
0
                     {% if entry.likes %}
0
                         -

0
@@ -20,6 +20,8 @@ urlpatterns = patterns('',
0
     url(r'^(?P<nickname>\w+)/$', 'fftogo.views.user', name='user'),
0
     url(r'^(?P<nickname>\w+)/(?P<type>\w+)/$', 'fftogo.views.user', name='user_type'),
0
     url(r'^e/(?P<entry>[\w-]+)/comment/$', 'fftogo.views.entry_comment', name='entry_comment'),
0
+    url(r'^e/(?P<entry>[\w-]+)/delete/$', 'fftogo.views.entry_delete', name='entry_delete'),
0
+    url(r'^e/(?P<entry>[\w-]+)/undelete/$', 'fftogo.views.entry_undelete', name='entry_undelete'),
0
     url(r'^e/(?P<entry>[\w-]+)/c/(?P<comment>[\w-]+)/delete/$', 'fftogo.views.comment_delete', name='comment_delete'),
0
     url(r'^e/(?P<entry>[\w-]+)/c/(?P<comment>[\w-]+)/undelete/$', 'fftogo.views.comment_undelete', name='comment_undelete'),
0
     url(r'^e/(?P<entry>[\w-]+)/like/$', 'fftogo.views.entry_like', name='entry_like'),