From 5a0c22108d6ef0626418c30d504d553f23c099b8 Mon Sep 17 00:00:00 2001
From: Aevann1 <Aevann3@gmail.com>
Date: Fri, 6 Aug 2021 19:59:52 +0200
Subject: [PATCH] d-flex flex-row flex-nowrap justify-content-between

---
 files/templates/embeds/comment.html | 4 ++--
 files/templates/user_listing.html   | 2 +-
 files/templates/userpage.html       | 4 ++--
 files/templates/votes.html          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/files/templates/embeds/comment.html b/files/templates/embeds/comment.html
index b8391e399..ed78383ca 100644
--- a/files/templates/embeds/comment.html
+++ b/files/templates/embeds/comment.html
@@ -15,7 +15,7 @@
 
 <div id="comment-{{ c.base36id }}" class="comment rounded">
 
-    <span class="mr-2 d-block d-md-none"><a href="{{ c.author.permalink }}"><img src="{{ c.author.profile_url }}" class="profile-pic-25"></a></span>
+    <span class="mr-2 d-block d-md-none"><a href="{{ c.author.url }}"><img src="{{ c.author.profile_url }}" class="profile-pic-25"></a></span>
 
     <span class="comment-collapse d-md-block d-none" onclick="collapse_comment('{{ c.base36id }}')"></span>
 
@@ -23,7 +23,7 @@
 
         <div id="comment-{{ c.base36id }}-only">
 
-            <div class="user-info">{% if c.over_18 %}<span class="badge badge-danger">nsfw</span> {% endif %}{% if c.author.title and c.author.title.is_before %}<span style="color:#{{ c.author.title.color }}">{{ c.author.title.text }}</span> {% endif %}<a href="{{ c.author.permalink }}" class="user-name {% if c.post.author_id==c.author_id %}text-info{% endif %}">{{ c.author.username }}</a>{% if c.author.title and not c.author.title.is_before %}<span style="color:#{{ c.author.title.color }}">{{ c.author.title.text }}</span>{% endif %}
+            <div class="user-info">{% if c.over_18 %}<span class="badge badge-danger">nsfw</span> {% endif %}{% if c.author.title and c.author.title.is_before %}<span style="color:#{{ c.author.title.color }}">{{ c.author.title.text }}</span> {% endif %}<a href="{{ c.author.url }}" class="user-name {% if c.post.author_id==c.author_id %}text-info{% endif %}">{{ c.author.username }}</a>{% if c.author.title and not c.author.title.is_before %}<span style="color:#{{ c.author.title.color }}">{{ c.author.title.text }}</span>{% endif %}
 		{% if c.distinguish_level or c.author_id==c.post.author_id %}
 		<span> </span>
 			{% if c.distinguish_level %}
diff --git a/files/templates/user_listing.html b/files/templates/user_listing.html
index 58e87074a..0309dfd4e 100644
--- a/files/templates/user_listing.html
+++ b/files/templates/user_listing.html
@@ -9,7 +9,7 @@
 			<div class="card-body" style="word-wrap: break-word;">
 				<div class="d-flex flex-wrap justify-content-between align-items-center mb-3">
 
-					<a class="card-title text-break stretched-link h5 mb-0" href="{{u.permalink}}">@{{u.username}}</a>
+					<a class="card-title text-break stretched-link h5 mb-0" href="{{u.url}}">@{{u.username}}</a>
 
 					{% if v %}
 						{% if v.id!=u.id and not u.is_private and not u.is_nofollow %}
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index e1fd4fdf2..9612ab698 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -29,7 +29,7 @@
 <meta property="og:author" name="author" content="@{{u.username}}" />
 <meta property="og:title" content="{{u.username}}" />
 <meta property="og:image" content="{% if u.bannerurl %}{{u.banner_url}}{% else %}{{'/assets/images/preview.png' | full_link}}{% endif %}" />
-<meta property="og:url" content="{{u.permalink | full_link}}" />
+<meta property="og:url" content="{{u.url | full_link}}" />
 <meta property="og:site_name" content="{{request.host}}" />
 
 <meta name="twitter:card" content="summary_large_image"/>
@@ -38,7 +38,7 @@
 <meta name="twitter:creator" content="@{{u.username}}">
 <meta name="twitter:description" content="{{u.coins}} {{"SITE_NAME" | app_config}}coins - Joined {{u.created_date}} - {% if u.stored_subscriber_count >=1 and not u.is_private and not u.is_nofollow %}{{u.stored_subscriber_count}} Followers -{% endif %} {% if not u.is_private %} {{u.post_count}} Posts - {{u.comment_count}} Comments -{% endif %} {{u.bio}}" />
 <meta name="twitter:image" content="{% if u.bannerurl %}{{u.banner_url}}{% else %}{{'/assets/images/preview.png' | full_link}}{% endif %}" />
-<meta name="twitter:url" content="{{u.permalink | full_link}}" />
+<meta name="twitter:url" content="{{u.url | full_link}}" />
 {% endblock %}
 
 {% block desktopUserBanner %}
diff --git a/files/templates/votes.html b/files/templates/votes.html
index 0ee395703..a1c15b950 100644
--- a/files/templates/votes.html
+++ b/files/templates/votes.html
@@ -18,7 +18,7 @@
 
 <h1>Info</h1>
 <p><a href="{{thing.permalink}}">{{thing.permalink}}</a></p>
-<p><b>Author:</b> <a href="{{thing.author.permalink}}">@{{thing.author.username}}</a></p>
+<p><b>Author:</b> <a href="{{thing.author.url}}">@{{thing.author.username}}</a></p>
 <p><b>Author Created At:</b> {{thing.author.created_utc}} ({{thing.author.created_datetime}})</p>
 <p><b>Upvotes:</b>{{ups | length}}</p>
 <p><b>Downvotes:</b>{{downs | length}}</p>