From: Art Cancro <ajc@citadel.org>
Date: Fri, 9 Sep 2022 22:08:57 +0000 (-0400)
Subject: Moved render_msg_author() into a different file
X-Git-Tag: v958~19
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=60ecdd5eeb96be571020966047762965b818a0ef;p=citadel.git

Moved render_msg_author() into a different file
---

diff --git a/webcit-ng/static/js/user_profile.js b/webcit-ng/static/js/user_profile.js
index 70c853bf9..fb46c5253 100644
--- a/webcit-ng/static/js/user_profile.js
+++ b/webcit-ng/static/js/user_profile.js
@@ -4,6 +4,24 @@
 // disclosure are subject to the GNU General Public License v3.
 
 
+// Display the author of a message.  This can be called from many different views.
+// For messages originating locally, it renders the display name linked to their profile.
+// For messages originating locally, it renders the display name and their email address.
+function render_msg_author(msg) {
+	if (msg.locl) {
+		return(
+			"<span class=\"ctdl-username\" onClick=\"javascript:user_profile('" + msg.from + "');\">"
+			+ msg.from
+			+ "</span>"
+		);
+	}
+	else {
+		return("<span class=\"ctdl-username\">" + msg.from + " &lt;" + msg.rfca + "&gt;</span>");
+	}
+}
+
+
+// Display the user profile for a user
 function user_profile(who) {
 	document.getElementById("ctdl-main").innerHTML = `user_profile(${who})`;
 }
diff --git a/webcit-ng/static/js/view_forum.js b/webcit-ng/static/js/view_forum.js
index c5f0d6179..5f95ca724 100644
--- a/webcit-ng/static/js/view_forum.js
+++ b/webcit-ng/static/js/view_forum.js
@@ -183,9 +183,7 @@ function forum_render_one(msg, existing_div) {
 		+ "<div class=\"ctdl-fmsg-content\">"				// begin content
 		+ "<div class=\"ctdl-msg-header\">"				// begin header
 		+ "<span class=\"ctdl-msg-header-info\">"			// begin header info on left side
-		+ "<span class=\"ctdl-username\" onClick=\"javascript:user_profile('" + msg.from + "');\">"
-		+ msg.from
-		+ "</a></span>"							// end username
+		+ render_msg_author(msg)					// author
 		+ "<span class=\"ctdl-msgdate\">"
 		+ string_timestamp(msg.time,0)
 		+ "</span>"							// end msgdate
diff --git a/webcit-ng/static/js/view_mail.js b/webcit-ng/static/js/view_mail.js
index 5effc0b46..3499f49b9 100644
--- a/webcit-ng/static/js/view_mail.js
+++ b/webcit-ng/static/js/view_mail.js
@@ -13,7 +13,7 @@ var RefreshMailboxInterval;							// We store our refresh timer here
 // Render a message into the mailbox view
 function mail_render_one(msg, target_div) {
 	let div = "FIXME";
-	console.log(msg);
+	console.log(render_msg_author(msg));
 	try {
 		outmsg =
 	  	  "<div class=\"ctdl-mmsg-wrapper\">"				// begin message wrapper
@@ -24,9 +24,7 @@ function mail_render_one(msg, target_div) {
 		+ "<div class=\"ctdl-mmsg-content\">"				// begin content
 		+ "<div class=\"ctdl-msg-header\">"				// begin header
 		+ "<span class=\"ctdl-msg-header-info\">"			// begin header info on left side
-		+ "<span class=\"ctdl-username\" onClick=\"javascript:user_profile('" + msg.from + "');\">"
-		+ msg.from
-		+ "</a></span>"							// end username
+		+ render_msg_author(msg)
 		+ "<span class=\"ctdl-msgdate\">"
 		+ string_timestamp(msg.time,0)
 		+ "</span>"							// end msgdate