Merge branch 'tag_user'

routes/f_front.py

@@ -199,12 +199,18 @@ def friends_route(userid):
     theme = db.get_theme(userid["userid"])
     friend_list = db.get_friends(userid["userid"])
     shadow_bans = db.get_shadow_bans(userid["userid"])
-    db.close()
     for friend in friend_list:
         if friend["has"] in shadow_bans:
             friend["position"] = None
             friend["last_active"] = ""
         else:
+            friend.update({"admin": {"tag": db.get_admin_tag(friend["id"])}})
+            print(type(friend["admin"]["tag"]))
+            if len(friend["admin"]["tag"]) == 0:
+                friend["admin"]["tag"] = ""
+            else :
+                friend["admin"]["tag"] = friend["admin"]["tag"][0]["tag"]
+            # friend["admin"]["tag"] = db.get_admin_tag(friend["id"])
             friend["position"] = get_position(friend["name"])
             if friend["active"] and friend["position"] is None:
                 date = arrow.get(friend["active"], "YYYY-MM-DD HH:mm:ss", tzinfo="UTC")
@@ -216,6 +222,7 @@ def friends_route(userid):
     friend_list = sorted(friend_list, key=lambda d: d["name"])
     friend_list = sorted(friend_list, key=lambda d: 0 if d["relation"] == 1 else 1)
     friend_list = sorted(friend_list, key=lambda d: 0 if d["position"] else 1)
+    db.close()
     return render_template(
         "friends.html", friends=friend_list, theme=theme, is_admin=userid["admin"]
     )

static/js/common.js

@@ -163,6 +163,7 @@ function openFriend(name, auto_reload = false) {
 				let openFriendProfile = document.getElementById("openFriendProfile");
 				let openFriendShowCluster = document.getElementById('openFriendShowCluster');
 				let isAdmin = document.getElementById('modal-admin');
+				let istag = document.getElementById('modal-tag');
 				let pool = openFriendModalName.querySelector('.pool');
 				let modal_name = openFriendModalName.querySelector('.name');
 				let send_msg = document.getElementById('send_msg');
@@ -179,7 +180,9 @@ function openFriend(name, auto_reload = false) {
 				isAdmin.hidden = !(data.admin !== false);
 				if (data.admin)
 					isAdmin.innerHTML = data.admin.tag;
-
+				istag.hidden = !(data.tag !== false);
+				if(data.tag)
+					istag.innerHTML = data.tag;
 				if (send_msg) {
 					send_msg.onclick = () => {
 						document.getElementById("dest-login").value = name;

templates/friends.html

@@ -39,6 +39,8 @@
 					<img src="{{ proxy_images(friend.image_medium) }}" class="m-1 card-img-top card-img-size"
 					     alt="{{ friend.name }}'s image">
 					<div class="card-body">
+						<span class="badge badge-sm align-vertical bg-info text-dark">{{ friend.tag | safe }}</span>
+						<span class="badge badge-sm align-vertical bg-danger text-dark">{{ friend.admin.tag | safe }}</span>
 						<h5 class="card-title">
 							<i class="fa-solid {{ "fa-2xs fa-circle online" if friend.position else "fa-xs fa-person-walking offline" }}"></i> {{ friend.name }}
 						</h5>

templates/open_modal.html

@@ -3,6 +3,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<h1 class="modal-title fs-5 me-2" id="openFriendLabel"></h1>
+				<span hidden id="modal-tag" class="badge badge-sm align-vertical bg-info">tag</span>
 				<span hidden id="modal-admin" class="badge badge-sm align-vertical bg-danger">admin</span>
 				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 			</div>