Merge of jambazov branch to trunk. Adds CC license and failed sign-in referrer bug...

[osqa.git] / forum / views / commands.py

diff --git a/forum/views/commands.py b/forum/views/commands.py
index e09924b064a38409874e253a66495263454d4fc9..af6ad644e8ee6466dad347890b9995e15722a214 100644 (file)
--- a/forum/views/commands.py
+++ b/forum/views/commands.py
@@ -2,52 +2,62 @@ import datetime
 from forum import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils import simplejson
 from forum import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils import simplejson

-from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden, Http404
+from django.http import HttpResponse, HttpResponseRedirect, Http404

 from django.shortcuts import get_object_or_404, render_to_response
 from django.utils.translation import ungettext, ugettext as _
 from django.template import RequestContext
 from forum.models import *
 from django.shortcuts import get_object_or_404, render_to_response
 from django.utils.translation import ungettext, ugettext as _
 from django.template import RequestContext
 from forum.models import *

+from forum.models.node import NodeMetaClass

 from forum.actions import *
 from django.core.urlresolvers import reverse
 from forum.actions import *
 from django.core.urlresolvers import reverse

-from django.contrib.auth.decorators import login_required

 from forum.utils.decorators import ajax_method, ajax_login_required
 from forum.utils.decorators import ajax_method, ajax_login_required

-from forum.modules.decorators import decoratable
-from decorators import command, CommandException
+from decorators import command, CommandException, RefreshPageCommand
+from forum.modules import decorate

 from forum import settings
 import logging
 
 class NotEnoughRepPointsException(CommandException):
     def __init__(self, action):
         super(NotEnoughRepPointsException, self).__init__(
 from forum import settings
 import logging
 
 class NotEnoughRepPointsException(CommandException):
     def __init__(self, action):
         super(NotEnoughRepPointsException, self).__init__(

-            _("""Sorry, but you don't have enough reputation points to %(action)s.<br />Please check the <a href='%(faq_url)s'>faq</a>""") % {'action': action, 'faq_url': reverse('faq')}
-        )
+                _(
+                        """Sorry, but you don't have enough reputation points to %(action)s.<br />Please check the <a href='%(faq_url)s'>faq</a>"""
+                        ) % {'action': action, 'faq_url': reverse('faq')}
+                )

 
 class CannotDoOnOwnException(CommandException):
     def __init__(self, action):
         super(CannotDoOnOwnException, self).__init__(
 
 class CannotDoOnOwnException(CommandException):
     def __init__(self, action):
         super(CannotDoOnOwnException, self).__init__(

-            _("""Sorry but you cannot %(action)s your own post.<br />Please check the <a href='%(faq_url)s'>faq</a>""") % {'action': action, 'faq_url': reverse('faq')}
-        )
+                _(
+                        """Sorry but you cannot %(action)s your own post.<br />Please check the <a href='%(faq_url)s'>faq</a>"""
+                        ) % {'action': action, 'faq_url': reverse('faq')}
+                )

 
 class AnonymousNotAllowedException(CommandException):
     def __init__(self, action):
         super(AnonymousNotAllowedException, self).__init__(
 
 class AnonymousNotAllowedException(CommandException):
     def __init__(self, action):
         super(AnonymousNotAllowedException, self).__init__(

-            _("""Sorry but anonymous users cannot %(action)s.<br />Please login or create an account <a href='%(signin_url)s'>here</a>.""") % {'action': action, 'signin_url': reverse('auth_signin')}
-        )
+                _(
+                        """Sorry but anonymous users cannot %(action)s.<br />Please login or create an account <a href='%(signin_url)s'>here</a>."""
+                        ) % {'action': action, 'signin_url': reverse('auth_signin')}
+                )

 
 class NotEnoughLeftException(CommandException):
     def __init__(self, action, limit):
         super(NotEnoughLeftException, self).__init__(
 
 class NotEnoughLeftException(CommandException):
     def __init__(self, action, limit):
         super(NotEnoughLeftException, self).__init__(

-            _("""Sorry, but you don't have enough %(action)s left for today..<br />The limit is %(limit)s per day..<br />Please check the <a href='%(faq_url)s'>faq</a>""") % {'action': action, 'limit': limit, 'faq_url': reverse('faq')}
-        )
+                _(
+                        """Sorry, but you don't have enough %(action)s left for today..<br />The limit is %(limit)s per day..<br />Please check the <a href='%(faq_url)s'>faq</a>"""
+                        ) % {'action': action, 'limit': limit, 'faq_url': reverse('faq')}
+                )

 
 class CannotDoubleActionException(CommandException):
     def __init__(self, action):
         super(CannotDoubleActionException, self).__init__(
 
 class CannotDoubleActionException(CommandException):
     def __init__(self, action):
         super(CannotDoubleActionException, self).__init__(

-            _("""Sorry, but you cannot %(action)s twice the same post.<br />Please check the <a href='%(faq_url)s'>faq</a>""") % {'action': action, 'faq_url': reverse('faq')}
-        )
+                _(
+                        """Sorry, but you cannot %(action)s twice the same post.<br />Please check the <a href='%(faq_url)s'>faq</a>"""
+                        ) % {'action': action, 'faq_url': reverse('faq')}
+                )

 
 
 
 

