Skip to content

Commit 966d973

Browse files
committed
timezone is on User object, not Profile
1 parent 10c8692 commit 966d973

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

src/main/java/allbegray/slack/type/Profile.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public class Profile {
1111
protected String email;
1212
protected String skype;
1313
protected String phone;
14-
protected String tz;
1514
protected String image_24;
1615
protected String image_32;
1716
protected String image_48;
@@ -66,14 +65,6 @@ public void setPhone(String phone) {
6665
this.phone = phone;
6766
}
6867

69-
public String getTz() {
70-
return tz;
71-
}
72-
73-
public void setTz(String tz) {
74-
this.tz = tz;
75-
}
76-
7768
public String getImage_24() {
7869
return image_24;
7970
}
@@ -116,7 +107,7 @@ public void setImage_192(String image_192) {
116107

117108
@Override
118109
public String toString() {
119-
return "Profile [first_name=" + first_name + ", last_name=" + last_name + ", real_name=" + real_name + ", email=" + email + ", tz=" + tz + ", skype=" + skype + ", phone=" + phone + ", image_24=" + image_24
110+
return "Profile [first_name=" + first_name + ", last_name=" + last_name + ", real_name=" + real_name + ", email=" + email + ", skype=" + skype + ", phone=" + phone + ", image_24=" + image_24
120111
+ ", image_32=" + image_32 + ", image_48=" + image_48 + ", image_72=" + image_72 + ", image_192=" + image_192 + "]";
121112
}
122113

src/main/java/allbegray/slack/type/User.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ public class User {
77

88
protected String id;
99
protected String name;
10+
protected String tz;
1011
protected Boolean deleted;
1112
protected String color;
1213
protected Profile profile;
@@ -35,6 +36,14 @@ public void setName(String name) {
3536
this.name = name;
3637
}
3738

39+
public String getTz() {
40+
return tz;
41+
}
42+
43+
public void setTz(String tz) {
44+
this.tz = tz;
45+
}
46+
3847
public Boolean getDeleted() {
3948
return deleted;
4049
}
@@ -125,7 +134,7 @@ public void setHas_files(Boolean has_files) {
125134

126135
@Override
127136
public String toString() {
128-
return "User [id=" + id + ", name=" + name + ", deleted=" + deleted + ", color=" + color + ", profile="
137+
return "User [id=" + id + ", name=" + name + ", tz=" + tz + ", deleted=" + deleted + ", color=" + color + ", profile="
129138
+ profile + ", is_admin=" + is_admin + ", is_owner=" + is_owner + ", is_primary_owner="
130139
+ is_primary_owner + ", is_restricted=" + is_restricted + ", is_ultra_restricted=" + is_ultra_restricted
131140
+ ", has_2fa=" + has_2fa + ", two_factor_type=" + two_factor_type + ", has_files=" + has_files + "]";

0 commit comments

Comments
 (0)