heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up code (after linting)

Browse Source
This commit is contained in:
xray7224 2013-11-14 17:27:06 +00:00 committed by Jessica Tallon
parent 7810817caf
commit c64fc16b13
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mediagoblin/federation/views.py
View File

@ -8,9 +8,7 @@ from mediagoblin.decorators import oauth_required
from mediagoblin.db.models import User, MediaEntry, MediaComment from mediagoblin.db.models import User, MediaEntry, MediaComment
from mediagoblin.tools.response import redirect, json_response from mediagoblin.tools.response import redirect, json_response
from mediagoblin.meddleware.csrf import csrf_exempt from mediagoblin.meddleware.csrf import csrf_exempt
from mediagoblin.notifications import add_comment_subscription from mediagoblin.submit.lib import new_upload_entry
from mediagoblin.submit.lib import (new_upload_entry, prepare_queue_task,
run_process_media)
#@oauth_required #@oauth_required
def profile(request, raw=False): def profile(request, raw=False):
@ -46,7 +44,7 @@ def user(request):
#@oauth_required #@oauth_required
@csrf_exempt @csrf_exempt
def uploads(request): def uploads(request):
""" This is the endpoint which uploads can be sent to - /api/user/<username>/uploads """ """ Endpoint for file uploads """
user = request.matchdict["username"] user = request.matchdict["username"]
requested_user = User.query.filter_by(username=user) requested_user = User.query.filter_by(username=user)
@ -97,7 +95,6 @@ def feed(request):
if obj.get("objectType", None) == "comment": if obj.get("objectType", None) == "comment":
# post a comment # post a comment
media = int(data["object"]["inReplyTo"]["id"]) media = int(data["object"]["inReplyTo"]["id"])
author = request.user
comment = MediaComment( comment = MediaComment(
media_entry=media, media_entry=media,
author=request.user.id, author=request.user.id,
@ -126,7 +123,11 @@ def feed(request):
return json_response(error, status=400) return json_response(error, status=400)
else: else:
# Oh no! We don't know about this type of object (yet) # Oh no! We don't know about this type of object (yet)
error = {"error": "Unknown object type '{0}'.".format(obj.get("objectType", None))} error_message = "Unknown object type '{0}'.".format(
obj.get("objectType", None)
)
error = {"error": error_message}
return json_response(error, status=400) return json_response(error, status=400)
@ -137,7 +138,10 @@ def feed(request):
) )
feed = { feed = {
"displayName": "Activities by {0}@{1}".format(request.user.username, request.host), "displayName": "Activities by {user}@{host}".format(
user=request.user.username,
host=request.host
),
"objectTypes": ["activity"], "objectTypes": ["activity"],
"url": feed_url, "url": feed_url,
"links": { "links": {
@ -176,11 +180,6 @@ def feed(request):
return json_response(feed) return json_response(feed)
@oauth_required @oauth_required
def inbox(request):
""" Handles the user's inbox - /api/user/<username>/inbox """
raise NotImplemented("Yet to implement looking up user's inbox")
#@oauth_required
def object(request, raw_obj=False): def object(request, raw_obj=False):
""" Lookup for a object type """ """ Lookup for a object type """
objectType = request.matchdict["objectType"] objectType = request.matchdict["objectType"]