fixed edit views working again

remy · remy · commit 76ae69019dc7 · 2023-08-18T14:01:01.000+01:00
diff --git a/lib/handlers/bin.js b/lib/handlers/bin.js
@@ -205,6 +205,11 @@ module.exports = Observable.extend({
     next();
   },
   getBinPreview: function(req, res, next) {
+
+    if (features('flagged', req.bin)) {
+      return next(410);
+    }
+
     // if we're loading a username/last(-:n)? and no 'n' is present
     // it breaks quiet, leaving it as undefined, here we manually
     // check for it and modify the req.params to reflect the url.
@@ -956,19 +961,17 @@ module.exports = Observable.extend({
           };
           return self.createRevision(req, res, next);
         }
-        var hardFlag = undefsafe(result, 'metadata.flagged');
-        var flag = features('flagged', result);
+        var flag = undefsafe(result, 'metadata.flagged');
         if (flag) {
           var ip = req.headers['x-real-ip'] || req.ip;
           if (username === result.metadata.name && ip !== flag) {
             // log ip if hard flag
-            if (hardFlag) {
-              models.user.updateOwnershipData(
-                username,
-                { flagged: ip, },
-                function() {}
-              );
-            }
+            models.user.updateOwnershipData(
+              username,
+              { flagged: ip, },
+              function() {}
+            );
+
             // continue to next()
           } else if (username !== result.metadata.name && ip !== flag) {
             metrics.increment('bin.404-banned-user');
diff --git a/views/410.html b/views/410.html
@@ -9,7 +9,9 @@
     <img id="dave" src="{{static}}/images/dave.min.svg?{{version}}" alt="Dave, the JS Bin bot">
     <div class="wrapper">
       <h1>410: This bin has gone</h1>
-      <p>This bin has gone and there's no alternative that I'll redirect you to. It's quite possible this bin has been blocked from appearing due to abuse content, so really, I'm just doing you a&nbsp;favour.</p>
+      <p>This bin has gone and there's no alternative that I'll redirect you to. It's quite possible this bin has been blocked from appearing either due to the owner being anonymous, or the content flagged for abuse.</p>
+
+      <p>In some cases you will still be able to view the <a href="{{request.url}}/edit">editable</a> content in the browser.</p>
     </div>
   </body>
 </html>
