Merge pull request stream-labs#1472 from stream-labs/sb_remove_unders…

…core Remove references to underscore
JeonghunPark · Mar 8, 2019 · f4fc16c · f4fc16c
2 parents 0d614e4 + 3a1af40
commit f4fc16c
Show file tree

Hide file tree

Showing 46 changed files with 106 additions and 137 deletions.
diff --git a/app/components/Selector.vue.ts b/app/components/Selector.vue.ts
@@ -1,5 +1,4 @@
 import Vue from 'vue';
-import _ from 'lodash';
 import { Component, Prop } from 'vue-property-decorator';
 import draggable from 'vuedraggable';
 
@@ -24,14 +23,9 @@ export default class Selector extends Vue {
   draggableSelector: string = this.draggable ? '.selector-item' : 'none';
 
   handleChange(change: any) {
-    const order = _.map(this.normalizedItems, item => {
-      return item.value;
-    });
+    const order = this.normalizedItems.map(item => item.value);
 
-    this.$emit('sort', {
-      change,
-      order,
-    });
+    this.$emit('sort', { change, order });
   }
 
   handleSelect(ev: MouseEvent, index: number) {
@@ -60,14 +54,10 @@ export default class Selector extends Vue {
    * array of objects, so we normalize those here.
    */
   get normalizedItems(): ISelectorItem[] {
-    return _.map(this.items, item => {
+    return this.items.map(item => {
       if (typeof item === 'string') {
-        return {
-          name: item,
-          value: item,
-        };
+        return { name: item, value: item };
       }
-
       return item;
     });
   }

diff --git a/app/components/StudioEditor.vue.ts b/app/components/StudioEditor.vue.ts
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import { Component } from 'vue-property-decorator';
-import _ from 'lodash';
+import clamp from 'lodash/clamp';
 import { DragHandler } from 'util/DragHandler';
 import { Inject } from 'util/injector';
 import { Scene, SceneItem, ScenesService, TSceneNode } from 'services/scenes';
@@ -226,7 +226,9 @@ export default class StudioEditor extends Vue {
       this.dragHandler.move(event);
     } else if (event.buttons === 1) {
       // We might need to start dragging
-      const sourcesInPriorityOrder = _.compact(this.activeSources.concat(this.sceneItems));
+      const sourcesInPriorityOrder = this.activeSources
+        .concat(this.sceneItems)
+        .filter(item => item);
 
       const overSource = sourcesInPriorityOrder.find(source => {
         return this.isOverSource(event, source);
@@ -262,28 +264,28 @@ export default class StudioEditor extends Vue {
           case AnchorPoint.East: {
             const croppableWidth = rect.width - rect.crop.right - 2;
             const distance = croppableWidth * rect.scaleX - (rect.x - x);
-            rect.crop.left = Math.round(_.clamp(distance / rect.scaleX, 0, croppableWidth));
+            rect.crop.left = Math.round(clamp(distance / rect.scaleX, 0, croppableWidth));
             break;
           }
 
           case AnchorPoint.West: {
             const croppableWidth = rect.width - rect.crop.left - 2;
             const distance = croppableWidth * rect.scaleX + (rect.x - x);
-            rect.crop.right = Math.round(_.clamp(distance / rect.scaleX, 0, croppableWidth));
+            rect.crop.right = Math.round(clamp(distance / rect.scaleX, 0, croppableWidth));
             break;
           }
 
           case AnchorPoint.South: {
             const croppableHeight = rect.height - rect.crop.bottom - 2;
             const distance = croppableHeight * rect.scaleY - (rect.y - y);
-            rect.crop.top = Math.round(_.clamp(distance / rect.scaleY, 0, croppableHeight));
+            rect.crop.top = Math.round(clamp(distance / rect.scaleY, 0, croppableHeight));
             break;
           }
 
           case AnchorPoint.North: {
             const croppableHeight = rect.height - rect.crop.top - 2;
             const distance = croppableHeight * rect.scaleY + (rect.y - y);
-            rect.crop.bottom = Math.round(_.clamp(distance / rect.scaleY, 0, croppableHeight));
+            rect.crop.bottom = Math.round(clamp(distance / rect.scaleY, 0, croppableHeight));
             break;
           }
         }
@@ -437,7 +439,7 @@ export default class StudioEditor extends Vue {
   // of the active source's resize regions.
   isOverResize(event: MouseEvent) {
     if (this.activeSources.length > 0) {
-      return _.find(this.resizeRegions, region => {
+      return this.resizeRegions.find(region => {
         return this.isOverBox(event, region.x, region.y, region.width, region.height);
       });
     }

diff --git a/app/components/obs/inputs/ObsColorInput.vue.ts b/app/components/obs/inputs/ObsColorInput.vue.ts
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import { Component, Watch, Prop } from 'vue-property-decorator';
 import { debounce } from 'lodash-decorators';
 import { TObsType, IObsInput, ObsInput } from './ObsInput';
@@ -29,7 +28,7 @@ class ObsColorInput extends ObsInput<IObsInput<number>> {
 
   @debounce(500)
   setValue(rgba: IColor) {
-    if (!_.isEqual(rgba, this.obsColor)) {
+    if (!Object.keys(rgba).every(key => rgba[key] === this.obsColor[key])) {
       const intColor = Utils.rgbaToInt(rgba.r, rgba.g, rgba.b, Math.round(255 * rgba.a));
       this.emitInput({ ...this.value, value: intColor });
     }
@@ -41,7 +40,7 @@ class ObsColorInput extends ObsInput<IObsInput<number>> {
 
   get hexAlpha() {
     const alpha = this.obsColor.a;
-    return _.padStart(Math.floor(alpha * 255).toString(16), 2, '0');
+    return `00${Math.floor(alpha * 255).toString(16)}`;
   }
 
   get hexColor() {

diff --git a/app/components/obs/inputs/ObsEditableListInput.vue.ts b/app/components/obs/inputs/ObsEditableListInput.vue.ts
@@ -1,5 +1,5 @@
-import _ from 'lodash';
 import electron from 'electron';
+import cloneDeep from 'lodash/cloneDeep';
 import Selector from '../../Selector.vue';
 import { Component, Prop } from 'vue-property-decorator';
 import { IObsEditableListInputValue, ObsInput, TObsType } from './ObsInput';
@@ -47,7 +47,7 @@ class ObsEditableListProperty extends ObsInput<IObsEditableListInputValue> {
   }
 
   handleRemove() {
-    this.setList(_.without(this.list, this.activeItem));
+    this.setList(this.list.filter(item => item !== this.activeItem));
   }
 
   handleEdit() {
@@ -62,7 +62,7 @@ class ObsEditableListProperty extends ObsInput<IObsEditableListInputValue> {
     });
 
     if (files) {
-      const activeIndex = _.indexOf(this.list, this.activeItem);
+      const activeIndex = this.list.indexOf(this.activeItem);
 
       this.list[activeIndex] = files[0];
 
@@ -101,7 +101,7 @@ class ObsEditableListProperty extends ObsInput<IObsEditableListInputValue> {
 
   get list(): string[] {
     const items = this.value.value || [];
-    return _.cloneDeep(items.map(item => item.value));
+    return cloneDeep(items.map(item => item.value));
   }
 }
 

diff --git a/app/components/obs/inputs/ObsInput.ts b/app/components/obs/inputs/ObsInput.ts
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import Vue from 'vue';
 import { Prop } from 'vue-property-decorator';
 import * as obs from '../../../../obs-api';
@@ -114,7 +113,7 @@ export interface IElectronOpenDialogFilter {
 }
 
 function parsePathFilters(filterStr: string): IElectronOpenDialogFilter[] {
-  const filters = _.compact(filterStr.split(';;'));
+  const filters = filterStr.split(';;').filter(item => item);
 
   // Browser source uses *.*
   if (filterStr === '*.*') {
@@ -128,7 +127,7 @@ function parsePathFilters(filterStr: string): IElectronOpenDialogFilter[] {
 
   return filters.map(filter => {
     const match = filter.match(/^(.*)\((.*)\)$/);
-    const desc = _.trim(match[1]);
+    const desc = match[1].replace(/^\s+/, '').replace(/\s+$/, '');
     let types = match[2].split(' ');
 
     types = types.map(type => {

diff --git a/app/components/page-components/Chatbot/ChatbotBase.vue.ts b/app/components/page-components/Chatbot/ChatbotBase.vue.ts
@@ -6,7 +6,6 @@ import Tabs from 'components/Tabs.vue';
 import DropdownMenu from 'components/shared/DropdownMenu.vue';
 import { inputComponents } from 'components/widgets/inputs';
 import VFormGroup from 'components/shared/inputs/VFormGroup.vue';
-import * as _ from 'lodash';
 import {
   ChatbotApiService,
   ChatbotPermissionsEnums,
@@ -38,7 +37,7 @@ export default class ChatbotBase extends Vue {
   }
 
   get chatbotPermissions() {
-    const keys = _.difference(Object.keys(ChatbotPermissionsEnums), ['None']);
+    const keys = Object.keys(ChatbotPermissionsEnums).filter(key => key !== 'None');
 
     const permissions = keys.reduce((a: IListOption<number>[], b: string) => {
       if (typeof ChatbotPermissionsEnums[b] === 'number') {

diff --git a/app/components/page-components/Chatbot/Poll/ChatbotActivePoll.vue.ts b/app/components/page-components/Chatbot/Poll/ChatbotActivePoll.vue.ts
@@ -1,7 +1,8 @@
-import ChatbotBase from 'components/page-components/Chatbot/ChatbotBase.vue';
 import { Component, Prop } from 'vue-property-decorator';
+import { throttle } from 'lodash-decorators';
+import sumBy from 'lodash/sumBy';
+import ChatbotBase from 'components/page-components/Chatbot/ChatbotBase.vue';
 import ChatbotVoteTracker from './ChatbotVoteTracker.vue';
-import * as _ from 'lodash';
 import ChatbotGenericModalWindow from '../windows/ChatbotGenericModalWindow.vue';
 import { ChatbotSettingSlug } from 'services/chatbot';
 
@@ -22,8 +23,7 @@ export default class ChatbotActivePoll extends ChatbotBase {
   get isCancelable() {
     if (this.type === 'poll') {
       return (
-        _.sumBy(this.chatbotApiService.Poll.state.activePollResponse.settings.options, 'votes') ===
-        0
+        sumBy(this.chatbotApiService.Poll.state.activePollResponse.settings.options, 'votes') === 0
       );
     }
     return this.chatbotApiService.Betting.state.activeBettingResponse.status !== 'Picked';
@@ -38,13 +38,13 @@ export default class ChatbotActivePoll extends ChatbotBase {
 
   get total() {
     if (this.type === 'poll') {
-      return _.sumBy(this.active.settings.options, 'votes');
+      return sumBy(this.active.settings.options, 'votes');
     }
-    return _.sumBy(this.active.settings.options, 'bets');
+    return sumBy(this.active.settings.options, 'bets');
   }
 
   get loyalty() {
-    return _.sumBy(this.active.settings.options, 'loyalty');
+    return sumBy(this.active.settings.options, 'loyalty');
   }
 
   get active() {
@@ -65,12 +65,7 @@ export default class ChatbotActivePoll extends ChatbotBase {
     return this.chatbotApiService.Betting.state.timeRemaining;
   }
 
-  mounted() {
-    this.onToggleStateHandler = _.throttle(this.onToggleStateHandler, 1000);
-    this.onCancelHandler = _.throttle(this.onCancelHandler, 1000);
-    this.onCompleteHandler = _.throttle(this.onCompleteHandler, 1000);
-  }
-
+  @throttle(1000)
   onToggleStateHandler() {
     if (this.type === 'poll') {
       this.togglePoll();
@@ -95,11 +90,13 @@ export default class ChatbotActivePoll extends ChatbotBase {
     }
   }
 
+  @throttle(1000)
   onCancelHandler() {
     this.$modal.show(this.CANCEL_MODAL);
     this.chatbotApiService.Common.closeChatbotChildWindow();
   }
 
+  @throttle(1000)
   onCompleteHandler() {
     if (this.type === 'poll') {
       this.chatbotApiService.Poll.completePoll();

diff --git a/app/components/page-components/Chatbot/Poll/ChatbotPollProfile.vue.ts b/app/components/page-components/Chatbot/Poll/ChatbotPollProfile.vue.ts
@@ -1,8 +1,9 @@
-import ChatbotBase from 'components/page-components/Chatbot/ChatbotBase.vue';
 import { Component, Prop } from 'vue-property-decorator';
+import orderBy from 'lodash/orderBy';
+import map from 'lodash/map';
+import ChatbotBase from 'components/page-components/Chatbot/ChatbotBase.vue';
 import { IPollProfile, DELETE_MODAL, ChatbotSettingSlug, IBettingProfile } from 'services/chatbot';
 import moment from 'moment';
-import * as _ from 'lodash';
 import ChatbotGenericModalWindow from '../windows/ChatbotGenericModalWindow.vue';
 import ChatbotVoteTracker from './ChatbotVoteTracker.vue';
 
@@ -18,7 +19,7 @@ export default class ChatbotPollProfile extends ChatbotBase {
   }
 
   get options() {
-    return _.map(this.profile.options, 'name').join(', ');
+    return map(this.profile.options, 'name').join(', ');
   }
 
   get timeRemaining() {
@@ -74,11 +75,11 @@ export default class ChatbotPollProfile extends ChatbotBase {
   get topThreeOptions() {
     if (this.type === 'poll') {
       const active = this.chatbotApiService.Poll.state.activePollResponse;
-      return _.orderBy(active.settings.options.slice(0, 5), 'votes', 'desc');
+      return orderBy(active.settings.options.slice(0, 5), 'votes', 'desc');
     }
 
     const active = this.chatbotApiService.Betting.state.activeBettingResponse;
-    return _.orderBy(active.settings.options.slice(0, 5), 'bets', 'desc');
+    return orderBy(active.settings.options.slice(0, 5), 'bets', 'desc');
   }
 
   onEditProfileHandler() {

diff --git a/app/components/page-components/Chatbot/Poll/ChatbotVoteTracker.vue.ts b/app/components/page-components/Chatbot/Poll/ChatbotVoteTracker.vue.ts
@@ -1,7 +1,7 @@
-import ChatbotBase from 'components/page-components/Chatbot/ChatbotBase.vue';
 import { Component, Prop } from 'vue-property-decorator';
+import sumBy from 'lodash/sumBy';
+import ChatbotBase from 'components/page-components/Chatbot/ChatbotBase.vue';
 import { IPollOption, ChatbotSettingSlug, IBettingOption } from 'services/chatbot';
-import * as _ from 'lodash';
 
 @Component({})
 export default class ChatbotVoteTracker extends ChatbotBase {
@@ -53,9 +53,9 @@ export default class ChatbotVoteTracker extends ChatbotBase {
 
   get total() {
     if (this.type === 'poll') {
-      return _.sumBy(this.activeSettings.options, 'votes');
+      return sumBy(this.activeSettings.options, 'votes');
     }
-    return _.sumBy(this.activeSettings.options, 'bets');
+    return sumBy(this.activeSettings.options, 'bets');
   }
 
   get settings() {

diff --git a/app/components/page-components/Chatbot/module-bases/ChatbotAlertsBase.vue.ts b/app/components/page-components/Chatbot/module-bases/ChatbotAlertsBase.vue.ts
@@ -1,4 +1,4 @@
-import { cloneDeep } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 import { Component } from 'vue-property-decorator';
 import ChatbotWindowsBase from 'components/page-components/Chatbot/windows/ChatbotWindowsBase.vue';
 import {

diff --git a/app/components/page-components/Chatbot/module-bases/ChatbotModToolsBase.vue.ts b/app/components/page-components/Chatbot/module-bases/ChatbotModToolsBase.vue.ts
@@ -1,4 +1,4 @@
-import { cloneDeep } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 import { Component, Watch } from 'vue-property-decorator';
 import ChatbotWindowsBase from 'components/page-components/Chatbot/windows/ChatbotWindowsBase.vue';
 import { $t } from 'services/i18n';

diff --git a/app/components/page-components/Chatbot/windows/ChatbotBettingPreferencesWindow.vue.ts b/app/components/page-components/Chatbot/windows/ChatbotBettingPreferencesWindow.vue.ts
@@ -1,12 +1,12 @@
-import { Component, Prop, Watch } from 'vue-property-decorator';
+import { Component, Watch } from 'vue-property-decorator';
+import cloneDeep from 'lodash/cloneDeep';
 import ChatbotWindowsBase from 'components/page-components/Chatbot/windows/ChatbotWindowsBase.vue';
 import { $t } from 'services/i18n';
-import * as _ from 'lodash';
 import ValidatedForm from 'components/shared/inputs/ValidatedForm.vue';
 
 import { IBettingPreferencesResponse } from 'services/chatbot';
 
-import { EInputType, metadata, formMetadata } from 'components/shared/inputs/index';
+import { metadata, formMetadata } from 'components/shared/inputs/index';
 import { ITab } from 'components/Tabs.vue';
 import { debounce } from 'lodash-decorators';
 
@@ -104,7 +104,7 @@ export default class ChatbotBettingPreferencesWindow extends ChatbotWindowsBase
   }
 
   mounted() {
-    this.newBettingPreferences = _.cloneDeep(this.pollPreferences);
+    this.newBettingPreferences = cloneDeep(this.pollPreferences);
   }
 
   onSelectTabHandler(tab: string) {

diff --git a/app/components/page-components/Chatbot/windows/ChatbotBettingProfileWindow.vue.ts b/app/components/page-components/Chatbot/windows/ChatbotBettingProfileWindow.vue.ts
@@ -1,12 +1,9 @@
-import { Component, Prop, Watch } from 'vue-property-decorator';
-import ChatbotWindowsBase from 'components/page-components/Chatbot/windows/ChatbotWindowsBase.vue';
+import { Component } from 'vue-property-decorator';
+import cloneDeep from 'lodash/cloneDeep';
 import { $t } from 'services/i18n';
-import * as _ from 'lodash';
-import { IChatbotErrorResponse, IBettingProfile, IBettingOption } from 'services/chatbot';
-import { EInputType, metadata, formMetadata } from 'components/shared/inputs/index';
+import { IBettingProfile, IBettingOption } from 'services/chatbot';
+import { metadata, formMetadata } from 'components/shared/inputs/index';
 import ValidatedForm from 'components/shared/inputs/ValidatedForm.vue';
-import { ITab } from 'components/Tabs.vue';
-import { debounce } from 'lodash-decorators';
 import ChatbotBetOptionModal from '../Bet/ChatbotBetOptionModal.vue';
 import ChatbotPollProfileWindow from './ChatbotPollProfileWindow.vue';
 
@@ -77,7 +74,7 @@ export default class ChatbotBettingProfileWindow extends ChatbotPollProfileWindo
   mounted() {
     // if editing existing custom command
     if (this.isEdit) {
-      this.newProfile = _.cloneDeep(this.profileToUpdate);
+      this.newProfile = cloneDeep(this.profileToUpdate);
     }
   }
 

diff --git a/app/components/page-components/Chatbot/windows/ChatbotCommandPreferencesWindow.vue.ts b/app/components/page-components/Chatbot/windows/ChatbotCommandPreferencesWindow.vue.ts
@@ -1,6 +1,6 @@
 import { Component, Prop } from 'vue-property-decorator';
 import ChatbotWindowsBase from 'components/page-components/Chatbot/windows/ChatbotWindowsBase.vue';
-import { cloneDeep } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 import { $t } from 'services/i18n';
 import { metadata as metadataHelper } from 'components/widgets/inputs';
 import ValidatedForm from 'components/shared/inputs/ValidatedForm.vue';