-@command
+@decorate.withfn(command)

 def vote_post(request, id, vote_type):
     post = get_object_or_404(Node, id=id).leaf
     user = request.user
 def vote_post(request, id, vote_type):
     post = get_object_or_404(Node, id=id).leaf
     user = request.user


@@ -63,25 +73,24 @@ def vote_post(request, id, vote_type):
 
     user_vote_count_today = user.get_vote_count_today()
 
 
     user_vote_count_today = user.get_vote_count_today()
 

-    if user_vote_count_today >= int(settings.MAX_VOTES_PER_DAY):
+    if user_vote_count_today >= user.can_vote_count_today():

         raise NotEnoughLeftException(_('votes'), str(settings.MAX_VOTES_PER_DAY))
 
     new_vote_cls = (vote_type == 'up') and VoteUpAction or VoteDownAction
     score_inc = 0
 
         raise NotEnoughLeftException(_('votes'), str(settings.MAX_VOTES_PER_DAY))
 
     new_vote_cls = (vote_type == 'up') and VoteUpAction or VoteDownAction
     score_inc = 0
 

-    try:
-        old_vote = Action.objects.get_for_types((VoteUpAction, VoteDownAction), node=post, user=user)
+    old_vote = VoteAction.get_action_for(node=post, user=user)

 
 

+    if old_vote:

         if old_vote.action_date < datetime.datetime.now() - datetime.timedelta(days=int(settings.DENY_UNVOTE_DAYS)):
             raise CommandException(
                     _("Sorry but you cannot cancel a vote after %(ndays)d %(tdays)s from the original vote") %
         if old_vote.action_date < datetime.datetime.now() - datetime.timedelta(days=int(settings.DENY_UNVOTE_DAYS)):
             raise CommandException(
                     _("Sorry but you cannot cancel a vote after %(ndays)d %(tdays)s from the original vote") %

-                    {'ndays': int(settings.DENY_UNVOTE_DAYS), 'tdays': ungettext('day', 'days', int(settings.DENY_UNVOTE_DAYS))}
-            )
+                    {'ndays': int(settings.DENY_UNVOTE_DAYS),
+                     'tdays': ungettext('day', 'days', int(settings.DENY_UNVOTE_DAYS))}
+                    )

 
         old_vote.cancel(ip=request.META['REMOTE_ADDR'])
         score_inc += (old_vote.__class__ == VoteDownAction) and 1 or -1
 
         old_vote.cancel(ip=request.META['REMOTE_ADDR'])
         score_inc += (old_vote.__class__ == VoteDownAction) and 1 or -1

