Merge pull request #11054 from nanaya/all-internal

Update handling method for old web links

Author: notbakaneko

resources/js/turbolinks-overrides.coffee

@@ -2,7 +2,7 @@
 # See the LICENCE file in the repository root for full licence text.
 
 import { currentUrl } from 'utils/turbolinks'
-import { isHTML, isInternal } from 'utils/url'
+import { isHTML } from 'utils/url'
 
 # Anchor navigation with turbolinks. Works around [1].
 # [1] https://github.com/turbolinks/turbolinks/issues/75
@@ -61,4 +61,7 @@ Turbolinks.Controller::replaceHistory = (url) ->
 Turbolinks.Snapshot::hasAnchor = -> true
 
 Turbolinks.Controller::locationIsVisitable = (location) ->
-  location.isPrefixedBy(@view.getRootLocation()) && isInternal(location) && isHTML(location)
+  location.isPrefixedBy(@view.getRootLocation()) &&
+    # old website pages
+    !location.getPath().startsWith('/p/') &&
+    isHTML(location)

resources/js/utils/url.ts

@@ -10,33 +10,6 @@ import { TurbolinksLocation } from 'turbolinks';
 import { generate } from './beatmapset-page-hash';
 import { currentUrl } from './turbolinks';
 
-const internalUrls = [
-  'admin',
-  'api/v2',
-  'beatmaps',
-  'beatmapsets',
-  'client-verifications',
-  'comments',
-  'community',
-  'help',
-  'home',
-  'groups',
-  'legal',
-  'multiplayer',
-  'news',
-  'notifications',
-  'oauth',
-  'rankings',
-  'scores',
-  'seasons',
-  'session',
-  'store',
-  'users',
-  'wiki',
-].join('|');
-
-const internalUrlRegExp = RegExp(`^/(?:${internalUrls})(?:$|/|#)`);
-
 interface OsuLinkOptions {
   classNames?: string[];
   isRemote?: boolean;
@@ -70,10 +43,6 @@ export function isHTML(location: TurbolinksLocation): boolean {
   return location.isHTML() || startsWith(location.getPath(), '/home/changelog/');
 }
 
-export function isInternal(location: TurbolinksLocation): boolean {
-  return internalUrlRegExp.test(location.getPath());
-}
-
 // external link
 export function openBeatmapEditor(timestampWithRange: string): string {
   return `osu://edit/${timestampWithRange}`;