refactor(MarkBlocked): ; optimize logic (qiuwenbaike#1652)

* refactor(MarkBlocked): ; optimize logic

* avoid querying global user info of IP users
* querying range blocking affecting certain IP address

Author: WaitSpringQW

dist/MarkBlocked/MarkBlocked.js

@@ -2,6 +2,7 @@ import type {QueryLocalAndGlobalBlocksAndLocksResponse} from './types';
 import {generateUserLinks} from './util/generateUserLinks';
 import {markLinks} from './util/markLinks';
 import {queryGlobalUserInfo} from './util/queryGlobalUserInfo';
+import {queryIPBlocks} from './util/queryIPBlocks';
 import {queryUserBlocks} from './util/queryUserBlocks';
 
 const markBlockedUser = ($content: JQuery): void => {
@@ -21,6 +22,10 @@ const markBlockedUser = ($content: JQuery): void => {
 	// since they use Array#splice to create bulk queries,
 	// and items will be removed from the array "users".
 	for (const guiuser of users) {
+		if (mw.util.isIPv4Address(guiuser) || mw.util.isIPv6Address(guiuser)) {
+			continue;
+		}
+
 		promises[promises.length] = async (): Promise<void> => {
 			try {
 				const response = (await queryGlobalUserInfo(guiuser)) as QueryLocalAndGlobalBlocksAndLocksResponse;
@@ -46,6 +51,25 @@ const markBlockedUser = ($content: JQuery): void => {
 				console.error('[MarkBlocked] Ajax error:', error);
 			}
 		};
+
+		for (let bkip of bkusers) {
+			if (!mw.util.isIPv4Address(bkip) && !mw.util.isIPv6Address(bkip)) {
+				continue;
+			}
+
+			if (mw.util.isIPv6Address(bkip)) {
+				bkip = bkip.toUpperCase();
+			}
+
+			promises[promises.length] = async (): Promise<void> => {
+				try {
+					const response = (await queryIPBlocks(bkip)) as QueryLocalAndGlobalBlocksAndLocksResponse;
+					markLinks({response, userLinks, bkip});
+				} catch (error: unknown) {
+					console.error('[MarkBlocked] Ajax error:', error);
+				}
+			};
+		}
 	}
 
 	void (async () => {

src/MarkBlocked/modules/markBlockedUser.ts

@@ -7,9 +7,11 @@ import {getMessage} from '../i18n';
 const markLinks = ({
 	response,
 	userLinks,
+	bkip,
 }: {
 	response: QueryLocalAndGlobalBlocksAndLocksResponse;
 	userLinks: Record<string, JQuery[]>;
+	bkip?: string;
 }): void => {
 	// Local blocks
 	if (response['query']?.blocks) {
@@ -37,7 +39,7 @@ const markLinks = ({
 				.replace('$4', inHours(Date.now() - parseTS(block.timestamp)));
 			tip = isPartialBlcok ? tip.replace('$5', getMessage('partial')) : tip.replace('$5', '');
 
-			const $links: JQuery[] | undefined = userLinks[block.user];
+			const $links: JQuery[] | undefined = userLinks[bkip ?? block.user];
 			if (!$links) {
 				continue;
 			}
@@ -71,7 +73,7 @@ const markLinks = ({
 				.replace('$4', inHours(Date.now() - parseTS(block.timestamp)));
 			tip = tip.replace('$5', '');
 
-			const $links: JQuery[] | undefined = userLinks[block.target];
+			const $links: JQuery[] | undefined = userLinks[bkip ?? block.target];
 			if (!$links) {
 				continue;
 			}
@@ -96,7 +98,7 @@ const markLinks = ({
 
 		const tip: string = getMessage('Locked');
 
-		const $links: JQuery[] | undefined = userLinks[user];
+		const $links: JQuery[] | undefined = userLinks[bkip ?? user];
 		if (!$links) {
 			return;
 		}

src/MarkBlocked/modules/util/markLinks.ts

@@ -0,0 +1,23 @@
+import {ApiQueryGlobalBlocksParamsRedefined} from '../types';
+import {api} from './api';
+
+const queryIPBlocks = async (bkip: string) => {
+	const params: ApiQueryBlocksParams & ApiQueryGlobalBlocksParamsRedefined = {
+		action: 'query',
+		format: 'json',
+		formatversion: '2',
+		list: ['blocks', 'globalblocks'],
+		bkip,
+		bklimit: 100,
+		bkprop: ['by', 'expiry', 'reason', 'restrictions', 'timestamp', 'user'],
+		bgip: bkip,
+		bglimit: 100,
+		bgprop: ['by', 'expiry', 'reason', 'timestamp', 'target'],
+		smaxage: 600,
+		maxage: 600,
+	};
+
+	return await api.get(params);
+};
+
+export {queryIPBlocks};