Minki/abaddon-ppc
1
0
Fork 0
forked from OpenGamers/abaddon
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into attachments

Browse Source
This commit is contained in:
ouwou
2022-06-14 02:23:22 -04:00
parent 5cf4d8e160 ccf5afbba9
commit caa551a469
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@@ -59,18 +59,17 @@ the result of fundamental issues with Discord's thread implementation.
#### Mac: #### Mac:
1. `git clone https://github.com/uowuo/abaddon && cd abaddon` 1. `git clone https://github.com/uowuo/abaddon --recurse-submodules="subprojects" && cd abaddon`
2. `brew install gtkmm3 nlohmann-json` 2. `brew install gtkmm3 nlohmann-json`
3. `git submodule update --init subprojects` 3. `mkdir build && cd build`
4. `mkdir build && cd build` 4. `cmake ..`
5. `cmake ..` 5. `make`
6. `make`
#### Linux: #### Linux:
1. Install dependencies: `libgtkmm-3.0-dev`, `libcurl4-gnutls-dev`, 1. Install dependencies: `libgtkmm-3.0-dev`, `libcurl4-gnutls-dev`,
and [nlohmann-json](https://github.com/nlohmann/json) and [nlohmann-json](https://github.com/nlohmann/json)
2. `git clone https://github.com/uowuo/abaddon && cd abaddon` 2. `git clone https://github.com/uowuo/abaddon --recurse-submodules="subprojects" && cd abaddon`
3. `mkdir build && cd build` 3. `mkdir build && cd build`
4. `cmake ..` 4. `cmake ..`
5. `make` 5. `make`

2
src/discord/objects.cpp
View File

@@ -41,7 +41,7 @@ void from_json(const nlohmann::json &j, GuildMemberListUpdateMessage::MemberItem
JS_D("mute", m.IsMuted); JS_D("mute", m.IsMuted);
JS_D("joined_at", m.JoinedAt); JS_D("joined_at", m.JoinedAt);
JS_D("deaf", m.IsDefeaned); JS_D("deaf", m.IsDefeaned);
JS_N("hoisted_role", m.HoistedRole); JS_ON("hoisted_role", m.HoistedRole);
JS_ON("premium_since", m.PremiumSince); JS_ON("premium_since", m.PremiumSince);
JS_ON("nick", m.Nickname); JS_ON("nick", m.Nickname);
JS_ON("presence", m.Presence); JS_ON("presence", m.Presence);