-    except ObjectDoesNotExist:
-        old_vote = None

 
     if old_vote.__class__ != new_vote_cls:
         new_vote_cls(user=user, node=post, ip=request.META['REMOTE_ADDR']).save()
 
     if old_vote.__class__ != new_vote_cls:
         new_vote_cls(user=user, node=post, ip=request.META['REMOTE_ADDR']).save()


@@ -90,10 +99,10 @@ def vote_post(request, id, vote_type):
         vote_type = "none"
 
     response = {
         vote_type = "none"
 
     response = {

-        'commands': {
-            'update_post_score': [id, score_inc],
-            'update_user_post_vote': [id, vote_type]
-        }
+    'commands': {
+    'update_post_score': [id, score_inc],
+    'update_user_post_vote': [id, vote_type]
+    }

     }
 
     votes_left = (int(settings.MAX_VOTES_PER_DAY) - user_vote_count_today) + (vote_type == 'none' and -1 or 1)
     }
 
     votes_left = (int(settings.MAX_VOTES_PER_DAY) - user_vote_count_today) + (vote_type == 'none' and -1 or 1)


@@ -104,7 +113,7 @@ def vote_post(request, id, vote_type):
 
     return response
 
 
     return response
 

-@command
+@decorate.withfn(command)

 def flag_post(request, id):
     if not request.POST:
         return render_to_response('node/report.html', {'types': settings.FLAG_TYPES})
 def flag_post(request, id):
     if not request.POST:
         return render_to_response('node/report.html', {'types': settings.FLAG_TYPES})


@@ -127,8 +136,9 @@ def flag_post(request, id):
         raise NotEnoughLeftException(_('flags'), str(settings.MAX_FLAGS_PER_DAY))
 
     try:
         raise NotEnoughLeftException(_('flags'), str(settings.MAX_FLAGS_PER_DAY))
 
     try:

-        current = FlagAction.objects.get(user=user, node=post)
-        raise CommandException(_("You already flagged this post with the following reason: %(reason)s") % {'reason': current.extra})
+        current = FlagAction.objects.get(canceled=False, user=user, node=post)
+        raise CommandException(
+                _("You already flagged this post with the following reason: %(reason)s") % {'reason': current.extra})

     except ObjectDoesNotExist:
         reason = request.POST.get('prompt', '').strip()
 
     except ObjectDoesNotExist:
         reason = request.POST.get('prompt', '').strip()
 


@@ -138,8 +148,8 @@ def flag_post(request, id):
         FlagAction(user=user, node=post, extra=reason, ip=request.META['REMOTE_ADDR']).save()
 
     return {'message': _("Thank you for your report. A moderator will review your submission shortly.")}
         FlagAction(user=user, node=post, extra=reason, ip=request.META['REMOTE_ADDR']).save()
 
     return {'message': _("Thank you for your report. A moderator will review your submission shortly.")}

-        
-@command
+
+@decorate.withfn(command)

 def like_comment(request, id):
     comment = get_object_or_404(Comment, id=id)
     user = request.user
 def like_comment(request, id):
     comment = get_object_or_404(Comment, id=id)
     user = request.user


@@ -151,24 +161,25 @@ def like_comment(request, id):
         raise CannotDoOnOwnException(_('like'))
 
     if not user.can_like_comment(comment):
         raise CannotDoOnOwnException(_('like'))
 
     if not user.can_like_comment(comment):

-        raise NotEnoughRepPointsException( _('like comments'))    
+        raise NotEnoughRepPointsException( _('like comments'))

 
 

-    try:
-        like = VoteUpCommentAction.objects.get(node=comment, user=user)
+    like = VoteAction.get_action_for(node=comment, user=user)
+
+    if like:

         like.cancel(ip=request.META['REMOTE_ADDR'])
         likes = False
         like.cancel(ip=request.META['REMOTE_ADDR'])
         likes = False

