From 22d0b1ec227a55fd31cd7dc69f68c33a215bb7e5 Mon Sep 17 00:00:00 2001
From: El RIDO <elrido@gmx.net>
Date: Sun, 18 Oct 2015 11:38:48 +0200
Subject: [PATCH] updating comment format to match defined JSON-LD API context

---
 js/comment.jsonld    | 7 +++++++
 js/zerobin.js        | 8 ++++----
 lib/zerobin.php      | 1 -
 lib/zerobin/data.php | 4 ++--
 lib/zerobin/db.php   | 6 +++---
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/js/comment.jsonld b/js/comment.jsonld
index 237cf2e..bdee3c2 100644
--- a/js/comment.jsonld
+++ b/js/comment.jsonld
@@ -2,9 +2,16 @@
 	"@context": {
 		"status": "http://schema.org/Integer",
 		"id": "http://schema.org/name",
+		"parentid": "http://schema.org/name",
 		"url: {
 			"@id": "http://schema.org/url",
 			"@type": "@id"
+		},
+		"data": "http://schema.org/Text",
+		"meta": {
+			"postdate": "http://schema.org/Integer",
+			"nickname": "http://schema.org/Text",
+			"vizhash": "http://schema.org/Text"
 		}
 	}
 }
\ No newline at end of file
diff --git a/js/zerobin.js b/js/zerobin.js
index 39c8072..149e455 100644
--- a/js/zerobin.js
+++ b/js/zerobin.js
@@ -709,18 +709,18 @@ $(function() {
                     catch(err)
                     {}
                     // If parent comment exists, display below (CSS will automatically shift it right.)
-                    var cname = '#comment_' + comment.meta.parentid;
+                    var cname = '#comment_' + comment.parentid;
 
                     // If the element exists in page
                     if ($(cname).length)
                     {
                         place = $(cname);
                     }
-                    var divComment = $('<article><div class="comment" id="comment_' + comment.meta.commentid+'">'
+                    var divComment = $('<article><div class="comment" id="comment_' + comment.id + '">'
                                    + '<div class="commentmeta"><span class="nickname"></span><span class="commentdate"></span></div><div class="commentdata"></div>'
                                    + '<button class="btn btn-default btn-sm">' + i18n._('Reply') + '</button>'
                                    + '</div></article>');
-                    divComment.find('button').click({commentid: comment.meta.commentid}, $.proxy(this.openReply, this));
+                    divComment.find('button').click({commentid: comment.id}, $.proxy(this.openReply, this));
                     helper.setElementText(divComment.find('div.commentdata'), cleartext);
                     // Convert URLs to clickable links in comment.
                     helper.urls2links(divComment.find('div.commentdata'));
@@ -737,7 +737,7 @@ $(function() {
                     }
                     divComment.find('span.commentdate')
                               .text(' (' + (new Date(comment.meta.postdate * 1000).toLocaleString()) + ')')
-                              .attr('title', 'CommentID: ' + comment.meta.commentid);
+                              .attr('title', 'CommentID: ' + comment.id);
 
                     // If an avatar is available, display it.
                     if (comment.meta.vizhash)
diff --git a/lib/zerobin.php b/lib/zerobin.php
index bcf4b56..d1d1075 100644
--- a/lib/zerobin.php
+++ b/lib/zerobin.php
@@ -444,7 +444,6 @@ class zerobin
             $result['url'] = (
                 array_key_exists('REQUEST_URI', $_SERVER) ? $_SERVER['REQUEST_URI'] : '/'
             ) . '?' . $message;
-            $result['@context'] = 'js/paste.jsonld';
         }
         $result += $other;
         $this->_json = json_encode($result);
diff --git a/lib/zerobin/data.php b/lib/zerobin/data.php
index 4751190..1b8c697 100644
--- a/lib/zerobin/data.php
+++ b/lib/zerobin/data.php
@@ -177,8 +177,8 @@ class zerobin_data extends zerobin_abstract
                     $comment = json_decode(file_get_contents($discdir . $filename));
                     $items = explode('.', $filename);
                     // Add some meta information not contained in file.
-                    $comment->meta->commentid = $items[1];
-                    $comment->meta->parentid = $items[2];
+                    $comment->id = $items[1];
+                    $comment->parentid = $items[2];
 
                     // Store in array
                     $key = $this->getOpenSlot($comments, (int) $comment->meta->postdate);
diff --git a/lib/zerobin/db.php b/lib/zerobin/db.php
index 799ba8d..0fc7261 100644
--- a/lib/zerobin/db.php
+++ b/lib/zerobin/db.php
@@ -378,15 +378,15 @@ class zerobin_db extends zerobin_abstract
             {
                 $i = $this->getOpenSlot($comments, (int) $row['postdate']);
                 $comments[$i] = new stdClass;
+                $comments[$i]->id = $row['dataid'];
+                $comments[$i]->parentid = $row['parentid'];
                 $comments[$i]->data = $row['data'];
                 $comments[$i]->meta = new stdClass;
+                $comments[$i]->meta->postdate = (int) $row['postdate'];
                 if (array_key_exists('nickname', $row))
                     $comments[$i]->meta->nickname = $row['nickname'];
                 if (array_key_exists('vizhash', $row))
                     $comments[$i]->meta->vizhash = $row['vizhash'];
-                $comments[$i]->meta->postdate = (int) $row['postdate'];
-                $comments[$i]->meta->commentid = $row['dataid'];
-                $comments[$i]->meta->parentid = $row['parentid'];
             }
             ksort($comments);
         }