Revert "refactor(eventsub): consume date.h as submodule" (#6046)

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

@@ -0,0 +1,83 @@
+---
+name: Test Arch Linux
+
+on:
+  pull_request:
+  workflow_dispatch:
+  merge_group:
+  push:
+    branches:
+      - master
+      - main
+
+env:
+  TWITCH_PUBSUB_SERVER_TAG: v1.0.8
+  HTTPBOX_TAG: v0.2.1
+  QT_QPA_PLATFORM: minimal
+
+concurrency:
+  group: test-arch-linux-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    name: "Test Arch Linux"
+    runs-on: ubuntu-latest
+    container: archlinux:base-devel
+    strategy:
+      fail-fast: false
+
+    steps:
+      - name: Install dependencies
+        run: |
+          sudo pacman -Sy
+          sudo pacman -S --noconfirm 'qt6-base' 'qt6-tools' 'boost-libs' 'openssl' 'qt6-imageformats' 'qtkeychain-qt6' 'qt6-5compat' 'qt6-svg' 'libnotify'
+          sudo pacman -S --noconfirm 'git' 'boost' 'cmake' 'benchmark'
+
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Create build directory
+        run: mkdir build-test
+
+      - name: Install httpbox
+        run: |
+          curl -L -o httpbox.tar.xz "https://github.com/Chatterino/httpbox/releases/download/${{ env.HTTPBOX_TAG }}/httpbox-x86_64-unknown-linux-gnu.tar.xz"
+          tar -xJf httpbox.tar.xz
+          mv ./httpbox-x86_64-unknown-linux-gnu/httpbox /usr/local/bin
+        working-directory: /tmp
+
+      - name: Download and extract Twitch PubSub Server Test
+        run: |
+          mkdir pubsub-server-test
+          curl -L -o pubsub-server.tar.gz "https://github.com/Chatterino/twitch-pubsub-server-test/releases/download/${{ env.TWITCH_PUBSUB_SERVER_TAG }}/server-${{ env.TWITCH_PUBSUB_SERVER_TAG }}-linux-amd64.tar.gz"
+          tar -xzf pubsub-server.tar.gz -C pubsub-server-test
+          cd pubsub-server-test
+          cd ..
+
+      - name: Configure
+        run: |
+          cmake \
+            -DBUILD_TESTS=On \
+            -DBUILD_BENCHMARKS=On \
+            -DBUILD_APP=OFF \
+            -DCHATTERINO_PLUGINS=On \
+            -DCMAKE_BUILD_TYPE=Debug \
+            ..
+        working-directory: build-test
+
+      - name: Build
+        run: |
+          cmake --build . -j $(nproc)
+        working-directory: build-test
+
+      - name: Test
+        timeout-minutes: 30
+        run: |
+          httpbox --port 9051 &
+          cd ../pubsub-server-test
+          ./server 127.0.0.1:9050 &
+          cd ../build-test
+          ctest --repeat until-pass:4 --output-on-failure
+        working-directory: build-test

.gitmodules

@@ -52,6 +52,3 @@
 [submodule "lib/certify"]
 	path = lib/certify
 	url = https://github.com/Chatterino/certify
-[submodule "lib/twitch-eventsub-ws/lib/date"]
-	path = lib/twitch-eventsub-ws/lib/date
-	url = https://github.com/HowardHinnant/date.git

CHANGELOG.md

@@ -41,7 +41,7 @@
 - Bugfix: Fixed an issue where commands would sometimes reset if Chatterino was improperly shut down. (#6011)
 - Bugfix: Fixed a thick border on Windows 11. (#5836)
 - Dev: Subscriptions to PubSub channel points redemption topics now use no auth token, making it continue to work during PubSub shutdown. (#5947)
-- Dev: Add initial experimental EventSub support. (#5837, #5895, #5897, #5904, #5910, #5903, #5915, #5916, #5930, #5935, #5932, #5943, #5952, #5953, #5968, #5973, #5974, #5980, #5981, #5985, #5990, #5992, #5993, #5996, #5995, #6000, #6001, #6002, #6003, #6005, #6007, #6010, #6008, #6012, #6013, #6015, #6017, #6027, #6028, #6035, #6036, #6040, #6041, #6044)
+- Dev: Add initial experimental EventSub support. (#5837, #5895, #5897, #5904, #5910, #5903, #5915, #5916, #5930, #5935, #5932, #5943, #5952, #5953, #5968, #5973, #5974, #5980, #5981, #5985, #5990, #5992, #5993, #5996, #5995, #6000, #6001, #6002, #6003, #6005, #6007, #6010, #6008, #6012, #6013, #6015, #6017, #6027, #6028, #6035, #6036, #6040, #6041)
 - Dev: Remove unneeded platform specifier for toasts. (#5914)
 - Dev: Highlight checks now use non-capturing groups for the boundaries. (#5784)
 - Dev: Removed unused PubSub whisper code. (#5898)

lib/twitch-eventsub-ws/include/twitch-eventsub-ws/chrono.hpp

@@ -3,6 +3,7 @@
 #include <boost/json.hpp>
 
 #include <chrono>
+#include <sstream>
 
 namespace chatterino::eventsub::lib {
 

lib/twitch-eventsub-ws/src/CMakeLists.txt

@@ -48,12 +48,7 @@ add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES})
 # Generate source groups for use in IDEs
 # source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${SOURCE_FILES})
 
-target_include_directories(${PROJECT_NAME}
-    PUBLIC
-        "${CMAKE_CURRENT_SOURCE_DIR}/../include"
-    PRIVATE
-        "${CMAKE_CURRENT_SOURCE_DIR}/../lib/date/include"
-)
+target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../include")
 
 
 target_link_libraries(${PROJECT_NAME}

lib/twitch-eventsub-ws/src/chrono.cpp

@@ -1,6 +1,6 @@
 #include "twitch-eventsub-ws/chrono.hpp"
 
-#include <date/date.h>
+#include "twitch-eventsub-ws/date.h"
 
 #include <sstream>