-    except ObjectDoesNotExist:
+    else:

         VoteUpCommentAction(node=comment, user=user, ip=request.META['REMOTE_ADDR']).save()
         likes = True
 
     return {
         VoteUpCommentAction(node=comment, user=user, ip=request.META['REMOTE_ADDR']).save()
         likes = True
 
     return {

-        'commands': {
-            'update_post_score': [comment.id, likes and 1 or -1],
-            'update_user_post_vote': [comment.id, likes and 'up' or 'none']
-        }
+    'commands': {
+    'update_post_score': [comment.id, likes and 1 or -1],
+    'update_user_post_vote': [comment.id, likes and 'up' or 'none']
+    }

     }
 
     }
 

-@command
+@decorate.withfn(command)

 def delete_comment(request, id):
     comment = get_object_or_404(Comment, id=id)
     user = request.user
 def delete_comment(request, id):
     comment = get_object_or_404(Comment, id=id)
     user = request.user


@@ -179,16 +190,16 @@ def delete_comment(request, id):
     if not user.can_delete_comment(comment):
         raise NotEnoughRepPointsException( _('delete comments'))
 
     if not user.can_delete_comment(comment):
         raise NotEnoughRepPointsException( _('delete comments'))
 

-    if not comment.deleted:
+    if not comment.nis.deleted:

         DeleteAction(node=comment, user=user, ip=request.META['REMOTE_ADDR']).save()
 
     return {
         DeleteAction(node=comment, user=user, ip=request.META['REMOTE_ADDR']).save()
 
     return {

-        'commands': {
-            'remove_comment': [comment.id],
-        }
+    'commands': {
+    'remove_comment': [comment.id],
+    }

     }
 
     }
 

-@command
+@decorate.withfn(command)

 def mark_favorite(request, id):
     question = get_object_or_404(Question, id=id)
 
 def mark_favorite(request, id):
     question = get_object_or_404(Question, id=id)
 


@@ -196,7 +207,7 @@ def mark_favorite(request, id):
         raise AnonymousNotAllowedException(_('mark a question as favorite'))
 
     try:
         raise AnonymousNotAllowedException(_('mark a question as favorite'))
 
     try:

-        favorite = FavoriteAction.objects.get(node=question, user=request.user)
+        favorite = FavoriteAction.objects.get(canceled=False, node=question, user=request.user)

         favorite.cancel(ip=request.META['REMOTE_ADDR'])
         added = False
     except ObjectDoesNotExist:
         favorite.cancel(ip=request.META['REMOTE_ADDR'])
         added = False
     except ObjectDoesNotExist:


@@ -204,14 +215,13 @@ def mark_favorite(request, id):
         added = True
 
     return {
         added = True
 
     return {

-        'commands': {
-            'update_favorite_count': [added and 1 or -1],
-            'update_favorite_mark': [added and 'on' or 'off']
-        }
+    'commands': {
+    'update_favorite_count': [added and 1 or -1],
+    'update_favorite_mark': [added and 'on' or 'off']
+    }

     }
 
     }
 

-@decoratable
-@command
+@decorate.withfn(command)

 def comment(request, id):
     post = get_object_or_404(Node, id=id)
     user = request.user
 def comment(request, id):
     post = get_object_or_404(Node, id=id)
     user = request.user


@@ -239,30 +249,34 @@ def comment(request, id):
         if not user.can_edit_comment(comment):
             raise NotEnoughRepPointsException( _('edit comments'))
 
         if not user.can_edit_comment(comment):
             raise NotEnoughRepPointsException( _('edit comments'))
 

