X-Git-Url: http://these/git/?a=blobdiff_plain;f=src%2Fshared%2Fcomponents%2Fmodlog.tsx;h=ca1cb3326b2cfef3a2ca454d00d071d454e72abc;hb=ed0fd264de3d2162a3837733632fee69696681aa;hp=3ea910c514271681b5d4c75ee816196f8bf5c97a;hpb=69a123b6d80766c48a64c15f7d7e1545605bad47;p=lemmy-ui.git diff --git a/src/shared/components/modlog.tsx b/src/shared/components/modlog.tsx index 3ea910c..ca1cb33 100644 --- a/src/shared/components/modlog.tsx +++ b/src/shared/components/modlog.tsx @@ -1,3 +1,21 @@ +import { + fetchUsers, + getUpdatedSearchId, + myAuth, + personToChoice, + setIsoData, +} from "@utils/app"; +import { + debounce, + formatPastDate, + getIdFromString, + getPageFromString, + getQueryParams, + getQueryString, +} from "@utils/helpers"; +import { amAdmin, amMod } from "@utils/roles"; +import type { QueryParams } from "@utils/types"; +import { Choice, RouteDataResponse } from "@utils/types"; import { NoOptionI18nKeys } from "i18next"; import { Component, linkEvent } from "inferno"; import { T } from "inferno-i18next-dess"; @@ -27,29 +45,10 @@ import { ModlogActionType, Person, } from "lemmy-js-client"; -import moment from "moment"; -import { i18n } from "../i18next"; +import { fetchLimit } from "../config"; import { InitialFetchRequest } from "../interfaces"; -import { FirstLoadService } from "../services/FirstLoadService"; +import { FirstLoadService, I18NextService } from "../services"; import { HttpService, RequestState } from "../services/HttpService"; -import { - Choice, - RouteDataResponse, - fetchLimit, - fetchUsers, - getIdFromString, - getPageFromString, - getUpdatedSearchId, - myAuth, - 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"; @@ -313,6 +312,7 @@ function renderModlogType({ type_, view }: ModlogType) { const { mod_feature_post: { featured, is_featured_community }, post: { id, name }, + community, } = view as ModFeaturePostView; return ( @@ -321,7 +321,12 @@ function renderModlogType({ type_, view }: ModlogType) { Post {name} - {is_featured_community ? " In Community" : " In Local"} + + {is_featured_community + ? " in community " + : " in Local, from community "} + + > ); } @@ -372,7 +377,7 @@ function renderModlogType({ type_, view }: ModlogType) { )} {expires && ( - expires: {moment.utc(expires).fromNow()} + expires: {formatPastDate(expires)} )} > @@ -404,7 +409,7 @@ function renderModlogType({ type_, view }: ModlogType) { )} {expires && ( - expires: {moment.utc(expires).fromNow()} + expires: {formatPastDate(expires)} )} > @@ -468,7 +473,7 @@ function renderModlogType({ type_, view }: ModlogType) { )} {expires && ( - expires: {moment.utc(expires).fromNow()} + expires: {formatPastDate(expires)} )} > @@ -533,7 +538,7 @@ function renderModlogType({ type_, view }: ModlogType) { return ( <> - Purged a Post from from + Purged a Post from {reason && ( @@ -584,16 +589,16 @@ const Filter = ({ options: Choice[]; loading: boolean; }) => ( - - - {i18n.t(`filter_by_${filterType}` as NoOptionI18nKeys)} + + + {I18NextService.i18n.t(`filter_by_${filterType}` as NoOptionI18nKeys)} id === person.id ) - ? i18n.t("admin") - : i18n.t("mod"); + ? I18NextService.i18n.t("admin") + : I18NextService.i18n.t("mod"); } get documentTitle(): string { @@ -742,48 +751,50 @@ export class Modlog extends Component< const { actionType, modId, userId } = getModlogQueryParams(); return ( - + - - - - - ### - - - {this.state.communityRes.state === "success" && ( - - - /c/{this.state.communityRes.data.community_view.community.name}{" "} - - {i18n.t("modlog")} - - )} - + {I18NextService.i18n.t("modlog")} + + + + + ### + + + {this.state.communityRes.state === "success" && ( + + + /c/{this.state.communityRes.data.community_view.community.name}{" "} + + {I18NextService.i18n.t("modlog")} + + )} + + - {i18n.t("filter_by_action")} + {I18NextService.i18n.t("filter_by_action")} - {i18n.t("all")} + {I18NextService.i18n.t("all")} Removing Posts Locking Posts Featuring Posts @@ -800,29 +811,29 @@ export class Modlog extends Component< Banning From Site - + + + + {!this.isoData.site_res.site_view.local_site + .hide_modlog_mod_names && ( - {!this.isoData.site_res.site_view.local_site - .hide_modlog_mod_names && ( - - )} - - {this.renderModlogTable()} + )} + {this.renderModlogTable()} ); } @@ -842,9 +853,9 @@ export class Modlog extends Component< - {i18n.t("time")} - {i18n.t("mod")} - {i18n.t("action")} + {I18NextService.i18n.t("time")} + {I18NextService.i18n.t("mod")} + {I18NextService.i18n.t("action")} {this.combined}