Merge branch 'master' into release

package-lock.json

@@ -5417,8 +5417,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5833,8 +5832,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5890,7 +5888,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "2.1.1"
           }
@@ -5934,14 +5931,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         }
       }
     },

src/components/ControlPanel/lineLog/components/image-item.vue

@@ -1,17 +0,0 @@
-<template>
-  <div>
-    <sui-image :src="'https://bot.trj.tw/image/line_log_image/' + image" class="img-item"/>
-  </div>
-</template>
-
-<style lang="less" scope>
-.img-item {
-  width: 250px;
-}
-</style>
-
-<script>
-export default {
-  props: ['image']
-}
-</script>

src/components/ControlPanel/lineLog/components/message-item.vue

@@ -1,38 +0,0 @@
-<template>
-  <div class="msg-content">
-    <sui-label class="time-field">{{ parseTime }}</sui-label>
-    <TextItem v-if="type === 'text'" :message="msg" />
-    <ImageItem v-if="type === 'image'" :image="msg" />
-  </div>
-</template>
-
-<style lang="less" scope>
-.msg-content{
-  padding: 0.4em
-}
-.time-field{
-  margin-bottom: 5px !important;
-}
-</style>
-
-<script>
-import TextItem from './text-item.vue'
-import ImageItem from './image-item.vue'
-import {padleft} from '@/tools'
-export default {
-  props: ['type', 'msg', 'time'],
-  components: {
-    TextItem,
-    ImageItem
-  },
-  data () {
-    return {}
-  },
-  computed: {
-    parseTime () {
-      let date = new Date(this.time)
-      return `${date.getFullYear()}-${date.getMonth() + 1}-${padleft(date.getDate().toString(), 2)} ${padleft(date.getHours(), 2)}:${padleft(date.getMinutes(), 2)}:${padleft(date.getSeconds(), 2)}`
-    }
-  }
-}
-</script>

src/components/ControlPanel/lineLog/components/text-item.vue

@@ -1,9 +0,0 @@
-<template>
-  <div>{{ message }}</div>
-</template>
-
-<script>
-export default {
-  props: ['message']
-}
-</script>

src/components/ControlPanel/lineLog/index.vue

@@ -1,82 +0,0 @@
-<template>
-  <sui-container>
-    <sui-grid>
-      <sui-grid-row>
-        <sui-grid-column :width="4">
-          <sui-segment>
-            <sui-list divided>
-              <sui-list-item @click="changeGroup('')">All</sui-list-item>
-              <sui-list-item v-for="it in lineGroups" :key="it.id" @click="changeGroup(it.id)">
-                {{ it.name }}
-              </sui-list-item>
-            </sui-list>
-          </sui-segment>
-        </sui-grid-column>
-        <sui-grid-column :width="12">
-          <sui-segment>
-            <sui-list>
-              <sui-list-item v-for="it in list" :key="it.id">
-                <sui-segment>
-                  <sui-list-header><sui-label :basic="true">{{ it.group_name }}</sui-label>&nbsp;{{ it.user_name }}</sui-list-header>
-                  <MessageItem :type="it.type" :msg="it.message" :time="it.ctime" />
-                </sui-segment>
-              </sui-list-item>
-            </sui-list>
-          </sui-segment>
-        </sui-grid-column>
-      </sui-grid-row>
-    </sui-grid>
-  </sui-container>
-</template>
-
-<script>
-import MessageItem from './components/message-item.vue'
-import {mapActions, mapGetters} from 'vuex'
-
-export default {
-  name: 'LineLog',
-  components: {
-    MessageItem
-  },
-  data () {
-    return {
-      list: [],
-      nowGroup: '',
-      page: {
-        cur: 1,
-        total: 1
-      }
-    }
-  },
-  updated () {
-    console.log(this.lineGroups)
-  },
-  methods: {
-    ...mapActions(['getLineGroups', 'getLogList']),
-    changeGroup (id = '') {
-      console.log('change grp ::::: ', id)
-      if (typeof id !== 'string') return
-      this.nowGroup = id
-      this.page = { cur: 1, total: 1 }
-      this.getLog()
-    },
-    getLog (page = -1) {
-      this.getLogList({
-        group: this.nowGroup,
-        page: page,
-        max: 20,
-        cb: data => {
-          this.list = data.list
-          this.page = data.page
-        }})
-    }
-  },
-  mounted () {
-    this.getLineGroups()
-    this.getLog()
-  },
-  computed: {
-    ...mapGetters(['lineGroups'])
-  }
-}
-</script>