-        comment = ReviseAction(user=user, node=comment, ip=request.META['REMOTE_ADDR']).save(data=dict(text=comment_text)).node
+        comment = ReviseAction(user=user, node=comment, ip=request.META['REMOTE_ADDR']).save(
+                data=dict(text=comment_text)).node

     else:
         if not user.can_comment(post):
             raise NotEnoughRepPointsException( _('comment'))
 
     else:
         if not user.can_comment(post):
             raise NotEnoughRepPointsException( _('comment'))
 

-        comment = CommentAction(user=user, ip=request.META['REMOTE_ADDR']).save(data=dict(text=comment_text, parent=post)).node
+        comment = CommentAction(user=user, ip=request.META['REMOTE_ADDR']).save(
+                data=dict(text=comment_text, parent=post)).node

 
     if comment.active_revision.revision == 1:
         return {
 
     if comment.active_revision.revision == 1:
         return {

-            'commands': {
-                'insert_comment': [
-                    id, comment.id, comment.comment, user.username, user.get_profile_url(),
-                        reverse('delete_comment', kwargs={'id': comment.id}), reverse('node_markdown', kwargs={'id': comment.id})
+        'commands': {
+        'insert_comment': [
+                id, comment.id, comment.comment, user.decorated_name, user.get_profile_url(),
+                reverse('delete_comment', kwargs={'id': comment.id}),
+                reverse('node_markdown', kwargs={'id': comment.id}),
+                reverse('convert_comment', kwargs={'id': comment.id}),            

                 ]
                 ]

-            }
+        }

         }
     else:
         return {
         }
     else:
         return {

-            'commands': {
-                'update_comment': [comment.id, comment.comment]
-            }
+        'commands': {
+        'update_comment': [comment.id, comment.comment]
+        }

         }
 
         }
 

-@command
+@decorate.withfn(command)

 def node_markdown(request, id):
     user = request.user
 
 def node_markdown(request, id):
     user = request.user
 


@@ -270,11 +284,14 @@ def node_markdown(request, id):
         raise AnonymousNotAllowedException(_('accept answers'))
 
     node = get_object_or_404(Node, id=id)
         raise AnonymousNotAllowedException(_('accept answers'))
 
     node = get_object_or_404(Node, id=id)

-    return HttpResponse(node.body, mimetype="text/plain")
+    return HttpResponse(node.active_revision.body, mimetype="text/plain")

 
 
 
 

-@command
+@decorate.withfn(command)

 def accept_answer(request, id):
 def accept_answer(request, id):

+    if settings.DISABLE_ACCEPTING_FEATURE:
+        raise Http404()
+

     user = request.user
 
     if not user.is_authenticated():
     user = request.user
 
     if not user.is_authenticated():


@@ -284,25 +301,32 @@ def accept_answer(request, id):
     question = answer.question
 
     if not user.can_accept_answer(answer):
     question = answer.question
 
     if not user.can_accept_answer(answer):

-        raise CommandException(_("Sorry but only the question author can accept an answer"))
+        raise CommandException(_("Sorry but you cannot accept the answer"))

 
     commands = {}
 
 
     commands = {}
 

-    if answer.accepted:
-        answer.accepted.cancel(user, ip=request.META['REMOTE_ADDR'])
+    if answer.nis.accepted:
+        answer.nstate.accepted.cancel(user, ip=request.META['REMOTE_ADDR'])

         commands['unmark_accepted'] = [answer.id]
     else:
         commands['unmark_accepted'] = [answer.id]
     else:

