diff --git a/src/components/app/MemberTemplate.vue b/src/components/app/MemberTemplate.vue index 7c768ce..82c0d55 100644 --- a/src/components/app/MemberTemplate.vue +++ b/src/components/app/MemberTemplate.vue @@ -51,7 +51,7 @@ export default { }, roleColor() { if (!this.member || !this.member.roles) return undefined; - const roles = this.$store.getters["servers/roles"][this.serverID]; + const roles = this.$store.getters["servers/selectedServerRoles"]; if (!roles) return undefined; const filter = roles.filter(r => this.member.roles.includes(r.id)); diff --git a/src/components/app/MembersList.vue b/src/components/app/MembersList.vue index 762dd1f..9af9a1d 100644 --- a/src/components/app/MembersList.vue +++ b/src/components/app/MembersList.vue @@ -101,7 +101,7 @@ export default { return roleMembers; }, noneRoleOnlineMembers() { - const roles = this.$store.getters["servers/roles"][this.selectedServerID]; + const roles = this.$store.getters["servers/selectedServerRoles"]; return this.onlineMembers.filter(sm => { if (!sm.roles || !sm.roles.length) { return sm; @@ -113,7 +113,7 @@ export default { }); }, serverRoles() { - const roles = this.$store.getters["servers/roles"][this.selectedServerID]; + const roles = this.$store.getters["servers/selectedServerRoles"]; let newRolesWithMembers = []; if (!roles) return undefined; diff --git a/src/components/app/MessageTemplate.vue b/src/components/app/MessageTemplate.vue index ef62857..8d9403d 100644 --- a/src/components/app/MessageTemplate.vue +++ b/src/components/app/MessageTemplate.vue @@ -313,9 +313,7 @@ export default { }; }, roles() { - return this.$store.getters["servers/roles"][ - this.$store.getters["servers/selectedServerID"] - ]; + return this.$store.getters["servers/selectedServerRoles"]; }, serverMember() { const serverMembers = this.$store.getters["servers/serverMembers"]; diff --git a/src/components/app/Popouts/Popouts/ServerSettingsPanels/ManageRoles.vue b/src/components/app/Popouts/Popouts/ServerSettingsPanels/ManageRoles.vue index 957c8aa..0f07bb4 100644 --- a/src/components/app/Popouts/Popouts/ServerSettingsPanels/ManageRoles.vue +++ b/src/components/app/Popouts/Popouts/ServerSettingsPanels/ManageRoles.vue @@ -11,15 +11,25 @@
add
Add Role
-
-
{{ role.name }}
-
+
+
+ {{ role.name }} +
+
+
@@ -86,20 +96,30 @@