app/item/views.py

@@ -59,7 +59,6 @@ def item(request, id):
     ):
         raise Http404
     context['item'] = item
-    context['url'] = request.build_absolute_uri(item.get_absolute_url())
     qs = item.comments.order_by('created')
     if not request.user.is_staff:
         q = ~Q(published=None)

app/static/js/item.js

@@ -40,10 +40,9 @@ async function loadData(id, args) {
     if (id.split('/').length == 1 || id.split('/')[1] == 'info') {
         data.view = 'info'
         data.title = data.item.title
-        if (data.item.source) {
+        data.byline = data.item.director ? data.item.director.join(', ') : ''
+        if (!data.byline && data.item.source) {
             data.byline = data.item.source
-        } else {
-            data.byline = data.item.director ? data.item.director.join(', ') : ''
         }
         data.link = `${pandora.proto}://${data.site}/${data.item.id}/info`
         let poster = pandora.site.user.ui.icons == 'posters' ? 'poster' : 'icon'
@@ -125,10 +124,9 @@ async function loadData(id, args) {
     data.value = value.join('\n')
 
     data.title = data.item.title
-    if (data.item.source) {
+    data.byline = data.item.director ? data.item.director.join(', ') : ''
+    if (!data.byline && data.item.source) {
         data.byline = data.item.source
-    } else {
-        data.byline = data.item.director ? data.item.director.join(', ') : ''
     }
     data.link = `${pandora.proto}://${data.site}/${data.item.id}/${data["in"]},${data.out}`
     data.poster = `${pandora.proto}://${data.site}/${data.item.id}/480p${data["in"]}.jpg`

app/templates/item.html

@@ -1,18 +1,6 @@
 {% extends "base.html" %}
 {% load static sass_tags compress %}
 {% block head %}
-    <title>{{ item.title }} - {{ settings.SITENAME }}</title>
-    <meta name="title" content="{{ item.title }}"/>
-    <meta property="og:title" content="{{ item.title }}"/>
-    {% if item.data.thumbnail %}
-    <meta content="{{ item.data.thumbnail }}" name="thumbnail"/>
-    <meta content="{{ item.data.thumbnail }}" name="image_src"/>
-    <meta property="og:image" content="{{ item.data.thumbnail }}"/>
-    {% endif %}
-    {% if url %}
-    <meta property="og:url" content="{{ url }}"/>
-    {% endif %}
-    <meta property="og:site_name" content="{{ settings.SITENAME }}"/>
 {% endblock %}
 {% block main %}
     <div class="content">