Skip to content

Commit

Permalink
Updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheRockettek
TheRockettek committed Aug 5, 2024
1 parent cdbc562 commit cce4ae3
Show file tree
Hide file tree
Showing 39 changed files with 263 additions and 238 deletions.
14 changes: 14 additions & 0 deletions go.work.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,7 @@ cloud.google.com/go/workflows v1.12.4/go.mod h1:yQ7HUqOkdJK4duVtMeBCAOPiN1ZF1E9p
cloud.google.com/go/workflows v1.12.5/go.mod h1:KbK5/Ef28G8MKLXcsvt/laH1Vka4CKeQj0I1/wEiByo=
cloud.google.com/go/workflows v1.12.6/go.mod h1:oDbEHKa4otYg4abwdw2Z094jB0TLLiFGAPA78EDAKag=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.0/go.mod h1:dppbR7CwXD4pgtV9t3wD1812RaLDcBjtblcDF5f1vI0=
Expand Down Expand Up @@ -878,11 +879,13 @@ github.com/fasthttp/router v1.4.20/go.mod h1:um867yNQKtERxBm+C+yzgWxjspTiQoA8z86
github.com/fasthttp/router v1.4.22/go.mod h1:KeMvHLqhlB9vyDWD5TSvTccl9qeWrjSSiTJrJALHKV0=
github.com/fasthttp/router v1.5.0 h1:3Qbbo27HAPzwbpRzgiV5V9+2faPkPt3eNuRaDV6LYDA=
github.com/fasthttp/router v1.5.0/go.mod h1:FddcKNXFZg1imHcy+uKB0oo/o6yE9zD3wNguqlhWDak=
github.com/fasthttp/router v1.5.2/go.mod h1:C8EY53ozOwpONyevc/V7Gr8pqnEjwnkFFqPo1alAGs0=
github.com/fasthttp/session/v2 v2.5.1 h1:Sr7eCYO3Yu/Ug/yER7bxy9IDxwqaHErXhi9lriWjcX4=
github.com/fasthttp/session/v2 v2.5.1/go.mod h1:ldz56yIR9TOUW4iJ/bMOiEOlRK/30KZHC7oXDxGzt4c=
github.com/fasthttp/session/v2 v2.5.3/go.mod h1:7WZ7Dr2aFxJkFAlbpnS6EYuEmaIek/nZrTlX4XgXU/I=
github.com/fasthttp/session/v2 v2.5.4 h1:SeblRaKHYQoVBjJIF1KlZD0F8QX1poA80h/KaLhNo8I=
github.com/fasthttp/session/v2 v2.5.4/go.mod h1:LCKe//Mwwfv6Ir4p10rBGnxi5yfPaXwuBlq1seR4vhI=
github.com/fasthttp/session/v2 v2.5.6/go.mod h1:Q3mnygkR0hh3r8X83Brht9A3awfPGwGsoAeAK/Scop4=
github.com/fasthttp/websocket v1.4.5/go.mod h1:Yj4Z4kFdJmIFWiRcT8yb3/lov94g2w77KcsDfJPyhJk=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
Expand Down Expand Up @@ -910,6 +913,7 @@ github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
Expand Down Expand Up @@ -977,6 +981,7 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
Expand Down Expand Up @@ -1093,6 +1098,7 @@ github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha
github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw=
github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0=
github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM=
github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I=
github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
Expand Down Expand Up @@ -1125,6 +1131,7 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c
github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b/go.mod h1:wTPjTepVu7uJBYgZ0SdWHQlIas582j6cn2jgk4DDdlg=
github.com/redis/go-redis/v9 v9.0.5/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
github.com/redis/go-redis/v9 v9.5.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
github.com/redis/go-redis/v9 v9.5.3/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
Expand All @@ -1141,6 +1148,7 @@ github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0=
github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw=
github.com/tinylib/msgp v1.1.9 h1:SHf3yoO2sGA0veCJeCBYLHuttAVFHGm2RHgNodW7wQU=
github.com/tinylib/msgp v1.1.9/go.mod h1:BCXGB54lDD8qUEPmiG0cQQUANC4IUQyB2ItS2UDlO/k=
github.com/tinylib/msgp v1.2.0/go.mod h1:2vIGs3lcUo8izAATNobrCHevYZC/LMsJtw4JPiYPHro=
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo=
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
Expand All @@ -1153,6 +1161,7 @@ github.com/valyala/fasthttp v1.51.0/go.mod h1:oI2XroL+lI7vdXyYoQk03bXBThfFl2cVdI
github.com/valyala/fasthttp v1.52.0/go.mod h1:hf5C4QnVMkNXMspnsUlfM3WitlgYflyhHYoKol/szxQ=
github.com/valyala/fasthttp v1.53.0 h1:lW/+SUkOxCx2vlIu0iaImv4JLrVRnbbkpCoaawvA4zc=
github.com/valyala/fasthttp v1.53.0/go.mod h1:6dt4/8olwq9QARP/TDuPmWyWcl4byhpvTJ4AAtcz+QM=
github.com/valyala/fasthttp v1.55.0/go.mod h1:NkY9JtkrpPKmgwV3HTaS2HWaJss9RSIsRVfcxxoHiOM=
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
github.com/wader/gormstore/v2 v2.0.0/go.mod h1:3BgNKFxRdVo2E4pq3e/eiim8qRDZzaveaIcIvu2T8r0=
github.com/wader/gormstore/v2 v2.0.3/go.mod h1:sr3N3a8F1+PBc3fHoKaphFqDXLRJ9Oe6Yow0HxKFbbg=
Expand All @@ -1172,6 +1181,7 @@ go.etcd.io/gofail v0.1.0/go.mod h1:VZBCXYGZhHAinaBiiqYvuDynvahNsAyLFwB3kEHKz1M=
go.mongodb.org/mongo-driver v1.9.0/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY=
go.mongodb.org/mongo-driver v1.12.0/go.mod h1:AZkxhPnFJUoH7kZlFkVKucV20K387miPfm7oimrSmK0=
go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
go.mongodb.org/mongo-driver v1.16.0/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
Expand Down Expand Up @@ -1261,6 +1271,7 @@ golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand Down Expand Up @@ -1322,6 +1333,7 @@ golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2
golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8=
golang.org/x/oauth2 v0.19.0/go.mod h1:vYi7skDa1x015PmRRYZ7+s1cWyPgrPiSYRe4rnsexc8=
golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand Down Expand Up @@ -1442,6 +1454,7 @@ golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58
golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
Expand Down Expand Up @@ -1601,6 +1614,7 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240415141817-7cd4c1c1f9ec/go.
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8/go.mod h1:I7Y+G38R2bu5j1aLzfFmQfTcU/WnFuqDwLZAbvKTKpM=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
Expand Down
2 changes: 1 addition & 1 deletion migration-service/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ type Embed struct {
Description string `json:"description,omitempty" yaml:"description,omitempty"`
URL string `json:"url,omitempty" yaml:"url,omitempty"`
Title string `json:"title,omitempty" yaml:"title,omitempty"`
Fields []*discord.EmbedField `json:"fields,omitempty" yaml:"fields,omitempty"`
Fields []discord.EmbedField `json:"fields,omitempty" yaml:"fields,omitempty"`
Color int32 `json:"color,omitempty" yaml:"color,omitempty"`
}

