1.0.2 Release (#130)

* Master (#111) * 0.2.2 Release (#103) * HOTFIX: Fixed a registration error with the TreeView containers * bump version and log changes * add launch for runnin with extensions * Major Upgrade (#123) * Redesigned the entire extension (#112) * Refactored enum types into an enums folder. * Generating 'types' so we can provide types for our API we'll be exposing. * API interface has been added * Started initial refactor to App and expose API * App class is now working. * Twitch chat client is now working * Old credentials removed by default * Added an API entry to verify if a user is following the channel * Fixed an error with the twitch login on linux * Twitch Authentication server callback port is now a setting * Fixed inconsistency in command titles * Fixed bearer token issue * Removed 'token' requirement for followers check, not required * Reverted server port back to static 5544. Must match registered app with Twitch * Updated changelog for 0.5.0 * Context menu support (#115) * Remove highlights by context-menu * Updated changelog * Updated node_modules to fix security vulnerabilities (#113) * Remove Types folder (#116) * Ignore types * Removed types folder * Cleanup and fixed some issues (#122) * Fixed a high vulnerability in node * Fixed authentication issues and updated packages * Fixed promise issues in the highlight * Removed declaration generation * Updated webpack plugins and options * Redesigned the entire extension (#112) * Refactored enum types into an enums folder. * Generating 'types' so we can provide types for our API we'll be exposing. * API interface has been added * Started initial refactor to App and expose API * App class is now working. * Twitch chat client is now working * Old credentials removed by default * Added an API entry to verify if a user is following the channel * Fixed an error with the twitch login on linux * Twitch Authentication server callback port is now a setting * Fixed inconsistency in command titles * Fixed bearer token issue * Removed 'token' requirement for followers check, not required * Reverted server port back to static 5544. Must match registered app with Twitch * Updated changelog for 0.5.0 * Context menu support (#115) * Remove highlights by context-menu * Updated changelog * Updated node_modules to fix security vulnerabilities (#113) * Remove Types folder (#116) * Ignore types * Removed types folder * Cleanup and fixed some issues (#122) * Fixed a high vulnerability in node * Fixed authentication issues and updated packages * Fixed promise issues in the highlight * Removed declaration generation * Updated webpack plugins and options * clarify status bar item actions * No longer alert about saving token, log it! * Updated copyfiles to 2.3.0 to hopefully solve linux issue * Fixed some casing issues for references on linux * fix: change casing of 'twitch' Co-authored-by: clarkio <clarkio@users.noreply.github.com> * Bump elliptic from 6.4.1 to 6.5.3 (#124) Bumps [elliptic](https://github.com/indutny/elliptic) from 6.4.1 to 6.5.3. - [Release notes](https://github.com/indutny/elliptic/releases) - [Commits](indutny/elliptic@v6.4.1...v6.5.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 💯 1.0.0 Release🎉🎊✨🎆 * Update README.md * hotfix(correct reading of settings by name) * remove tmi token from readme requirements * update version for patch * fix(only reconnect on config change if previously connected) * sec: fix deps from audit * 1.0.2 Release * fix: adjust whitespace Co-authored-by: Anthony Conrad (parithon) <parithon@outlook.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
clarkio · Nov 8, 2020 · 546ca4c · 546ca4c
1 parent c9e762a
commit 546ca4c
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Released]
 
+## [1.0.2]
+
+### Security
+- Addressed dependency from security audit for package `bl`: [bl npm advisory](https://npmjs.com/advisories/1555)
+
+## [1.0.1]
+
+### Fixed
+- Reading of extension settings by name: [commit](https://github.com/clarkio/vscode-twitch-highlighter/commit/5b6844bd999d5eefb5ec186f76510b0a62704d4e)
+
 ## [1.0.0]
 First full release and no longer in preview!
 
@@ -128,6 +138,8 @@ This is a complete rewrite of the extension. The extension now has an API that o
 
 - Pre-release version to gather feedback from the community and help identify gaps.
 
+[1.0.2]: https://github.com/clarkio/vscode-twitch-highlighter/compare/1.0.1...1.0.2
+[1.0.1]: https://github.com/clarkio/vscode-twitch-highlighter/compare/1.0.0...1.0.1
 [1.0.0]: https://github.com/clarkio/vscode-twitch-highlighter/compare/0.5.1...1.0.0
 [0.5.1]: https://github.com/clarkio/vscode-twitch-highlighter/compare/0.5.0...0.5.1
 [0.5.0]: https://github.com/clarkio/vscode-twitch-highlighter/compare/0.2.3...0.5.0

diff --git a/README.md b/README.md
@@ -12,8 +12,6 @@ In order to use this extension you will need the following things before going t
 
 - An installed version of [VS Code](https://code.visualstudio.com)
 - A Twitch account for yourself or a separate one to be used as a chat bot ([sign up here](https://www.twitch.tv/signup))
-- While logged in as your own account or as a separate account go to this site to generate a token for the chat bot: http://www.twitchapps.com/tmi
-  - Save this token temporarily in a safe place as you will need it later in the [Getting Started](#getting-started) section.
 
 ## Getting Started
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "twitch-highlighter",
   "displayName": "Twitch Highlighter",
   "description": "Allow your Twitch viewers to help in spotting bugs, typos, etc. by sending a command in chat that will highlight the line of code they want you to check.",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "preview": false,
   "publisher": "clarkio",
   "engines": {

diff --git a/src/app.ts b/src/app.ts
@@ -1,13 +1,13 @@
 import * as vscode from 'vscode';
-
 import { HighlighterAPI } from './api';
-import { Commands, LogLevel, Configuration, Settings, AppContexts } from './enums';
-import { Logger, log } from './logger';
+import { AppContexts, Commands, Configuration, LogLevel, Settings } from './enums';
 import {
   HighlightManager,
-  HighlightTreeItem,
-  HighlightTreeDataProvider
+
+  HighlightTreeDataProvider, HighlightTreeItem
 } from './highlight';
+import { log, Logger } from './logger';
+
 
 export class App implements vscode.Disposable {
   private readonly _highlightManager: HighlightManager;
@@ -159,9 +159,9 @@ export class App implements vscode.Disposable {
     }
 
     return vscode.window.createTextEditorDecorationType({
-      backgroundColor: configuration.get<string>(Configuration.highlightBackgroundColor) || 'green',
-      border: configuration.get<string>(Configuration.highlightBorderStyle) || '2px solid white',
-      color: configuration.get<string>(Configuration.highlightForegroundColor) || 'white'
+      backgroundColor: configuration.get<string>(Settings.highlightColor) || 'green',
+      border: configuration.get<string>(Settings.highlightBorder) || '2px solid white',
+      color: configuration.get<string>(Settings.highlightFontColor) || 'white'
     });
   }
 
@@ -183,8 +183,8 @@ export class App implements vscode.Disposable {
   private get isActiveTextEditor(): boolean {
     const editor = vscode.window.activeTextEditor;
     return (editor !== undefined &&
-            editor.document.languageId !== 'log' &&
-            editor.document.getText().length > 0);
+      editor.document.languageId !== 'log' &&
+      editor.document.getText().length > 0);
   }
 
   private async highlightHandler(): Promise<void> {
@@ -204,7 +204,7 @@ export class App implements vscode.Disposable {
         this._highlightManager.Add(editor!.document, 'self', +(value || 0));
       }
     }
-    catch ( err ) {
+    catch (err) {
       this.log(LogLevel.Error, err);
     }
 
@@ -232,7 +232,7 @@ export class App implements vscode.Disposable {
           this._highlightManager.Remove(fileName, 'self', +(lineNumber));
         }
       }
-      catch ( err ) {
+      catch (err) {
         this.log(LogLevel.Error, err);
       }
     }
@@ -249,7 +249,7 @@ export class App implements vscode.Disposable {
     let pickerOptions: Array<string> = new Array<string>();
     const highlights = this._highlightManager.GetHighlightDetails();
     highlights.forEach(highlight => {
-      pickerOptions = [ ...pickerOptions, highlight ];
+      pickerOptions = [...pickerOptions, highlight];
     });
 
     try {
@@ -261,7 +261,7 @@ export class App implements vscode.Disposable {
       const [pickedFile, lineNumber] = pickedOption.split(': ');
       this._highlightManager.Remove(pickedFile, 'self', +(lineNumber));
     }
-    catch ( err ) {
+    catch (err) {
       this.log(LogLevel.Error, err);
     }
   }

diff --git a/src/ttvchat/ChatClient.ts b/src/ttvchat/ChatClient.ts
@@ -1,25 +1,18 @@
 import {
-  EventEmitter,
-  Event,
-  Disposable,
-  workspace,
-  WorkspaceConfiguration,
-  ExtensionContext,
-  ConfigurationChangeEvent,
-  OutputChannel
-} from 'vscode';
-import {
-  Client,
-  Options,
-  ChatUserstate,
-  Badges
+  Badges, ChatUserstate, Client,
+  Options
 } from "tmi.js";
-
-import { log } from '../logger';
+import {
+  ConfigurationChangeEvent, Disposable, Event, EventEmitter,
+  ExtensionContext, workspace,
+  WorkspaceConfiguration
+} from 'vscode';
 import { keytar } from "../common";
-import { LogLevel, KeytarKeys, Configuration, Settings } from "../enums";
+import { Configuration, KeytarKeys, LogLevel, Settings } from "../enums";
+import { log } from '../logger';
 import { API } from './api';
 
+
 interface IBadges extends Badges {
   [key: string]: string | undefined;
   follower: string;
@@ -45,7 +38,7 @@ export class ChatClient implements Disposable {
   private leaveMessage: string = "";
   private requiredBadges: string[] = [];
 
-  constructor(private log: log) {}
+  constructor(private log: log) { }
 
   public initialize(context: ExtensionContext) {
     this.config = workspace.getConfiguration(Configuration.sectionIdentifier);
@@ -159,7 +152,7 @@ export class ChatClient implements Disposable {
   }
 
   private async onDidChangeConfigurationHandler(event: ConfigurationChangeEvent) {
-    if (event.affectsConfiguration(Configuration.sectionIdentifier)) {
+    if (event.affectsConfiguration(Configuration.sectionIdentifier) && this.isConnected) {
       await this.disconnect();
       await this.connect();
     }