-        if question.answer_accepted:
-            accepted = question.accepted_answer
-            accepted.accepted.cancel(user, ip=request.META['REMOTE_ADDR'])
-            commands['unmark_accepted'] = [accepted.id]
+        if settings.MAXIMUM_ACCEPTED_ANSWERS and (question.accepted_count >= settings.MAXIMUM_ACCEPTED_ANSWERS):
+            raise CommandException(ungettext("This question already has an accepted answer.",
+                "Sorry but this question has reached the limit of accepted answers.", int(settings.MAXIMUM_ACCEPTED_ANSWERS)))
+
+        if settings.MAXIMUM_ACCEPTED_PER_USER and question.accepted_count:
+            accepted_from_author = question.accepted_answers.filter(author=answer.author).count()
+
+            if accepted_from_author >= settings.MAXIMUM_ACCEPTED_PER_USER:
+                raise CommandException(ungettext("The author of this answer already has an accepted answer in this question.",
+                "Sorry but the author of this answer has reached the limit of accepted answers per question.", int(settings.MAXIMUM_ACCEPTED_PER_USER)))             
+

 
         AcceptAnswerAction(node=answer, user=user, ip=request.META['REMOTE_ADDR']).save()
         commands['mark_accepted'] = [answer.id]
 
     return {'commands': commands}
 
 
         AcceptAnswerAction(node=answer, user=user, ip=request.META['REMOTE_ADDR']).save()
         commands['mark_accepted'] = [answer.id]
 
     return {'commands': commands}
 

-@command    
+@decorate.withfn(command)

 def delete_post(request, id):
     post = get_object_or_404(Node, id=id)
     user = request.user
 def delete_post(request, id):
     post = get_object_or_404(Node, id=id)
     user = request.user


@@ -315,8 +339,8 @@ def delete_post(request, id):
 
     ret = {'commands': {}}
 
 
     ret = {'commands': {}}
 

-    if post.deleted:
-        post.deleted.cancel(user, ip=request.META['REMOTE_ADDR'])
+    if post.nis.deleted:
+        post.nstate.deleted.cancel(user, ip=request.META['REMOTE_ADDR'])

         ret['commands']['unmark_deleted'] = [post.node_type, id]
     else:
         DeleteAction(node=post, user=user, ip=request.META['REMOTE_ADDR']).save()
         ret['commands']['unmark_deleted'] = [post.node_type, id]
     else:
         DeleteAction(node=post, user=user, ip=request.META['REMOTE_ADDR']).save()


@@ -325,7 +349,7 @@ def delete_post(request, id):
 
     return ret
 
 
     return ret
 

-@command
+@decorate.withfn(command)

 def close(request, id, close):
     if close and not request.POST:
         return render_to_response('node/report.html', {'types': settings.CLOSE_TYPES})
 def close(request, id, close):
     if close and not request.POST:
         return render_to_response('node/report.html', {'types': settings.CLOSE_TYPES})


@@ -336,11 +360,11 @@ def close(request, id, close):
     if not user.is_authenticated():
         raise AnonymousNotAllowedException(_('close questions'))
 
     if not user.is_authenticated():
         raise AnonymousNotAllowedException(_('close questions'))
 

-    if question.extra_action:
+    if question.nis.closed:

         if not user.can_reopen_question(question):
             raise NotEnoughRepPointsException(_('reopen questions'))
 
         if not user.can_reopen_question(question):
             raise NotEnoughRepPointsException(_('reopen questions'))
 

-        question.extra_action.cancel(user, ip=request.META['REMOTE_ADDR'])
+        question.nstate.closed.cancel(user, ip=request.META['REMOTE_ADDR'])

     else:
         if not request.user.can_close_question(question):
             raise NotEnoughRepPointsException(_('close questions'))
     else:
         if not request.user.can_close_question(question):
             raise NotEnoughRepPointsException(_('close questions'))


@@ -352,30 +376,145 @@ def close(request, id, close):
 
         CloseAction(node=question, user=user, extra=reason, ip=request.META['REMOTE_ADDR']).save()
 
 
         CloseAction(node=question, user=user, extra=reason, ip=request.META['REMOTE_ADDR']).save()
 

