Commit graph

2197 commits

Author SHA1 Message Date
DatGuy1
a6c91afde4 Remove support for CBenni's Logviewer (#1458) 2020-01-03 21:11:00 +01:00
Rasmus Karlsson
7f4b7564da Fix a windows-only occurence of log() 2020-01-03 21:08:27 +01:00
pajlada
90296a2d85
Expect a PONG response to our PINGs (#1476)
If no PONG was received, force a reconnection

Fixes #1164
2020-01-03 20:55:13 +01:00
pajlada
3c8992cac1
Remove FMT dependency (#1472)
All occurrences of log() have been replaced with qDebug()

bonus meme: remove a bunch of std::string usages in the pubsub client

Fixes #1467
2020-01-03 20:51:37 +01:00
Mm2PL
6c0b53a996
Fix wrong QSrting::arg() being called by using two calls. 2020-01-03 15:31:39 +01:00
Mm2PL
a86367f4be
Fix issues pointed out in reviews :)
Fixed PR BabyRage
2020-01-03 14:43:05 +01:00
Mm2PL
86318590bf
Fix formatting. 2020-01-01 21:27:13 +01:00
Mm2PL
20d8da8f2d
Merge branch 'master' into git_is_pepega 2020-01-01 21:06:29 +01:00
Rasmus Karlsson
f02988b657 Correct "Emote Link" for BTTV Global and Channel emotes 2019-12-31 21:21:53 +01:00
fourtf
845c8fa638 2.1.7 2019-12-29 17:35:58 +01:00
Rasmus Karlsson
db860b5907 fix semi-deterministic bug with link parser 2019-12-29 16:42:20 +01:00
Rasmus Karlsson
25a2c04b02 Add lists of valid and invalid links 2019-12-29 15:46:29 +01:00
fourtf
17ff0b9d83 fixed case sensitivity in link matching 2019-12-29 15:45:19 +01:00
fourtf
e12f76387a replaced link regex with object oriented assembly 2019-12-29 14:15:45 +01:00
fourtf
443aba3f9c fixed tooltip deselect issue 2019-12-29 11:14:55 +01:00
fourtf
c5e8c5396f oops 2019-12-26 23:41:31 +01:00
fourtf
b70806409d workaround for white border 2019-12-26 23:23:59 +01:00
fourtf
4911c62764 2.1.6 2019-12-26 22:18:46 +01:00
fourtf
6111985b77 replaced link regex 2019-12-26 22:00:31 +01:00
apa420
be898e88dd Add setting to stack bits (#1452) 2019-12-21 10:36:46 +01:00
pajlada
d5001b97f4
allow customizing twitch server parameters through environment variables (#1449) 2019-12-21 10:11:23 +01:00
apa420
0d227ab2f5 Various bits fixes (#1443)
We now make sure we don't render any fake bits
Bits now show their real value properly
2019-12-19 21:36:02 +01:00
Rasmus Karlsson
11442bba20 move titleRefreshPeriod out of the TwitchChannel class
this fixes a "use of uninitialized variable" error
2019-12-16 08:55:38 +01:00
SupDos
ba685b291f Typo in Settings (#1441)
small one character typo
2019-12-15 15:58:58 +01:00
Mm2PL
62cf7cbea2 Remove unmod button for moderators (#1439)
Fixes #1419
2019-12-14 13:22:49 +01:00
Rasmus Karlsson
58e909067e the EmotePopup now inherits from the BasePopup instead of BaseWindow
Fixes #1437
2019-12-14 12:58:15 +01:00
Rasmus Karlsson
55080bd354 Add a "BasePopup" class, which helps add default functionality to any popups (like the search popup) 2019-12-14 12:58:15 +01:00
Rasmus Karlsson
bb9eb582ec replace the QStringList with a QSet<QString> as suggested by RAnders00
2d3fb8950e (r36317456)
2019-12-14 12:13:19 +01:00
Rasmus Karlsson
2d3fb8950e hardcoded list of BTTV's christmas emotes 2019-12-05 20:10:56 -08:00
Rasmus Karlsson
bcc53c9aa7 Clean up Twitch badge appending code 2019-12-01 13:32:41 +01:00
apa420
c00f97ac53 Show exact months subscribed in Subscriber and Founder badge tooltip (#1424) 2019-12-01 02:20:56 -08:00
23rd
d99102cd23 Fixed closing tab with middle button when tab management is not allowed. (#1426) 2019-12-01 02:00:06 -08:00
Ian
e3d3f12425 Fixes C1001 compiler error on release builds with MSVC (#1417) 2019-11-16 02:58:13 -08:00
Rasmus Karlsson
d4474c4ed4 Fixes a bug where the insecure credential store could not save credentials.
Part of the fix for #1377
2019-11-02 14:05:59 +01:00
Rasmus Karlsson
0e1f1196d6 reformat 2019-11-02 12:36:42 +01:00
W Gomes
ce90253aac Removed unused variables (#1394)
* Removed unused variables

Fixes compiler warning C4189: Local variable is initialized but not
referenced

* fixed typo
2019-10-29 21:15:06 +01:00
Felanbird
6f5c4cacf8 moved hardcoded global-badges to be more inline with browser chat (#1392) 2019-10-27 13:18:07 -07:00
Felanbird
0a8d50223d switch badge tooltips from description to title (#1384) 2019-10-27 07:46:08 -07:00
Mm2PL
6c261459cf
Renamed TypedBytes to RawImageData, type to format.
FeelsGoodMan Clap
2019-10-22 17:21:46 +02:00
Mm2PL
736df48788
Smol fix. 2019-10-22 16:04:36 +02:00
apa420
a12bd3df18 Now show joined setting doesn't also show parted and parted shows parted (#1376) 2019-10-20 20:11:12 +02:00
Mm2PL
e005fe806a
Comment stuff
This includes:
 - Adding two comments
 - Fixing one spelling mistake.
2019-10-19 11:41:23 +02:00
CommName
dc1e4d2544 Show the title when offline (#1347)
* Channel text for offline chats

* Title refresh timer

* Fixed typo

* Refresh title when room id is loaded

* removed timer

* Typo

* Loaded on demand when hovered over

* removed the extra api request

* Moved refreshTitle function call

* Added thottling for 10s

* Fixed formating style

* reformat

* make status fetcher safer

* Requested changes from fourtf
2019-10-12 15:09:12 +02:00
fourtf
8153aa7d40 fixed #1362 rightclick on empty split crash 2019-10-12 11:17:40 +02:00
Mm2PL
77af5d54cf
Change more things.
Things changed:
 - make getImageFileFormat case insensitive
 - use QTextEdit::dragEnterEvent instead of QAbstractScrollArea::dragEnterEvent,
 - Make dragEnterEvent() and dropEvent() overrides.
2019-10-11 17:00:26 +02:00
Mm2PL
bf434f3ac5
Fix the stupid things.
This includes:
 - NuulsUploader.cpp
   - changing upload delay to a #define
   - moving png conversion code to `boost::optional<QByteArray> convertToPng(QImage image)`
   - in uploadImageToNuuls: moving content type definition to a variable, move things around a bit to eliminate an if
   - in upload: adding a comment about `source->hasUrls()` and `source->urls()`, change `uploadQueue.size()` to `!uploadQueue.empty()`
 - ResizingTextEdit.cpp
   - changing #include order
2019-10-11 15:41:33 +02:00
fourtf
6f710823ed renamed getInstance() -> instance() for singletons 2019-10-07 22:42:34 +02:00
fourtf
aeab038bc8 removed get function prefix in Version 2019-10-07 22:32:11 +02:00
fourtf
ec2a2f30b7 fixed windows compilation 2019-10-07 22:29:35 +02:00
fourtf
bc55a05480 clears cache files > 14 days 1 min after start 2019-10-07 22:14:00 +02:00
fourtf
a894753596 renamed isVIP -> isVip 2019-10-07 20:31:34 +02:00
fourtf
f25e52b218 attach extension to opera/vivaldi or all windows 2019-10-07 20:23:28 +02:00
fourtf
2fc799f85a run destructor of Frames in gui thread 2019-10-07 20:03:15 +02:00
fourtf
0ada53a3c1 tell user they might downgrade in update popup 2019-10-07 19:53:46 +02:00
fourtf
594c0fb255 print version on --version switch 2019-10-07 18:57:33 +02:00
fourtf
05bcf22af4 clear search field when reopening settings 2019-10-07 17:30:47 +02:00
fourtf
b1cbf09427 removed appbase directory 2019-10-07 15:46:41 +02:00
fourtf
9f52564b9c fixes tab and split header title text size 2019-10-06 21:31:59 +02:00
fourtf
4ab8a7e9dd Fixes #1312 pixelated scaling on kde 2019-10-06 20:31:29 +02:00
Cranken
f89ca517ce Fix first line of emotes in emote picker window being shifted. 2019-10-06 17:29:18 +02:00
fourtf
c6e1a1de2e Revert "changed default port from 443 to 6697"
It doens't appear to be the issue that builds aren't working

This reverts commit 56b7a3616f.
2019-10-05 19:42:46 +02:00
fourtf
56b7a3616f changed default port from 443 to 6697 2019-10-05 19:29:19 +02:00
fourtf
16b2b2458c Fixes #1331 emote picker out of bounds 2019-10-05 18:17:29 +02:00
Cranken
252e2e8bae Fix tooltips in chat not showing on ctrl hover. 2019-10-05 17:36:03 +02:00
fourtf
b64e2e9b70 Revert "Revert "added error message if settings initalizion failed""
This reverts commit f3ff40385d.
2019-10-05 16:40:04 +02:00
fourtf
50a68e380c Revert "test #7"
This reverts commit 645272718e.
2019-10-05 16:13:15 +02:00
fourtf
96a6d94699 Revert "Test #6"
This reverts commit 533516a9ed.
2019-10-05 16:13:11 +02:00
fourtf
645272718e test #7 2019-10-05 15:12:02 +02:00
fourtf
533516a9ed Test #6 2019-10-05 14:40:42 +02:00
Rasmus Karlsson
3a8f91d6f6 Change default port from 6697 to 443 2019-10-04 13:06:15 +02:00
pajlada
2284b713c1
Merge pull request #1353 from leon-richardt/comma-mention-fix
Fix Bug Regarding Mentions with Comma
2019-10-04 04:01:37 -07:00
fourtf
c46a65d173 Revert "disabled updates as a test"
This reverts commit f8c4ac8c17.
2019-10-03 22:18:03 +02:00
fourtf
245001c2f0 Revert "test #2"
This reverts commit 30587e18c9.
2019-10-03 22:18:01 +02:00
fourtf
44551b4009 Revert "test #3"
This reverts commit 08004b9181.
2019-10-03 22:17:59 +02:00
fourtf
9d1213ecad Revert "test #4"
This reverts commit a08ca1333f.
2019-10-03 22:17:57 +02:00
fourtf
34749c9d3d Revert "test #5"
This reverts commit 5aff7b0b40.
2019-10-03 22:17:54 +02:00
fourtf
f3ff40385d Revert "added error message if settings initalizion failed"
This reverts commit 2b9b96abb5.
2019-10-03 22:12:22 +02:00
fourtf
5aff7b0b40 test #5 2019-10-03 21:52:10 +02:00
fourtf
a08ca1333f test #4 2019-10-03 21:40:59 +02:00
fourtf
08004b9181 test #3 2019-10-03 21:29:18 +02:00
fourtf
30587e18c9 test #2 2019-10-03 20:36:22 +02:00
fourtf
f8c4ac8c17 disabled updates as a test 2019-10-03 20:09:58 +02:00
fourtf
2b9b96abb5 added error message if settings initalizion failed 2019-10-03 18:05:56 +02:00
fourtf
7fa2c7b4a5 init irc and restart on crash is false by default 2019-10-03 17:37:09 +02:00
Leon Richardt
d6bcd61289
Fix bug regarding mentions with comma
While tab-completing user names already respected the setting for
mentions with commas, right-clicking user names did not.

This commit adds the missing check in ChannelView::handleMouseClick.
2019-10-03 15:30:51 +02:00
fourtf
375aa221eb messed up the operator 2019-10-03 10:13:49 +02:00
fourtf
033c97e85d disabled hash<QString> for Qt 5.14 2019-10-03 10:07:14 +02:00
fourtf
e31371fdf5 Fixes #1344 Copying user id adds "ID: " 2019-10-01 22:38:21 +02:00
TranRed
1d306c1dd9 Revert "broke everything (revert if needed)"
This reverts commit f9d50954d9.
2019-09-27 14:05:03 +02:00
TranRed
f9d50954d9 broke everything (revert if needed) 2019-09-27 13:51:12 +02:00
Mm2PL
970503b755
Apply last suggestion and fix mistake not letting the user upload an
image after attempting to upload a file that is not an image.
2019-09-26 14:42:30 +02:00
Mm2PL
205122ee68
Avoid copying a QUrl in upload() when pasting files from the filesystem. 2019-09-26 14:24:41 +02:00
fourtf
9874bd779a formatted all files with clang 9 2019-09-26 00:51:05 +02:00
fourtf
e47a043a27 updated .clang-format for clang 9 2019-09-26 00:15:07 +02:00
fourtf
848d5c8789 Fixes #1336 Pause on hover breaks moves selection 2019-09-25 23:49:30 +02:00
Mm2PL
b55d08df8e
Renamed the pastedImage signal to imagePasted. 2019-09-25 22:39:02 +02:00
Mm2PL
4e9951371f
Applied a bit of foutf's suggestions. Replace uploadQueue.size() with .empty() and swap if/else bodies, move non empty queue check outside of the timer on line 60, move getImageFileFormat to an anonymous namespace, rename pasteFromClipoard to upload(), removed usesless comment, shortened message on line 83, use QMimeData.hasUrls() and QMimeData.urls(), moved GIF format case in upload() more to the top, call original functions in canInsertFromMimeData and dragEnterEvent which are overriden 2019-09-25 22:21:26 +02:00
Mm2PL
298c013fa0
Rename Env::imagePasteSiteUrl to Env::imageUploaderUrl. 2019-09-25 12:51:17 +02:00
Mm2PL
1a77df1674
Delete overloads for uploadImageToNuuls(). Use TypedBytes in the main
definition. Use QHttpMultiPart instead of manually creating the
request.
2019-09-24 18:28:28 +02:00
Mm2PL
e0eb4e5a6d
I'm Pepega too. Added two missing files. 2019-09-24 16:08:12 +02:00
Mm2PL
65fab779c5
Redo all changes done before breaking the branch. 2019-09-23 19:36:52 +02:00
fourtf
367b1970fd use C_DEBUG instead of QT_DEBUG 2019-09-22 18:09:11 +02:00
fourtf
ca0db97d09 ammend 2.1.5 added setting for experimental irc support 2019-09-22 17:12:09 +02:00
fourtf
2c25c8a5f5 2.1.5 2019-09-22 16:59:51 +02:00
fourtf
fc049d8f45 disabled irc and fixed notice messages in write conn not showing 2019-09-22 16:16:08 +02:00
fourtf
f27c8eb1b4 fixed crash restart conditions 2019-09-22 16:14:16 +02:00
fourtf
431d35e528 added setting to restart on SIGSEGV 2019-09-22 15:32:36 +02:00
fourtf
7e555843ca added class containing program arguments 2019-09-22 15:30:04 +02:00
fourtf
456065f508 moved resources out of Application 2019-09-22 10:54:32 +02:00
fourtf
da4714944d small fixes in Image 2019-09-22 10:54:32 +02:00
pajlada
038fdd5446
Merge pull request #1326 from CommName/MentionsFix
[Bug fix] Highlights in /mentions
2019-09-22 10:43:13 +02:00
pajlada
1256a7b631
Fix formatting 2019-09-22 10:42:22 +02:00
CommName
5078ecbef1 Highlight bug fix 2019-09-21 22:19:03 +02:00
Leon Richardt
19b2102fed Fix Version::dateOfBuild_ on Windows
The `CHATTERINO_NIGHTLY_VERSION_STRING` defines differ on Windows and
MacOS/Linux. (See `appveyor.yml` and `travis.yml`, respectively.)
Therefore, the Windows version string looked really messed up but it
should be fixed now.
2019-09-21 20:44:49 +02:00
Rasmus Karlsson
5871414e6b Possibly fixed PubSub over 50 listens
Keep an eye out on #1189
2019-09-21 12:46:10 +02:00
Rasmus Karlsson
137d7910c0 move more handlers from write to read 2019-09-21 11:57:09 +02:00
Rasmus Karlsson
d94be74007 handle clearchat in read connection 2019-09-21 11:54:30 +02:00
Rasmus Karlsson
88da9501f7 handle ROOMSTATE in read connection too
this fixes the "recent messages not loading" issue
2019-09-21 11:45:55 +02:00
Rasmus Karlsson
8312d4b112 Fix USERSTATE not being handled unless you write in a channel.
This commit might re-enable some duplicate messages like host requests
and what-not.
2019-09-21 11:38:08 +02:00
pajlada
452b65b4dd
Merge pull request #1315 from leon-richardt/commit-hash-settings
Add Version Information to "About" Page
2019-09-21 10:10:04 +02:00
Leon Richardt
baf52d7563 Add version information to "About" page 2019-09-19 23:31:04 +02:00
Leon Richardt
ddcce73111 Use Version singleton to set window title 2019-09-19 23:30:18 +02:00
Leon Richardt
9c59efb985 Provide singleton class for version information 2019-09-19 23:30:18 +02:00
fourtf
758a6bb41c NetworkRequest onError now uses NetworkResult 2019-09-19 19:03:50 +02:00
fourtf
986694e4bc added multipart support to NetworkRequest 2019-09-19 18:26:38 +02:00
fourtf
ce53653ecd remoed nullableptr 2019-09-19 12:19:50 +02:00
fourtf
88d8bf7cec renamed members in Helpers.cpp 2019-09-18 16:32:07 +02:00
fourtf
5ca0fc0c8f
Merge branch 'master' into moderation 2019-09-18 16:14:45 +02:00
fourtf
277bd5b179 maybe?? 2019-09-18 16:01:41 +02:00
fourtf
4d99d2dade maybe? 2019-09-18 15:30:17 +02:00
fourtf
4bb0b79348 fix compilation on macos maybe 2019-09-18 15:12:23 +02:00
fourtf
99f99f0cff smol fixes 2019-09-18 14:20:21 +02:00
fourtf
3ab7362304 Merge branch 'master' into irc-support 2019-09-18 13:03:16 +02:00
fourtf
997a0598cd changed tab title to "Irc (beta)" 2019-09-18 11:16:07 +02:00
fourtf
07133166d9 added setting to show unhandled irc commands 2019-09-18 11:11:50 +02:00
fourtf
765a75f158 added irc commands 2019-09-18 10:59:28 +02:00
fourtf
27d6cf2bfd reconnect for irc + show errors + nickRequired 2019-09-18 08:05:51 +02:00
fourtf
96dac0fd3d moved chatters to ChannelChatters 2019-09-17 12:11:11 +02:00
fourtf
6298b74884 fixed compilation on non-msvc 2019-09-16 21:08:14 +02:00
fourtf
13c9aabf29 show all irc messages for debugging 2019-09-16 18:01:32 +02:00
fourtf
cadff4c430 Fixes #1259 highlight not added when changing channel 2019-09-16 11:54:34 +02:00
fourtf
89fd3bfce9 hide tooltip on split::leaveEvent 2019-09-16 11:48:17 +02:00
fourtf
40c1857c90 added additional dropdown for moderation mode 2019-09-16 11:44:03 +02:00
fourtf
3a9f9fa17b added setting for pause on hover length 2019-09-16 11:36:19 +02:00
fourtf
602a66f5bc Fixes #963 Highlights move while paused 2019-09-16 10:55:54 +02:00
fourtf
fd8987cf1b fixed typo 2019-09-16 10:44:05 +02:00
fourtf
63126899ec added pause while key is down 2019-09-16 10:43:20 +02:00
fourtf
b06918eb47 2.1.4 2019-09-15 19:32:31 +02:00
fourtf
84b1efcd24 fixes #1304 emote.name eating the .name 2019-09-15 19:05:04 +02:00
fourtf
04f8875c4d fixes #1303 now searches using search text instead of message text 2019-09-15 18:29:50 +02:00
fourtf
0cb918b96a fixed spaces in the wrong place 2019-09-15 17:01:18 +02:00
fourtf
b1bf60f286 added a critical detail 2019-09-15 16:56:44 +02:00
fourtf
7cbbd72e7f disable updates on windows nightlies 2019-09-15 15:45:04 +02:00
fourtf
a390649d0f added sasl auth 2019-09-15 13:15:29 +02:00
fourtf
22ca20ad2a renamed TwitchServer -> TwitchIrcServer 2019-09-15 13:02:02 +02:00
fourtf
c3b65b4db0 select the right server in the dialog 2019-09-15 11:42:22 +02:00
fourtf
67ffb0e34b irc default now uses ssl 2019-09-15 11:36:59 +02:00
fourtf
2a56cef848 added irc authentificate type 2019-09-15 11:35:17 +02:00
fourtf
d451b31cee fixed loading cached files twice 2019-09-14 23:23:09 +02:00
fourtf
9bbc4f8a5e queue for erase/set credentials 2019-09-14 22:58:53 +02:00
fourtf
13d1fab303 credentials are now loaded when needed 2019-09-14 20:45:01 +02:00
fourtf
d33a8b1b3a now loads passwords for irc 2019-09-14 18:38:09 +02:00
fourtf
b45a6eea22 fixed missing include 2019-09-14 15:50:05 +02:00
fourtf
7c6f744e73 added insecure credential store 2019-09-13 19:26:52 +02:00
fourtf
eadf5355ee renamed IrcConnection_ to IrcServerData 2019-09-11 13:51:48 +02:00
fourtf
158564d0c2 disabled twitch dropdown items for irc chats 2019-09-11 13:34:59 +02:00
fourtf
b20fdc0da6 smol irc fixes 2019-09-11 13:17:36 +02:00
fourtf
2f39f4246c fixed warning + added more checks to SignalVectorModel 2019-09-11 13:12:08 +02:00
fourtf
2a8c5e654f saving irc splits now 2019-09-11 00:10:49 +02:00
fourtf
c4d0efacff added loading and saving of irc servers 2019-09-10 23:55:43 +02:00
fourtf
fe67bda136 moved .clang-format into src directory so submodules don't get formatted 2019-09-10 17:00:23 +02:00
fourtf
82f63d2f7e added send and receive for irc messages 2019-09-10 14:46:43 +02:00
fourtf
25f75f7580 added Credential class 2019-09-09 22:27:46 +02:00
fourtf
5974438edf added irc tab in SelectChannelView 2019-09-09 22:26:56 +02:00
fourtf
fd0c11964e added new function and classes for irc support 2019-09-09 22:26:14 +02:00
fourtf
9f1a5b900e fixed single connection code and deleting abstractircserver 2019-09-09 22:22:47 +02:00
fourtf
8241ce7097 added qtkeychain dependency 2019-09-09 22:18:56 +02:00
Leon Richardt
720e5aa25f Improvements to Message Search (#1237)
* Ran clang-format

* Implement user-specific search in message history

This functionality was originally requested in #1236.

This commit changes the SearchPopup::performSearch method so that only
messages from specific users can be shown.

In order to filter for a specific user, enter their username with a
leading '@' in the search popup. You can also add an additional search
phrase which will also be considered in the search.

* Naive implementation for "from:" tags

Rebase later?

* Cleverer (?) version using Predicates

Commit adds two POC predicates: one for the author of messages, and one
for substring search in messages.

Problems/TODOs:
* Best way to register new predicates?
* Clean up tags (e.g. "from:") or not?
* Test combinations of different predicates

* Add a predicate to check for links in messages

* Remove a dumb TODO

* Rewrite SearchPopup::performSearch to be cleaner

* Ran clang-format on all files

* Remove TODO I missed earlier

* Forgot to run clang-format

peepoSadDank

* Re-use {}-initialization

Was accidentally removed when fixing earlier merge conflict.

* Does this fix line endings?

No diffs are shown locally, hopefully Git doesn't lie to me.

* Rename "predicates" directory to "search"

Resolving one conversation in the review of #1237.

* Use LinkParser in LinkPredicate

Resolving a conversation in the review of #1237.

* Predicates: Use unique_ptr instead of shared_ptr

Resolves a conversation in the review of #1237.

* Refactor of SearchPopup and AuthorPredicate

Resolving some points from the review in #1237.

* Moved parsing of comma-seperated values into AuthorPredicate
  constructor.
* Rewrite SearchPopup::parsePredicates as suggested.
* Deleted now redundant methods in SearchPopup.

* MessagePredicate::appliesTo now takes a Message&

... instead of a MessagePtr.

This resolves a conversation in the review of #1237.

* Run clang-format on two files I missed

* AuthorPredicate: Check for displayName & loginName

Resolving conversation on #1237.
2019-09-09 15:21:49 +02:00
Leon Richardt
b6f632701f Fix merge conflicts 2019-09-08 22:58:17 +02:00
Leon Richardt
b06eb9df83 Normalize line endings in already existing files 2019-09-08 22:27:57 +02:00
fourtf
e1a9a437f1 fixed pingsound not playing sometimes 2019-09-08 21:57:14 +02:00
fourtf
4f356f80cf BaseWindow smol refactor 2019-09-08 21:45:46 +02:00
fourtf
3158ed4085 fixed user popup size issues 2019-09-08 20:05:40 +02:00
fourtf
343cd3970a bump version 2019-09-08 18:46:57 +02:00
fourtf
cf23838099 added irc support 2019-09-08 18:06:43 +02:00
fourtf
9f1eb654fd
Merge branch 'master' into apa-bits 2019-09-08 18:02:58 +02:00
apa420
0c6a26d897 IFDEF QT_DEBUG 2019-09-08 17:40:30 +00:00
apa420
ffc483049c Pepega 2019-09-08 17:36:26 +00:00
apa420
0eb633cfa0 Removed some examples 2019-09-08 17:31:00 +00:00
apa420
3f411805b7 Forgot to add file 2019-09-08 17:27:04 +00:00
apa420
289811dc7d Moved example cheers to new file 2019-09-08 17:25:42 +00:00
apa420
5c602fea94 Resolved review 2019-09-08 16:01:38 +00:00
fourtf
c6a05f289d removed useless table column in user highlights 2019-09-08 15:10:10 +02:00
fourtf
87c0ff76e7 added setting to open links in incognito by default 2019-09-08 14:59:51 +02:00
Rasmus Karlsson
94048595f6 Split parseChannelResponse into two functions: parseModBadge and
parseChannelEmotes
2019-09-08 14:08:18 +02:00
Rasmus Karlsson
862164bc2b make ffz custom mod badge atomic 2019-09-08 14:08:18 +02:00
Rasmus Karlsson
2cd07435bd Remove more unused includes 2019-09-08 14:08:18 +02:00
Rasmus Karlsson
57ba829775 Remove previously added includes to Image 2019-09-08 14:08:18 +02:00
Rasmus Karlsson
dbce128cc3 Remove "custom on success" logic from Image.
Create a new message element and message layout element type for mod badges.
2019-09-08 14:08:18 +02:00
Rasmus Karlsson
256a65a12e Load mod badge information from the FFZ API instead of assuming the URL.
This lets us load all sizes of the emote if they are available.

Channel with all versions of the mod badge: https://api.frankerfacez.com/v1/room/pajlada
Channel with only one version of the mod badge: https://api.frankerfacez.com/v1/room/apa420
Channel with no mod badge: https://api.frankerfacez.com/v1/room/forsen
2019-09-08 14:08:18 +02:00
apa420
c08eaa4640 Higher cheer tiers now show and added tests 2019-09-08 13:40:11 +02:00
apa420
cd64b5eff5 Removed old tests 2019-09-08 12:47:36 +02:00
apa420
48fcc1a1a1 Fixed cheers not showing up in chat Fixes #1031 2019-09-08 12:45:25 +02:00
fourtf
4ec10e720c adjusted size of user switch popup 2019-09-08 12:43:12 +02:00
fourtf
b14154a811 Fixes #996 can't ctrl+c in search popup 2019-09-08 12:31:27 +02:00
TranRed
21f65b716d Merge branch 'Ch2Usercard' of https://github.com/TranRed/chatterino2 into Ch2Usercard 2019-09-08 12:05:46 +02:00
TranRed
d3c4d4b8cf moved anonymous namespace into chatterino namespace 2019-09-08 12:05:41 +02:00
pajlada
dd996d1b8a
Merge pull request #1281 from Chatterino/logsGtSearch
Allow searching in LogsPopup
2019-09-08 10:59:13 +02:00
Leon Richardt
a62b7ac094 Add setting for case-sensitivity in highlights 2019-09-07 19:01:52 +02:00
fourtf
a268abfd4c Allow searching in LogsPopup 2019-09-04 00:29:58 +02:00
fourtf
9ee286f60f Fixes #1279 bttv global V3 2019-09-03 23:32:22 +02:00
fourtf
69aa5db2be changed version format 2019-09-03 19:54:17 +02:00
fourtf
3e85a29ab6 2.1.4 Beta 1 2019-09-03 19:19:57 +02:00
Rasmus Karlsson
f94b44188d Use BTTV V3 API
Fixes #1275
2019-09-03 15:09:49 +02:00
fourtf
1c0ed6b1aa slightly changed layout for logs and cache 2019-09-03 13:09:33 +02:00
fourtf
577e2e0a21 moved cache into general page 2019-09-03 12:46:22 +02:00
fourtf
299cc84e04 fixed compilation 2019-09-03 12:02:58 +02:00
fourtf
6aa6e084af removed unused settings pages 2019-09-03 11:49:44 +02:00
fourtf
ac26bd8d2d fixed "open appdata button" always showing 2019-09-03 11:38:15 +02:00
fourtf
ab816e18bd Merge branch 'search-settings' 2019-09-03 11:28:10 +02:00
fourtf
3ab40b280b fixed some margins 2019-09-03 11:24:40 +02:00
fourtf
f7ee778af6 some style changes to settings 2019-09-03 11:15:38 +02:00
fourtf
0ada2e51c6 fixed spacing 2019-09-02 19:14:19 +02:00
fourtf
eaaa52260e smol fixes 2019-09-02 19:00:17 +02:00
fourtf
125426dbf1 added header for search 2019-09-02 18:59:37 +02:00
fourtf
234cdb041b sort paths in Resources to eliminate merge conflicts 2019-09-02 18:53:08 +02:00
fourtf
661a36c2e4 prefere user selected tab in settings search 2019-09-02 17:22:14 +02:00
fourtf
a6fd6300c9 hide duplicate spaces in settings tab list 2019-09-02 17:21:17 +02:00
fourtf
b0459ba646 add basic hiding of SettingsTabs 2019-09-02 16:39:21 +02:00
fourtf
0e62192732 post update 2019-09-02 14:01:43 +02:00
fourtf
dc1c7cb419 2.1.3 2019-09-02 12:29:18 +02:00
fourtf
e1e953272b moved some settings around 2019-09-02 10:55:17 +02:00
fourtf
42581598e1 added "beta update" settings 2019-09-02 10:55:17 +02:00
fourtf
54c26d2228 fixed width when searching 2019-09-02 09:44:25 +02:00
fourtf
0b49f696ce added filtering to general page and greying out some items to the other
pages
2019-09-01 23:23:20 +02:00
fourtf
ae20acb7ea renamed AccountSwitchPopupWidget -> AccountSwitchPopup
This has been triggering me forever
2019-09-01 14:13:44 +02:00
fourtf
19960b5d8f Fixes #1261 size on startup 2019-09-01 14:06:30 +02:00
fourtf
5c0f81defd Fixed stuff in user popup 2019-09-01 13:06:56 +02:00
Mm2PL
b441e3e159 Add copy button for user ids 2019-09-01 11:06:07 +02:00
Mm2PL
6732aab323 Add user IDs to user cards (#1247)
* Add user ids to user cards and a setting to the misc section of the settings

* Fix letter casing

* Forgot to run clang-format, now it's fixed

* Fix crash in UserInfoPopup::updateUserData()

* Removed setting as per Apa420's and fourtf's advice

* Removed remnants of the setting
2019-08-31 17:58:28 +02:00
Rasmus Karlsson
a878ca8062 Remove unused lambda capture to fix warnings 2019-08-31 17:45:13 +02:00
Rasmus Karlsson
7ff567d584 rename "messageReceived" to "readConnectionMessageReceived" to match the "readConnected/writeConnected" and "writeConnectionMessageReceived" functions 2019-08-31 17:44:41 +02:00
Rasmus Karlsson
829c63be51 Change in which "message received" handler IRC commands are handled after the change in CAP REQs.
Fixes #1252
2019-08-31 17:41:49 +02:00
fourtf
671c9ed654 fixed commands like /mods not working 2019-08-27 20:45:42 +02:00
Mm2PL
7aa2bf4fec Fix build and rename variables to be camelCase 2019-08-27 20:10:30 +02:00
Mm2PL
1c242a51dd Create a copy icon. Change the copy button text to be an icon 2019-08-27 20:10:30 +02:00
Mm2PL
f2f5ae9c93 Add a copy button near the username in usercards 2019-08-27 20:10:30 +02:00
apa420
a624d14a4f Fetch FFZ channel emotes with channel id instead of name 2019-08-27 20:08:17 +02:00
fourtf
450f3bc492 removed useless const 2019-08-27 20:08:17 +02:00
apa420
677017a8bd Now shows connect and reconnect messages 2019-08-27 19:54:37 +02:00
fourtf
2d64d79c17 enabled commit titles 2019-08-27 10:19:39 +02:00
fourtf
7b43f0a30a 2.1.2 2019-08-26 23:04:55 +02:00
TranRed
18349ed9b3 Revert "Merge pull request #1 from TranRed/subbutton"
This reverts commit d3aa3694f2.
2019-08-26 23:02:04 +02:00
fourtf
810acbcfcc fixed window frame for minimized and maximized windows on startup 2019-08-26 22:32:17 +02:00
fourtf
a831c1d5d8 enabled commit number again 2019-08-26 17:45:58 +02:00
fourtf
377a30fd9e 2.1.1 2019-08-26 17:16:22 +02:00
fourtf
f949605477 added descriptions to collection settings 2019-08-26 14:36:06 +02:00
fourtf
e7b4527a0f added regex help link 2019-08-26 14:07:21 +02:00
fourtf
a64e5b2834 made follow mode text shorter 2019-08-26 13:48:07 +02:00
fourtf
238d213072 punctuation changes 2019-08-26 13:29:04 +02:00
fourtf
a6ab9be8d6 fixed double : in general settings 2019-08-26 13:22:44 +02:00
fourtf
e095db87bc changed screen out of bounds detection from contains() to intersects() 2019-08-26 13:18:40 +02:00
fourtf
20e978ad85 changed up settings 2019-08-26 13:18:23 +02:00
fourtf
cced199eaf added button to import commands from chatterino 1 2019-08-26 11:46:52 +02:00
fourtf
ea28269951 attempt to fix the tabs that sometimes get added 2019-08-26 11:26:58 +02:00
fourtf
748920e8fd fixed shift+(home/end) 2019-08-26 11:11:02 +02:00
fourtf
77aec1d3eb improved description of double click link setting 2019-08-26 10:58:47 +02:00
fourtf
6cb82307e6 switched std::optional to boost::optional 2019-08-25 22:58:19 +02:00
fourtf
84c7c40e86 added some flush() calls just to be sure 2019-08-25 21:26:14 +02:00
fourtf
38bceba5ec improved browser extension 2019-08-25 21:25:31 +02:00
fourtf
68a96e3be8 added prompt to move windows into bounds 2019-08-25 21:24:43 +02:00
Mm2PL
1a25c5afe8 Add a switch for follower only mode (#1241)
* Add a switch follower only mode

* Format the code
2019-08-25 19:08:04 +02:00
TranRed
23c2fa8ee5 made fillLatestMessages into a free standing function 2019-08-25 15:09:30 +02:00
TranRed
288ea5036b did first requested refactors 2019-08-25 14:57:31 +02:00
23rd
a893be796c Refactored UserInfoPopup::TimeoutWidget. 2019-08-25 12:24:35 +02:00
TranRed
d63438c351 added some improvements suggested by 23rd 2019-08-25 11:56:15 +02:00
TranRed
89a60ceea8 turned QString::compare() call into a bool
create self-similarity with bool isMyself further up in the class implementation
2019-08-25 10:02:26 +02:00
23rd
cdc7051e56 Considerably refactored code of Usercard. 2019-08-25 09:47:00 +02:00
TranRed
f7fa000266 fixed bug that terminates chatterino
seems like durationUnits[i++] tried to access a non existing element and chatterino crashed while opening the user card.

this tweek fixed it
2019-08-24 17:26:37 +02:00
23rd
25871bdc2f Slightly refactored code of Usercard. 2019-08-24 17:09:41 +02:00
TranRed
0ce5e7f529 added border to Buttons
added border to Buttons
deleted unused variables
renamed some vars
2019-08-24 11:00:55 +02:00
pajlada
def839bef9
Merge pull request #1232 from Chatterino/pajlada-manually-send-req
manually send req, this ensures we send it before JOIN
2019-08-23 22:37:52 +02:00
fourtf
0577692c99 Updated chatterino badges api 2019-08-23 16:52:44 +02:00
Rasmus Karlsson
ab0d70300c manually send req, this ensures we send it before JOIN
Fixes #1229
2019-08-22 22:04:26 +02:00
TranRed
5cd067aab0 readded used "unused" variable 2019-08-22 21:33:50 +02:00
apa420
0c6760d0ca Fixes the remove button '''crash''' #1226 2019-08-22 16:34:26 +02:00
fourtf
d709b98331 switched order in loaded image selection 2019-08-21 02:21:12 +02:00
fourtf
e140905faf ? 2019-08-21 02:16:33 +02:00
fourtf
978d5aa1c1 Special message when login expired. 2019-08-21 02:14:01 +02:00
fourtf
3b3791e43a Special message when login expired. 2019-08-21 02:00:42 +02:00
fourtf
6d9545157e Fixes #1215 Allow previewing badges 2019-08-21 01:52:01 +02:00
fourtf
dbc20baa65 fixed emote preview not using 3x images 2019-08-21 01:44:19 +02:00
fourtf
67aadfe61f Fixes #1218 Usercard link from search popup 2019-08-21 01:19:41 +02:00
fourtf
b513caf572 added settings to mention users with , 2019-08-21 01:08:15 +02:00
fourtf
b84c3ac3be Fixes #1220 Added setting do disable timeout stacking 2019-08-21 00:41:48 +02:00
fourtf
f3e48c1325 smoll changes 2019-08-21 00:07:59 +02:00
fourtf
d98318e1cc fixed compilation on linux 2019-08-20 23:54:45 +02:00
fourtf
7643c0d20d fixed deleting QTimer on wrong thread 2019-08-20 23:46:27 +02:00
fourtf
14222f84f2 made caller/concurrent rules tighter 2019-08-20 23:46:27 +02:00
fourtf
7d842e6cf7 Writing cache files async 2019-08-20 22:16:17 +02:00