From: SleeplessOne1917 <abias1122@gmail.com>
Date: Mon, 19 Jun 2023 23:32:00 +0000 (+0000)
Subject: Merge branch 'main' into fix/add-aria-label-to-featured-pins
X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%7Bthis.state.thumbnail%7D?a=commitdiff_plain;h=13df4b9c56e5d27a4b57c69560401b1da9683e0d;p=lemmy-ui.git

Merge branch 'main' into fix/add-aria-label-to-featured-pins
---

13df4b9c56e5d27a4b57c69560401b1da9683e0d
diff --cc src/shared/components/post/post-listing.tsx
index 222e485,5ee0761..8e69b18
--- a/src/shared/components/post/post-listing.tsx
+++ b/src/shared/components/post/post-listing.tsx
@@@ -518,84 -486,105 +486,107 @@@ export class PostListing extends Compon
      const url = post.url;
  
      return (
-       <div className="post-title overflow-hidden">
-         <h5 className="d-inline">
-           {url && this.props.showBody ? (
-             <a
-               className={
-                 !post.featured_community && !post.featured_local
-                   ? "text-body"
-                   : "text-primary"
-               }
-               href={url}
-               title={url}
-               rel={relTags}
-               dangerouslySetInnerHTML={mdToHtmlInline(post.name)}
-             ></a>
-           ) : (
-             this.postLink
+       <>
+         <div className="post-title overflow-hidden">
+           <h5 className="d-inline">
+             {url && this.props.showBody ? (
+               <a
+                 className={
+                   !post.featured_community && !post.featured_local
+                     ? "text-body"
+                     : "text-primary"
+                 }
+                 href={url}
+                 title={url}
+                 rel={relTags}
+                 dangerouslySetInnerHTML={mdToHtmlInline(post.name)}
+               ></a>
+             ) : (
+               this.postLink
+             )}
+           </h5>
+           {(url && isImage(url)) ||
+             (post.thumbnail_url && (
+               <button
+                 className="btn btn-link text-monospace text-muted small d-inline-block"
+                 data-tippy-content={i18n.t("expand_here")}
+                 onClick={linkEvent(this, this.handleImageExpandClick)}
+               >
+                 <Icon
+                   icon={
+                     !this.state.imageExpanded ? "plus-square" : "minus-square"
+                   }
+                   classes="icon-inline"
+                 />
+               </button>
+             ))}
+           {post.removed && (
+             <small className="ml-2 badge text-bg-secondary">
+               {i18n.t("removed")}
+             </small>
            )}
-         </h5>
-         {(url && isImage(url)) ||
-           (post.thumbnail_url && (
-             <button
-               className="btn btn-link text-monospace text-muted small d-inline-block"
-               data-tippy-content={i18n.t("expand_here")}
-               onClick={linkEvent(this, this.handleImageExpandClick)}
+           {post.deleted && (
+             <small
+               className="unselectable pointer ml-2 text-muted font-italic"
+               data-tippy-content={i18n.t("deleted")}
              >
-               <Icon
-                 icon={
-                   !this.state.imageExpanded ? "plus-square" : "minus-square"
-                 }
-                 classes="icon-inline"
-               />
-             </button>
-           ))}
-         {post.removed && (
-           <small className="ml-2 text-muted font-italic">
-             {i18n.t("removed")}
-           </small>
-         )}
-         {post.deleted && (
-           <small
-             className="unselectable pointer ml-2 text-muted font-italic"
-             data-tippy-content={i18n.t("deleted")}
-           >
-             <Icon icon="trash" classes="icon-inline text-danger" />
-           </small>
-         )}
-         {post.locked && (
-           <small
-             className="unselectable pointer ml-2 text-muted font-italic"
-             data-tippy-content={i18n.t("locked")}
-           >
-             <Icon icon="lock" classes="icon-inline text-danger" />
-           </small>
-         )}
-         {post.featured_community && (
-           <small
-             className="unselectable pointer ml-2 text-muted font-italic"
-             data-tippy-content={i18n.t("featured_in_community")}
-             aria-label={i18n.t("featured_in_community")}
-           >
-             <Icon icon="pin" classes="icon-inline text-primary" />
-           </small>
-         )}
-         {post.featured_local && (
-           <small
-             className="unselectable pointer ml-2 text-muted font-italic"
-             data-tippy-content={i18n.t("featured_in_local")}
-             aria-label={i18n.t("featured_in_local")}
+               <Icon icon="trash" classes="icon-inline text-danger" />
+             </small>
+           )}
+           {post.locked && (
+             <small
+               className="unselectable pointer ml-2 text-muted font-italic"
+               data-tippy-content={i18n.t("locked")}
+             >
+               <Icon icon="lock" classes="icon-inline text-danger" />
+             </small>
+           )}
+           {post.featured_community && (
+             <small
+               className="unselectable pointer ml-2 text-muted font-italic"
 -              data-tippy-content={i18n.t("featured")}
++              data-tippy-content={i18n.t("featured_in_community")}
++              aria-label={i18n.t("featured_in_community")}
+             >
+               <Icon icon="pin" classes="icon-inline text-primary" />
+             </small>
+           )}
+           {post.featured_local && (
+             <small
+               className="unselectable pointer ml-2 text-muted font-italic"
 -              data-tippy-content={i18n.t("featured")}
++              data-tippy-content={i18n.t("featured_in_local")}
++              aria-label={i18n.t("featured_in_local")}
+             >
+               <Icon icon="pin" classes="icon-inline text-secondary" />
+             </small>
+           )}
+           {post.nsfw && (
+             <small className="ml-2 badge text-bg-danger">
+               {i18n.t("nsfw")}
+             </small>
+           )}
+         </div>
+         {url && this.urlLine()}
+       </>
+     );
+   }
+ 
+   urlLine() {
+     const post = this.postView.post;
+     const url = post.url;
+ 
+     return (
+       <p className="d-flex text-muted align-items-center gap-1 small m-0">
+         {url && !(hostname(url) === getExternalHost()) && (
+           <a
+             className="text-muted font-italic"
+             href={url}
+             title={url}
+             rel={relTags}
            >
-             <Icon icon="pin" classes="icon-inline text-secondary" />
-           </small>
-         )}
-         {post.nsfw && (
-           <small className="ml-2 text-muted font-italic">
-             {i18n.t("nsfw")}
-           </small>
+             {hostname(url)}
+           </a>
          )}
-       </div>
+       </p>
      );
    }