Mirrors/ProToots
2
0
Fork 0
mirror of https://github.com/ItsVipra/ProToots synced 2024-11-21 19:13:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor pronoun/username extraction with named groups

Browse source
This commit is contained in:
nachtjasmin 2023-07-16 10:52:07 +02:00
parent e7aabc0af0
commit 6858978b99
No known key found for this signature in database
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/libs/pronouns.js
View file

@ -2,9 +2,9 @@ import sanitizeHtml from "sanitize-html";
const fieldMatchers = [/pro.*nouns?/i, "pronomen"];
const knownPronounUrls = [
/pronouns\.page\/:?([\w/@]+)/,
/pronouns\.within\.lgbt\/([\w/]+)/,
/pronouns\.cc\/pronouns\/([\w/]+)/,
/pronouns\.page\/(@(?<username>\w+))?:?(?<pronouns>[\w/:]+)?/,
/pronouns\.within\.lgbt\/(?<pronouns>[\w/]+)/,
/pronouns\.cc\/pronouns\/(?<pronouns>[\w/]+)/,
];
/**
@ -58,12 +58,14 @@ async function extractFromField(field) {
// If one of pronoun URLs matches, overwrite the current known value.
for (const knownUrlRe of knownPronounUrls) {
if (!knownUrlRe.test(pronounsRaw)) continue;
text = pronounsRaw.match(knownUrlRe)[1];
}
const { pronouns, username } = pronounsRaw.match(knownUrlRe).groups;
// For now, only the pronouns.page regexp has a username value, so we can be sure
// that we don't query the wrong API.
if (username) {
return await queryUserFromPronounsPage(username);
}
// Right now, only the pronoun.page regex matches the @usernames.
if (text.charAt(0) === "@") {
text = await queryPronounsFromPronounsPage(text.substring(1));
}
if (!text) return null;
@ -71,11 +73,11 @@ async function extractFromField(field) {
}
/**
* Queries the pronouns from the pronouns.page API.
* @param {string} username The username of the person.
* @returns {Promise<string|null>} The pronouns that have set the "yes" opinion.
* Queries the pronouns for a given user from the pronouns.page API.
* @param {string} username The username of the person, without the leading "@".
* @returns {Promise<string|null>} The pronouns that have set the "yes" or "meh" opinion.
*/
async function queryPronounsFromPronounsPage(username) {
async function queryUserFromPronounsPage(username) {
// Example page: https://en.pronouns.page/api/profile/get/andrea?version=2
const resp = await fetch(`https://en.pronouns.page/api/profile/get/${username}?version=2`);
if (resp.status >= 400) {