replace discord.js with roleypoly v3 discord service

UI/src/components/role-editor/index.js

@@ -58,7 +58,6 @@ class RoleEditor extends Component {
 
   dropRole = (category, name) => ({ role, category }) => {
     const { dispatch } = this.props
-    console.log(role)
     dispatch(Actions.addRoleToCategory(name, category, role))
   }
 

UI/src/components/role-picker/Category.js

@@ -26,7 +26,6 @@ class Category extends Component {
       case 'multi':
         return this.toggleRoleMulti(id, next)
       default:
-        console.warn('DEFAULTING TO MULTI', id, next, old)
         return this.toggleRoleMulti(id, next)
     }
   }
@@ -54,7 +53,7 @@ class Category extends Component {
               <Role
                 key={k}
                 role={r}
-                disabled={!r.get('safe')}
+                disabled={r.get('safety') !== 0}
                 selected={isSelected(id)}
                 onToggle={this.onRoleToggle(id)}
               />

UI/src/components/role-picker/actions.js

@@ -17,13 +17,14 @@ export const setup = id => async dispatch => {
 }
 
 export const getViewMap = server => {
+  const gmRoles = server.get('gm').get('rolesList')
   const roles = server.get('roles')
   const categories = server.get('categories')
   const categoriesIds = server.get('categories').keySeq()
 
   const allRoles = server
     .get('roles')
-    .filter(v => v.get('safe'))
+    .filter(v => v.get('safety') === 0)
     .map(r => r.get('id'))
     .toSet()
   const accountedRoles = categories
@@ -32,8 +33,6 @@ export const getViewMap = server => {
     .flatten()
   const unaccountedRoles = allRoles.subtract(accountedRoles)
 
-  // console.log('roles', allRoles.toJS(), accountedRoles.toJS(), unaccountedRoles.toJS())
-
   const viewMap = categories
     .set(
       'Uncategorized',
@@ -67,7 +66,7 @@ export const getViewMap = server => {
     })
 
   const selected = roles.reduce(
-    (acc, r) => acc.set(r.get('id'), r.get('selected')),
+    (acc, r) => acc.set(r.get('id'), gmRoles.includes(r.get('id'))),
     Map()
   )
 

UI/src/components/role-picker/index.js

@@ -73,8 +73,6 @@ class RolePicker extends Component {
     const msg = server.get('message')
     const msgBuffer = this.props.data.get('messageBuffer')
 
-    console.log(msg, roleManager, isEditing, this.props.data.toJS())
-
     if (!roleManager && msg !== '') {
       return (
         <section>

UI/src/components/role/index.js

@@ -18,8 +18,6 @@ class Role extends Component {
     let { role, selected, disabled, type, isDragging } = this.props
     type = type || 'button'
 
-    // console.log(this.props)
-
     let color = Color(role.get('color'))
 
     if (color.rgbNumber() === 0) {

UI/src/components/servers/Navigation.js

@@ -14,7 +14,6 @@ class ServersNavigation extends Component {
   }
 
   render() {
-    // console.log(this.props.servers)
     return (
       <Fragment>
         <UserCard user={this.props.user} />

UI/src/components/servers/ServerCard.js

@@ -14,8 +14,6 @@ class ServerCard extends Component {
 
     let icon = ''
 
-    console.log(__filename, server)
-
     const s = server.get('server')
     const gm = server.get('gm')
     const perms = server.get('perms')

UI/src/components/servers/ServerLanding.js

@@ -10,8 +10,6 @@ export default class ServerLanding extends Component {
   }
 
   async componentDidMount() {
-    console.log(this.props)
-
     try {
       const rsp = await superagent.get(
         `/api/server/${this.props.match.params.server}/slug`

UI/src/components/servers/UserCard.js

@@ -25,8 +25,6 @@ class UserCard extends Component {
   render() {
     const { user } = this.props
 
-    // console.log(this.props)
-
     return (
       <div className="user-card">
         <div className="user-card__icon">

UI/src/components/servers/index.js

@@ -10,8 +10,6 @@ import RolePicker from '../role-picker'
 import './index.sass'
 import Navigation from './Navigation'
 
-// import mockData from './mockData'
-
 const mapState = ({ servers, user, appState }) => {
   return {
     servers,
@@ -22,8 +20,6 @@ const mapState = ({ servers, user, appState }) => {
 
 class Servers extends Component {
   get defaultPath() {
-    console.log(this.props.servers.toJS())
-
     const first = this.props.servers.first()
     if (first != null) {
       return first.get('id')