Merge pull request #3670 from thelounge/xpaw/show-in-active

Show an icon for "show in active" messages

client/components/Message.vue

@@ -58,6 +58,12 @@
 				</template>
 			</span>
 			<span class="content" dir="auto">
+				<span
+					v-if="message.showInActive"
+					aria-label="This message was shown in your active channel"
+					class="msg-shown-in-active tooltipped tooltipped-e"
+					><span></span
+				></span>
 				<ParsedMessage :network="network" :message="message" />
 				<LinkPreview
 					v-for="preview in message.previews"

client/css/style.css

@@ -309,6 +309,7 @@ p {
 #chat .msg[data-type="action"] .from::before,
 #chat .msg[data-type="plugin"] .from::before,
 #chat .msg[data-type="raw"] .from::before,
+#chat .msg-shown-in-active span::before,
 #chat .toggle-button::after,
 #chat .toggle-content .more-caret::before,
 #chat .scroll-down-arrow::after,
@@ -486,6 +487,16 @@ p {
 	padding: 1px;
 }
 
+#chat .msg-shown-in-active {
+	cursor: help;
+	margin-right: 5px;
+}
+
+#chat .msg-shown-in-active span::before {
+	font-size: 10px;
+	content: "\f06e"; /* https://fontawesome.com/icons/eye?style=solid */
+}
+
 #chat .toggle-button {
 	display: inline-block;
 	transition: opacity 0.2s, transform 0.2s;

client/js/socket-events/msg.js

@@ -29,9 +29,9 @@ socket.on("msg", function(data) {
 
 	// Display received notices and errors in currently active channel.
 	// Reloading the page will put them back into the lobby window.
+	if (data.msg.showInActive) {
 		// We only want to put errors/notices in active channel if they arrive on the same network
 		if (
-		data.msg.showInActive &&
 			store.state.activeChannel &&
 			store.state.activeChannel.network === receivingChannel.network
 		) {
@@ -40,14 +40,18 @@ socket.on("msg", function(data) {
 			if (data.chan === channel.id) {
 				// If active channel is the intended channel for this message,
 				// remove the showInActive flag
-			data.msg.showInActive = false;
+				delete data.msg.showInActive;
 			} else {
 				data.chan = channel.id;
 			}
-	} else if (!isActiveChannel) {
+		} else {
+			delete data.msg.showInActive;
+		}
+	}
+
 	// Do not set unread counter for channel if it is currently active on this client
 	// It may increase on the server before it processes channel open event from this client
-
+	if (!isActiveChannel) {
 		if (typeof data.highlight !== "undefined") {
 			channel.highlight = data.highlight;
 		}