diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 5fdc828ee7..9585fb0966 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -4097,7 +4097,7 @@ small, .small { width: 28px; height: 28px; } -.profile-pic-20, .pp20, img[src*="/uid/"], img[src*="/pp/"]:not(img[alt^=":"]) { +.profile-pic-20, .pp20, img[src^="/uid/"], img[src^="/pp/"]:not(img[alt^=":"]) { margin-right: 0.25rem !important; width: 20px; height: 20px; @@ -5397,7 +5397,7 @@ textarea { } } .in-comment-image, .img, img[alt^="![]("], -.preview img:not(img[src*="/uid/"], img[src*="/pp/"], img[src$="/pic"], img[src$="/i/hand.webp"], img[src*="/e/"]) { +.preview img:not(img[src^="/uid/"], img[src^="/pp/"], img[src$="/pic"], img[src$="/i/hand.webp"], img[src*="/e/"]) { max-height: 150px !important; max-width: 100% !important; border-radius: 0.2rem !important; @@ -5541,7 +5541,7 @@ img[src$="/i/hand.webp"]+img { text-align: center; object-fit: contain; } -img[src$="/i/hand.webp"]+img[src*="/pp/"], img[src$="/i/hand.webp"]+img[src$="/pic"] { +img[src$="/i/hand.webp"]+img[src^="/pp/"], img[src$="/i/hand.webp"]+img[src$="/pic"] { border-radius: 50%; } @keyframes pat-pfp-anim { diff --git a/files/assets/js/chat.js b/files/assets/js/chat.js index f72052cdd2..e38a328984 100644 --- a/files/assets/js/chat.js +++ b/files/assets/js/chat.js @@ -213,7 +213,7 @@ socket.on('online', function(data){ online += `
  • ` if (admin_level && Object.keys(data[1]).includes(u[0].toLowerCase())) online += 'X ' - online += `${u[0]}
  • ` + online += `${u[0]}` online2 += `
    @${u[0]}` } document.getElementById('online').innerHTML = online diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index 27efa66d8b..c17b0287df 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -412,7 +412,7 @@ def sanitize(sanitized, golden=True, limit_pings=0, showmore=False, count_emojis u = users_dict.get(m.group(1).lower()) if not u or (v and u.id in v.all_twoway_blocks): return m.group(0) - return f'@{u.username}' + return f'@{u.username}' sanitized = mention_regex.sub(replacer, sanitized) diff --git a/files/templates/admin/dm_media.html b/files/templates/admin/dm_media.html index 2b57035109..d76b52832d 100644 --- a/files/templates/admin/dm_media.html +++ b/files/templates/admin/dm_media.html @@ -34,7 +34,7 @@ {% if item[1] != "Unknown" %} - + @{{item[1]}} {% endif %} @@ -45,7 +45,7 @@ Modmail {% else %} - + @{{item[3]}} {% endif %} diff --git a/files/templates/formatting.html b/files/templates/formatting.html index 8fd419d8bd..7eef90ef7a 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -105,7 +105,7 @@ Text 2 Pat User :@snappypat: - :@snappypat: + :@snappypat: Random Marsey @@ -212,7 +212,7 @@ Text 2 Username Mention @QuadNarca - @QuadNarca profile picture@QuadNarca + @QuadNarca profile picture@QuadNarca Subreddit Mention diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html index 649485365c..034dae8a24 100644 --- a/files/templates/util/macros.html +++ b/files/templates/util/macros.html @@ -231,7 +231,7 @@ {% macro chat_group_template(id, m) %}
    -
    {% if m %}{{m['username']}}{% else %}NULL{% endif %}
    +
    {% if m %}{{m['username']}}{% else %}NULL{% endif %}
    {% if m %}{{m['time'] | timestamp}}{% else %}just now{% endif %} {% endmacro %}