Skip to content

Commit 23db240

Browse files
authored
Merge branch 'Chatterino:master' into master
2 parents f3c95d8 + 1a6b4d6 commit 23db240

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+209
-139
lines changed

.github/workflows/test-arch-linux.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ jobs:
2828
steps:
2929
- name: Install dependencies
3030
run: |
31-
sudo pacman -Sy
32-
sudo pacman -S --noconfirm 'qt6-base' 'qt6-tools' 'boost-libs' 'openssl' 'qt6-imageformats' 'qtkeychain-qt6' 'qt6-svg' 'libnotify'
33-
sudo pacman -S --noconfirm 'git' 'boost' 'cmake' 'benchmark'
31+
sudo pacman -Syu --noconfirm
32+
sudo pacman -S --noconfirm qt6-base qt6-tools boost-libs qt6-imageformats qtkeychain-qt6 qt6-svg libnotify git boost cmake benchmark
3433
3534
- uses: actions/checkout@v5
3635
with:

CHANGELOG.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,15 @@
55
- Minor: Badges now link to their home page like emotes in the context menu. (#6437)
66
- Minor: Fixed usercard resizing improperly without recent messages. (#6496)
77
- Minor: Added setting for character limit of deleted messages. (#6491)
8-
- Minor: Added link support to plugin message API. (#6386)
8+
- Minor: Added link support to plugin message API. (#6386, #6527)
99
- Minor: Added a description for the logging option under moderation tab. (#6514)
10+
- Minor: Added a menu action to sort tabs alphabetically. (#6551)
11+
- Minor: Fixed "edit hotkey" dialog opening like a normal window. (#6540)
1012
- Bugfix: Expose the "Extra extension IDs" setting on non-Windows systems too. (#6509)
13+
- Bugfix: Fixed some commands and filters not working as expected in seach popups. (#6539)
14+
- Bugfix: Fixed settings occasionally not opening when clicking on "Manage Accounts" in the account switcher. (#6543)
15+
- Bugfix: Fixed font change not resulting in forced layout update. (#6536)
16+
- Bugfix: Fixed scrollbar rect computation potentially resulting in overflows. (#6547)
1117
- Dev: Update release documentation. (#6498)
1218
- Dev: Make code sanitizers opt in with the `CHATTERINO_SANITIZER_SUPPORT` CMake option. After that's enabled, use the `SANITIZE_*` flag to enable individual sanitizers. (#6493)
1319
- Dev: Remove unused QTextCodec includes. (#6487)
@@ -21,8 +27,11 @@
2127
- Dev: Fixed warnings on Qt 6.10. (#6422)
2228
- Dev: Removed unused method in `Emojis`. (#6517)
2329
- Dev: Refactored `Emotes` into `EmoteController`. (#6516)
30+
- Dev: Fix Arch Linux partial upgrade error in CI. (#6553)
2431
- Dev: Added Qt keyword and warning flags project wide. (#6520)
2532
- Def: Fixed compilation error in tests with Clang 21. (#6519)
33+
- Dev: Fixed compilation warnings on clang-cl. (#6528)
34+
- Dev: Fixed compilation error in tests with Clang 21. (#6519)
2635
- Dev: The LuaLS meta files moved from `docs/plugin-meta.lua` to `docs/lua-meta/globals.lua`. (#6530)
2736

2837
## 2.5.4

docs/chatterino.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ declare namespace c2 {
255255
JumpToChannel,
256256
CopyToClipboard,
257257
JumpToMessage,
258+
InsertText,
258259
}
259260

260261
enum MessageFlag {

docs/lua-meta/globals.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ c2.LinkType = {
354354
JumpToChannel = {}, ---@type c2.LinkType.JumpToChannel
355355
CopyToClipboard = {}, ---@type c2.LinkType.CopyToClipboard
356356
JumpToMessage = {}, ---@type c2.LinkType.JumpToMessage
357+
InsertText = {}, ---@type c2.LinkType.InsertText
357358
}
358359

359360
-- Begin src/singletons/Fonts.hpp

docs/wip-plugins.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,7 @@ This table describes links available to plugins.
621621
| `JumpToChannel` | [Channel name](#channelget_name) | Go to already open split with given channel | `#pajlada` |
622622
| `CopyToClipboard` | Any Unicode text | Copy value to clipboard | n/a |
623623
| `JumpToMessage` | ID of the message | Highlight the message with given ID in current split, do nothing if it was not found | n/a |
624+
| `InsertText` | Any text, command or emote | Insert text into split input | n/a |
624625

625626
### Input/Output API
626627

src/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,6 +1235,14 @@ if (MSVC)
12351235
# Enable updated '__cplusplus' macro - workaround for CMake#18837
12361236
/Zc:__cplusplus
12371237
)
1238+
1239+
# Warnings on clang-cl
1240+
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
1241+
target_compile_options(${LIBRARY_PROJECT} PUBLIC
1242+
-Wno-missing-designated-field-initializers
1243+
)
1244+
endif()
1245+
12381246
# Disable min/max macros from Windows.h
12391247
target_compile_definitions(${LIBRARY_PROJECT} PUBLIC NOMINMAX)
12401248
else ()

src/RunGui.cpp

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -110,20 +110,7 @@ void showLastCrashDialog(const Args &args, const Paths &paths)
110110
dialog->exec();
111111
}
112112

113-
void createRunningFile(const QString &path)
114-
{
115-
QFile runningFile(path);
116-
117-
std::ignore = runningFile.open(QIODevice::WriteOnly | QIODevice::Truncate);
118-
runningFile.flush();
119-
runningFile.close();
120-
}
121-
122-
void removeRunningFile(const QString &path)
123-
{
124-
QFile::remove(path);
125-
}
126-
113+
#if defined(NDEBUG) && !defined(CHATTERINO_WITH_CRASHPAD)
127114
std::chrono::steady_clock::time_point signalsInitTime;
128115

129116
[[noreturn]] void handleSignal(int signum)
@@ -135,7 +122,7 @@ std::chrono::steady_clock::time_point signalsInitTime;
135122
{
136123
QProcess proc;
137124

138-
#ifdef Q_OS_MAC
125+
# ifdef Q_OS_MAC
139126
// On macOS, programs are bundled into ".app" Application bundles,
140127
// when restarting Chatterino that bundle should be opened with the "open"
141128
// terminal command instead of directly starting the underlying executable,
@@ -152,16 +139,17 @@ std::chrono::steady_clock::time_point signalsInitTime;
152139

153140
CFRelease(appUrlRef);
154141
CFRelease(macPath);
155-
#else
142+
# else
156143
proc.setProgram(QApplication::applicationFilePath());
157144
proc.setArguments({"--crash-recovery"});
158-
#endif
145+
# endif
159146

160147
proc.startDetached();
161148
}
162149

163150
std::_Exit(signum);
164151
}
152+
#endif
165153

166154
// We want to restart Chatterino when it crashes and the setting is set to
167155
// true.

src/common/Args.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,10 @@ void Args::applyCustomChannelLayout(const QString &argValue, const Paths &paths)
306306

307307
// Set first tab as selected
308308
tab.selected_ = window.tabs_.empty();
309-
tab.rootNode_ = SplitNodeDescriptor{{"twitch", channelName}};
309+
tab.rootNode_ = SplitNodeDescriptor{{
310+
.type_ = "twitch",
311+
.channelName_ = channelName,
312+
}};
310313

311314
window.tabs_.emplace_back(std::move(tab));
312315
}

src/common/ChannelChatters.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ void ChannelChatters::addJoinedUser(const QString &user, bool isMod,
3333
assertInGuiThread();
3434

3535
if (isIgnoredMessage(IgnoredMessageParameters{
36+
.message = {},
37+
.twitchUserID = {},
3638
.twitchUserLogin = user,
3739
.isMod = isMod,
3840
.isBroadcaster = isBroadcaster,
@@ -69,6 +71,8 @@ void ChannelChatters::addPartedUser(const QString &user, bool isMod,
6971
assertInGuiThread();
7072

7173
if (isIgnoredMessage(IgnoredMessageParameters{
74+
.message = {},
75+
.twitchUserID = {},
7276
.twitchUserLogin = user,
7377
.isMod = isMod,
7478
.isBroadcaster = isBroadcaster,

0 commit comments

Comments
 (0)