Merge develop into master #68

tazz4843 · 2021-11-20T19:18:56Z

Fixes clippy and adds new shit

Add user object to members in /guilds

Implement `offset` query parameter

…into channels_in_users

Add `user` field to `MemberCreate` events

…into channels_in_users

it's not going to be great since the assets are linked to the rust version but it should help a bit

Fix Clippy

hydrostaticcog

Works as intended on endeavourOS Linux x86-64 (kernel 5.14.12)

jay3332 and others added 30 commits November 14, 2021 09:40

Implement offset query parameter

581f6ce

optimize

6ad5370

Merge pull request #55 from jay3332/patch-2

74c57ee

Add user object to members in /guilds

Merge branch 'develop' into patch-1

113138b

make offset mutable

bf145d2

Merge branch 'patch-1' of github.com:jay3332/Server into patch-1

6c9779f

Merge pull request #52 from jay3332/patch-1

4f13c9b

Implement `offset` query parameter

Include guilds in IdentifyAccepted and include channels in fetch_user

d68bef1

Include members in guild in get_user

4d908c1

fmt

fb8924f

Merge branch 'develop' into channels_in_users

a9acf54

Merge branch 'channels_in_users' of github.com:Cryptex-github/Server …

7ec706e

…into channels_in_users

Fix unresolve imports and use async closure

783aa98

Use for loop instead of filter_map

c58d20e

remove ?

8609980

match id

670e1d6

Don't need to pre define it

6ed38a6

Borrow a mutable reference yes

778bedc

ref

f78fbc1

Add user field to MemberCreate events

bc9a313

Merge pull request #57 from jay3332/patch-3

e6508b2

Add `user` field to `MemberCreate` events

Merge branch 'develop' into channels_in_users

670f69e

shrug

b1c9606

Merge branch 'channels_in_users' of github.com:Cryptex-github/Server …

5283428

…into channels_in_users

zero fix will eventually yes

36305f2

Fix stuff i guess

52b2fd2

Some

82394e2

await the send

4e71d0a

fmt

7b83b19

Fix redundant field names

4d277d5

randomairborne and others added 27 commits November 17, 2021 22:33

update sqlx data

d5154ce

update sqlx data

1c6cb27

fix sqlx data

16e1e34

add message to verify response

98be634

and this is why we test before we commit, valk

a4788bc

url encoding

c1378fa

fix redundant uses

b01f59b

Fix token encoding

f73ee28

Add comments to verify_user.rs

1ef8708

add a TODO

9d7f960

Comment the users submodule

509ad5f

update linters and add sqlx query checking

9e90920

add branch this was pushed to

d494747

add postgres db

9c477ee

try fixing the postgres db

41e2e07

fix typo

696da36

fix typos

fb369b8

fix service is unhealthy error

d420d6a

remove .env in builds

389f11b

move env key to where it needed to be

91fd084

automatically update sqlx-data.json if not eq

1592862

fix capitalization and tell git who is updating the commit

4e7a3cb

cache rust assets

3492b0e

it's not going to be great since the assets are linked to the rust version but it should help a bit

cache rust assets where possible

6ebc084

move asset caching before building sqlx

db0aadc

Merge branch 'develop' into gh-actions-fixes

108702a

Merge pull request #67 from FerrisChat/gh-actions-fixes

67c85a8

Fix Clippy

tazz4843 requested a review from a team as a code owner November 20, 2021 19:18

hydrostaticcog approved these changes Nov 20, 2021

View reviewed changes

tazz4843 merged commit cd74043 into master Nov 20, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge develop into master #68

Merge develop into master #68

tazz4843 commented Nov 20, 2021

hydrostaticcog left a comment

Merge develop into master #68

Merge develop into master #68

Conversation

tazz4843 commented Nov 20, 2021

hydrostaticcog left a comment

Choose a reason for hiding this comment