fix: http status correctness improvements

Author: moughxyz

.env.sample

@@ -30,12 +30,6 @@ CERTIFICATES_FOLDER_PATH=
 HCAPTCHA_SECRET_KEY=
 HCAPTCHA_SITE_KEY=
 
-# NewRelic (Optional)
-NEW_RELIC_ENABLED=false
-NEW_RELIC_THREAD_PROFILER_ENABLED=false
-NEW_RELIC_LICENSE_KEY=
-NEW_RELIC_APP_NAME=Listed
-
 # Domain Events
 #SNS_TOPIC_ARN=
 #SQS_QUEUE_URL=

Gemfile

@@ -58,10 +58,6 @@ gem "lograge", "~> 0.11.2"
 
 gem "aws-sdk-route53", "~> 1.40"
 
-gem "newrelic_rpm", "= 8.2.0"
-
-gem "newrelic-infinite_tracing", "= 8.2.0"
-
 gem "shoryuken", "~> 5.3"
 
 gem "capistrano-shoryuken", "~> 0.1.5"

Gemfile.lock

@@ -133,20 +133,6 @@ GEM
     ffi (1.15.4)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    google-protobuf (3.19.1)
-    google-protobuf (3.19.1-x86_64-darwin)
-    google-protobuf (3.19.1-x86_64-linux)
-    googleapis-common-protos-types (1.3.0)
-      google-protobuf (~> 3.14)
-    grpc (1.42.0)
-      google-protobuf (~> 3.18)
-      googleapis-common-protos-types (~> 1.0)
-    grpc (1.42.0-x86_64-darwin)
-      google-protobuf (~> 3.18)
-      googleapis-common-protos-types (~> 1.0)
-    grpc (1.42.0-x86_64-linux)
-      google-protobuf (~> 3.18)
-      googleapis-common-protos-types (~> 1.0)
     haml (5.2.2)
       temple (>= 0.8.0)
       tilt
@@ -191,10 +177,6 @@ GEM
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.1.0)
-    newrelic-infinite_tracing (8.2.0)
-      grpc (~> 1.34)
-      newrelic_rpm (= 8.2.0)
-    newrelic_rpm (8.2.0)
     nio4r (2.5.8)
     nokogiri (1.12.5-arm64-darwin)
       racc (~> 1.4)
@@ -349,8 +331,6 @@ DEPENDENCIES
   lograge (~> 0.11.2)
   mini_racer
   mysql2
-  newrelic-infinite_tracing (= 8.2.0)
-  newrelic_rpm (= 8.2.0)
   puma (~> 4.3)
   rack-cors
   rails (= 5.2.5)

app/controllers/application_controller.rb

@@ -50,7 +50,7 @@ def redirect_to_authenticated_settings(author)
   end
 
   def not_found
-    redirect_to "#{ENV['HOST']}/"
+    render :file => "#{Rails.root}/public/404.html",  :status => 404
   end
 
 end

app/controllers/authors_controller.rb

@@ -18,6 +18,7 @@ class AuthorsController < ApplicationController
 
     @pages = @display_author.pages if @display_author
     @styles = @display_author.css if @display_author && @display_author.custom_theme_enabled
+    @canonical = @display_author.url if @display_author
 
     set_meta_images_for_author(@display_author)
   }

app/controllers/posts_controller.rb

@@ -19,7 +19,7 @@ def metatype_to_contenttype(metatype)
     }[metatype]
   end
 
-  before_action :find_post, except: [:unpublish, :change_privacy, :delete]
+  before_action :find_post, only: [:show]
 
   def find_page(author, title)
     return unless author
@@ -50,7 +50,6 @@ def find_post
         @post = find_page(author, params[:id])
       end
       if @post && @post.unlisted == true
-        not_found
         return
       end
     elsif params[:custom_path]
@@ -64,21 +63,13 @@ def find_post
 
     domain = Domain.find_by(domain: request.host)
     if domain && @post && @post.author != domain.author
