Skip to content

Commit de0c777

Browse files
zeonzipzeonzip
committed
address review comments, and additional fixes
1 parent 13c7239 commit de0c777

File tree

13 files changed

+64
-7
lines changed

13 files changed

+64
-7
lines changed

‎twilight-cache-inmemory/src/event/interaction.rs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ mod tests {
154154
Id::new(7),
155155
InteractionMember {
156156
avatar: None,
157+
avatar_decoration_data: None,
158+
banner: None,
157159
communication_disabled_until: None,
158160
flags,
159161
joined_at: Some(timestamp),
@@ -206,6 +208,8 @@ mod tests {
206208
kind: MessageType::Regular,
207209
member: Some(PartialMember {
208210
avatar: None,
211+
avatar_decoration_data: None,
212+
banner: None,
209213
communication_disabled_until: None,
210214
deaf: false,
211215
flags,
@@ -297,6 +301,8 @@ mod tests {
297301
locale: Some("en-GB".to_owned()),
298302
member: Some(PartialMember {
299303
avatar: None,
304+
avatar_decoration_data: None,
305+
banner: None,
300306
communication_disabled_until: None,
301307
deaf: false,
302308
flags,

‎twilight-cache-inmemory/src/event/message.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ mod tests {
185185
kind: MessageType::Regular,
186186
member: Some(PartialMember {
187187
avatar: None,
188+
avatar_decoration_data: None,
189+
banner: None,
188190
communication_disabled_until: None,
189191
deaf: false,
190192
flags,

‎twilight-cache-inmemory/src/model/member.rs‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
use std::ops::Deref;
22

3+
use crate::CacheableMember;
34
use serde::Serialize;
5+
use twilight_model::user::AvatarDecorationData;
46
use twilight_model::{
57
application::interaction::InteractionMember,
68
gateway::payload::incoming::MemberUpdate,
@@ -12,8 +14,6 @@ use twilight_model::{
1214
util::{ImageHash, Timestamp},
1315
};
1416

15-
use crate::CacheableMember;
16-
1717
/// Computed components required to complete a full cached interaction member
1818
/// by implementing [`CacheableMember`].
1919
#[derive(Clone, Debug, Eq, PartialEq)]
@@ -44,6 +44,8 @@ impl Deref for ComputedInteractionMember {
4444
#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
4545
pub struct CachedMember {
4646
pub(crate) avatar: Option<ImageHash>,
47+
pub(crate) avatar_decoration_data: Option<AvatarDecorationData>,
48+
pub(crate) banner: Option<ImageHash>,
4749
pub(crate) communication_disabled_until: Option<Timestamp>,
4850
pub(crate) deaf: Option<bool>,
4951
pub(crate) flags: MemberFlags,
@@ -126,7 +128,6 @@ impl CachedMember {
126128

127129
impl From<Member> for CachedMember {
128130
fn from(member: Member) -> Self {
129-
#[allow(unused_variables)]
130131
let Member {
131132
avatar,
132133
avatar_decoration_data,
@@ -145,6 +146,8 @@ impl From<Member> for CachedMember {
145146

146147
Self {
147148
avatar,
149+
avatar_decoration_data,
150+
banner,
148151
communication_disabled_until,
149152
deaf: Some(deaf),
150153
flags,
@@ -170,6 +173,8 @@ impl From<ComputedInteractionMember> for CachedMember {
170173
} = member;
171174
let InteractionMember {
172175
avatar: _,
176+
avatar_decoration_data,
177+
banner,
173178
communication_disabled_until,
174179
flags,
175180
joined_at,
@@ -182,6 +187,8 @@ impl From<ComputedInteractionMember> for CachedMember {
182187

183188
Self {
184189
avatar,
190+
avatar_decoration_data,
191+
banner,
185192
communication_disabled_until,
186193
deaf,
187194
flags,
@@ -200,6 +207,8 @@ impl From<(Id<UserMarker>, PartialMember)> for CachedMember {
200207
fn from((user_id, member): (Id<UserMarker>, PartialMember)) -> Self {
201208
let PartialMember {
202209
avatar,
210+
avatar_decoration_data,
211+
banner,
203212
communication_disabled_until,
204213
deaf,
205214
flags,
@@ -214,6 +223,8 @@ impl From<(Id<UserMarker>, PartialMember)> for CachedMember {
214223

215224
Self {
216225
avatar,
226+
avatar_decoration_data,
227+
banner,
217228
communication_disabled_until,
218229
deaf: Some(deaf),
219230
flags,
@@ -325,6 +336,8 @@ mod tests {
325336
let flags = MemberFlags::BYPASSES_VERIFICATION | MemberFlags::DID_REJOIN;
326337
CachedMember {
327338
avatar: None,
339+
avatar_decoration_data: None,
340+
banner: None,
328341
communication_disabled_until: None,
329342
deaf: Some(false),
330343
flags,
@@ -393,6 +406,8 @@ mod tests {
393406

394407
let member = PartialMember {
395408
avatar: None,
409+
avatar_decoration_data: None,
410+
banner: None,
396411
communication_disabled_until: None,
397412
deaf: false,
398413
flags,

‎twilight-cache-inmemory/src/test.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ pub fn cache_with_message_and_reactions() -> DefaultInMemoryCache {
8181
kind: MessageType::Regular,
8282
member: Some(PartialMember {
8383
avatar: None,
84+
avatar_decoration_data: None,
85+
banner: None,
8486
communication_disabled_until: None,
8587
deaf: false,
8688
flags,

‎twilight-model/src/application/interaction/mod.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,8 @@ mod tests {
583583
Id::new(600),
584584
InteractionMember {
585585
avatar: None,
586+
avatar_decoration_data: None,
587+
banner: None,
586588
communication_disabled_until: None,
587589
flags,
588590
joined_at,
@@ -644,6 +646,8 @@ mod tests {
644646
locale: Some("en-GB".to_owned()),
645647
member: Some(PartialMember {
646648
avatar: None,
649+
avatar_decoration_data: None,
650+
banner: None,
647651
communication_disabled_until: None,
648652
deaf: false,
649653
flags,

‎twilight-model/src/application/interaction/resolved.rs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::user::AvatarDecorationData;
12
use crate::{
23
channel::{Attachment, ChannelType, Message, thread::ThreadMetadata},
34
guild::{MemberFlags, Permissions, Role},
@@ -73,6 +74,12 @@ pub struct InteractionMember {
7374
/// Member's guild avatar.
7475
#[serde(skip_serializing_if = "Option::is_none")]
7576
pub avatar: Option<ImageHash>,
77+
/// The member's guild avatar decoration.
78+
#[serde(skip_serializing_if = "Option::is_none")]
79+
pub avatar_decoration_data: Option<AvatarDecorationData>,
80+
/// Member's guild banner.
81+
#[serde(skip_serializing_if = "Option::is_none")]
82+
pub banner: Option<ImageHash>,
7683
/// If the member is timed out, when the timeout will expire.
7784
pub communication_disabled_until: Option<Timestamp>,
7885
/// Flags for the member.
@@ -161,6 +168,8 @@ mod tests {
161168
Id::new(300),
162169
InteractionMember {
163170
avatar: None,
171+
avatar_decoration_data: None,
172+
banner: None,
164173
communication_disabled_until: None,
165174
flags,
166175
joined_at,
@@ -214,6 +223,8 @@ mod tests {
214223
kind: MessageType::Regular,
215224
member: Some(PartialMember {
216225
avatar: None,
226+
avatar_decoration_data: None,
227+
banner: None,
217228
communication_disabled_until: None,
218229
flags,
219230
deaf: false,

‎twilight-model/src/channel/message/interaction.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ mod tests {
4949
kind: InteractionType::ApplicationCommand,
5050
member: Some(PartialMember {
5151
avatar: None,
52+
avatar_decoration_data: None,
53+
banner: None,
5254
communication_disabled_until: None,
5355
deaf: false,
5456
flags,

‎twilight-model/src/channel/message/mention.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ mod tests {
104104
id: Id::new(1),
105105
member: Some(PartialMember {
106106
avatar: None,
107+
avatar_decoration_data: None,
108+
banner: None,
107109
communication_disabled_until: None,
108110
deaf: false,
109111
flags,

‎twilight-model/src/channel/message/message_pin.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ mod tests {
7575
kind: MessageType::Regular,
7676
member: Some(PartialMember {
7777
avatar: None,
78+
avatar_decoration_data: None,
79+
banner: None,
7880
communication_disabled_until: None,
7981
deaf: false,
8082
flags,

‎twilight-model/src/channel/message/mod.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,8 @@ mod tests {
289289
kind: MessageType::Regular,
290290
member: Some(PartialMember {
291291
avatar: None,
292+
avatar_decoration_data: None,
293+
banner: None,
292294
communication_disabled_until: None,
293295
deaf: false,
294296
flags,
@@ -512,6 +514,8 @@ mod tests {
512514
kind: MessageType::Regular,
513515
member: Some(PartialMember {
514516
avatar: None,
517+
avatar_decoration_data: None,
518+
banner: None,
515519
communication_disabled_until: None,
516520
deaf: false,
517521
flags,

0 commit comments

Comments
 (0)