colin/abaddon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into voice

Browse Source
This commit is contained in:
ouwou
2023-02-21 22:35:07 -05:00
parent 345a84e654 ba9d9997d4
commit 135f631761
3 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
.github/workflows/ci.yml vendored
View File

@@ -78,27 +78,28 @@ jobs:
- name: Setup Artifact - name: Setup Artifact
run: | run: |
mkdir -p build/artifactdir/bin build/artifactdir/etc/ssl/certs build/artifactdir/lib build/artifactdir/share/glib-2.0/schemas artifact_dir=build/artifactdir/abaddon-${{ matrix.buildtype }}-${GITHUB_SHA::7}
mkdir -p ${artifact_dir}/bin ${artifact_dir}/etc/ssl/certs ${artifact_dir}/lib ${artifact_dir}/share/glib-2.0/schemas
cd build cd build
cp *.exe artifactdir/bin cp *.exe ../${artifact_dir}/bin
cd .. cd ..
cp /mingw64/etc/ssl/certs/ca-bundle.crt build/artifactdir/etc/ssl/certs cp /mingw64/etc/ssl/certs/ca-bundle.crt ${artifact_dir}/etc/ssl/certs
cp -r /mingw64/lib/gdk-pixbuf-2.0 build/artifactdir/lib cp -r /mingw64/lib/gdk-pixbuf-2.0 ${artifact_dir}/lib
cp -r res/css res/res res/fonts build/artifactdir/bin cp -r res/css res/res res/fonts ${artifact_dir}/bin
cp /mingw64/share/glib-2.0/schemas/gschemas.compiled build/artifactdir/share/glib-2.0/schemas cp /mingw64/share/glib-2.0/schemas/gschemas.compiled ${artifact_dir}/share/glib-2.0/schemas
cat "ci/msys-deps.txt" | sed 's/\r$//' | xargs -I % cp /mingw64% build/artifactdir/bin || : cat "ci/msys-deps.txt" | sed 's/\r$//' | xargs -I % cp /mingw64% ${artifact_dir}/bin || :
cp /usr/bin/msys-ffi-8.dll build/artifactdir/bin/libffi-8.dll cp /usr/bin/msys-ffi-8.dll ${artifact_dir}/bin/libffi-8.dll
mkdir -p build/artifactdir/share/icons/Adwaita mkdir -p ${artifact_dir}/share/icons/Adwaita
cd build/artifactdir/share/icons/Adwaita cd ${artifact_dir}/share/icons/Adwaita
mkdir -p 16x16/actions 24x24/actions 32x32/actions 48x48/actions 64x64/actions 96x96/actions scalable/actions mkdir -p 16x16/actions 24x24/actions 32x32/actions 48x48/actions 64x64/actions 96x96/actions scalable/actions
cd ../../../../../ cd ../../../../../
cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/16x16/actions/%.symbolic.png build/artifactdir/share/icons/Adwaita/16x16/actions || : cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/16x16/actions/%.symbolic.png ${artifact_dir}/share/icons/Adwaita/16x16/actions || :
cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/24x24/actions/%.symbolic.png build/artifactdir/share/icons/Adwaita/24x24/actions || : cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/24x24/actions/%.symbolic.png ${artifact_dir}/share/icons/Adwaita/24x24/actions || :
cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/32x32/actions/%.symbolic.png build/artifactdir/share/icons/Adwaita/32x32/actions || : cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/32x32/actions/%.symbolic.png ${artifact_dir}/share/icons/Adwaita/32x32/actions || :
cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/48x48/actions/%.symbolic.png build/artifactdir/share/icons/Adwaita/48x48/actions || : cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/48x48/actions/%.symbolic.png ${artifact_dir}/share/icons/Adwaita/48x48/actions || :
cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/64x64/actions/%.symbolic.png build/artifactdir/share/icons/Adwaita/64x64/actions || : cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/64x64/actions/%.symbolic.png ${artifact_dir}/share/icons/Adwaita/64x64/actions || :
cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/96x96/actions/%.symbolic.png build/artifactdir/share/icons/Adwaita/96x96/actions || : cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/96x96/actions/%.symbolic.png ${artifact_dir}/share/icons/Adwaita/96x96/actions || :
cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/scalable/actions/%.svg build/artifactdir/share/icons/Adwaita/scalable/actions || : cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/scalable/actions/%.svg ${artifact_dir}/share/icons/Adwaita/scalable/actions || :
- name: Upload build (1) - name: Upload build (1)
uses: haya14busa/action-cond@v1 uses: haya14busa/action-cond@v1
@@ -130,6 +131,7 @@ jobs:
- name: Fetch dependencies - name: Fetch dependencies
run: | run: |
brew install pkg-config
brew install gtkmm3 brew install gtkmm3
brew install nlohmann-json brew install nlohmann-json
brew install jpeg brew install jpeg
@@ -146,16 +148,17 @@ jobs:
- name: Setup artifact files - name: Setup artifact files
run: | run: |
mkdir "${{ runner.workspace }}/artifactdir" artifact_dir=build/artifactdir/abaddon-${{ matrix.buildtype }}-${GITHUB_SHA::7}
cp "${{runner.workspace}}/build/abaddon" "${{ runner.workspace }}/artifactdir/abaddon" mkdir -p "${artifact_dir}"
cp -r "${{ github.workspace }}/res/css" "${{ runner.workspace }}/artifactdir/css" cp "${{runner.workspace}}/build/abaddon" "${artifact_dir}/abaddon"
cp -r "${{ github.workspace }}/res/res" "${{ runner.workspace }}/artifactdir/res" cp -r "${{ github.workspace }}/res/css" "${artifact_dir}/css"
cp -r "${{ github.workspace }}/res/res" "${artifact_dir}/res"
- name: Upload build - name: Upload build
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: build-macos-${{ matrix.buildtype }} name: build-macos-${{ matrix.buildtype }}
path: ${{ runner.workspace }}/artifactdir path: build/artifactdir
linux: linux:
name: linux-${{ matrix.buildtype }} name: linux-${{ matrix.buildtype }}
@@ -203,10 +206,11 @@ jobs:
- name: Setup artifact files - name: Setup artifact files
run: | run: |
mkdir "${{ runner.workspace }}/artifactdir" artifact_dir=${{ runner.workspace }}/artifactdir/abaddon-${{ matrix.buildtype }}-${GITHUB_SHA::7}
cp "${{runner.workspace}}/build/abaddon" "${{ runner.workspace }}/artifactdir/abaddon" mkdir -p "${artifact_dir}"
cp -r "${{ github.workspace }}/res/css" "${{ runner.workspace }}/artifactdir/css" cp "${{runner.workspace}}/build/abaddon" "${artifact_dir}/abaddon"
cp -r "${{ github.workspace }}/res/res" "${{ runner.workspace }}/artifactdir/res" cp -r "${{ github.workspace }}/res/css" "${artifact_dir}/css"
cp -r "${{ github.workspace }}/res/res" "${artifact_dir}/res"
- name: Upload build - name: Upload build
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2