-    return {
-        'commands': {
-            'refresh_page': []
-        }
-    }
+    return RefreshPageCommand()
+
+@decorate.withfn(command)
+def wikify(request, id):
+    node = get_object_or_404(Node, id=id)
+    user = request.user
+
+    if not user.is_authenticated():
+        raise AnonymousNotAllowedException(_('mark posts as community wiki'))
+
+    if node.nis.wiki:
+        if not user.can_cancel_wiki(node):
+            raise NotEnoughRepPointsException(_('cancel a community wiki post'))
+
+        if node.nstate.wiki.action_type == "wikify":
+            node.nstate.wiki.cancel()
+        else:
+            node.nstate.wiki = None
+    else:
+        if not user.can_wikify(node):
+            raise NotEnoughRepPointsException(_('mark posts as community wiki'))
+
+        WikifyAction(node=node, user=user, ip=request.META['REMOTE_ADDR']).save()
+
+    return RefreshPageCommand()
+
+@decorate.withfn(command)
+def convert_to_comment(request, id):
+    user = request.user
+    answer = get_object_or_404(Answer, id=id)
+    question = answer.question
+
+    if not request.POST:
+        description = lambda a: _("Answer by %(uname)s: %(snippet)s...") % {'uname': a.author.username,
+                                                                            'snippet': a.summary[:10]}
+        nodes = [(question.id, _("Question"))]
+        [nodes.append((a.id, description(a))) for a in
+         question.answers.filter_state(deleted=False).exclude(id=answer.id)]
+
+        return render_to_response('node/convert_to_comment.html', {'answer': answer, 'nodes': nodes})
+
+    if not user.is_authenticated():
+        raise AnonymousNotAllowedException(_("convert answers to comments"))
+
+    if not user.can_convert_to_comment(answer):
+        raise NotEnoughRepPointsException(_("convert answers to comments"))
+
+    try:
+        new_parent = Node.objects.get(id=request.POST.get('under', None))
+    except:
+        raise CommandException(_("That is an invalid post to put the comment under"))
+
+    if not (new_parent == question or (new_parent.node_type == 'answer' and new_parent.parent == question)):
+        raise CommandException(_("That is an invalid post to put the comment under"))
+
+    AnswerToCommentAction(user=user, node=answer, ip=request.META['REMOTE_ADDR']).save(data=dict(new_parent=new_parent))
+
+    return RefreshPageCommand()
+
+@decorate.withfn(command)
+def convert_comment_to_answer(request, id):
+    user = request.user
+    comment = get_object_or_404(Comment, id=id)
+    parent = comment.parent
+
+    if not parent.question:
+        question = parent
+    else:
+        question = parent.question
+    
+    if not user.is_authenticated():
+        raise AnonymousNotAllowedException(_("convert comments to answers"))
+
+    if not user.can_convert_comment_to_answer(comment):
+        raise NotEnoughRepPointsException(_("convert comments to answers"))
+    
+    CommentToAnswerAction(user=user, node=comment, ip=request.META['REMOTE_ADDR']).save(data=dict(question=question))
+
+    return RefreshPageCommand()
+
+@decorate.withfn(command)
+def convert_to_question(request, id):
+    user = request.user
+    answer = get_object_or_404(Answer, id=id)
+    question = answer.question
+
+    if not request.POST:
+        description = lambda a: _("Answer by %(uname)s: %(snippet)s...") % {'uname': a.author.username,
+                                                                            'snippet': a.summary[:10]}
+        nodes = [(question.id, _("Question"))]
+        [nodes.append((a.id, description(a))) for a in
+         question.answers.filter_state(deleted=False).exclude(id=answer.id)]
+
+        return render_to_response('node/convert_to_question.html', {'answer': answer})
+
+    if not user.is_authenticated():
+        raise AnonymousNotAllowedException(_("convert answers to questions"))
+
+    if not user.can_convert_to_question(answer):
+        raise NotEnoughRepPointsException(_("convert answers to questions"))
+
+    try:
+        title = request.POST.get('title', None)
+    except:
+        raise CommandException(_("You haven't specified the title of the new question"))
+
+    AnswerToQuestionAction(user=user, node=answer, ip=request.META['REMOTE_ADDR']).save(data=dict(title=title))
+
+    return RefreshPageCommand()
+
+@decorate.withfn(command)
+def subscribe(request, id, user=None):
+    if user:
+        try:
+            user = User.objects.get(id=user)
+        except User.DoesNotExist:
+            raise Http404()
+
+        if not (request.user.is_a_super_user_or_staff() or user.is_authenticated()):
+            raise CommandException(_("You do not have the correct credentials to preform this action."))
+    else:
+        user = request.user

 
 

