From 58076f9ab87199472ec97cc2518aaa7cdb19b478 Mon Sep 17 00:00:00 2001
From: "Mr. Stallion" <mrstallion@nobody.nowhere.fauxdomain.ext>
Date: Sun, 19 Apr 2020 12:06:50 -0500
Subject: [PATCH] Cleanup

---
 chat/CharacterSearch.vue        | 25 +++++++++++++++++++------
 chat/CharacterSearchHistory.vue |  2 +-
 chat/ChatView.vue               |  7 +++----
 chat/ads/ad-manager.ts          |  6 +++---
 chat/vue-raven.ts               |  4 ++--
 electron/Index.vue              |  2 +-
 electron/Window.vue             |  7 ++-----
 electron/tsconfig-main.json     |  6 ++++--
 electron/tsconfig-renderer.json |  6 ++++--
 mobile/Index.vue                |  2 +-
 readme.md                       |  2 +-
 tsconfig.json                   |  6 ++++--
 12 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/chat/CharacterSearch.vue b/chat/CharacterSearch.vue
index 197481a..46ff894 100644
--- a/chat/CharacterSearch.vue
+++ b/chat/CharacterSearch.vue
@@ -109,8 +109,21 @@
         resultsComplete = false;
         characterImage = characterImage;
         options!: ExtendedSearchData;
-        data: ExtendedSearchData = {kinks: [], genders: [], orientations: [], languages: [], furryprefs: [], roles: [], positions: [], species: []};
-        listItems: ReadonlyArray<keyof SearchData> = ['genders', 'orientations', 'languages', 'furryprefs', 'roles', 'positions']; // SearchData is correct
+
+        data: ExtendedSearchData = {
+            kinks: [],
+            genders: [],
+            orientations: [],
+            languages: [],
+            furryprefs: [],
+            roles: [],
+            positions: [],
+            species: []
+        };
+
+        listItems: ReadonlyArray<keyof SearchData> = [
+            'genders', 'orientations', 'languages', 'furryprefs', 'roles', 'positions'
+        ]; // SearchData is correct
 
         searchString = '';
 
@@ -233,15 +246,15 @@
             return false;
           }
 