13
README.md
View File

@@ -73,7 +73,7 @@ the result of fundamental issues with Discord's thread implementation.
1. Install dependencies 1. Install dependencies
* On Ubuntu 20.04 (Focal) and newer: * On Ubuntu 20.04 (Focal) and newer:
```Shell ```Shell
$ sudo apt install g++ cmake libgtkmm-3.0-dev libcurl4-gnutls-dev libsqlite3-dev libssl-dev nlohmann-json3-dev $ sudo apt install g++ cmake libgtkmm-3.0-dev libcurl4-gnutls-dev libsqlite3-dev libssl-dev nlohmann-json3-dev libhandy-1-dev libsecret-1-dev
``` ```
* On Arch Linux * On Arch Linux
```Shell ```Shell
@@ -102,11 +102,19 @@ Latest release version: https://github.com/uowuo/abaddon/releases/latest
> **Warning**: If you use Windows, make sure to start from the `bin` directory > **Warning**: If you use Windows, make sure to start from the `bin` directory
On Linux, `css` and `res` can also be loaded from `~/.local/share/abaddon` or `/usr/share/abaddon` #### Resources
The two folders within the `res` folder (`res/res` and `res/css`) are necessary. Windows also uses the `fonts` folder.
You can put them directly next to the executable. On Linux, `css` and `res` can also be loaded from
`~/.local/share/abaddon` or `/usr/share/abaddon`
`abaddon.ini` will also be automatically used if located at `~/.config/abaddon/abaddon.ini` and there is `abaddon.ini` will also be automatically used if located at `~/.config/abaddon/abaddon.ini` and there is
no `abaddon.ini` in the working directory no `abaddon.ini` in the working directory
#### How do I get my token?
Follow [these](https://github.com/Tyrrrz/DiscordChatExporter/issues/76#issuecomment-410067054) instructions.
#### The Spam Filter #### The Spam Filter
Discord likes disabling accounts/forcing them to reset their passwords if they think the user is a spam bot or Discord likes disabling accounts/forcing them to reset their passwords if they think the user is a spam bot or
@@ -189,6 +197,7 @@ spam filter's wrath:
| `.typing-indicator` | The typing indicator (also used for replies) | | `.typing-indicator` | The typing indicator (also used for replies) |
Used in reorderable list implementation: Used in reorderable list implementation:
| Selector | | Selector |
|----------------------| |----------------------|
| `.drag-icon` | | `.drag-icon` |

2
ci/msys-deps.txt
View File

@@ -53,7 +53,7 @@
/bin/libssl-3-x64.dll /bin/libssl-3-x64.dll
/bin/libstdc++-6.dll /bin/libstdc++-6.dll
/bin/libthai-0.dll /bin/libthai-0.dll
/bin/libunistring-2.dll /bin/libunistring-5.dll
/bin/libwinpthread-1.dll /bin/libwinpthread-1.dll
/bin/libzstd.dll /bin/libzstd.dll
/bin/zlib1.dll /bin/zlib1.dll