From: Alec Armbruster <35377827+alectrocute@users.noreply.github.com> Date: Fri, 16 Jun 2023 21:33:46 +0000 (-0400) Subject: Merge branch 'main' into breakout-role-utils X-Git-Url: http://these/git/?a=commitdiff_plain;h=9c37cea106571a492e0b951fa66a182395053b67;hp=e0cc7ba3c35994a490038d417686f1198cb58018;p=lemmy-ui.git Merge branch 'main' into breakout-role-utils --- diff --git a/src/client/index.tsx b/src/client/index.tsx index 7b6b6b1..860c075 100644 --- a/src/client/index.tsx +++ b/src/client/index.tsx @@ -1,14 +1,13 @@ import { hydrate } from "inferno-hydrate"; import { Router } from "inferno-router"; import { App } from "../shared/components/app/app"; +import { HistoryService } from "../shared/services/HistoryService"; import { initializeSite } from "../shared/utils"; import "bootstrap/js/dist/collapse"; import "bootstrap/js/dist/dropdown"; -import { HistoryService } from "../shared/services/HistoryService"; -const site = window.isoData.site_res; -initializeSite(site); +initializeSite(window.isoData.site_res); const wrapper = ( @@ -17,6 +16,7 @@ const wrapper = ( ); const root = document.getElementById("root"); + if (root) { hydrate(wrapper, root); } diff --git a/src/shared/components/app/navbar.tsx b/src/shared/components/app/navbar.tsx index 6d310ee..20d4f25 100644 --- a/src/shared/components/app/navbar.tsx +++ b/src/shared/components/app/navbar.tsx @@ -10,17 +10,17 @@ import { i18n } from "../../i18next"; import { UserService } from "../../services"; import { HttpService, RequestState } from "../../services/HttpService"; import { - amAdmin, - canCreateCommunity, donateLemmyUrl, - isBrowser, myAuth, numToSI, - poll, showAvatars, toast, updateUnreadCountsInterval, } from "../../utils"; +import { isBrowser } from "../../utils/browser/is-browser"; +import { poll } from "../../utils/helpers/poll"; +import { amAdmin } from "../../utils/roles/am-admin"; +import { canCreateCommunity } from "../../utils/roles/can-create-community"; import { Icon } from "../common/icon"; import { PictrsImage } from "../common/pictrs-image"; diff --git a/src/shared/components/comment/comment-node.tsx b/src/shared/components/comment/comment-node.tsx index 0380a72..10b13c1 100644 --- a/src/shared/components/comment/comment-node.tsx +++ b/src/shared/components/comment/comment-node.tsx @@ -40,16 +40,10 @@ import { } from "../../interfaces"; import { UserService } from "../../services"; import { - amCommunityCreator, - canAdmin, - canMod, colorList, commentTreeMaxDepth, futureDaysToUnixTime, getCommentParentId, - isAdmin, - isBanned, - isMod, mdToHtml, mdToHtmlNoImages, myAuth, @@ -59,6 +53,12 @@ import { setupTippy, showScores, } from "../../utils"; +import { amCommunityCreator } from "../../utils/roles/am-community-creator"; +import { canAdmin } from "../../utils/roles/can-admin"; +import { canMod } from "../../utils/roles/can-mod"; +import { isAdmin } from "../../utils/roles/is-admin"; +import { isBanned } from "../../utils/roles/is-banned"; +import { isMod } from "../../utils/roles/is-mod"; import { Icon, PurgeWarning, Spinner } from "../common/icon"; import { MomentTime } from "../common/moment-time"; import { CommunityLink } from "../community/community-link"; diff --git a/src/shared/components/common/markdown-textarea.tsx b/src/shared/components/common/markdown-textarea.tsx index a4459ac..4e1bca1 100644 --- a/src/shared/components/common/markdown-textarea.tsx +++ b/src/shared/components/common/markdown-textarea.tsx @@ -7,7 +7,6 @@ import { HttpService, UserService } from "../../services"; import { concurrentImageUpload, customEmojisLookup, - isBrowser, markdownFieldCharacterLimit, markdownHelpUrl, maxUploadImages, @@ -20,12 +19,12 @@ import { setupTribute, toast, } from "../../utils"; +import { isBrowser } from "../../utils/browser/is-browser"; import { EmojiPicker } from "./emoji-picker"; import { Icon, Spinner } from "./icon"; import { LanguageSelect } from "./language-select"; import NavigationPrompt from "./navigation-prompt"; import ProgressBar from "./progress-bar"; - interface MarkdownTextAreaProps { initialContent?: string; initialLanguageId?: number; diff --git a/src/shared/components/community/communities.tsx b/src/shared/components/community/communities.tsx index 6232694..b98bf25 100644 --- a/src/shared/components/community/communities.tsx +++ b/src/shared/components/community/communities.tsx @@ -11,17 +11,17 @@ import { InitialFetchRequest } from "../../interfaces"; import { FirstLoadService } from "../../services/FirstLoadService"; import { HttpService, RequestState } from "../../services/HttpService"; import { - QueryParams, editCommunity, getPageFromString, - getQueryParams, - getQueryString, myAuth, myAuthRequired, numToSI, setIsoData, showLocal, } from "../../utils"; +import { getQueryParams } from "../../utils/helpers/get-query-params"; +import { getQueryString } from "../../utils/helpers/get-query-string"; +import type { QueryParams } from "../../utils/types/query-params"; import { HtmlTags } from "../common/html-tags"; import { Spinner } from "../common/icon"; import { ListingTypeSelect } from "../common/listing-type-select"; diff --git a/src/shared/components/community/community.tsx b/src/shared/components/community/community.tsx index f2d7ad7..58b330f 100644 --- a/src/shared/components/community/community.tsx +++ b/src/shared/components/community/community.tsx @@ -62,7 +62,6 @@ import { UserService } from "../../services"; import { FirstLoadService } from "../../services/FirstLoadService"; import { HttpService, RequestState } from "../../services/HttpService"; import { - QueryParams, commentsToFlatNodes, communityRSSUrl, editComment, @@ -74,8 +73,6 @@ import { getCommentParentId, getDataTypeString, getPageFromString, - getQueryParams, - getQueryString, myAuth, postToCommentSortType, relTags, @@ -88,6 +85,9 @@ import { updateCommunityBlock, updatePersonBlock, } from "../../utils"; +import { getQueryParams } from "../../utils/helpers/get-query-params"; +import { getQueryString } from "../../utils/helpers/get-query-string"; +import type { QueryParams } from "../../utils/types/query-params"; import { CommentNodes } from "../comment/comment-nodes"; import { BannerIconHeader } from "../common/banner-icon-header"; import { DataTypeSelect } from "../common/data-type-select"; @@ -99,7 +99,6 @@ import { Sidebar } from "../community/sidebar"; import { SiteSidebar } from "../home/site-sidebar"; import { PostListings } from "../post/post-listings"; import { CommunityLink } from "./community-link"; - interface State { communityRes: RequestState; postsRes: RequestState; diff --git a/src/shared/components/community/sidebar.tsx b/src/shared/components/community/sidebar.tsx index 56b1ef2..592a06f 100644 --- a/src/shared/components/community/sidebar.tsx +++ b/src/shared/components/community/sidebar.tsx @@ -17,15 +17,15 @@ import { import { i18n } from "../../i18next"; import { UserService } from "../../services"; import { - amAdmin, - amMod, - amTopMod, getUnixTime, hostname, mdToHtml, myAuthRequired, numToSI, } from "../../utils"; +import { amAdmin } from "../../utils/roles/am-admin"; +import { amMod } from "../../utils/roles/am-mod"; +import { amTopMod } from "../../utils/roles/am-top-mod"; import { BannerIconHeader } from "../common/banner-icon-header"; import { Icon, PurgeWarning, Spinner } from "../common/icon"; import { CommunityForm } from "../community/community-form"; diff --git a/src/shared/components/home/home.tsx b/src/shared/components/home/home.tsx index 215075d..3613b0f 100644 --- a/src/shared/components/home/home.tsx +++ b/src/shared/components/home/home.tsx @@ -57,7 +57,6 @@ import { UserService } from "../../services"; import { FirstLoadService } from "../../services/FirstLoadService"; import { HttpService, RequestState } from "../../services/HttpService"; import { - canCreateCommunity, commentsToFlatNodes, editComment, editPost, @@ -68,13 +67,10 @@ import { getCommentParentId, getDataTypeString, getPageFromString, - getQueryParams, - getQueryString, getRandomFromList, mdToHtml, myAuth, postToCommentSortType, - QueryParams, relTags, restoreScrollPosition, saveScrollPosition, @@ -85,6 +81,10 @@ import { trendingFetchLimit, updatePersonBlock, } from "../../utils"; +import { getQueryParams } from "../../utils/helpers/get-query-params"; +import { getQueryString } from "../../utils/helpers/get-query-string"; +import { canCreateCommunity } from "../../utils/roles/can-create-community"; +import type { QueryParams } from "../../utils/types/query-params"; import { CommentNodes } from "../comment/comment-nodes"; import { DataTypeSelect } from "../common/data-type-select"; import { HtmlTags } from "../common/html-tags"; diff --git a/src/shared/components/home/login.tsx b/src/shared/components/home/login.tsx index 381c13b..d7e20ec 100644 --- a/src/shared/components/home/login.tsx +++ b/src/shared/components/home/login.tsx @@ -3,7 +3,8 @@ import { GetSiteResponse, LoginResponse } from "lemmy-js-client"; import { i18n } from "../../i18next"; import { UserService } from "../../services"; import { HttpService, RequestState } from "../../services/HttpService"; -import { isBrowser, myAuth, setIsoData, toast, validEmail } from "../../utils"; +import { myAuth, setIsoData, toast, validEmail } from "../../utils"; +import { isBrowser } from "../../utils/browser/is-browser"; import { HtmlTags } from "../common/html-tags"; import { Spinner } from "../common/icon"; diff --git a/src/shared/components/home/signup.tsx b/src/shared/components/home/signup.tsx index 16a3cc6..192393d 100644 --- a/src/shared/components/home/signup.tsx +++ b/src/shared/components/home/signup.tsx @@ -13,7 +13,6 @@ import { i18n } from "../../i18next"; import { UserService } from "../../services"; import { HttpService, RequestState } from "../../services/HttpService"; import { - isBrowser, joinLemmyUrl, mdToHtml, myAuth, @@ -21,6 +20,7 @@ import { toast, validEmail, } from "../../utils"; +import { isBrowser } from "../../utils/browser/is-browser"; import { HtmlTags } from "../common/html-tags"; import { Icon, Spinner } from "../common/icon"; import { MarkdownTextArea } from "../common/markdown-textarea"; diff --git a/src/shared/components/modlog.tsx b/src/shared/components/modlog.tsx index d917f5f..cd0cfcb 100644 --- a/src/shared/components/modlog.tsx +++ b/src/shared/components/modlog.tsx @@ -33,21 +33,21 @@ import { FirstLoadService } from "../services/FirstLoadService"; import { HttpService, RequestState } from "../services/HttpService"; import { Choice, - QueryParams, - amAdmin, - amMod, debounce, fetchLimit, fetchUsers, getIdFromString, getPageFromString, - getQueryParams, - getQueryString, getUpdatedSearchId, myAuth, personToChoice, setIsoData, } from "../utils"; +import { getQueryParams } from "../utils/helpers/get-query-params"; +import { getQueryString } from "../utils/helpers/get-query-string"; +import { amAdmin } from "../utils/roles/am-admin"; +import { amMod } from "../utils/roles/am-mod"; +import type { QueryParams } from "../utils/types/query-params"; import { HtmlTags } from "./common/html-tags"; import { Icon, Spinner } from "./common/icon"; import { MomentTime } from "./common/moment-time"; diff --git a/src/shared/components/person/profile.tsx b/src/shared/components/person/profile.tsx index f80d5b9..c12114b 100644 --- a/src/shared/components/person/profile.tsx +++ b/src/shared/components/person/profile.tsx @@ -53,8 +53,6 @@ import { UserService } from "../../services"; import { FirstLoadService } from "../../services/FirstLoadService"; import { HttpService, RequestState } from "../../services/HttpService"; import { - QueryParams, - canMod, capitalizeFirstLetter, editComment, editPost, @@ -65,10 +63,6 @@ import { futureDaysToUnixTime, getCommentParentId, getPageFromString, - getQueryParams, - getQueryString, - isAdmin, - isBanned, mdToHtml, myAuth, myAuthRequired, @@ -81,6 +75,12 @@ import { toast, updatePersonBlock, } from "../../utils"; +import { getQueryParams } from "../../utils/helpers/get-query-params"; +import { getQueryString } from "../../utils/helpers/get-query-string"; +import { canMod } from "../../utils/roles/can-mod"; +import { isAdmin } from "../../utils/roles/is-admin"; +import { isBanned } from "../../utils/roles/is-banned"; +import type { QueryParams } from "../../utils/types/query-params"; import { BannerIconHeader } from "../common/banner-icon-header"; import { HtmlTags } from "../common/html-tags"; import { Icon, Spinner } from "../common/icon"; diff --git a/src/shared/components/person/reports.tsx b/src/shared/components/person/reports.tsx index 29daa3f..187fe4c 100644 --- a/src/shared/components/person/reports.tsx +++ b/src/shared/components/person/reports.tsx @@ -23,7 +23,6 @@ import { HttpService, UserService } from "../../services"; import { FirstLoadService } from "../../services/FirstLoadService"; import { RequestState } from "../../services/HttpService"; import { - amAdmin, editCommentReport, editPostReport, editPrivateMessageReport, @@ -31,6 +30,7 @@ import { myAuthRequired, setIsoData, } from "../../utils"; +import { amAdmin } from "../../utils/roles/am-admin"; import { CommentReport } from "../comment/comment-report"; import { HtmlTags } from "../common/html-tags"; import { Spinner } from "../common/icon"; diff --git a/src/shared/components/post/create-post.tsx b/src/shared/components/post/create-post.tsx index c759791..f01dd72 100644 --- a/src/shared/components/post/create-post.tsx +++ b/src/shared/components/post/create-post.tsx @@ -16,14 +16,14 @@ import { } from "../../services/HttpService"; import { Choice, - QueryParams, enableDownvotes, enableNsfw, getIdFromString, - getQueryParams, myAuth, setIsoData, } from "../../utils"; +import { getQueryParams } from "../../utils/helpers/get-query-params"; +import type { QueryParams } from "../../utils/types/query-params"; import { HtmlTags } from "../common/html-tags"; import { Spinner } from "../common/icon"; import { PostForm } from "./post-form"; diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx index 60e188a..4c36f65 100644 --- a/src/shared/components/post/post-listing.tsx +++ b/src/shared/components/post/post-listing.tsx @@ -28,18 +28,9 @@ import { i18n } from "../../i18next"; import { BanType, PostFormParams, PurgeType, VoteType } from "../../interfaces"; import { UserService } from "../../services"; import { - amAdmin, - amCommunityCreator, - amMod, - canAdmin, - canMod, - canShare, futureDaysToUnixTime, hostname, - isAdmin, - isBanned, isImage, - isMod, isVideo, mdNoImages, mdToHtml, @@ -49,9 +40,18 @@ import { numToSI, relTags, setupTippy, - share, showScores, } from "../../utils"; +import { canShare } from "../../utils/browser/can-share"; +import { share } from "../../utils/browser/share"; +import { amAdmin } from "../../utils/roles/am-admin"; +import { amCommunityCreator } from "../../utils/roles/am-community-creator"; +import { amMod } from "../../utils/roles/am-mod"; +import { canAdmin } from "../../utils/roles/can-admin"; +import { canMod } from "../../utils/roles/can-mod"; +import { isAdmin } from "../../utils/roles/is-admin"; +import { isBanned } from "../../utils/roles/is-banned"; +import { isMod } from "../../utils/roles/is-mod"; import { Icon, PurgeWarning, Spinner } from "../common/icon"; import { MomentTime } from "../common/moment-time"; import { PictrsImage } from "../common/pictrs-image"; diff --git a/src/shared/components/post/post.tsx b/src/shared/components/post/post.tsx index b602f30..05e4d9b 100644 --- a/src/shared/components/post/post.tsx +++ b/src/shared/components/post/post.tsx @@ -73,7 +73,6 @@ import { getCommentParentId, getDepthFromComment, getIdFromProps, - isBrowser, isImage, myAuth, restoreScrollPosition, @@ -84,6 +83,7 @@ import { updateCommunityBlock, updatePersonBlock, } from "../../utils"; +import { isBrowser } from "../../utils/browser/is-browser"; import { CommentForm } from "../comment/comment-form"; import { CommentNodes } from "../comment/comment-nodes"; import { HtmlTags } from "../common/html-tags"; diff --git a/src/shared/components/search.tsx b/src/shared/components/search.tsx index 8097dbd..59bbf61 100644 --- a/src/shared/components/search.tsx +++ b/src/shared/components/search.tsx @@ -26,7 +26,6 @@ import { FirstLoadService } from "../services/FirstLoadService"; import { HttpService, RequestState } from "../services/HttpService"; import { Choice, - QueryParams, capitalizeFirstLetter, commentsToFlatNodes, communityToChoice, @@ -38,8 +37,6 @@ import { fetchUsers, getIdFromString, getPageFromString, - getQueryParams, - getQueryString, getUpdatedSearchId, myAuth, numToSI, @@ -49,6 +46,9 @@ import { setIsoData, showLocal, } from "../utils"; +import { getQueryParams } from "../utils/helpers/get-query-params"; +import { getQueryString } from "../utils/helpers/get-query-string"; +import type { QueryParams } from "../utils/types/query-params"; import { CommentNodes } from "./comment/comment-nodes"; import { HtmlTags } from "./common/html-tags"; import { Spinner } from "./common/icon"; diff --git a/src/shared/env.ts b/src/shared/env.ts index 576c6c5..969f876 100644 --- a/src/shared/env.ts +++ b/src/shared/env.ts @@ -1,4 +1,4 @@ -import { isBrowser } from "./utils"; +import { isBrowser } from "./utils/browser/is-browser"; const testHost = "0.0.0.0:8536"; diff --git a/src/shared/services/UserService.ts b/src/shared/services/UserService.ts index 57c8aec..8f553ab 100644 --- a/src/shared/services/UserService.ts +++ b/src/shared/services/UserService.ts @@ -4,7 +4,8 @@ import jwt_decode from "jwt-decode"; import { LoginResponse, MyUserInfo } from "lemmy-js-client"; import { isHttps } from "../env"; import { i18n } from "../i18next"; -import { isAuthPath, isBrowser, toast } from "../utils"; +import { isAuthPath, toast } from "../utils"; +import { isBrowser } from "../utils/browser/is-browser"; interface Claims { sub: number; diff --git a/src/shared/utils.ts b/src/shared/utils.ts index df7673a..bc6e76f 100644 --- a/src/shared/utils.ts +++ b/src/shared/utils.ts @@ -9,7 +9,6 @@ import { CommentReportView, CommentSortType, CommentView, - CommunityModeratorView, CommunityView, CustomEmojiView, GetSiteMetadata, @@ -17,7 +16,6 @@ import { Language, LemmyHttp, MyUserInfo, - Person, PersonMentionView, PersonView, PostReportView, @@ -45,6 +43,8 @@ import { getHttpBase } from "./env"; import { i18n } from "./i18next"; import { CommentNodeI, DataType, IsoData, VoteType } from "./interfaces"; import { HttpService, UserService } from "./services"; +import { isBrowser } from "./utils/browser/is-browser"; +import { groupBy } from "./utils/helpers/group-by"; let Tribute: any; if (isBrowser()) { @@ -228,92 +228,6 @@ export function futureDaysToUnixTime(days?: number): number | undefined { : undefined; } -export function canMod( - creator_id: number, - mods?: CommunityModeratorView[], - admins?: PersonView[], - myUserInfo = UserService.Instance.myUserInfo, - onSelf = false -): boolean { - // You can do moderator actions only on the mods added after you. - let adminsThenMods = - admins - ?.map(a => a.person.id) - .concat(mods?.map(m => m.moderator.id) ?? []) ?? []; - - if (myUserInfo) { - const myIndex = adminsThenMods.findIndex( - id => id == myUserInfo.local_user_view.person.id - ); - if (myIndex == -1) { - return false; - } else { - // onSelf +1 on mod actions not for yourself, IE ban, remove, etc - adminsThenMods = adminsThenMods.slice(0, myIndex + (onSelf ? 0 : 1)); - return !adminsThenMods.includes(creator_id); - } - } else { - return false; - } -} - -export function canAdmin( - creatorId: number, - admins?: PersonView[], - myUserInfo = UserService.Instance.myUserInfo, - onSelf = false -): boolean { - return canMod(creatorId, undefined, admins, myUserInfo, onSelf); -} - -export function isMod( - creatorId: number, - mods?: CommunityModeratorView[] -): boolean { - return mods?.map(m => m.moderator.id).includes(creatorId) ?? false; -} - -export function amMod( - mods?: CommunityModeratorView[], - myUserInfo = UserService.Instance.myUserInfo -): boolean { - return myUserInfo ? isMod(myUserInfo.local_user_view.person.id, mods) : false; -} - -export function isAdmin(creatorId: number, admins?: PersonView[]): boolean { - return admins?.map(a => a.person.id).includes(creatorId) ?? false; -} - -export function amAdmin(myUserInfo = UserService.Instance.myUserInfo): boolean { - return myUserInfo?.local_user_view.person.admin ?? false; -} - -export function amCommunityCreator( - creator_id: number, - mods?: CommunityModeratorView[], - myUserInfo = UserService.Instance.myUserInfo -): boolean { - const myId = myUserInfo?.local_user_view.person.id; - // Don't allow mod actions on yourself - return myId == mods?.at(0)?.moderator.id && myId != creator_id; -} - -export function amSiteCreator( - creator_id: number, - admins?: PersonView[], - myUserInfo = UserService.Instance.myUserInfo -): boolean { - const myId = myUserInfo?.local_user_view.person.id; - return myId == admins?.at(0)?.person.id && myId != creator_id; -} - -export function amTopMod( - mods: CommunityModeratorView[], - myUserInfo = UserService.Instance.myUserInfo -): boolean { - return mods.at(0)?.moderator.id == myUserInfo?.local_user_view.person.id; -} - const imageRegex = /(http)?s?:?(\/\/[^"']*\.(?:jpg|jpeg|gif|png|svg|webp))/; const videoRegex = /(http)?s?:?(\/\/[^"']*\.(?:mp4|webm))/; const tldRegex = /([a-z0-9]+\.)*[a-z0-9]+\.[a-z]+/; @@ -1141,10 +1055,6 @@ export function siteBannerCss(banner: string): string { `; } -export function isBrowser() { - return typeof window !== "undefined"; -} - export function setIsoData(context: any): IsoData { // If its the browser, you need to deserialize the data from the window if (isBrowser()) { @@ -1274,21 +1184,6 @@ export function numToSI(value: number): string { return SHORTNUM_SI_FORMAT.format(value); } -export function isBanned(ps: Person): boolean { - const expires = ps.ban_expires; - // Add Z to convert from UTC date - // TODO this check probably isn't necessary anymore - if (expires) { - if (ps.banned && new Date(expires + "Z") > new Date()) { - return true; - } else { - return false; - } - } else { - return ps.banned; - } -} - export function myAuth(): string | undefined { return UserService.Instance.auth(); } @@ -1320,15 +1215,6 @@ export function postToCommentSortType(sort: SortType): CommentSortType { } } -export function canCreateCommunity( - siteRes: GetSiteResponse, - myUserInfo = UserService.Instance.myUserInfo -): boolean { - const adminOnly = siteRes.site_view.local_site.community_creation_admin_only; - // TODO: Make this check if user is logged on as well - return !adminOnly || amAdmin(myUserInfo); -} - export function isPostBlocked( pv: PostView, myUserInfo: MyUserInfo | undefined = UserService.Instance.myUserInfo @@ -1409,64 +1295,12 @@ interface EmojiMartSkin { src: string; } -const groupBy = ( - array: T[], - predicate: (value: T, index: number, array: T[]) => string -) => - array.reduce((acc, value, index, array) => { - (acc[predicate(value, index, array)] ||= []).push(value); - return acc; - }, {} as { [key: string]: T[] }); - -export type QueryParams> = { - [key in keyof T]?: string; -}; - -export function getQueryParams>(processors: { - [K in keyof T]: (param: string) => T[K]; -}): T { - if (isBrowser()) { - const searchParams = new URLSearchParams(window.location.search); - - return Array.from(Object.entries(processors)).reduce( - (acc, [key, process]) => ({ - ...acc, - [key]: process(searchParams.get(key)), - }), - {} as T - ); - } - - return {} as T; -} - -export function getQueryString>( - obj: T -) { - return Object.entries(obj) - .filter(([, val]) => val !== undefined && val !== null) - .reduce( - (acc, [key, val], index) => `${acc}${index > 0 ? "&" : ""}${key}=${val}`, - "?" - ); -} - export function isAuthPath(pathname: string) { return /create_.*|inbox|settings|admin|reports|registration_applications/g.test( pathname ); } -export function canShare() { - return isBrowser() && !!navigator.canShare; -} - -export function share(shareData: ShareData) { - if (isBrowser()) { - navigator.share(shareData); - } -} - export function newVote(voteType: VoteType, myVote?: number): number { if (voteType == VoteType.Upvote) { return myVote == 1 ? 0 : 1; @@ -1474,18 +1308,3 @@ export function newVote(voteType: VoteType, myVote?: number): number { return myVote == -1 ? 0 : -1; } } - -function sleep(millis: number): Promise { - return new Promise(resolve => setTimeout(resolve, millis)); -} - -/** - * Polls / repeatedly runs a promise, every X milliseconds - */ -export async function poll(promiseFn: any, millis: number) { - if (window.document.visibilityState !== "hidden") { - await promiseFn(); - } - await sleep(millis); - return poll(promiseFn, millis); -} diff --git a/src/shared/utils/browser/can-share.ts b/src/shared/utils/browser/can-share.ts new file mode 100644 index 0000000..bec7e80 --- /dev/null +++ b/src/shared/utils/browser/can-share.ts @@ -0,0 +1,5 @@ +import { isBrowser } from "./is-browser"; + +export function canShare() { + return isBrowser() && !!navigator.canShare; +} diff --git a/src/shared/utils/browser/is-browser.ts b/src/shared/utils/browser/is-browser.ts new file mode 100644 index 0000000..4139b25 --- /dev/null +++ b/src/shared/utils/browser/is-browser.ts @@ -0,0 +1,3 @@ +export function isBrowser() { + return typeof window !== "undefined"; +} diff --git a/src/shared/utils/browser/share.ts b/src/shared/utils/browser/share.ts new file mode 100644 index 0000000..b1d1b5b --- /dev/null +++ b/src/shared/utils/browser/share.ts @@ -0,0 +1,7 @@ +import { isBrowser } from "./is-browser"; + +export function share(shareData: ShareData) { + if (isBrowser()) { + navigator.share(shareData); + } +} diff --git a/src/shared/utils/helpers/get-query-params.ts b/src/shared/utils/helpers/get-query-params.ts new file mode 100644 index 0000000..213d352 --- /dev/null +++ b/src/shared/utils/helpers/get-query-params.ts @@ -0,0 +1,19 @@ +import { isBrowser } from "../browser/is-browser"; + +export function getQueryParams>(processors: { + [K in keyof T]: (param: string) => T[K]; +}): T { + if (isBrowser()) { + const searchParams = new URLSearchParams(window.location.search); + + return Array.from(Object.entries(processors)).reduce( + (acc, [key, process]) => ({ + ...acc, + [key]: process(searchParams.get(key)), + }), + {} as T + ); + } + + return {} as T; +} diff --git a/src/shared/utils/helpers/get-query-string.ts b/src/shared/utils/helpers/get-query-string.ts new file mode 100644 index 0000000..a66b5af --- /dev/null +++ b/src/shared/utils/helpers/get-query-string.ts @@ -0,0 +1,10 @@ +export function getQueryString>( + obj: T +) { + return Object.entries(obj) + .filter(([, val]) => val !== undefined && val !== null) + .reduce( + (acc, [key, val], index) => `${acc}${index > 0 ? "&" : ""}${key}=${val}`, + "?" + ); +} diff --git a/src/shared/utils/helpers/group-by.ts b/src/shared/utils/helpers/group-by.ts new file mode 100644 index 0000000..4dd5d5d --- /dev/null +++ b/src/shared/utils/helpers/group-by.ts @@ -0,0 +1,8 @@ +export const groupBy = ( + array: T[], + predicate: (value: T, index: number, array: T[]) => string +) => + array.reduce((acc, value, index, array) => { + (acc[predicate(value, index, array)] ||= []).push(value); + return acc; + }, {} as { [key: string]: T[] }); diff --git a/src/shared/utils/helpers/poll.ts b/src/shared/utils/helpers/poll.ts new file mode 100644 index 0000000..055f17f --- /dev/null +++ b/src/shared/utils/helpers/poll.ts @@ -0,0 +1,12 @@ +import { sleep } from "./sleep"; + +/** + * Polls / repeatedly runs a promise, every X milliseconds + */ +export async function poll(promiseFn: any, millis: number) { + if (window.document.visibilityState !== "hidden") { + await promiseFn(); + } + await sleep(millis); + return poll(promiseFn, millis); +} diff --git a/src/shared/utils/helpers/sleep.ts b/src/shared/utils/helpers/sleep.ts new file mode 100644 index 0000000..5b7c538 --- /dev/null +++ b/src/shared/utils/helpers/sleep.ts @@ -0,0 +1,3 @@ +export function sleep(millis: number): Promise { + return new Promise(resolve => setTimeout(resolve, millis)); +} diff --git a/src/shared/utils/roles/am-admin.ts b/src/shared/utils/roles/am-admin.ts new file mode 100644 index 0000000..aadf52c --- /dev/null +++ b/src/shared/utils/roles/am-admin.ts @@ -0,0 +1,5 @@ +import { UserService } from "../../services"; + +export function amAdmin(myUserInfo = UserService.Instance.myUserInfo): boolean { + return myUserInfo?.local_user_view.person.admin ?? false; +} diff --git a/src/shared/utils/roles/am-community-creator.ts b/src/shared/utils/roles/am-community-creator.ts new file mode 100644 index 0000000..20f9b1d --- /dev/null +++ b/src/shared/utils/roles/am-community-creator.ts @@ -0,0 +1,12 @@ +import { CommunityModeratorView } from "lemmy-js-client"; +import { UserService } from "../../services"; + +export function amCommunityCreator( + creator_id: number, + mods?: CommunityModeratorView[], + myUserInfo = UserService.Instance.myUserInfo +): boolean { + const myId = myUserInfo?.local_user_view.person.id; + // Don't allow mod actions on yourself + return myId == mods?.at(0)?.moderator.id && myId != creator_id; +} diff --git a/src/shared/utils/roles/am-mod.ts b/src/shared/utils/roles/am-mod.ts new file mode 100644 index 0000000..7b792b3 --- /dev/null +++ b/src/shared/utils/roles/am-mod.ts @@ -0,0 +1,10 @@ +import { CommunityModeratorView } from "lemmy-js-client"; +import { UserService } from "../../services"; +import { isMod } from "./is-mod"; + +export function amMod( + mods?: CommunityModeratorView[], + myUserInfo = UserService.Instance.myUserInfo +): boolean { + return myUserInfo ? isMod(myUserInfo.local_user_view.person.id, mods) : false; +} diff --git a/src/shared/utils/roles/am-site-creator.ts b/src/shared/utils/roles/am-site-creator.ts new file mode 100644 index 0000000..323ac0a --- /dev/null +++ b/src/shared/utils/roles/am-site-creator.ts @@ -0,0 +1,11 @@ +import { PersonView } from "lemmy-js-client"; +import { UserService } from "../../services"; + +export function amSiteCreator( + creator_id: number, + admins?: PersonView[], + myUserInfo = UserService.Instance.myUserInfo +): boolean { + const myId = myUserInfo?.local_user_view.person.id; + return myId == admins?.at(0)?.person.id && myId != creator_id; +} diff --git a/src/shared/utils/roles/am-top-mod.ts b/src/shared/utils/roles/am-top-mod.ts new file mode 100644 index 0000000..4b942da --- /dev/null +++ b/src/shared/utils/roles/am-top-mod.ts @@ -0,0 +1,9 @@ +import { CommunityModeratorView } from "lemmy-js-client"; +import { UserService } from "../../services"; + +export function amTopMod( + mods: CommunityModeratorView[], + myUserInfo = UserService.Instance.myUserInfo +): boolean { + return mods.at(0)?.moderator.id == myUserInfo?.local_user_view.person.id; +} diff --git a/src/shared/utils/roles/can-admin.ts b/src/shared/utils/roles/can-admin.ts new file mode 100644 index 0000000..080c7ac --- /dev/null +++ b/src/shared/utils/roles/can-admin.ts @@ -0,0 +1,12 @@ +import { PersonView } from "lemmy-js-client"; +import { UserService } from "../../services"; +import { canMod } from "./can-mod"; + +export function canAdmin( + creatorId: number, + admins?: PersonView[], + myUserInfo = UserService.Instance.myUserInfo, + onSelf = false +): boolean { + return canMod(creatorId, undefined, admins, myUserInfo, onSelf); +} diff --git a/src/shared/utils/roles/can-create-community.ts b/src/shared/utils/roles/can-create-community.ts new file mode 100644 index 0000000..202290d --- /dev/null +++ b/src/shared/utils/roles/can-create-community.ts @@ -0,0 +1,12 @@ +import { GetSiteResponse } from "lemmy-js-client"; +import { UserService } from "../../services"; +import { amAdmin } from "./am-admin"; + +export function canCreateCommunity( + siteRes: GetSiteResponse, + myUserInfo = UserService.Instance.myUserInfo +): boolean { + const adminOnly = siteRes.site_view.local_site.community_creation_admin_only; + // TODO: Make this check if user is logged on as well + return !adminOnly || amAdmin(myUserInfo); +} diff --git a/src/shared/utils/roles/can-mod.ts b/src/shared/utils/roles/can-mod.ts new file mode 100644 index 0000000..2892304 --- /dev/null +++ b/src/shared/utils/roles/can-mod.ts @@ -0,0 +1,31 @@ +import { CommunityModeratorView, PersonView } from "lemmy-js-client"; +import { UserService } from "../../services"; + +export function canMod( + creator_id: number, + mods?: CommunityModeratorView[], + admins?: PersonView[], + myUserInfo = UserService.Instance.myUserInfo, + onSelf = false +): boolean { + // You can do moderator actions only on the mods added after you. + let adminsThenMods = + admins + ?.map(a => a.person.id) + .concat(mods?.map(m => m.moderator.id) ?? []) ?? []; + + if (myUserInfo) { + const myIndex = adminsThenMods.findIndex( + id => id == myUserInfo.local_user_view.person.id + ); + if (myIndex == -1) { + return false; + } else { + // onSelf +1 on mod actions not for yourself, IE ban, remove, etc + adminsThenMods = adminsThenMods.slice(0, myIndex + (onSelf ? 0 : 1)); + return !adminsThenMods.includes(creator_id); + } + } else { + return false; + } +} diff --git a/src/shared/utils/roles/is-admin.ts b/src/shared/utils/roles/is-admin.ts new file mode 100644 index 0000000..fbf662b --- /dev/null +++ b/src/shared/utils/roles/is-admin.ts @@ -0,0 +1,5 @@ +import { PersonView } from "lemmy-js-client"; + +export function isAdmin(creatorId: number, admins?: PersonView[]): boolean { + return admins?.map(a => a.person.id).includes(creatorId) ?? false; +} diff --git a/src/shared/utils/roles/is-banned.ts b/src/shared/utils/roles/is-banned.ts new file mode 100644 index 0000000..dd5ffe6 --- /dev/null +++ b/src/shared/utils/roles/is-banned.ts @@ -0,0 +1,16 @@ +import { Person } from "lemmy-js-client"; + +export function isBanned(ps: Person): boolean { + const expires = ps.ban_expires; + // Add Z to convert from UTC date + // TODO this check probably isn't necessary anymore + if (expires) { + if (ps.banned && new Date(expires + "Z") > new Date()) { + return true; + } else { + return false; + } + } else { + return ps.banned; + } +} diff --git a/src/shared/utils/roles/is-mod.ts b/src/shared/utils/roles/is-mod.ts new file mode 100644 index 0000000..8731107 --- /dev/null +++ b/src/shared/utils/roles/is-mod.ts @@ -0,0 +1,8 @@ +import { CommunityModeratorView } from "lemmy-js-client"; + +export function isMod( + creatorId: number, + mods?: CommunityModeratorView[] +): boolean { + return mods?.map(m => m.moderator.id).includes(creatorId) ?? false; +} diff --git a/src/shared/utils/types/query-params.ts b/src/shared/utils/types/query-params.ts new file mode 100644 index 0000000..37705bd --- /dev/null +++ b/src/shared/utils/types/query-params.ts @@ -0,0 +1,3 @@ +export type QueryParams> = { + [key in keyof T]?: string; +};