Merge branch 'master' into canary

CHANGELOG.md

@@ -5,6 +5,9 @@
   * Post Ads and Ad Editor have been merged together into My Ads
   * Profile Helper now only shows up if you have anything to fix; otherwise the profile helper can be found in the Settings menu
 
+## 1.23.3
+* Hotfix to fix color picker not disappearing
+
 ## 1.23.2
 * Hotfix to fix eicon search hanging the client
 

README.md

@@ -1,8 +1,8 @@
 # Download
-[Windows](https://github.com/mrstallion/fchat-rising/releases/download/v1.23.2/F-Chat-Rising-1.23.2-win.exe) (82 MB)
-| [MacOS Intel](https://github.com/mrstallion/fchat-rising/releases/download/v1.23.2/F-Chat-Rising-1.23.2-macos-intel.dmg) (82 MB)
-| [MacOS M1](https://github.com/mrstallion/fchat-rising/releases/download/v1.23.2/F-Chat-Rising-1.23.2-macos-m1.dmg) (84 MB)
-| [Linux](https://github.com/mrstallion/fchat-rising/releases/download/v1.23.2/F-Chat-Rising-1.23.2-linux.AppImage) (82 MB)
+[Windows](https://github.com/mrstallion/fchat-rising/releases/download/v1.23.3/F-Chat-Rising-1.23.3-win.exe) (82 MB)
+| [MacOS Intel](https://github.com/mrstallion/fchat-rising/releases/download/v1.23.3/F-Chat-Rising-1.23.3-macos-intel.dmg) (82 MB)
+| [MacOS M1](https://github.com/mrstallion/fchat-rising/releases/download/v1.23.3/F-Chat-Rising-1.23.3-macos-m1.dmg) (84 MB)
+| [Linux](https://github.com/mrstallion/fchat-rising/releases/download/v1.23.3/F-Chat-Rising-1.23.3-linux.AppImage) (82 MB)
 
 
 # F-Chat Rising
@@ -147,10 +147,11 @@ node pack.js
    *   Non-custom kinks
    *   Species
 1. Matching for non-binary genders relies on kinks. For example, if your non-binary character has a preference for females, make sure 'females' are listed as a favorite kink.
-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 8+ years.
-1. Comparison results will get faster over time, as more and more character data is cached.
-1. If you have a species-fluid character (e.g. you play both your character as both a human and an anthro), you can indicate this by setting your **species** in your character profile in the following ways. F-List Rising will then score you against the best fitting type. 
+   *    Similarly if you want to match with non-binary genders -- independent of your characters' gender -- add your preferred non-binary types into your kink list.
+3. 'Underage' kink is considered to apply to characters aged 16 or above; 'ageplay' kink is considered to apply to characters aged 16 or below.
+4. 'Older characters' and 'younger characters' kink preferences are interpreted as age difference of 8+ years.
+5. Comparison results will get faster over time, as more and more character data is cached.
+6. If you have a species-fluid character (e.g. you play both your character as both a human and an anthro), you can indicate this by setting your **species** in your character profile in the following ways. F-List Rising will then score you against the best fitting type. 
     * Human or tiger
     * Human, tiger, or dragon 
     * Anthro (Horse or Tiger)

bbcode/Editor.vue

@@ -16,12 +16,6 @@
                 </div>
             </div>
 
-<!--            <div class="popover popover-top eicon-selector" :class="{ big: type === 'big' }" v-show="eiconPopupVisible" v-on-clickaway="dismissEIconSelector">-->
-<!--                <div class="popover-body">-->
-<!--                  <EIconSelector :onSelect="onSelectEIcon" ref="eIconSelector"></EIconSelector>-->
-<!--                </div>-->
-<!--            </div>-->
-
             <EIconSelector :onSelect="onSelectEIcon" ref="eIconSelector"></EIconSelector>
 
             <div class="btn-group toolbar-buttons" style="flex-wrap:wrap">
@@ -60,6 +54,7 @@
     import {Component, Hook, Prop, Watch} from '@f-list/vue-ts';
     import _ from 'lodash';
     import Vue from 'vue';
+    import { mixin as clickaway } from 'vue-clickaway';
     import {getKey} from '../chat/common';
     import {Keys} from '../keys';
     import {BBCodeElement, CoreBBCodeParser, urlRegex} from './core';
@@ -73,7 +68,8 @@
       components: {
         'icon': IconView,
         'EIconSelector': EIconSelector
-      }
+      },
+      mixins: [ clickaway ]
     })
     export default class Editor extends Vue {
         @Prop
@@ -298,14 +294,15 @@
         }
 
         apply(button: EditorButton): void {
-            this.colorPopupVisible = false;
-
             if (button.tag === 'color') {
               this.colorPopupVisible = !this.colorPopupVisible;
               return;
             } else if (button.tag === 'eicon') {
               this.showEIconSelector();
+              this.colorPopupVisible = false;
               return;
+            } else {
+              this.colorPopupVisible = false;
             }
 
             this.applyButtonEffect(button);

docs/_config.yml

@@ -50,7 +50,7 @@ theme: jekyll-theme-slate
 changelog: https://github.com/mrstallion/fchat-rising/blob/master/CHANGELOG.md
 
 download:
-  version: 1.23.2
+  version: 1.23.3
 
   url: https://github.com/mrstallion/fchat-rising/releases/download/v%VERSION%/F-Chat-Rising-%VERSION%-%PLATFORM_TAIL%
 

electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fchat",
-  "version": "1.23.2",
+  "version": "1.23.3",
   "author": "The F-List Team and Mister Stallion (Esq.)",
   "description": "F-List.net Chat Client",
   "main": "main.js",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "f-list-rising",
-  "version": "1.23.2",
+  "version": "1.23.3",
   "author": "The F-List Team and and Mister Stallion (Esq.)",
   "description": "A heavily modded F-Chat 3.0 client for F-List",
   "license": "MIT",