refactor(MarkRights*): ; optimize logic (qiuwenbaike#1651)

* refactor(MarkRights): ; optimize logic

* avoid querying user groups for IP users

* refactor(MarkRights-Userpage): ; optimize logic

* avoid querying user groups for IP users

Author: WaitSpringQW

dist/MarkRights-Userpage/MarkRights-Userpage.js

@@ -7,6 +7,10 @@ import {getPermissions} from './modules/core';
 		return;
 	}
 
+	if (mw.util.isIPv4Address(wgRelevantUserName) || mw.util.isIPv6Address(wgRelevantUserName)) {
+		return;
+	}
+
 	const relevantUserPageName: string = new mw.Title(wgRelevantUserName, OPTIONS.userNameSpaceNumber).toText();
 	const pageName: string = new mw.Title(wgPageName).toText();
 	if (pageName !== relevantUserPageName) {

dist/MarkRights/MarkRights.js

@@ -9,4 +9,4 @@ mw.hook('wikipage.content').add(function markRights($content): void {
 	}
 });
 
-export {queryGlobalUserGroups, queryUserGroups} from './modules/query';
+export {queryGlobalUserGroups, queryUserGroups} from './modules/util/query';

src/MarkRights-Userpage/MarkRights-Userpage.ts

@@ -1,14 +1,29 @@
-import {queryGlobalUserGroups, queryUserGroups} from './query';
+import {queryGlobalUserGroups, queryUserGroups} from './util/query';
 import {appendUserRightsMark} from './util/appendUserRightsMark';
 import {generateUserLinks} from './util/generateUserLinks';
 
 const markUserRights = ($content: JQuery): void => {
-	const {users, $userLinks} = generateUserLinks($content);
+	const userLinks = generateUserLinks($content);
+
+	// Convert users into array
+	const users: string[] = Object.keys(userLinks);
+	if (!users.length) {
+		return;
+	}
+
+	const $userLinks = Object.values(userLinks).reduce((previousValue, currentValue) => {
+		return [...previousValue, ...currentValue];
+	});
+	if (!$userLinks.length) {
+		return;
+	}
 
 	const promises: (() => Promise<void>)[] = [];
 
 	for (let i = 0; i < users.length; i++) {
-		const ususers = users.splice(0, 25);
+		const ususers = users.splice(0, 25).filter((element) => {
+			return !(mw.util.isIPv4Address(element) || mw.util.isIPv6Address(element));
+		});
 		if (!ususers.length) {
 			continue;
 		}

src/MarkRights/MarkRights.ts

@@ -1,5 +1,5 @@
-type QueryUserGroups = typeof import('./query').queryUserGroups;
-type QueryGlobalUserGroups = typeof import('./query').queryGlobalUserGroups;
+type QueryUserGroups = typeof import('./util/query').queryUserGroups;
+type QueryGlobalUserGroups = typeof import('./util/query').queryGlobalUserGroups;
 
 declare module 'ext.gadget.MarkRights' {
 	export const queryUserGroups: QueryUserGroups;

src/MarkRights/modules/core.ts

@@ -1,4 +1,4 @@
-import * as OPTIONS from '../options.json';
+import * as OPTIONS from '../../options.json';
 import {initMwApi} from 'ext.gadget.Util';
 
 const api: mw.Api = initMwApi(`MarkRights/${OPTIONS.version}`);

src/MarkRights/modules/global.d.ts

@@ -1,6 +1,5 @@
-const generateUserLinks = ($content: JQuery): {users: string[]; $userLinks: JQuery<HTMLAnchorElement>[]} => {
-	const users: string[] = [];
-	const $userLinks: JQuery<HTMLAnchorElement>[] = [];
+const generateUserLinks = ($content: JQuery): Record<string, JQuery<HTMLAnchorElement>[]> => {
+	const userLinks: Record<string, JQuery<HTMLAnchorElement>[]> = generateUserLinks($content);
 	const $elements = $content.find<HTMLAnchorElement>('a.mw-userlink:not(.mw-anonuserlink)');
 
 	for (const element of $elements) {
@@ -12,19 +11,23 @@ const generateUserLinks = ($content: JQuery): {users: string[]; $userLinks: JQue
 			continue;
 		}
 
-		$userLinks[$userLinks.length] = $element;
-
 		const {textContent} = element;
 		const user: string | undefined = textContent?.toString();
 
 		if (!user) {
 			continue;
 		}
 
-		users[users.length] = user;
+		if (mw.util.isIPv4Address(user) || mw.util.isIPv6Address(user)) {
+			continue;
+		}
+
+		userLinks[user] ??= [];
+
+		userLinks[user][userLinks[user].length] = $element; // Replace `[].push()` to avoid polyfilling core-js
 	}
 
-	return {users, $userLinks};
+	return userLinks;
 };
 
 export {generateUserLinks};

src/MarkRights/modules/api.ts src/MarkRights/modules/util/api.tssrc/MarkRights/modules/api.ts renamed to src/MarkRights/modules/util/api.ts

@@ -16,13 +16,13 @@ const queryUserGroups = async (ususers: string | string[]) => {
 	return response;
 };
 
-const queryGlobalUserGroups = async (user: string) => {
+const queryGlobalUserGroups = async (guiuser: string) => {
 	const params = {
 		action: 'query',
 		format: 'json',
 		formatversion: '2',
 		meta: 'globaluserinfo',
-		guiuser: user,
+		guiuser,
 		guiprop: 'groups',
 		smaxage: 600,
 		maxage: 600,