diff --git a/src/services/juxt-web/routes/console/posts.js b/src/services/juxt-web/routes/console/posts.js index 09814cd..c4d300f 100644 --- a/src/services/juxt-web/routes/console/posts.js +++ b/src/services/juxt-web/routes/console/posts.js @@ -113,6 +113,7 @@ router.get('/:post_id', async function (req, res) { const community = await database.getCommunityByID(post.community_id); const communityMap = await util.data.getCommunityHash(); const replies = await database.getPostReplies(req.params.post_id.toString(), 25); + const postPNID = await util.data.getUserDataFromPid(post.pid); res.render(req.directory + '/post.ejs', { moment: moment, userSettings: userSettings, @@ -125,6 +126,7 @@ router.get('/:post_id', async function (req, res) { lang: req.lang, mii_image_CDN: config.mii_image_CDN, pid: req.pid, + postPNID, moderator: req.moderator }); }); diff --git a/src/services/juxt-web/routes/console/web.js b/src/services/juxt-web/routes/console/web.js index 7b4c1df..b6559f7 100644 --- a/src/services/juxt-web/routes/console/web.js +++ b/src/services/juxt-web/routes/console/web.js @@ -135,10 +135,9 @@ router.get('/notifications.json', async function (req, res) { router.get('/:post_id/oembed.json', async function (req, res) { const post = await database.getPostByID(req.params.post_id.toString()); - const user = await database.getUserByPID(post.pid); const doc = { - 'author_name': user.user_id, - 'author_url': 'https://portal.olv.pretendo.cc/users/show?pid=' + user.pid, + 'author_name': post.screen_name, + 'author_url': 'https://juxt.pretendo.network/users/show?pid=' + post.pid, }; res.send(doc); }); diff --git a/src/webfiles/web/post.ejs b/src/webfiles/web/post.ejs index e620733..e89ce35 100644 --- a/src/webfiles/web/post.ejs +++ b/src/webfiles/web/post.ejs @@ -3,8 +3,10 @@ Post by <%= post.screen_name %> <%- include('partials/head'); %> - - + + <% if(post.screenshot !== '') { %> <%} else if(post.painting !== '') { %> @@ -12,13 +14,15 @@ <%}%> - - + + <% if(post.screenshot !== '') { %> - + <%} else if(post.painting !== '') { %> - + <%}%> @@ -28,9 +32,9 @@ <% if(post.screenshot !== '') { %> - + <%} else if(post.painting !== '') { %> - + <%}%>