rearranging to fix issues of automatic CR

Author: Idrinth

src/mods/observer.js

@@ -16,65 +16,81 @@ idrinth.observer = {
          * @param {HTMLElement} element
          * @returns {undefined}
          */
-        var processName = function ( element ) {
-            var name = '';
-            try {
-                name = idrinth.names.parse ( element );
-            } catch ( e ) {
-                return;
-            }
-            if ( !name ) {
-                return;
-            }
-            if ( !idrinth.names.users[name.toLowerCase ()] && name.length > 0 ) {
-                idrinth.names.users[name.toLowerCase ()] = { };
-                idrinth.core.ajax.runHome ( 'users-service/add/' + encodeURIComponent ( name ) + '/' );
+        var checkLinks = function ( node ) {
+            /**
+             * 
+             * @param {HTMLElement} element
+             * @returns {undefined}
+             */
+            var handleLink = function ( element ) {
+                var href = element.getAttribute ( 'href' );
+                if ( href && href.match ( /action_type=raidhelp/ ) ) {
+                    var hash = '';
+                    var id = '';
+                    href = href.replace ( /^.*\?/, '' );
+                    var parts = href.split ( "&" );
+                    for (var count = 0; count < parts.length; count++) {
+                        if ( parts[count].match ( 'raid_id=' ) ) {
+                            id = parts[count].split ( '=' )[1];
+                        } else if ( parts[count].match ( 'hash=' ) ) {
+                            hash = parts[count].split ( '=' )[1];
+                        } else if ( parts[count].match ( 'serverid=2' ) && !idrinth.settings.get ( "world" ) ) {
+                            return;
+                        } else if ( !parts[count].match ( 'server_id=2' ) && idrinth.settings.get ( "world" ) ) {
+                            return;
+                        }
+                    }
+                    if ( !id || !hash ) {
+                        return;
+                    }
+                    idrinth.raids.private[id] = hash;
+                    idrinth.core.ajax.runHome ( 'get-raid-service/' + id + '/' + hash + '/' );
+                }
+            };
+            if ( node.tagName === 'A' || node.tagName === 'a' ) {
+                handleLink ( node );
+            } else {
+                var elements = node.getElementsByTagName ( 'a' );
+                for (var count = 0; count < elements.length; count++) {
+                    handleLink ( elements[count] );
+                }
             }
         };
         /**
-         * 
+         *
          * @param {HTMLElement} element
          * @returns {undefined}
          */
-        var handleLink = function ( element ) {
-            var href = element.getAttribute ( 'href' );
-            if ( href && href.match ( /action_type=raidhelp/ ) ) {
-                var hash = '';
-                var id = '';
-                href = href.replace ( /^.*\?/, '' );
-                var parts = href.split ( "&" );
-                for (var count = 0; count < parts.length; count++) {
-                    if ( parts[count].match ( 'raid_id=' ) ) {
-                        id = parts[count].split ( '=' )[1];
-                    } else if ( parts[count].match ( 'hash=' ) ) {
-                        hash = parts[count].split ( '=' )[1];
-                    } else if ( parts[count].match ( 'serverid=2' ) && !idrinth.settings.get ( "world" ) ) {
-                        return;
-                    } else if ( !parts[count].match ( 'server_id=2' ) && idrinth.settings.get ( "world" ) ) {
-                        return;
-                    }
+        var checkNames = function ( node ) {
+            /**
+             *
+             * @param {HTMLElement} element
+             * @returns {undefined}
+             */
+            var processName = function ( element ) {
+                var name = '';
+                try {
+                    name = idrinth.names.parse ( element );
+                } catch ( e ) {
+                    return;
                 }
-                if ( !id || !hash ) {
+                if ( !name ) {
                     return;
                 }
-                idrinth.raids.private[id] = hash;
-                idrinth.core.ajax.runHome ( 'get-raid-service/' + id + '/' + hash + '/' );
+                if ( !idrinth.names.users[name.toLowerCase ()] && name.length > 0 ) {
+                    idrinth.names.users[name.toLowerCase ()] = { };
+                    idrinth.core.ajax.runHome ( 'users-service/add/' + encodeURIComponent ( name ) + '/' );
+                }
+            };
+            var elements = node.getElementsByClassName ( 'username' );
+            for (var count = elements.length - 1; count >= 0; count--) {
+                processName ( elements[count] );
             }
         };
         mutations.forEach ( function ( mutation ) {
             mutation.addedNodes.forEach ( function ( node ) {
-                if ( node.tagName === 'A' || node.tagName === 'a' ) {
-                    handleLink ( node );
-                } else {
-                    var elements = node.getElementsByTagName ( 'a' );
-                    for (var count = 0; count < elements.length; count++) {
-                        handleLink ( elements[count] );
-                    }
-                }
-                var el = node.getElementsByClassName ( 'username' );
-                for (var count = el.length - 1; count >= 0; count--) {
-                    processName ( el[count] );
-                }
+                checkLinks ( node );
+                checkNames ( node );
             } );
         } );
     },