From: Jay Sitter <jay@jaysitter.com>
Date: Thu, 22 Jun 2023 21:37:10 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/main' into feat/add-post-body-preview-to-desktop
X-Git-Url: http://these/git/%7B%60/feeds/front/static/%7BpictrsAvatarThumbnail%28this.state.siteRes.site.icon%29%7D?a=commitdiff_plain;h=a9bcf0567d815afcfbe1775bff3dc1eea66c1c18;p=lemmy-ui.git

Merge remote-tracking branch 'origin/main' into feat/add-post-body-preview-to-desktop

* origin/main: (40 commits)
  Adding jsit to codeowners.
  Cleanup, only check for /u/ if /c/ and /m/ checks fail
  Rename function to be more generic, since it parses users
  Typescript linter fixes
  bandaid fix our video embeds
  Remove pipe from community link regex
  Add missing classes
  Use shorter regex in community link parser
  Move regex pattern to config
  Update community link markdown parsing
  Fix avatar alignment issue (#1475)
  Omit user-scalable to use default
  Update getHttpBase dependency reference
  Enable users to zoom on mobile
  rethink it a bit
  rethink it a bit
  add fallback style tag
  move env utils into folder
  fix capitalization (#1467)
  Fix buildThemeList() function to ensure no duplicates (#1466)
  ...
---

a9bcf0567d815afcfbe1775bff3dc1eea66c1c18
diff --cc src/shared/components/post/post-listing.tsx
index 3c27165,93b8fff..d5ddc2f
--- a/src/shared/components/post/post-listing.tsx
+++ b/src/shared/components/post/post-listing.tsx
@@@ -360,25 -381,33 +381,30 @@@ export class PostListing extends Compon
    createdLine() {
      const post_view = this.postView;
      return (
 -      <ul className="list-inline mb-1 text-muted small mt-2">
 -        <li className="list-inline-item">
 -          <PersonListing person={post_view.creator} />
 -
 -          {this.creatorIsMod_ && (
 -            <span className="mx-1 badge text-bg-light">
 -              {I18NextService.i18n.t("mod")}
 -            </span>
 -          )}
 -          {this.creatorIsAdmin_ && (
 -            <span className="mx-1 badge text-bg-light">
 -              {I18NextService.i18n.t("admin")}
 -            </span>
 -          )}
 -          {post_view.creator.bot_account && (
 -            <span className="mx-1 badge text-bg-light">
 -              {I18NextService.i18n.t("bot_account").toLowerCase()}
 -            </span>
 -          )}
 -          {this.props.showCommunity && (
 -            <>
 -              {" "}
 -              {I18NextService.i18n.t("to")}{" "}
 -              <CommunityLink community={post_view.community} />
 -            </>
 -          )}
 -        </li>
 +      <span className="small">
 +        <PersonListing person={post_view.creator} />
 +        {this.creatorIsMod_ && (
-           <span className="mx-1 badge text-bg-light">{i18n.t("mod")}</span>
++          <span className="mx-1 badge text-bg-light">
++            {I18NextService.i18n.t("mod")}
++          </span>
 +        )}
 +        {this.creatorIsAdmin_ && (
-           <span className="mx-1 badge text-bg-light">{i18n.t("admin")}</span>
++          <span className="mx-1 badge text-bg-light">
++            {I18NextService.i18n.t("admin")}
++          </span>
 +        )}
 +        {post_view.creator.bot_account && (
 +          <span className="mx-1 badge text-bg-light">
-             {i18n.t("bot_account").toLowerCase()}
++            {I18NextService.i18n.t("bot_account").toLowerCase()}
 +          </span>
 +        )}
 +        {this.props.showCommunity && (
 +          <>
 +            {" "}
-             {i18n.t("to")} <CommunityLink community={post_view.community} />
++            {I18NextService.i18n.t("to")}{" "}
++            <CommunityLink community={post_view.community} />
 +          </>
 +        )}
          {post_view.post.language_id !== 0 && (
            <span className="mx-1 badge text-bg-light">
              {
@@@ -730,11 -767,13 +760,11 @@@
          to={`/post/${post_view.post.id}?scrollToComments=true`}
          data-tippy-content={title}
        >
 -        <span className="me-1">
 -          <Icon icon="message-square" classes="me-1" inline />
 -          {post_view.counts.comments}
 -        </span>
 +        <Icon icon="message-square" classes="me-1" inline />
 +        {post_view.counts.comments}
          {this.unreadCount && (
            <span className="text-muted fst-italic">
-             ({this.unreadCount} {i18n.t("new")})
+             ({this.unreadCount} {I18NextService.i18n.t("new")})
            </span>
          )}
        </Link>