-@command
-def subscribe(request, id):

     question = get_object_or_404(Question, id=id)
 
     try:
     question = get_object_or_404(Question, id=id)
 
     try:

-        subscription = QuestionSubscription.objects.get(question=question, user=request.user)
+        subscription = QuestionSubscription.objects.get(question=question, user=user)

         subscription.delete()
         subscribed = False
     except:
         subscription.delete()
         subscribed = False
     except:

-        subscription = QuestionSubscription(question=question, user=request.user, auto_subscription=False)
+        subscription = QuestionSubscription(question=question, user=user, auto_subscription=False)

         subscription.save()
         subscribed = True
 
     return {
         'commands': {
         subscription.save()
         subscribed = True
 
     return {
         'commands': {

-                'set_subscription_button': [subscribed and _('unsubscribe me') or _('subscribe me')],
-                'set_subscription_status': ['']
-            }
+            'set_subscription_button': [subscribed and _('unsubscribe me') or _('subscribe me')],
+            'set_subscription_status': ['']
+        }

     }
 
 #internally grouped views - used by the tagging system
     }
 
 #internally grouped views - used by the tagging system


@@ -401,20 +540,33 @@ def mark_tag(request, tag=None, **kwargs):#tagging system
 
 def matching_tags(request):
     if len(request.GET['q']) == 0:
 
 def matching_tags(request):
     if len(request.GET['q']) == 0:

-       raise CommandException(_("Invalid request"))
+        raise CommandException(_("Invalid request"))

 
 

-    possible_tags = Tag.objects.filter(name__istartswith = request.GET['q'])
+    possible_tags = Tag.active.filter(name__icontains = request.GET['q'])

     tag_output = ''
     for tag in possible_tags:
     tag_output = ''
     for tag in possible_tags:

-        tag_output += (tag.name + "|" + tag.name + "." + tag.used_count.__str__() + "\n")
-        
+        tag_output += "%s|%s|%s\n" % (tag.id, tag.name, tag.used_count)
+

     return HttpResponse(tag_output, mimetype="text/plain")
 
     return HttpResponse(tag_output, mimetype="text/plain")
 

+def matching_users(request):
+    if len(request.GET['q']) == 0:
+        raise CommandException(_("Invalid request"))
+
+    possible_users = User.objects.filter(username__icontains = request.GET['q'])
+    output = ''
+
+    for user in possible_users:
+        output += ("%s|%s|%s\n" % (user.id, user.decorated_name, user.reputation))
+
+    return HttpResponse(output, mimetype="text/plain")
+

 def related_questions(request):
     if request.POST and request.POST.get('title', None):
 def related_questions(request):
     if request.POST and request.POST.get('title', None):

+        can_rank, questions = Question.objects.search(request.POST['title'])

         return HttpResponse(simplejson.dumps(
                 [dict(title=q.title, url=q.get_absolute_url(), score=q.score, summary=q.summary)
         return HttpResponse(simplejson.dumps(
                 [dict(title=q.title, url=q.get_absolute_url(), score=q.score, summary=q.summary)

-                 for q in Question.objects.search(request.POST['title'])[0:10]]), mimetype="application/json")
+                 for q in questions.filter_state(deleted=False)[0:10]]), mimetype="application/json")

     else:
         raise Http404()
 
     else:
         raise Http404()