src/components/ControlPanel/topMenu.vue

@@ -1,13 +1,10 @@
 <template>
   <sui-menu fluid borderless fixed='top'>
     <sui-container>
-      <sui-menu-menu position="left">
+      <sui-menu-menu>
         <sui-menu-item :active="activeItem === '' || activeItem === 'channel'">
           <router-link :to="{name: 'ChannelList'}">Channels</router-link>
         </sui-menu-item>
-        <sui-menu-item :active="activeItem !== '' && activeItem === 'linelog'"  v-if="userInfo.type === 'system'">
-          <router-link :to="{name: 'LineLog'}">Line Log</router-link>
-        </sui-menu-item>
       </sui-menu-menu>
       <sui-menu-menu  position='right'>
         <sui-menu-item>User: {{userInfo.name}}</sui-menu-item>

src/router.js

@@ -6,7 +6,6 @@ import ControlPanel from '@/components/ControlPanel'
 import ChannelList from '@/components/ControlPanel/channelList'
 import Channel from '@/components/ControlPanel/channel'
 import ChannelOpay from '@/components/ControlPanel/channel/opay'
-import LineLog from '@/components/ControlPanel/lineLog'
 
 import PublicOpayBar from '@/components/showDonateBar'
 
@@ -35,15 +34,6 @@ export default new Router({
             topMenu: 'channel'
           }
         },
-        {
-          path: 'linelog',
-          alias: '',
-          name: 'LineLog',
-          component: LineLog,
-          meta: {
-            topMenu: 'linelog'
-          }
-        },
         {
           path: 'channel/:chid',
           alias: '',

src/store/actions.js

@@ -235,37 +235,5 @@ export default {
       errorCatch.apply(commit, [err])
     }
     commit('toggleLoading', false)
-  },
-  async getLineGroups ({commit, dispatch}) {
-    try {
-      let res = await client({
-        method: 'get',
-        url: `/api/line/groups`
-      })
-      commit('setLineGroups', res.data.list)
-    } catch (err) {
-      errorCatch.call(commit, err)
-    }
-  },
-  async getLogList ({commit, dispatch}, {group, page, max = 20, cb = null}) {
-    console.log('get log list :::::: ', group, page, max)
-    let chk = chkObject.bind({ body: { group, page, max } })
-    if (!chk('group', 'string', true) || !chk('page', 'number') || !chk('max', 'number')) return
-    try {
-      let opts = {
-        method: 'get',
-        url: '/api/line/logs',
-        params: {
-          order: 'asc'
-        }
-      }
-      if (group.length > 0) opts.params.group = group
-      if (page > 1 || page < 0) opts.params.p = page
-      if (max > 0) opts.params.max = max
-      let res = await client(opts)
-      if (cb !== null && typeof cb === 'function') cb(res.data)
-    } catch (err) {
-      errorCatch.call(commit, err)
-    }
   }
 }

src/store/getters.js

@@ -6,4 +6,3 @@ export const getChannel = state => id => {
   let arr = state.twitch.channels.filter(t => t.id === id)
   return arr.length > 0 ? arr[0] : null
 }
-export const lineGroups = state => state.line.groups || []

src/store/index.js

@@ -15,9 +15,6 @@ const state = {
   },
   twitch: {
     channels: []
-  },
-  line: {
-    groups: []
   }
 }
 

src/store/mutations.js

@@ -39,8 +39,5 @@ export default {
       return t
     })
     state.twitch.channels = [...list]
-  },
-  setLineGroups (state, list) {
-    state.line.groups = [...list]
   }
 }

