make suggested changes

src/shared/components/app/navbar.tsx

@@ -1,3 +1,6 @@
+import { isBrowser } from "@utils/browser";
+import { poll } from "@utils/helpers";
+import { amAdmin, canCreateCommunity } from "@utils/roles";
 import { Component, createRef, linkEvent } from "inferno";
 import { NavLink } from "inferno-router";
 import {
@@ -17,10 +20,6 @@ import {
   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";
 

src/shared/components/comment/comment-node.tsx

@@ -1,3 +1,11 @@
+import {
+  amCommunityCreator,
+  canAdmin,
+  canMod,
+  isAdmin,
+  isBanned,
+  isMod,
+} from "@utils/roles";
 import classNames from "classnames";
 import { Component, InfernoNode, linkEvent } from "inferno";
 import { Link } from "inferno-router";
@@ -53,12 +61,6 @@ 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";

src/shared/components/community/communities.tsx

@@ -1,3 +1,5 @@
+import { getQueryParams, getQueryString } from "@utils/helpers";
+import type { QueryParams } from "@utils/types";
 import { Component, linkEvent } from "inferno";
 import {
   CommunityResponse,
@@ -20,9 +22,6 @@ 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 { HtmlTags } from "../common/html-tags";
 import { Spinner } from "../common/icon";
 import { ListingTypeSelect } from "../common/listing-type-select";

src/shared/components/community/community.tsx

@@ -1,3 +1,5 @@
+import { getQueryParams, getQueryString } from "@utils/helpers";
+import type { QueryParams } from "@utils/types";
 import { Component, linkEvent } from "inferno";
 import { RouteComponentProps } from "inferno-router/dist/Route";
 import {
@@ -86,9 +88,6 @@ 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";

src/shared/components/community/sidebar.tsx

@@ -1,3 +1,4 @@
+import { amAdmin, amMod, amTopMod } from "@utils/roles";
 import { Component, InfernoNode, linkEvent } from "inferno";
 import { T } from "inferno-i18next-dess";
 import { Link } from "inferno-router";
@@ -17,9 +18,6 @@ import {
 import { i18n } from "../../i18next";
 import { UserService } from "../../services";
 import { getUnixTime, hostname, mdToHtml, myAuthRequired } 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 { Badges } from "../common/badges";
 import { BannerIconHeader } from "../common/banner-icon-header";
 import { Icon, PurgeWarning, Spinner } from "../common/icon";

src/shared/components/home/home.tsx

@@ -1,5 +1,8 @@
+import { getQueryParams, getQueryString } from "@utils/helpers";
+import { canCreateCommunity } from "@utils/roles";
+import type { QueryParams } from "@utils/types";
 import { NoOptionI18nKeys } from "i18next";
-import { Component, linkEvent, MouseEventHandler } from "inferno";
+import { Component, MouseEventHandler, linkEvent } from "inferno";
 import { T } from "inferno-i18next-dess";
 import { Link } from "inferno-router";
 import {
@@ -57,6 +60,7 @@ import { UserService } from "../../services";
 import { FirstLoadService } from "../../services/FirstLoadService";
 import { HttpService, RequestState } from "../../services/HttpService";
 import {
+  RouteDataResponse,
   commentsToFlatNodes,
   editComment,
   editPost,
@@ -73,7 +77,6 @@ import {
   postToCommentSortType,
   relTags,
   restoreScrollPosition,
-  RouteDataResponse,
   saveScrollPosition,
   setIsoData,
   setupTippy,
@@ -82,10 +85,6 @@ 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";

src/shared/components/home/login.tsx

@@ -1,10 +1,10 @@
+import { isBrowser } from "@utils/browser";
 import { Component, linkEvent } from "inferno";
 import { GetSiteResponse, LoginResponse } from "lemmy-js-client";
 import { i18n } from "../../i18next";
 import { UserService } from "../../services";
 import { HttpService, RequestState } from "../../services/HttpService";
 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";
 

src/shared/components/home/signup.tsx

@@ -1,3 +1,4 @@
+import { isBrowser } from "@utils/browser";
 import { Options, passwordStrength } from "check-password-strength";
 import { NoOptionI18nKeys } from "i18next";
 import { Component, linkEvent } from "inferno";
@@ -20,7 +21,6 @@ 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";

src/shared/components/modlog.tsx

@@ -1,3 +1,6 @@
+import { debounce, getQueryParams, getQueryString } from "@utils/helpers";
+import { amAdmin, amMod } from "@utils/roles";
+import type { QueryParams } from "@utils/types";
 import { NoOptionI18nKeys } from "i18next";
 import { Component, linkEvent } from "inferno";
 import { T } from "inferno-i18next-dess";
@@ -44,12 +47,6 @@ import {
   personToChoice,
   setIsoData,
 } from "../utils";
-import debounce from "../utils/helpers/debounce";
-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";

src/shared/components/person/profile.tsx

@@ -1,3 +1,6 @@
+import { getQueryParams, getQueryString } from "@utils/helpers";
+import { canMod, isAdmin, isBanned } from "@utils/roles";
+import type { QueryParams } from "@utils/types";
 import classNames from "classnames";
 import { NoOptionI18nKeys } from "i18next";
 import { Component, linkEvent } from "inferno";
@@ -76,12 +79,6 @@ 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";

src/shared/components/person/reports.tsx

@@ -1,3 +1,4 @@
+import { amAdmin } from "@utils/roles";
 import { Component, linkEvent } from "inferno";
 import {
   CommentReportResponse,
@@ -31,7 +32,6 @@ 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";

src/shared/components/person/settings.tsx

@@ -1,3 +1,4 @@
+import { debounce } from "@utils/helpers";
 import { NoOptionI18nKeys } from "i18next";
 import { Component, linkEvent } from "inferno";
 import {
@@ -35,7 +36,6 @@ import {
   updateCommunityBlock,
   updatePersonBlock,
 } from "../../utils";
-import debounce from "../../utils/helpers/debounce";
 import { HtmlTags } from "../common/html-tags";
 import { Icon, Spinner } from "../common/icon";
 import { ImageUploadForm } from "../common/image-upload-form";

src/shared/components/post/create-post.tsx

@@ -1,3 +1,5 @@
+import { getQueryParams } from "@utils/helpers";
+import type { QueryParams } from "@utils/types";
 import { Component } from "inferno";
 import { RouteComponentProps } from "inferno-router/dist/Route";
 import {
@@ -24,8 +26,6 @@ import {
   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";

src/shared/components/post/post-listing.tsx

@@ -1,3 +1,14 @@
+import { canShare, share } from "@utils/browser";
+import {
+  amAdmin,
+  amCommunityCreator,
+  amMod,
+  canAdmin,
+  canMod,
+  isAdmin,
+  isBanned,
+  isMod,
+} from "@utils/roles";
 import classNames from "classnames";
 import { Component, linkEvent } from "inferno";
 import { Link } from "inferno-router";
@@ -42,16 +53,6 @@ import {
   setupTippy,
   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";

src/shared/components/post/post.tsx

@@ -1,3 +1,5 @@
+import { isBrowser } from "@utils/browser";
+import { debounce } from "@utils/helpers";
 import autosize from "autosize";
 import { Component, createRef, linkEvent, RefObject } from "inferno";
 import {
@@ -83,8 +85,6 @@ import {
   updateCommunityBlock,
   updatePersonBlock,
 } from "../../utils";
-import isBrowser from "../../utils/browser/is-browser";
-import debounce from "../../utils/helpers/debounce";
 import { CommentForm } from "../comment/comment-form";
 import { CommentNodes } from "../comment/comment-nodes";
 import { HtmlTags } from "../common/html-tags";

src/shared/components/search.tsx

@@ -1,3 +1,5 @@
+import { debounce, getQueryParams, getQueryString } from "@utils/helpers";
+import type { QueryParams } from "@utils/types";
 import type { NoOptionI18nKeys } from "i18next";
 import { Component, linkEvent } from "inferno";
 import {
@@ -46,10 +48,6 @@ import {
   setIsoData,
   showLocal,
 } from "../utils";
-import debounce from "../utils/helpers/debounce";
-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";

src/shared/utils/browser/can-share.ts

@@ -1,4 +1,4 @@
-import isBrowser from "./is-browser";
+import { isBrowser } from "@utils/browser";
 
 export default function canShare() {
   return isBrowser() && !!navigator.canShare;

src/shared/utils/browser/index.ts

@@ -0,0 +1,5 @@
+import canShare from "./can-share";
+import isBrowser from "./is-browser";
+import share from "./share";
+
+export { canShare, isBrowser, share };

src/shared/utils/browser/share.ts

@@ -1,4 +1,4 @@
-import isBrowser from "./is-browser";
+import { isBrowser } from "@utils/browser";
 
 export default function share(shareData: ShareData) {
   if (isBrowser()) {

src/shared/utils/helpers/get-query-params.ts

@@ -1,4 +1,4 @@
-import isBrowser from "../browser/is-browser";
+import { isBrowser } from "@utils/browser";
 
 export default function getQueryParams<
   T extends Record<string, any>

src/shared/utils/helpers/index.ts

@@ -0,0 +1,8 @@
+import debounce from "./debounce";
+import getQueryParams from "./get-query-params";
+import getQueryString from "./get-query-string";
+import { groupBy } from "./group-by";
+import poll from "./poll";
+import sleep from "./sleep";
+
+export { debounce, getQueryParams, getQueryString, groupBy, poll, sleep };

src/shared/utils/roles/am-mod.ts

@@ -1,6 +1,6 @@
+import { isMod } from "@utils/roles";
 import { CommunityModeratorView } from "lemmy-js-client";
 import { UserService } from "../../services";
-import isMod from "./is-mod";
 
 export default function amMod(
   mods?: CommunityModeratorView[],

src/shared/utils/roles/can-admin.ts

@@ -1,6 +1,6 @@
+import { canMod } from "@utils/roles";
 import { PersonView } from "lemmy-js-client";
 import { UserService } from "../../services";
-import canMod from "./can-mod";
 
 export default function canAdmin(
   creatorId: number,

src/shared/utils/roles/can-create-community.ts

@@ -1,6 +1,6 @@
+import { amAdmin } from "@utils/roles";
 import { GetSiteResponse } from "lemmy-js-client";
 import { UserService } from "../../services";
-import amAdmin from "./am-admin";
 
 export default function canCreateCommunity(
   siteRes: GetSiteResponse,

src/shared/utils/roles/index.ts

@@ -0,0 +1,25 @@
+import amAdmin from "./am-admin";
+import amCommunityCreator from "./am-community-creator";
+import amMod from "./am-mod";
+import amSiteCreator from "./am-site-creator";
+import amTopMod from "./am-top-mod";
+import canAdmin from "./can-admin";
+import canCreateCommunity from "./can-create-community";
+import canMod from "./can-mod";
+import isAdmin from "./is-admin";
+import isBanned from "./is-banned";
+import isMod from "./is-mod";
+
+export {
+  amAdmin,
+  amCommunityCreator,
+  amMod,
+  amSiteCreator,
+  amTopMod,
+  canAdmin,
+  canCreateCommunity,
+  canMod,
+  isAdmin,
+  isBanned,
+  isMod,
+};

src/shared/utils/types/index.ts

@@ -0,0 +1,3 @@
+import { QueryParams } from "./query-params";
+
+export { QueryParams };

tsconfig.json

@@ -18,7 +18,13 @@
     "noImplicitReturns": true,
     "experimentalDecorators": true,
     "strictNullChecks": true,
-    "noFallthroughCasesInSwitch": true
+    "noFallthroughCasesInSwitch": true,
+    "paths": {
+      "@utils/roles": ["./shared/utils/roles/index"],
+      "@utils/browser": ["./shared/utils/browser/index"],
+      "@utils/helpers": ["./shared/utils/helpers/index"],
+      "@utils/types": ["./shared/utils/types/index"],
+    }
   },
   "include": [
     "src/**/*.ts",