Expand Down
22 changes: 10 additions & 12 deletions welcomer-backend/backend/checks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ import (
welcomer "github.com/WelcomerTeam/Welcomer/welcomer-core"
)

func hasWelcomerPresence(guildID discord.Snowflake, returnBotGuildMembers bool) (ok bool, guild *discord.Guild, guildMembers []*discord.GuildMember, err error) {
func hasWelcomerPresence(guildID discord.Snowflake, returnBotGuildMembers bool) (ok bool, guild discord.Guild, guildMembers []discord.GuildMember, err error) {
guild, err = backend.GRPCInterface.FetchGuildByID(backend.GetBasicEventContext().ToGRPCContext(), guildID)

if err != nil {
backend.Logger.Warn().Err(err).Int64("guild_id", int64(guildID)).Msg("Failed to get welcomer presence")

return false, nil, nil, err
return false, guild, nil, err
}

if guild == nil {
return false, nil, nil, nil
if guild.ID.IsNil() {
return false, guild, nil, nil
}

if returnBotGuildMembers {
Expand All @@ -31,7 +31,7 @@ func hasWelcomerPresence(guildID discord.Snowflake, returnBotGuildMembers bool)
return true, guild, guildMembers, nil
}

func fetchBotUsersForGuild(guildID discord.Snowflake) (guildMembers []*discord.GuildMember, err error) {
func fetchBotUsersForGuild(guildID discord.Snowflake) (guildMembers []discord.GuildMember, err error) {
// Find out what managers can see this guild
locations, err := backend.GRPCInterface.WhereIsGuild(backend.GetBasicEventContext().ToGRPCContext(), guildID)
if err != nil {
Expand All @@ -40,12 +40,10 @@ func fetchBotUsersForGuild(guildID discord.Snowflake) (guildMembers []*discord.G
return nil, err
}

guildMembers = make([]*discord.GuildMember, 0, len(locations))
guildMembers = make([]discord.GuildMember, 0, len(locations))

for _, location := range locations {
if location.GuildMember != nil {
guildMembers = append(guildMembers, location.GuildMember)
}
guildMembers = append(guildMembers, location.GuildMember)
}

return guildMembers, nil
Expand Down Expand Up @@ -83,7 +81,7 @@ func getGuildMembership(guildID discord.Snowflake) (hasWelcomerPro bool, hasCust
return
}

func CalculateRoleValues(roles []*MinimalRole, guildMembers []*discord.GuildMember) (convertedRoles []*MinimalRole) {
func CalculateRoleValues(roles []MinimalRole, guildMembers []discord.GuildMember) (convertedRoles []MinimalRole) {
roleMap := MinimalRolesToMap(roles)

highestRolePosition := int32(0)
Expand All @@ -95,7 +93,7 @@ func CalculateRoleValues(roles []*MinimalRole, guildMembers []*discord.GuildMemb
}
}

convertedRoles = make([]*MinimalRole, len(roles))
convertedRoles = make([]MinimalRole, len(roles))

for i, role := range roles {
role.IsAssignable = (!role.managed) && (role.Position < highestRolePosition)
Expand All @@ -107,7 +105,7 @@ func CalculateRoleValues(roles []*MinimalRole, guildMembers []*discord.GuildMemb
return
}

func getHighestRoleForGuildMember(roleMap map[discord.Snowflake]*MinimalRole, guildMember *discord.GuildMember) int32 {
func getHighestRoleForGuildMember(roleMap map[discord.Snowflake]MinimalRole, guildMember discord.GuildMember) int32 {
highestRolePosition := int32(0)

for _, roleID := range guildMember.Roles {
Expand Down
2 changes: 1 addition & 1 deletion welcomer-backend/backend/routes_borderwall.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func getBorderwall(ctx *gin.Context) {
guild, err := backend.GRPCInterface.FetchGuildByID(backend.GetBasicEventContext().ToGRPCContext(), discord.Snowflake(borderwallRequest.GuildID))
if err != nil {
backend.Logger.Warn().Err(err).Int64("guildID", int64(borderwallRequest.GuildID)).Msg("Failed to fetch guild")
} else if guild != nil {
} else if !guild.ID.IsNil() {
borderwallResponse.GuildName = guild.Name
}
}
Expand Down
2 changes: 1 addition & 1 deletion welcomer-backend/backend/routes_guild.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func getGuild(ctx *gin.Context) {
partialGuild.Roles = CalculateRoleValues(partialGuild.Roles, guildMembers)

guild := Guild{
Guild: partialGuild,
Guild: &partialGuild,

HasWelcomerPro: hasWelcomerPro,
HasCustomBackgrounds: hasCustomBackgrounds,
Expand Down
4 changes: 2 additions & 2 deletions welcomer-backend/backend/routes_user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func (b *Backend) GetUserGuilds(session sessions.Session) (guilds map[discord.Sn

HasWelcomerPro: hasWelcomerPro,
HasCustomBackgrounds: hasCustomBackgrounds,
HasElevation: hasElevation(*discordGuild, user),
HasElevation: hasElevation(discordGuild, user),
IsOwner: discordGuild.Owner,
}
}
Expand Down Expand Up @@ -107,7 +107,7 @@ func (b *Backend) GetUserMemberships(session sessions.Session) (memberships []*M
backend.Logger.Warn().Err(err).Int64("guildID", userMembership.GuildID).Msg("Exception getting guild info")
}

if ok && guild != nil {
if ok && !guild.ID.IsNil() {
membership.Guild = GuildToMinimal(guild)
}
}
Expand Down
40 changes: 20 additions & 20 deletions welcomer-backend/backend/structs_guild.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ type Guild struct {
}

type PartialGuild struct {
*MinimalGuild
Channels []*MinimalChannel `json:"channels"`
Roles []*MinimalRole `json:"roles"`
Emojis []*MinimalEmoji `json:"emojis"`
MemberCount int32 `json:"member_count"`
MinimalGuild
Channels []MinimalChannel `json:"channels"`
Roles []MinimalRole `json:"roles"`
Emojis []MinimalEmoji `json:"emojis"`
MemberCount int32 `json:"member_count"`
}

type MinimalGuild struct {
Expand Down Expand Up @@ -65,8 +65,8 @@ type MinimalEmoji struct {
Available bool `json:"available"`
}

func GuildToPartial(guild *discord.Guild) *PartialGuild {
return &PartialGuild{
func GuildToPartial(guild discord.Guild) PartialGuild {
return PartialGuild{
MinimalGuild: GuildToMinimal(guild),
MemberCount: guild.MemberCount,
Channels: ChannelsToMinimal(guild.Channels),
Expand All @@ -75,8 +75,8 @@ func GuildToPartial(guild *discord.Guild) *PartialGuild {
}
}

func GuildToMinimal(guild *discord.Guild) *MinimalGuild {
return &MinimalGuild{
func GuildToMinimal(guild discord.Guild) MinimalGuild {
return MinimalGuild{
ID: guild.ID,
Name: guild.Name,
Icon: guild.Icon,
Expand All @@ -88,11 +88,11 @@ func GuildToMinimal(guild *discord.Guild) *MinimalGuild {
}
}

func ChannelsToMinimal(channels []*discord.Channel) []*MinimalChannel {
minimalChannels := make([]*MinimalChannel, len(channels))
func ChannelsToMinimal(channels []discord.Channel) []MinimalChannel {
minimalChannels := make([]MinimalChannel, len(channels))

for i, channel := range channels {
minimalChannels[i] = &MinimalChannel{
minimalChannels[i] = MinimalChannel{
ID: channel.ID,
Type: channel.Type,
Position: channel.Position,
Expand All @@ -103,11 +103,11 @@ func ChannelsToMinimal(channels []*discord.Channel) []*MinimalChannel {
return minimalChannels
}

func RolesToMinimal(roles []*discord.Role) []*MinimalRole {
minimalRoles := make([]*MinimalRole, len(roles))
func RolesToMinimal(roles []discord.Role) []MinimalRole {
minimalRoles := make([]MinimalRole, len(roles))

for i, role := range roles {
minimalRoles[i] = &MinimalRole{
minimalRoles[i] = MinimalRole{
ID: role.ID,
Name: role.Name,
Color: role.Color,
Expand All @@ -122,11 +122,11 @@ func RolesToMinimal(roles []*discord.Role) []*MinimalRole {
return minimalRoles
}

func EmojisToMinimal(emojis []*discord.Emoji) []*MinimalEmoji {
minimalEmojis := make([]*MinimalEmoji, len(emojis))
func EmojisToMinimal(emojis []discord.Emoji) []MinimalEmoji {
minimalEmojis := make([]MinimalEmoji, len(emojis))

for i, emoji := range emojis {
minimalEmojis[i] = &MinimalEmoji{
minimalEmojis[i] = MinimalEmoji{
ID: emoji.ID,
Name: emoji.Name,
Managed: emoji.Managed,
Expand All @@ -138,8 +138,8 @@ func EmojisToMinimal(emojis []*discord.Emoji) []*MinimalEmoji {
return minimalEmojis
}

func MinimalRolesToMap(roles []*MinimalRole) map[discord.Snowflake]*MinimalRole {
roleMap := map[discord.Snowflake]*MinimalRole{}
func MinimalRolesToMap(roles []MinimalRole) map[discord.Snowflake]MinimalRole {
roleMap := map[discord.Snowflake]MinimalRole{}

for _, role := range roles {
roleMap[role.ID] = role
Expand Down
2 changes: 1 addition & 1 deletion welcomer-backend/backend/structs_user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type Membership struct {
UpdatedAt time.Time `json:"updated_at"`
StartedAt time.Time `json:"started_at"`
ExpiresAt time.Time `json:"expires_at"`
Guild *MinimalGuild `json:"guild"`
Guild MinimalGuild `json:"guild"`
GuildID discord.Snowflake `json:"guild_id"`
Status int32 `json:"status"`
MembershipType int32 `json:"membership_type"`
Expand Down
Loading

0 comments on commit cce4ae3

Please sign in to comment.