From 221a177790244a110c502d4e685931fb08ecceda Mon Sep 17 00:00:00 2001 From: TLSM Date: Wed, 13 Jul 2022 05:19:36 -0400 Subject: [PATCH] Deduplicate userpage IDs desktop vs mobile. --- files/templates/userpage.html | 66 ++++++++++++++-------------- files/templates/util/assetcache.html | 2 +- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/files/templates/userpage.html b/files/templates/userpage.html index 900b75805..6af83a35e 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -377,7 +377,7 @@
-
+
{% if u.is_cakeday %} @@ -385,46 +385,46 @@
{% if u.is_suspended %} -
BANNED USER{% if u.ban_reason %}: {{u.ban_reason | safe}}{% endif %}
- {% if u.unban_utc %}
{{u.unban_string}}
{% endif %} +
BANNED USER{% if u.ban_reason %}: {{u.ban_reason | safe}}{% endif %}
+ {% if u.unban_utc %}
{{u.unban_string}}
{% endif %} {% endif %} -

{{u.username}}

+

{{u.username}}

{% if u.username != u.original_username %} - + {% endif %} {% if SITE_NAME=='rDrama' and u.house %} - House {{u.house}} + House {{u.house}} {% endif %} {% if u.verified %} -   +   {% endif %} {% if u.admin_level > 1 %} - + {% endif %} {% if v and v.id != u.id and v.has_follower(u) and not v.is_nofollow %} - Follows you + Follows you {% endif %} {% if SITE_NAME == 'rDrama' %} -

{{u.pronouns}}

+

{{u.pronouns}}

{% endif %} {% if u.customtitle %} -

{{u.customtitle | safe}}

+

{{u.customtitle | safe}}

{% else %} 

 				{% endif %}
 
-				
Simps | Haters | Simps for | Hates

+				
Simps | Haters | Simps for | Hates

 
 				

 					{{u.coins}}
@@ -435,39 +435,39 @@
 						marseybux  
 					{% endif %}
 
-					{{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}}  
+					{{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}}  
 
-					follows {{u.follow_count}} user{{'s' if u.follow_count != 1 else ''}}  
+					follows {{u.follow_count}} user{{'s' if u.follow_count != 1 else ''}}  
 
 					{% if u.basedcount %}
-						
Based count: {{u.basedcount}}
+						
Based count: {{u.basedcount}}
 					{% endif %}
 
-					
joined {{u.created_date}}
+					
joined {{u.created_date}}
 
 					{% if v and v.admin_level >= 2 -%}
-						
last active {{u.last_active_date}}
+						
last active {{u.last_active_date}}
 					{%- endif %}
 				

 				{% if u.bio_html %}
-					
{{u.bio_html | safe}}

+					
{{u.bio_html | safe}}

 				{% endif %}
 
 				{% if u.friends_html %}
 					
Friends:

-					
{{u.friends_html | safe}}

+					
{{u.friends_html | safe}}

 				{% endif %}
 
 				{% if u.enemies_html %}
 					
Enemies:

-					
{{u.enemies_html | safe}}

+					
{{u.enemies_html | safe}}

 				{% endif %}
 
 				{% if u.received_awards %}
-				

+				

 					
Awards received

 					{% for a in u.received_awards %}
-					
+					
 						
 						x{{a['count']}}
 					
@@ -476,7 +476,7 @@
 				{% endif %}
 
 				{% if u.moderated_subs %}
-					

+					

 						
Moderator of

 						{% for a in u.moderated_subs %}
 							
@@ -486,7 +486,7 @@
 					

 				{% endif %}
 
-				

+				

 					{% for b in u.badges %}
 						{% if b.url %}
 							{{b.name}}
@@ -641,24 +641,24 @@
 					{% endif %}
 				{% endif %}
 				

-				

-					
User ID: {{u.id}}

-					
Coins spent: {{u.coins_spent}}

-					
True score: {{u.truecoins}}

-					
Winnings: {{u.winnings}}

+				

+					
User ID: {{u.id}}

+					
Coins spent: {{u.coins_spent}}

+					
True score: {{u.truecoins}}

+					
Winnings: {{u.winnings}}

 					{% if u.is_private %}
-						
User has private mode enabled.

+						
User has private mode enabled.

 					{% endif %}
 					{% if v and (v.admin_level > 1 or v.alt) %}
-						Alts:
-						

 			

diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html
index c572578e8..3d75ce89e 100644
--- a/files/templates/util/assetcache.html
+++ b/files/templates/util/assetcache.html
@@ -1,6 +1,6 @@
 {%-
 set CACHE_VER = {
-	'css/main.css': 391,
+	'css/main.css': 392,
 
 	'css/4chan.css': 61,
 	'css/classic.css': 61,