From 91d5a2252dfc5081798bc4c1f3f83a0811a8d783 Mon Sep 17 00:00:00 2001
From: CaramelKat <32065563+caramelkat@users.noreply.github.com>
Date: Tue, 30 Nov 2021 00:09:16 -0600
Subject: [PATCH] Fixed notifications getting spammed when user repeatedly
 follows and unfollows a user

---
 src/services/juxt-web/routes/console/userpage.js | 5 ++++-
 src/webfiles/portal/css/juxt.css                 | 4 ++++
 src/webfiles/portal/js/juxt.js                   | 2 --
 src/webfiles/portal/post_template.ejs            | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/services/juxt-web/routes/console/userpage.js b/src/services/juxt-web/routes/console/userpage.js
index 2cdf2f3..82af3a4 100644
--- a/src/services/juxt-web/routes/console/userpage.js
+++ b/src/services/juxt-web/routes/console/userpage.js
@@ -200,7 +200,10 @@ router.post('/follow', upload.none(), async function (req, res) {
         userToFollow.addToFollowers(user.pid);
         user.addToUsers(userToFollow.pid);
         res.sendStatus(200);
-        await database.pushNewNotificationByPID(userToFollow.pid, user.user_id + ' ' + req.lang.notifications.new_follower, '/users/show?pid=' + user.pid)
+        let content = user.user_id + ' ' + req.lang.notifications.new_follower;
+        var picked = userToFollow.notification_list.find(o => o.content === content);
+        if(picked === undefined)
+            await database.pushNewNotificationByPID(userToFollow.pid, content, '/users/show?pid=' + user.pid)
     }
     else if(req.body.type === 'false' && user !== null  && user.followed_users.indexOf(userToFollow.pid) !== -1)
     {
diff --git a/src/webfiles/portal/css/juxt.css b/src/webfiles/portal/css/juxt.css
index 1fd362c..1007b44 100644
--- a/src/webfiles/portal/css/juxt.css
+++ b/src/webfiles/portal/css/juxt.css
@@ -1136,6 +1136,10 @@ h4 {
 .community-page-post-wrapper > h3 {
     padding-left: 0;
     overflow-wrap: break-word;
+    width: 760px;
+    max-width: 760px;
+    line-break: anywhere;
+    line-height: 20px;
 }
 
 .community-page-post-screenshot {
diff --git a/src/webfiles/portal/js/juxt.js b/src/webfiles/portal/js/juxt.js
index a93a359..f70a24c 100644
--- a/src/webfiles/portal/js/juxt.js
+++ b/src/webfiles/portal/js/juxt.js
@@ -287,8 +287,6 @@ function followUser(user) {
     var userWrapper = user.parentElement;
     var followersElement = document.getElementById('user-page-followers-tab');
     var followers = followersElement.innerHTML.trim().substr(0, followersElement.innerHTML.indexOf(' ') + 1);
-    alert(followersElement.innerHTML)
-    alert('"' + followers + '"')
     if (userWrapper.classList.contains("selected")) {
         userWrapper.classList.remove("selected");
         user.style.color = '#673DB6';
diff --git a/src/webfiles/portal/post_template.ejs b/src/webfiles/portal/post_template.ejs
index 6f684a2..af45ff5 100644
--- a/src/webfiles/portal/post_template.ejs
+++ b/src/webfiles/portal/post_template.ejs
@@ -40,7 +40,7 @@
                 <img id="<%= post.id%>" class="community-page-post-painting" src="<%= post.painting_uri %>">
             <%}%>
             <% if(post.url) { %>
-                    <iframe width="760" height="427.5" src="<%= post.url %>" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+                    <iframe width="760" height="427.5" src="<%= post.url.replace('watch?v=','embed/') %>" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
             <%}%>
             <% if(post.screenshot !== '' && post.body && post.body.size <= 50) { %>
                 <div class="community-page-post-text-overlay">