src/tools.js

@@ -1,70 +1,21 @@
 export const apiUrl = 'https://bot.trj.tw'
 
-export const padleft = (str, len, pad = '0') => {
+export const chkObject = function (key = '', type = '', empty = false) {
-  if (typeof str !== 'string') str = str.toString()
-  if (str.length < len) return padleft(`${pad}${str}`, len, pad)
-  return str
-}
-
-/**
-  * check is number
-  * @param {any} v input value
-  * @return {boolean}
-  */
-export const isNumber = (v) => {
-  if (!isFinite(v) || v === true || v === false) return false
-  return true
-}
-
-/**
-  * src value to int
-  * @param {object} v src value
-  * @param {number} defVal default value
-  * @param {number} min range min
-  * @param {number} max range max
-  */
-export const toInt = (v, defVal = 0, min = null, max = null) => {
-  if (!isNumber(defVal)) defVal = 0
-  if (typeof defVal === 'string') defVal = parseInt(defVal)
-  min = !isNumber(min) ? null : (typeof min === 'string' ? parseInt(min) : min)
-  max = !isNumber(max) ? null : (typeof max === 'string' ? parseInt(max) : max)
-  if (!isNumber(v)) return defVal
-  if (typeof v === 'string') v = parseInt(v)
-  if (min !== null && v < min) v = min
-  if (max !== null && v > max) v = max
-  return v
-}
-/**
-  * check Object
-  * @param {string} key key name
-  * @param {string} type type name
-  * @param {boolean} empty can empty
-  * @param {number} max max value
-  */
-export const chkObject = function (key = '', type = '', empty = false, max = null) {
   const uuidChk = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i
   if (!(key in this.body)) return false
 
-  if (isFinite(empty) && (empty !== false && empty !== true)) {
-    max = toInt(empty, 0)
-    empty = false
-  }
-
   switch (type) {
     case 'string':
-      if (typeof this.body[key] !== 'string' || (!empty && !this.body[key])) return false
+      if (typeof this.body[key] !== 'string' || (!empty && !this.body[key].trim())) return false
-      if (max !== null && this.body[key].length > max) return false
       break
     case 'number':
-      if (!isNumber(this.body[key])) return false
+      if (!isFinite(this.body[key])) return false
-      if (max !== null && this.body[key] > max) return false
       break
     case 'boolean':
       if (typeof this.body[key] !== 'boolean') return false
       break
     case 'array':
       if (!Array.isArray(this.body[key]) || (!empty && this.body[key].length === 0)) return false
-      if (max !== null && this.body[key].length > max) return false
       break
     case 'uuid':
       if (typeof this.body[key] !== 'string') return false
@@ -72,7 +23,7 @@ export const chkObject = function (key = '', type = '', empty = false, max = nul
       if (!empty && !uuidChk.test(this.body[key])) return false
       break
     case 'object':
-      if (typeof this.body[key] !== 'object' || this.body[key] === null || this.body[key] === undefined) return false
+      if (typeof this.body[key] !== 'object') return false
       try {
         let str = JSON.stringify(this.body[key])
         JSON.parse(str)
@@ -86,3 +37,23 @@ export const chkObject = function (key = '', type = '', empty = false, max = nul
 
   return true
 }
+
+/**
+ * parse number
+ * @param {any} v input number
+ * @param {number} def default number
+ * @param {number} min min number
+ * @param {number} max max number
+ * @return {number}
+ */
+export const toInt = (v, def = 0, min = null, max = null) => {
+  if (!isFinite(def)) def = 0
+  if (typeof def === 'string') def = parseInt(def)
+  min = isFinite(min) ? (typeof min === 'string' ? parseInt(min) : min) : null
+  max = isFinite(max) ? (typeof max === 'string' ? parseInt(max) : max) : null
+  if (!isFinite(v)) return def
+  if (typeof v === 'string') v = parseInt(v)
+  if (min !== null && v < min) v = min
+  if (max !== null && v > max) v = max
+  return v
+}