-          return !!_.find(this.data.species, (s) => (s.id === species));
+          return !!_.find(this.data.species, (s: SearchSpecies) => (s.id === species));
         }
 
 
         getSpeciesOptions(): SearchSpecies[] {
             const species = _.map(
                 _.filter(Species, (s) => (_.isString(s))) as unknown[] as string[],
-                (speciesName: string) => {
-                    const speciesId = (Species as any)[speciesName];
+                (speciesName: keyof typeof Species): SearchSpecies => {
+                    const speciesId: number = Species[speciesName];
 
                     if (speciesId in speciesNames) {
                         return {
@@ -255,7 +268,7 @@
                         id: speciesId
                     };
                 }
-            );
+            ) as unknown[] as SearchSpecies[];
 
             return _.sortBy(species, 'name');
         }
diff --git a/chat/CharacterSearchHistory.vue b/chat/CharacterSearchHistory.vue
index 508258f..c6c76eb 100644
--- a/chat/CharacterSearchHistory.vue
+++ b/chat/CharacterSearchHistory.vue
@@ -38,7 +38,7 @@
         @Prop({required: true})
         readonly curSearch!: ExtendedSearchData | undefined;
 
-        history: (ExtendedSearchData|SearchData)[] = [];
+        history: (ExtendedSearchData | SearchData)[] = [];
 
         selectedSearch: number | null = null;
 
diff --git a/chat/ChatView.vue b/chat/ChatView.vue
index 2697b61..a9673f0 100644
--- a/chat/ChatView.vue
+++ b/chat/ChatView.vue
@@ -101,8 +101,7 @@
 <script lang="ts">
     import {Component, Hook} from '@f-list/vue-ts';
 
-    import * as SortableBase from 'sortablejs';
-    const Sortable = (SortableBase as any).Sortable;
+    import Sortable from 'sortablejs';
 
     import Vue from 'vue';
     import {Keys} from '../keys';
@@ -159,7 +158,7 @@
             Sortable.create(<HTMLElement>this.$refs['privateConversations'], {
                 animation: 50,
                 fallbackTolerance: 5,
-                onEnd: async(e: any) => {
+                onEnd: async(e) => {
                     if(e.oldIndex === e.newIndex) return;
                     return core.conversations.privateConversations[e.oldIndex!].sort(e.newIndex!);
                 }
@@ -167,7 +166,7 @@
             Sortable.create(<HTMLElement>this.$refs['channelConversations'], {
                 animation: 50,
                 fallbackTolerance: 5,
-                onEnd: async(e: any) => {
+                onEnd: async(e) => {
                     if(e.oldIndex === e.newIndex) return;
                     return core.conversations.channelConversations[e.oldIndex!].sort(e.newIndex!);
                 }
diff --git a/chat/ads/ad-manager.ts b/chat/ads/ad-manager.ts
index 4001fba..3fb34fa 100644
--- a/chat/ads/ad-manager.ts
+++ b/chat/ads/ad-manager.ts
@@ -181,11 +181,11 @@ export class AdManager {
     }
 
 
-    protected static recoverableCharacter: string = '';
+    protected static recoverableCharacter = '';
     protected static recoverableAds: RecoverableAd[] = [];
 
 
-    static onConnectionClosed() {
+    static onConnectionClosed(): void {
         AdManager.recoverableCharacter = core.characters.ownCharacter.name;
 
         AdManager.recoverableAds = _.map(
@@ -210,7 +210,7 @@ export class AdManager {
     }
 
 
-    static onNewChannelAvailable(channel: ChannelConversation) {
+    static onNewChannelAvailable(channel: ChannelConversation): void {
         if (AdManager.recoverableCharacter !== core.characters.ownCharacter.name) {
             AdManager.recoverableAds = [];
             AdManager.recoverableCharacter = '';
diff --git a/chat/vue-raven.ts b/chat/vue-raven.ts
index c3ef9f3..278ea63 100644
--- a/chat/vue-raven.ts
+++ b/chat/vue-raven.ts
@@ -1,4 +1,4 @@
-import * as Raven from 'raven-js';
+import Raven from 'raven-js';
 import Vue from 'vue';
 
 /*tslint:disable:no-unsafe-any no-any*///hack
@@ -68,4 +68,4 @@ export function setupRaven(dsn: string, version: string): void {
     (<Window & {onunhandledrejection(e: PromiseRejectionEvent): void}>window).onunhandledrejection = (e: PromiseRejectionEvent) => {
         Raven.captureException(<Error>e.reason);
     };
-}
\ No newline at end of file
+}
diff --git a/electron/Index.vue b/electron/Index.vue
index c7e7b01..7a05948 100644
--- a/electron/Index.vue
+++ b/electron/Index.vue
@@ -85,7 +85,7 @@
     import * as fs from 'fs';
     import * as path from 'path';
     import * as qs from 'querystring';
-    import * as Raven from 'raven-js';
+    import Raven from 'raven-js';
     import {promisify} from 'util';
     import Vue from 'vue';
     import Chat from '../chat/Chat.vue';
diff --git a/electron/Window.vue b/electron/Window.vue
index 972f9ed..d5e3275 100644
--- a/electron/Window.vue
+++ b/electron/Window.vue
@@ -34,10 +34,7 @@
 </template>
 
 <script lang="ts">
-    import * as SortableBase from 'sortablejs';
-    const Sortable = (SortableBase as any).Sortable;
-
-    import * as _ from 'lodash';
+    import Sortable from 'sortablejs';
 
     import {Component, Hook} from '@f-list/vue-ts';
     import * as electron from 'electron';
@@ -155,7 +152,7 @@
 
             Sortable.create(<HTMLElement>this.$refs['tabs'], {
                 animation: 50,
-                onEnd: (e: any) => {
+                onEnd: (e) => {
                     if(e.oldIndex === e.newIndex) return;
                     const tab = this.tabs.splice(e.oldIndex!, 1)[0];
                     this.tabs.splice(e.newIndex!, 0, tab);
diff --git a/electron/tsconfig-main.json b/electron/tsconfig-main.json
index 3f40310..435e5c6 100644
--- a/electron/tsconfig-main.json
+++ b/electron/tsconfig-main.json
@@ -9,7 +9,9 @@
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "noUnusedLocals": true,
-    "noUnusedParameters": true
+    "noUnusedParameters": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true
   },
   "include": ["main.ts"]
-}
\ No newline at end of file
+}
diff --git a/electron/tsconfig-renderer.json b/electron/tsconfig-renderer.json
index 04b1125..274f4ed 100644
--- a/electron/tsconfig-renderer.json
+++ b/electron/tsconfig-renderer.json
@@ -10,7 +10,9 @@
     "strict": true,
     "forceConsistentCasingInFileNames": true,
     "noUnusedLocals": true,
-    "noUnusedParameters": true
+    "noUnusedParameters": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true
   },
   "include": ["chat.ts", "window.ts", "../**/*.d.ts"]
-}
\ No newline at end of file
+}
diff --git a/mobile/Index.vue b/mobile/Index.vue
index 5c679d7..b786783 100644
--- a/mobile/Index.vue
+++ b/mobile/Index.vue
@@ -60,7 +60,7 @@
     import {Component, Hook} from '@f-list/vue-ts';
     import Axios from 'axios';
     import * as qs from 'qs';
-    import * as Raven from 'raven-js';
+    import Raven from 'raven-js';
     import Vue from 'vue';
     import Chat from '../chat/Chat.vue';
     import core from '../chat/core';
diff --git a/readme.md b/readme.md
index 67d38d1..9ba2575 100644
--- a/readme.md
+++ b/readme.md
@@ -84,7 +84,6 @@ This repository contains a heavily customized version of the mainline F-Chat 3.0
 1. 'Underage' kink is considered to apply to characters aged 16 or above; 'ageplay' kink is considered to apply to characters aged 16 or below.
 1. 'Older characters' and 'younger characters' kink preferences are interpreted as age difference of 5+ years.
 1. Comparison results will get faster over time, as more and more character data is cached.
-1. Loading animation
 
 
 ## Todo / Ideas
@@ -97,6 +96,7 @@ This repository contains a heavily customized version of the mainline F-Chat 3.0
 *   Bug? Usually submissive vs usually submissive shows up as 'maybe'
 *   Bug? YOU have 'loves humans'; THEY have 'no furry characters, just humans' -- THEIR ad shows green, not red -- your side of comparison is fully green, they just have 'no furry pairings' in red
 *   Bug? [color] acts weird
+*   Add new chat is case sensitive
 
 
 # F-List Exported
diff --git a/tsconfig.json b/tsconfig.json
index 1e0abea..518cbeb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,7 +9,9 @@
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "noUnusedLocals": true,
-    "noUnusedParameters": true
+    "noUnusedParameters": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true
   },
   "include": ["./electron/main.ts"]
-}
\ No newline at end of file
+}