-      not_found
       return
     end
   end
 
   def show
     if !@post || !@post.published
-      author = Author.find_author_from_path(request.path)
-      # Go to author page
-      if author
-        redirect_to author.url
-      else
-        not_found
-      end
-      return
+      return not_found
     end
 
     @next = @post.next

app/views/layouts/application.html.erb

@@ -8,6 +8,11 @@
       <% @canonical = @post.canonical %>
       <% @meta_image = @post.image_url if @post.image_url %>
       <% @twitter_style = "summary_large_image" if @post.image_url %>
+
+      <% if @post.unlisted %>
+        <meta name="robots" content="noindex">
+      <% end %>
+
     <% elsif !@title && !@desc %>
       <% @title = "Listed" %>
       <% @desc = "Listed allows you to create an online publication with automatic email newsletters delivered to your readers, directly from Standard Notes. It's ideal for creating a public journal, or sharing domain-specific knowledge."%>
@@ -68,33 +73,9 @@
       </style>
     <% end %>
 
-    <!-- Piwik -->
-    <script type="text/javascript">
-      var _paq = _paq || [];
-      /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-      _paq.push(['trackPageView']);
-      _paq.push(['enableLinkTracking']);
-      (function() {
-        var u="//matomo.standardnotes.org/";
-        _paq.push(['setTrackerUrl', u+'piwik.php']);
-        _paq.push(['setSiteId', '6']);
-        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-        g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-      })();
-      (function() {
-        var previousPageUrl = null;
-        addEventListener("turbolinks:load", function(event) {
-          if (previousPageUrl) {
-            _paq.push(["setReferrerUrl", previousPageUrl]);
-            _paq.push(["setCustomUrl", window.location.href]);
-            _paq.push(["setDocumentTitle", document.title]);
-            _paq.push(["trackPageView"]);
-          }
-          previousPageUrl = window.location.href;
-        });
-      })();
-    </script>
-    <!-- End Piwik Code -->
+    <!-- Plausible -->
+    <script defer data-domain="listed.to" src="https://plausible.standardnotes.com/js/plausible.js"></script>
+    <!-- End Plausible Code -->
 
   </head>
 

config/routes.rb

@@ -90,5 +90,7 @@
   get '/:post_token' => 'posts#show'
   get '/p/:post_token' => 'posts#show'
 
+  get '404', :to => 'application#page_not_found'
+
   root 'usage#index'
 end

public/404.html

@@ -3,55 +3,6 @@
 <head>
   <title>The page you were looking for doesn't exist (404)</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
-  <style>
-  body {
-    background-color: #EFEFEF;
-    color: #2E2F30;
-    text-align: center;
-    font-family: arial, sans-serif;
-    margin: 0;
-  }
-
-  div.dialog {
-    width: 95%;
-    max-width: 33em;
-    margin: 4em auto 0;
-  }
-
-  div.dialog > div {
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
-    border-bottom-color: #BBB;
-    border-top: #B00100 solid 4px;
-    border-top-left-radius: 9px;
-    border-top-right-radius: 9px;
-    background-color: white;
-    padding: 7px 12% 0;
-    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-  }
-
-  h1 {
-    font-size: 100%;
-    color: #730E15;
-    line-height: 1.5em;
-  }
-
-  div.dialog > p {
-    margin: 0 0 1em;
-    padding: 1em;
-    background-color: #F7F7F7;
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
-    border-bottom-color: #999;
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
-    border-top-color: #DADADA;
-    color: #666;
-    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-  }
-  </style>
 </head>
 
 <body>
@@ -61,7 +12,6 @@
       <h1>The page you were looking for doesn't exist.</h1>
       <p>You may have mistyped the address or the page may have moved.</p>
     </div>
-    <p>If you are the application owner check the logs for more information.</p>
   </div>
 </body>
 </html>

public/robots.txt

@@ -5,4 +5,3 @@
 
 User-agent: *
 Sitemap: /sitemap.xml
-Disallow: /p/*