Skip to content

Commit 933e472

Browse files
zunderscorezunderscore
authored
Merge pull request #3506 from crowbartools/v5
5.66.3 Release
2 parents 2b84510 + 594c768 commit 933e472

15 files changed

Lines changed: 98 additions & 92 deletions

File tree

‎.github/workflows/bump-version-on-release.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Bump dev version on release
2+
3+
on:
4+
release:
5+
types: [released]
6+
7+
jobs:
8+
bumpversion:
9+
name: Bump version
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout repo
13+
uses: actions/checkout@v5
14+
with:
15+
ref: v5
16+
17+
- name: Setup Nodejs
18+
uses: actions/setup-node@v5
19+
with:
20+
node-version: latest
21+
22+
- name: Update patch version
23+
run: npm version patch
24+
25+
- name: Push
26+
run: |
27+
git config --local user.email "github-actions[bot]@users.noreply.github.com"
28+
git config --local user.name "github-actions[bot]"
29+
git push

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "firebotv5",
3-
"version": "5.66.2",
3+
"version": "5.66.3",
44
"description": "Powerful all-in-one bot for Twitch streamers.",
55
"main": "build/main.js",
66
"scripts": {

‎src/backend/chat/frontend-chat-helpers.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ class FirebotFrontendChatHelpers {
1717

1818
private sendChatMessageToChatWidget(
1919
chatWidget: OverlayWidgetConfig<ChatWidgetSettings | AdvancedChatWidgetSettings, ChatWidgetState>,
20-
chatMessage: FirebotChatMessage
20+
chatMessage: FirebotChatMessage,
21+
delayed = false
2122
): void {
22-
if (chatWidget.settings.delayMessages === true) {
23+
if (delayed === true) {
2324
if ((this._pendingMessageCache[chatWidget.id] ?? []).some(m => m === chatMessage.id)) {
2425
// Remove it from the pending list so we know we've taken care of it
2526
this._pendingMessageCache[chatWidget.id] = this._pendingMessageCache[chatWidget.id]
@@ -92,7 +93,7 @@ class FirebotFrontendChatHelpers {
9293
this._pendingMessageCache[chatWidget.id].push(chatMessage.id);
9394

9495
setTimeout(() => {
95-
this.sendChatMessageToChatWidget(chatWidget, chatMessage);
96+
this.sendChatMessageToChatWidget(chatWidget, chatMessage, true);
9697
}, chatWidget.settings.messageDelay * 1000);
9798
} else {
9899
this.sendChatMessageToChatWidget(chatWidget, chatMessage);

‎src/backend/effects/builtin/currency.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ const currency = {
158158
159159
<eos-container header="Message To Send" pad-top="true">
160160
<textarea ng-model="effect.message" class="form-control" name="text" placeholder="Enter message" rows="4" cols="40" replace-variables></textarea>
161-
<div style="color: #fb7373;" ng-if="effect.message && effect.message.length > 360">Chat messages cannot be longer than 360 characters. This message will get automatically trimmed if the length is still too long after all replace variables have been populated.</div>
161+
<div style="color: #fb7373;" ng-if="effect.message && effect.message.length > 500">Chat messages cannot be longer than 500 characters. This message will get automatically trimmed if the length is still too long after all replace variables have been populated.</div>
162162
<div style="display: flex; flex-direction: row; width: 100%; height: 36px; margin: 10px 0 10px; align-items: center;">
163163
<label class="control-fb control--checkbox" style="margin: 0px 15px 0px 0px"> Whisper
164164
<input type="checkbox" ng-init="whisper = (effect.whisper != null && effect.whisper !== '')" ng-model="whisper" ng-click="effect.whisper = ''">

‎src/backend/streaming-platforms/twitch/events/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ export const TwitchEventSource: EventSource = {
6565
description: "When someone raids your channel.",
6666
cached: true,
6767
cacheMetaKey: "username",
68+
cacheTtlInSecs: 3600,
6869
manualMetadata: {
6970
username: "firebot",
7071
userDisplayName: "Firebot",

‎src/gui/app/controllers/chat-messages.controller.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143

144144
$scope.onReplyClicked = function(threadOrReplyMessageId) {
145145
$scope.setThreadDetails(threadOrReplyMessageId);
146+
focusMessageInput();
146147
};
147148

148149
$scope.chatFeedIsEnabled = function() {

‎src/gui/app/directives/misc/toggleButton.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
autoUpdateValue: "<",
99
onToggle: "&",
1010
fontSize: "<?",
11-
accessibilityLabel: "<"
11+
accessibilityLabel: "<",
12+
disabled: "<?"
1213
},
1314
template: `
1415
<div class="toggle-button"
15-
ng-class="{'toggled-on': $ctrl.toggleModel}"
16-
ng-click="$ctrl.toggle()"
16+
ng-class="{'toggled-on': $ctrl.toggleModel, 'disabled-control': $ctrl.disabled}"
17+
ng-click="$ctrl.disabled ? angular.noop : $ctrl.toggle()"
1718
ng-style="$ctrl.getCustomStyles()"
1819
aria-label="{{ $ctrl.accessibilityLabel }}">
1920
<i class="fad" style="display: block;" ng-class="{'fa-toggle-on': $ctrl.toggleModel, 'fa-toggle-off': !$ctrl.toggleModel}"></i>

‎src/gui/app/directives/settings/categories/advanced-settings.js‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,24 @@
1212
<setting-description-addon>
1313
<b>Firebot must be restarted for changes to this setting to take effect.</b>
1414
</setting-description-addon>
15-
<firebot-button
16-
text="{{settings.getSetting('DebugMode') ? 'Disable Debug Mode' : 'Enable Debug Mode' }}"
17-
ng-click="settings.saveSetting('DebugMode', !settings.getSetting('DebugMode'))"
15+
<toggle-button
16+
toggle-model="settings.getSetting('DebugMode')"
17+
on-toggle="settings.saveSetting('DebugMode', !settings.getSetting('DebugMode'))"
18+
font-size="40"
1819
/>
1920
</firebot-setting>
2021
2122
<firebot-setting
22-
name="While Loop"
23+
name="While Loops"
2324
description="Enable or disable the conditional 'While Loop' option in the Loop Effects effect."
2425
>
2526
<setting-description-addon>
2627
<b>If you aren't careful, you can cause an infinite loop and freeze Firebot.</b>
2728
</setting-description-addon>
28-
<firebot-button
29-
text="{{settings.getSetting('WhileLoopEnabled') ? 'Disable While Loops' : 'Enable While Loops' }}"
30-
ng-click="toggleWhileLoops()"
29+
<toggle-button
30+
toggle-model="settings.getSetting('WhileLoopEnabled')"
31+
on-toggle="toggleWhileLoops()"
32+
font-size="40"
3133
/>
3234
</firebot-setting>
3335
@@ -63,10 +65,11 @@
6365
<setting-description-addon>
6466
<b>Requires Debug Mode to also be enabled.</b>
6567
</setting-description-addon>
66-
<firebot-button
67-
text="{{settings.getSetting('WebhookDebugLogs') && settings.getSetting('DebugMode') ? 'Disable Webhook Logs' : 'Enable Webhook Logs' }}"
68+
<toggle-button
69+
toggle-model="settings.getSetting('WebhookDebugLogs')"
6870
disabled="!settings.getSetting('DebugMode')"
69-
ng-click="settings.saveSetting('WebhookDebugLogs', !settings.getSetting('WebhookDebugLogs'))"
71+
on-toggle="settings.saveSetting('WebhookDebugLogs', !settings.getSetting('WebhookDebugLogs'))"
72+
font-size="40"
7073
/>
7174
</firebot-setting>
7275
@@ -87,28 +90,21 @@
8790
name="Allow Quote .CSV Export"
8891
description="Whether or not you want the 'Export as .CSV' button available for quotes on the profile page."
8992
>
90-
<firebot-select
91-
options="{ true: 'On', false: 'Off' }"
92-
ng-init="allowQuoteCsv = settings.getSetting('AllowQuoteCSVDownloads')"
93-
selected="allowQuoteCsv"
94-
on-update="settings.saveSetting('AllowQuoteCSVDownloads', option === 'true')"
95-
right-justify="true"
96-
aria-label="Choose Whether or not you want the 'Export as .CSV' button available for quotes on the profile page."
97-
93+
<toggle-button
94+
toggle-model="settings.getSetting('AllowQuoteCSVDownloads')"
95+
on-toggle="settings.saveSetting('AllowQuoteCSVDownloads', !settings.getSetting('AllowQuoteCSVDownloads'))"
96+
font-size="40"
9897
/>
9998
</firebot-setting>
10099
101100
<firebot-setting
102101
name="Persist All Custom Variables"
103102
description="Whether or not all custom variables should be persisted to file when Firebot closes."
104103
>
105-
<firebot-select
106-
options="{ true: 'On', false: 'Off' }"
107-
ng-init="persistVariables = settings.getSetting('PersistCustomVariables')"
108-
selected="persistVariables"
109-
on-update="settings.saveSetting('PersistCustomVariables', option === 'true')"
110-
right-justify="true"
111-
aria-label="enable or disable persistent Custom Variables"
104+
<toggle-button
105+
toggle-model="settings.getSetting('PersistCustomVariables')"
106+
on-toggle="settings.saveSetting('PersistCustomVariables', !settings.getSetting('PersistCustomVariables'))"
107+
font-size="40"
112108
/>
113109
</firebot-setting>
114110

‎src/gui/app/directives/settings/categories/database-settings.js‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,21 @@
1212
name="Viewer Database"
1313
description="Turn on/off the viewer tracking database. This could improve performance in some cases."
1414
>
15-
<firebot-select
16-
options="{ true: 'On', false: 'Off' }"
17-
ng-init="viewerDb = settings.getSetting('ViewerDB')"
18-
selected="viewerDb"
19-
on-update="settings.saveSetting('ViewerDB', option === 'true')"
20-
right-justify="true"
21-
aria-label="enable or disable Viewer Database"
15+
<toggle-button
16+
toggle-model="settings.getSetting('ViewerDB')"
17+
on-toggle="settings.saveSetting('ViewerDB', !settings.getSetting('ViewerDB'))"
18+
font-size="40"
2219
/>
2320
</firebot-setting>
2421
2522
<firebot-setting
2623
name="Auto Flag Bots"
2724
description="Prevents known bots from generating stats or showing up in active viewer lists."
2825
>
29-
<firebot-select
30-
options="{ true: 'On', false: 'Off' }"
31-
ng-init="autoFlagBots = settings.getSetting('AutoFlagBots')"
32-
selected="autoFlagBots"
33-
on-update="settings.saveSetting('AutoFlagBots', option === 'true')"
34-
right-justify="true"
35-
aria-label="enable or disable Auto Flag Bots"
26+
<toggle-button
27+
toggle-model="settings.getSetting('AutoFlagBots')"
28+
on-toggle="settings.saveSetting('AutoFlagBots', !settings.getSetting('AutoFlagBots'))"
29+
font-size="40"
3630
/>
3731
</firebot-setting>
3832

0 commit comments

Comments
 (0)