Merge remote-tracking branch 'lemmy/main' into fix/wider-max-width-1536

* lemmy/main:
  chore(DX): Add prettier to eslint config for use with editors
  fix: Remove unnecessary string interpolations

diff --combined src/shared/components/common/vote-buttons.tsx
index 1b4f4890b0a5b154eba5613af31759acef305541,005db8c003ec5aecbe806d9ff5996a3f07841f8b..ff12125f21328f33fa5fed7e26e050081802b390
--- 1/src/shared/components/common/vote-buttons.tsx
--- 2/src/shared/components/common/vote-buttons.tsx
+++ b/src/shared/components/common/vote-buttons.tsx
@@@ -174,7 -174,7 +174,7 @@@ export class VoteButtons extends Compon
  
    render() {
      return (
-       <div className={`vote-bar pe-0 small text-center`}>
 -      <div className="vote-bar col-1 pe-0 small text-center">
++      <div className="vote-bar pe-0 small text-center">
          <button
            type="button"
            className={`btn-animate btn btn-link p-0 ${
@@@ -193,7 -193,7 +193,7 @@@
          </button>
          {showScores() ? (
            <div
-             className={`unselectable pointer text-muted px-1 post-score`}
+             className="unselectable pointer text-muted px-1 post-score"
              data-tippy-content={tippy(this.props.counts)}
            >
              {numToSI(this.props.counts.score)}

diff --combined src/shared/components/post/post-listing.tsx
index d25e59bec2b1e8311d107859ddfe108d00bc839f,449f69630ad90294abccfc203897aa192ccf4c8a..eca56605235e1310dc80a144061be8fc55f0e642
--- 1/src/shared/components/post/post-listing.tsx
--- 2/src/shared/components/post/post-listing.tsx
+++ b/src/shared/components/post/post-listing.tsx
@@@ -1235,12 -1235,12 +1235,12 @@@ export class PostListing extends Compon
                  value={this.state.banReason}
                  onInput={linkEvent(this, this.handleModBanReasonChange)}
                />
-               <label className="col-form-label" htmlFor={`mod-ban-expires`}>
+               <label className="col-form-label" htmlFor="mod-ban-expires">
                  {I18NextService.i18n.t("expires")}
                </label>
                <input
                  type="number"
-                 id={`mod-ban-expires`}
+                 id="mod-ban-expires"
                  className="form-control me-2"
                  placeholder={I18NextService.i18n.t("number_of_days")}
                  value={this.state.banExpireDays}
@@@ -1407,23 -1407,21 +1407,23 @@@
          <div className="d-none d-sm-block">
            <article className="row post-container">
              {!this.props.viewOnly && (
 -              <VoteButtons
 -                voteContentType={VoteContentType.Post}
 -                id={this.postView.post.id}
 -                onVote={this.props.onPostVote}
 -                enableDownvotes={this.props.enableDownvotes}
 -                counts={this.postView.counts}
 -                my_vote={this.postView.my_vote}
 -              />
 +              <div className="col flex-grow-0">
 +                <VoteButtons
 +                  voteContentType={VoteContentType.Post}
 +                  id={this.postView.post.id}
 +                  onVote={this.props.onPostVote}
 +                  enableDownvotes={this.props.enableDownvotes}
 +                  counts={this.postView.counts}
 +                  my_vote={this.postView.my_vote}
 +                />
 +              </div>
              )}
 -            <div className="col-sm-2 pe-0 post-media">
 -              <div className="">{this.thumbnail()}</div>
 -            </div>
 -            <div className="col-12 col-sm-9">
 +            <div className="col flex-grow-1">
                <div className="row">
 -                <div className="col-12">
 +                <div className="col-sm-3 col-lg-2 pe-0 post-media">
 +                  <div className="">{this.thumbnail()}</div>
 +                </div>
 +                <div className="col-12 col-sm-9 col-lg-10">
                    {this.postTitleLine()}
                    {this.createdLine()}
                    {this.showBodyPreview()}