Merge pull request #3112 from reosarevok/MBS-13388

MBS-13388: Handle vk.gy links

lib/MusicBrainz/Server/Data/URL.pm

@@ -210,6 +210,7 @@ my %URL_SPECIALIZATIONS = (
     'VimeoOnDemand'       => qr{^https?://(?:www\.)?vimeo\.com/ondemand}i,
     'VK'                  => qr{^https?://(?:www\.)?vk\.com/}i,
     'Vkdb'                => qr{^https?://(?:www\.)?vkdb\.jp/}i,
+    'Vkgy'                => qr{^https?://(?:www\.)?vk\.gy/}i,
     'VNDB'                => qr{^https?://(?:www\.)?vndb\.org/}i,
     'VocaDB'              => qr{^https?://(?:www\.)?vocadb\.net/}i,
     'Weibo'               => qr{^https?://(?:www\.)?weibo\.com/}i,

lib/MusicBrainz/Server/Entity/URL/Vkgy.pm

@@ -0,0 +1,22 @@
+package MusicBrainz::Server::Entity::URL::Vkgy;
+
+use Moose;
+
+extends 'MusicBrainz::Server::Entity::URL';
+with 'MusicBrainz::Server::Entity::URL::Sidebar';
+
+sub sidebar_name { 'vkgy' }
+
+__PACKAGE__->meta->make_immutable;
+no Moose;
+1;
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2023 MetaBrainz Foundation
+
+This file is part of MusicBrainz, the open internet music database,
+and is licensed under the GPL version 2, or (at your option) any
+later version: http://www.gnu.org/licenses/gpl-2.0.txt
+
+=cut

root/static/scripts/common/constants.js

@@ -159,6 +159,7 @@ export const FAVICON_CLASSES = {
   'mainlynorfolk.info': 'mainlynorfolk',
   'melon.com': 'melon',
   'metal-archives.com': 'metalarchives',
+  'metalmusicarchives.com': 'metalmusicarchives',
   'mixcloud.com': 'mixcloud',
   'mobygames.com': 'mobygames',
   'mora.jp': 'mora',
@@ -248,6 +249,7 @@ export const FAVICON_CLASSES = {
   'vimeo.com': 'vimeo',
   'vk.com': 'vk',
   'vkdb.jp': 'vkdb',
+  'vk.gy': 'vkgy',
   'vndb.org': 'vndb',
   'vocadb.net': 'vocadb',
   'weibo.com': 'weibo',

root/static/scripts/edit/URLCleanup.js

@@ -6074,6 +6074,53 @@ const CLEANUPS: CleanupEntries = {
       return url.replace(/^(?:https?:\/\/)?(?:[^\/]+\.)?vk\.com/, 'https://vk.com');
     },
   },
+  'vkgy': {
+    match: [new RegExp('^(https?://)?(www\\.)?vk\\.gy', 'i')],
+    restrict: [LINK_TYPES.otherdatabases],
+    clean: function (url) {
+      return url.replace(/^(?:https?:\/\/)?(?:www\.)?vk\.gy\/(.*)$/, 'https://vk.gy/$1');
+    },
+    validate: function (url, id) {
+      const m = /^https:\/\/vk\.gy\/(\w+)\/((?:[\w-]+\/){0,2}[\w-]+)\/$/.exec(url);
+      if (m) {
+        const type = m[1];
+        const ending = m[2];
+        switch (id) {
+          case LINK_TYPES.otherdatabases.artist:
+            return {
+              result: (
+                (type === 'artists' && /^[\w-]+$/.test(ending)) ||
+                (type === 'musicians' && /^[\d]+\/[\w-]+$/.test(ending))
+              ),
+              target: ERROR_TARGETS.ENTITY,
+            };
+          case LINK_TYPES.otherdatabases.event:
+            return {
+              result: type === 'lives' && /^[\d]+\/[\w-]+$/.test(ending),
+              target: ERROR_TARGETS.ENTITY,
+            };
+          case LINK_TYPES.otherdatabases.label:
+            return {
+              result: type === 'labels' && /^[\w-]+$/.test(ending),
+              target: ERROR_TARGETS.ENTITY,
+            };
+          case LINK_TYPES.otherdatabases.place:
+            return {
+              result: type === 'livehouses' && /^[\w-]+$/.test(ending),
+              target: ERROR_TARGETS.ENTITY,
+            };
+          case LINK_TYPES.otherdatabases.release:
+            return {
+              result: type === 'releases' &&
+                      /^[\w-]+\/[\d]+\/[\w-]+$/.test(ending),
+              target: ERROR_TARGETS.ENTITY,
+            };
+        }
+        return {result: false, target: ERROR_TARGETS.ENTITY};
+      }
+      return {result: false, target: ERROR_TARGETS.URL};
+    },
+  },
   'vndb': {
     match: [new RegExp('^(https?://)?(www\\.)?vndb\\.org/', 'i')],
     restrict: [LINK_TYPES.otherdatabases],

root/static/scripts/tests/Control/URLCleanup.js

@@ -6070,6 +6070,44 @@ limited_link_type_combinations: [
     expected_relationship_type: 'socialnetwork',
             expected_clean_url: 'https://vk.com/tin_sontsya',
   },
+  // vkgy
+  {
+                     input_url: 'http://www.vk.gy/artists/skull/',
+             input_entity_type: 'artist',
+    expected_relationship_type: 'otherdatabases',
+            expected_clean_url: 'https://vk.gy/artists/skull/',
+       only_valid_entity_types: ['artist'],
+  },
+  {
+                     input_url: 'https://vk.gy/musicians/1199/akira/',
+             input_entity_type: 'artist',
+    expected_relationship_type: 'otherdatabases',
+       only_valid_entity_types: ['artist'],
+  },
+  {
+                     input_url: 'https://vk.gy/lives/121191/2023-12-10-shinsaibashi-big-twin-diner-panhead-groove/',
+             input_entity_type: 'event',
+    expected_relationship_type: 'otherdatabases',
+       only_valid_entity_types: ['event'],
+  },
+  {
+                     input_url: 'https://vk.gy/labels/speed-disk/',
+             input_entity_type: 'label',
+    expected_relationship_type: 'otherdatabases',
+       only_valid_entity_types: ['label'],
+  },
+  {
+                     input_url: 'https://vk.gy/livehouses/shinsaibashi-big-twin-diner-panhead-groove/',
+             input_entity_type: 'place',
+    expected_relationship_type: 'otherdatabases',
+       only_valid_entity_types: ['place'],
+  },
+  {
+                     input_url: 'https://vk.gy/releases/skull/9559/hysteric-media-zone/',
+             input_entity_type: 'release',
+    expected_relationship_type: 'otherdatabases',
+       only_valid_entity_types: ['release'],
+  },
   // VNDB
   {
                      input_url: 'http://www.vndb.org/s5406/hist',

root/static/styles/favicons.less

@@ -189,6 +189,7 @@
 .favicon("vimeoondemand", 32);
 .favicon("vk", 32);
 .favicon("vkdb");
+.favicon("vkgy", 32);
 .favicon("vndb");
 .favicon("vocadb");
 .favicon("weibo", 32);