Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
smokey019 committed Jan 23, 2024
2 parents 99b8cb7 + 180ca13 commit d0efad1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
16 changes: 3 additions & 13 deletions src/first-message-highlighter/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,6 @@ class FirstMessageHighlight extends Addon {
}
});

this.settings.add('first_message_highlight.remember_historical', {
default: true,
ui: {
path: 'Add-Ons > First Message Highlight >> Current Session >> Historical Messages',
title: 'Remember historical messages',
description: 'Remember logged user messages from before you joined the chat.',
component: 'setting-check-box'
}
});

// First Time Chatter
this.settings.add('first_message_highlight.first_time_chatter', {
default: false,
Expand Down Expand Up @@ -277,11 +267,11 @@ class FirstMessageHighlight extends Addon {
const shouldHighlight = this.shouldHighlight(msg);

if (msg.isHistorical) {
if (this.settings.get('first_message_highlight.remember_historical')
&& !shouldHighlight) return;
if (!this.settings.get('first_message_highlight.highlight_historical')) {
this.known_users.delete(msg.user.userID);

if (!this.settings.get('first_message_highlight.highlight_historical'))
return;
}
}

if (!shouldHighlight) return;
Expand Down
4 changes: 2 additions & 2 deletions src/first-message-highlighter/manifest.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"enabled": true,
"requires": [],
"version": "1.1.2",
"version": "1.1.3",
"icon": "https://i.imgur.com/Db2zP1l.png",
"short_name": "first_msg_highlight",
"name": "First Message Highlight",
"author": "deko_ration",
"description": "Addon to highlight the first message of a user during the current session. Useful for community-driven chats and welcoming.",
"settings": "add_ons.first_message_highlight",
"created": "2021-12-01T14:32:46.254Z",
"updated": "2024-01-17T20:33:51.465Z"
"updated": "2024-01-22T20:30:35.390Z"
}

0 comments on commit d0efad1

Please sign in to comment.