Skip to content

Commit 6b3a08d

Browse files
committed
Passthrough reconnect and resume packets, as well as RESUMED event
1 parent f8f1711 commit 6b3a08d

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

internal/convert/perms.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func RoleToDiscord(role fluxer.Role) discord.Role {
5959
Hoist: role.Hoist,
6060
UnicodeEmoji: role.UnicodeEmoji,
6161
Position: role.Position,
62-
Permissions: role.Permissions,
62+
Permissions: PermissionsToDiscord(role.Permissions),
6363
Mentionable: role.Mentionable,
6464
}
6565
}

internal/gateway/session.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,8 @@ var errNonConvertiblePacket = errors.New("non-convertible packet")
200200
func packetToFluxer(packet discord.Packet) (discord.Packet, error) {
201201
switch packet.Opcode {
202202
case discord.GatewayOpHeartbeat,
203-
discord.GatewayOpRequestGuildMembers:
203+
discord.GatewayOpRequestGuildMembers,
204+
discord.GatewayOpResume:
204205
return packet, nil
205206
case discord.GatewayOpIdentify:
206207
var inPayload discord.IdentifyPayload
@@ -298,6 +299,8 @@ func eventToDiscord(name string, payload json.RawMessage, info sessionInfo) (jso
298299
// NOTE: Fluxer doesn't currently support sharding, but some libs may break without this :)
299300
outEvent.Shard = misc.New([2]int{0, 1})
300301
return json.Marshal(outEvent)
302+
case "RESUMED":
303+
return payload, nil
301304
case "CHANNEL_CREATE", "CHANNEL_UPDATE":
302305
var inChannel fluxer.Channel
303306

@@ -395,6 +398,7 @@ func packetToDiscord(packet discord.Packet, info sessionInfo) (discord.Packet, e
395398
case discord.GatewayOpHello,
396399
discord.GatewayOpHeartbeat,
397400
discord.GatewayOpHeartbeatAck,
401+
discord.GatewayOpReconnect,
398402
discord.GatewayOpInvalidSession:
399403
// passthrough
400404
return packet, nil

0 commit comments

Comments
 (0)