supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Show an icon for "show in active" messages
This commit is contained in:
Pavel Djundik 2020-01-06 10:39:38 +02:00 committed by GitHub
commit 79cbe63067
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/components/Message.vue
View File

@ -58,6 +58,12 @@
</template> </template>
</span> </span>
<span class="content" dir="auto"> <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" /> <ParsedMessage :network="network" :message="message" />
<LinkPreview <LinkPreview
v-for="preview in message.previews" v-for="preview in message.previews"

11
client/css/style.css
View File

@ -309,6 +309,7 @@ p {
#chat .msg[data-type="action"] .from::before, #chat .msg[data-type="action"] .from::before,
#chat .msg[data-type="plugin"] .from::before, #chat .msg[data-type="plugin"] .from::before,
#chat .msg[data-type="raw"] .from::before, #chat .msg[data-type="raw"] .from::before,
#chat .msg-shown-in-active span::before,
#chat .toggle-button::after, #chat .toggle-button::after,
#chat .toggle-content .more-caret::before, #chat .toggle-content .more-caret::before,
#chat .scroll-down-arrow::after, #chat .scroll-down-arrow::after,
@ -486,6 +487,16 @@ p {
padding: 1px; 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 { #chat .toggle-button {
display: inline-block; display: inline-block;
transition: opacity 0.2s, transform 0.2s; transition: opacity 0.2s, transform 0.2s;

34
client/js/socket-events/msg.js
View File

@ -29,25 +29,29 @@ socket.on("msg", function(data) {
// Display received notices and errors in currently active channel. // Display received notices and errors in currently active channel.
// Reloading the page will put them back into the lobby window. // Reloading the page will put them back into the lobby window.
// We only want to put errors/notices in active channel if they arrive on the same network if (data.msg.showInActive) {
if ( // We only want to put errors/notices in active channel if they arrive on the same network
data.msg.showInActive && if (
store.state.activeChannel && store.state.activeChannel &&
store.state.activeChannel.network === receivingChannel.network store.state.activeChannel.network === receivingChannel.network
) { ) {
channel = store.state.activeChannel.channel; channel = store.state.activeChannel.channel;
if (data.chan === channel.id) { if (data.chan === channel.id) {
// If active channel is the intended channel for this message, // If active channel is the intended channel for this message,
// remove the showInActive flag // remove the showInActive flag
data.msg.showInActive = false; delete data.msg.showInActive;
} else {
data.chan = channel.id;
}
} else { } else {
data.chan = channel.id; delete data.msg.showInActive;
} }
} else if (!isActiveChannel) { }
// 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
// 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") { if (typeof data.highlight !== "undefined") {
channel.highlight = data.highlight; channel.highlight = data.highlight;
} }