fix(WhoIsActive): add logEvent query (qiuwenbaike#1676)

Author: WaitSpringQW

dist/WhoIsActive/WhoIsActive.js

@@ -4,4 +4,10 @@ type Usercontribs = {
 	}>;
 };
 
-export type {Usercontribs};
+type Logevents = {
+	logevents: Array<{
+		timestamp: string;
+	}>;
+};
+
+export type {Usercontribs, Logevents};

src/WhoIsActive/modules/types.d.ts

@@ -1,6 +1,6 @@
 import {SYSTEM_SCRIPT_LIST} from '../constant';
 import {getLastActiveMarker} from './getLastActiveMarker';
-import {getUserContribsTimestamp} from './getUserContribsTimestamp';
+import {getTimestamp} from './getTimestamp';
 import {uniqueArray} from 'ext.gadget.Util';
 
 const appendLastActiveMarker = async ({usernames, $elements}: {usernames: string[]; $elements: JQuery[]}) => {
@@ -10,7 +10,7 @@ const appendLastActiveMarker = async ({usernames, $elements}: {usernames: string
 			continue;
 		}
 
-		const timestamp = await getUserContribsTimestamp(username);
+		const timestamp = (await getTimestamp(username)) ?? '0';
 
 		if (!timestamp) {
 			continue;

src/WhoIsActive/modules/util/appendLastActiveMarker.ts

@@ -1,14 +1,14 @@
 import * as OPTIONS from '../../options.json';
 import {SYSTEM_SCRIPT_LIST} from '../constant';
 import {getLastActiveMarker} from './getLastActiveMarker';
-import {getUserContribsTimestamp} from './getUserContribsTimestamp';
+import {getTimestamp} from './getTimestamp';
 
 const appendLastActiveMarkerToUserPage = async (username: string) => {
 	if (SYSTEM_SCRIPT_LIST.includes(username)) {
 		return;
 	}
 
-	const timestamp = await getUserContribsTimestamp(username);
+	const timestamp = (await getTimestamp(username)) ?? '0';
 
 	if (!timestamp) {
 		return;

src/WhoIsActive/modules/util/appendLastActiveMarkerToUserPage.ts

@@ -0,0 +1,84 @@
+import * as OPTIONS from '../../options.json';
+import {Logevents, Usercontribs} from '../types';
+import {api} from './api';
+
+const getUserContribsTimestamp = async (ucuser: string) => {
+	let timestamp: string;
+
+	try {
+		const params: ApiQueryUserContribsParams = {
+			action: 'query',
+			format: 'json',
+			list: 'usercontribs',
+			uclimit: 1,
+			smaxage: 600,
+			maxage: 600,
+			ucuser,
+		};
+
+		const result = await api.get(params);
+
+		const {usercontribs} = result['query'] as Usercontribs;
+		if (!usercontribs.length) {
+			return;
+		}
+
+		({timestamp} = usercontribs[0]!);
+	} catch (error: unknown) {
+		timestamp = '0';
+		console.error('[WhoIsActive] Ajax error:', error);
+	}
+
+	return timestamp;
+};
+
+const getLogEventsTimestamp = async (leuser: string) => {
+	let timestamp: string;
+
+	try {
+		const params: ApiQueryLogEventsParams = {
+			leuser,
+			action: 'query',
+			format: 'json',
+			formatversion: '2',
+			list: 'logevents',
+			lelimit: 1,
+			leprop: 'timestamp',
+			smaxage: 600,
+			maxage: 600,
+		};
+
+		const result = await api.get(params);
+
+		const {logevents} = result['query'] as Logevents;
+		if (!logevents.length) {
+			return;
+		}
+
+		({timestamp} = logevents[0]!);
+	} catch (error: unknown) {
+		timestamp = '0';
+		console.error('[WhoIsActive] Ajax error:', error);
+	}
+
+	return timestamp;
+};
+
+const getTimestamp = async (username: string) => {
+	let timestamp: string;
+
+	if (mw.storage.get(OPTIONS.storageKey + username)) {
+		timestamp = mw.storage.get(OPTIONS.storageKey + username) as string;
+	} else {
+		const ucTimestamp = (await getUserContribsTimestamp(username)) ?? '0';
+		const leTimestamp = (await getLogEventsTimestamp(username)) ?? '0';
+		timestamp = Number.parseInt(ucTimestamp, 10) > Number.parseInt(leTimestamp, 10) ? ucTimestamp : leTimestamp;
+
+		// Cache for 10 minutes
+		mw.storage.set(OPTIONS.storageKey + username, timestamp, 10 * 60);
+	}
+
+	return timestamp;
+};
+
+export {getTimestamp};