From 81ad12b03f8ec7b30adac90e3f0fa284bdacae85 Mon Sep 17 00:00:00 2001
From: "Mr. Stallion" <mrstallion@nobody.nowhere.fauxdomain.ext>
Date: Sun, 21 Mar 2021 16:28:33 -0500
Subject: [PATCH] New version
---
CHANGELOG.md | 6 ++++
README.md | 14 ++-------
docs/_config.yml | 2 +-
electron/package.json | 2 +-
package.json | 6 ++--
yarn.lock | 67 ++++++++++++++++++++++++-------------------
6 files changed, 52 insertions(+), 45 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a4f282..6193aa2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# Changelog
+## 1.11.0
+* Kinks are now part of the profile matching score
+* Merged with the latest official F-Chat codebase
+* Fixed broken `[collapse]` when wrapped in `[heading]`
+
+
## 1.10.1
* Improved performance on highly advertised channels like LFRP
* Fixed Rule34.xxx previews
diff --git a/README.md b/README.md
index d5a23a1..1af3676 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# Download
-[Windows](https://github.com/mrstallion/fchat-rising/releases/download/v1.10.1/F-Chat-Rising-1.10.1-win.exe) (75 MB)
-| [MacOS](https://github.com/mrstallion/fchat-rising/releases/download/v1.10.1/F-Chat-Rising-1.10.1-macos.dmg) (76 MB)
-| [Linux](https://github.com/mrstallion/fchat-rising/releases/download/v1.10.1/F-Chat-Rising-1.10.1-linux.AppImage) (76 MB)
+[Windows](https://github.com/mrstallion/fchat-rising/releases/download/v1.11.0/F-Chat-Rising-1.11.0-win.exe) (75 MB)
+| [MacOS](https://github.com/mrstallion/fchat-rising/releases/download/v1.11.0/F-Chat-Rising-1.11.0-macos.dmg) (76 MB)
+| [Linux](https://github.com/mrstallion/fchat-rising/releases/download/v1.11.0/F-Chat-Rising-1.11.0-linux.AppImage) (76 MB)
# F-Chat Rising
@@ -109,22 +109,14 @@ This repository contains a heavily customized version of the mainline F-Chat 3.0
## Todo / Ideas
-
* Collect data on ads / responses to determine which ads work best
* Preview mode should allow detaching from the main window
* Improve log browsing
* Conversation bot API
* 'Filter unmatching ads' is not channel specific -- it's either on everywhere or nowhere
-* 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
-* Bug? inline images act weird on profiles
-* Better disconnect management / API tickets?
-* Ctrl+P to re-open closed profile; navigate back and forward in profiles (e.g. when you click one); 'back to top' button
* What are the things that would make your profile more compatible with others?
-
# F-List Exported
This repository contains the open source parts of F-list and F-Chat 3.0.
All necessary files to build F-Chat 3.0 as an Electron, mobile or web application are included.
diff --git a/docs/_config.yml b/docs/_config.yml
index f08c38f..8d4150f 100644
--- a/docs/_config.yml
+++ b/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.10.1
+ version: 1.11.0
url: https://github.com/mrstallion/fchat-rising/releases/download/v%VERSION%/F-Chat-Rising-%VERSION%-%PLATFORM_TAIL%
diff --git a/electron/package.json b/electron/package.json
index 556a819..91ca1e6 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -1,6 +1,6 @@
{
"name": "fchat",
- "version": "1.10.1",
+ "version": "1.11.0",
"author": "The F-List Team and Mister Stallion (Esq.)",
"description": "F-List.net Chat Client",
"main": "main.js",
diff --git a/package.json b/package.json
index 6e0777f..b73f3df 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "f-list-rising",
- "version": "1.10.1",
+ "version": "1.11.0",
"author": "The F-List Team and and Mister Stallion (Esq.)",
"description": "A heavily modded F-Chat 3.0 client for F-List",
"license": "MIT",
@@ -52,9 +52,9 @@
"webpack": "^5.3.2"
},
"dependencies": {
- "@cliqz/adblocker-electron": "^1.19.0",
+ "@cliqz/adblocker-electron": "^1.20.0",
"jquery": "^3.5.1",
- "keytar": "^7.3.0",
+ "keytar": "^7.4.0",
"node-fetch": "^2.6.1"
},
"optionalDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 38da842..fec8fd9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -23,36 +23,45 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@cliqz/adblocker-content@^1.19.0":
- version "1.19.0"
- resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.19.0.tgz#c3e8ce50a719905cfcb66b114882c086b5074131"
- integrity sha512-sciMicb+zmN5+iKCiDnWPegepgI32XzX4Snf1VxR+HAFwYGJmfk25vpL6ONd6hOlpmumxHkE/y5l7suH0ziP5g==
-
-"@cliqz/adblocker-electron-preload@^1.19.0":
- version "1.19.0"
- resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.19.0.tgz#960332fb3bc6e68e13596bc280f68aa9ee5e3170"
- integrity sha512-ns+VCyb+H8U5rKC4lfvAbb1KxZiIKFs3F8HvivRkGBFqjEzaCUC4s/kf6P+tWCLC69lVgrZUDIzFHkKmGG9LPA==
+"@cliqz/adblocker-content@^1.20.3":
+ version "1.20.3"
+ resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.20.3.tgz#198c8719cd62ef3c67a5c98e7a54336b7812ed86"
+ integrity sha512-aCBTiIiNgVbmDIQyUcsn0j3n+umvs0DuVlL6dccPE3qfeFxT4whUvMwjxUS2/dIBfJK9A1LywmvVke2eSPw9wg==
dependencies:
- "@cliqz/adblocker-content" "^1.19.0"
+ "@cliqz/adblocker-extended-selectors" "^1.20.3"
-"@cliqz/adblocker-electron@^1.19.0":
- version "1.19.0"
- resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.19.0.tgz#9be5e10e93cd0488b79c54e44a265687b3d07a87"
- integrity sha512-UFhhHAQUI02HXWEX0Yjw+sCzJrdLbcGjCdjbaPjkYSv/w+uGaq7TahE1IXGALkS8vXHenA2iJdJglt2mh96Uuw==
+"@cliqz/adblocker-electron-preload@^1.20.3":
+ version "1.20.3"
+ resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.20.3.tgz#17dff446ad742cb6e68a4572e7a75cff1fa33f95"
+ integrity sha512-fWAFEGj+F0VOUKZd2FqWLuguXmGzkRQz5wTCqasvndX4HSe0P8Pd2666pWK9RJW1dLJE7U61mQfTbYqlUFVTMA==
dependencies:
- "@cliqz/adblocker" "^1.19.0"
- "@cliqz/adblocker-electron-preload" "^1.19.0"
+ "@cliqz/adblocker-content" "^1.20.3"
+
+"@cliqz/adblocker-electron@^1.20.0":
+ version "1.20.3"
+ resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.20.3.tgz#f2b4bf5dddf90f64251c46f89238526dc0037384"
+ integrity sha512-ZcEl3W7R/aoUA0IPIMtvdn7gVE6O9+rDQ9OllIH/s/gVeElXZsgPEtpPMSuoJWbi9d2mlr8yo3UFvkV3u7c4gw==
+ dependencies:
+ "@cliqz/adblocker" "^1.20.3"
+ "@cliqz/adblocker-electron-preload" "^1.20.3"
tldts-experimental "^5.6.21"
-"@cliqz/adblocker@^1.19.0":
- version "1.19.0"
- resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.19.0.tgz#1521673172998d0a691aeb1f2b2c1732c9b8c6ab"
- integrity sha512-sy/aBjPoQsqLI5XYHAaZfgi+7HpddJmoHn/UMyX0dx0/jnnaM2/Z2LGylOsGwjW97GsNvvqSwXgxsEH2R0K9SQ==
+"@cliqz/adblocker-extended-selectors@^1.20.3":
+ version "1.20.3"
+ resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.20.3.tgz#a817915948ec4e64c8b878a80a71d911ea0412c8"
+ integrity sha512-Xsrqg4qgpNVx80UJrAz/nS8jcbgCTIGvir0MrjoXrw0GheqRxsgE540XXP9JA7QlifLNVEOO44DpHvhUmISkQw==
+
+"@cliqz/adblocker@^1.20.3":
+ version "1.20.3"
+ resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.20.3.tgz#4e8d03ed03c476f7b4388d25f910b1b9e0b15cc9"
+ integrity sha512-Dqj8fJ399kFsFQ53uW0ajA5jH5VJ5ppawOjtoV2s+7NILj1ydvw40jTrr3l/ObMvxaAGaDUj2Euo4beg3/EtRQ==
dependencies:
+ "@cliqz/adblocker-content" "^1.20.3"
+ "@cliqz/adblocker-extended-selectors" "^1.20.3"
"@remusao/guess-url-type" "^1.1.2"
"@remusao/small" "^1.1.2"
"@remusao/smaz" "^1.7.1"
- "@types/chrome" "^0.0.127"
+ "@types/chrome" "^0.0.133"
"@types/firefox-webext-browser" "^82.0.0"
tldts-experimental "^5.6.21"
@@ -213,10 +222,10 @@
resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8"
integrity sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==
-"@types/chrome@^0.0.127":
- version "0.0.127"
- resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.127.tgz#9e29f351d558f60e95326ceadc586fdcc824151b"
- integrity sha512-hBB9EApLYKKn2GvklVkTxVP6vZvxsH9okyIRUinNtMzZHIgIKWQk/ESbX+O5g4Bihfy38+aFGn7Kl7Cxou5JUg==
+"@types/chrome@^0.0.133":
+ version "0.0.133"
+ resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.133.tgz#9e1d55441584ba2d5274ca84db36427da9c5dc6e"
+ integrity sha512-G8uIUdaCTBILprQvQXBWGXZxjAWbkCkFQit17cdH3zYQEwU8f/etNl8+M7e8MRz9Xj8daHaVpysneMZMx8/ldQ==
dependencies:
"@types/filesystem" "*"
"@types/har-format" "*"
@@ -4262,10 +4271,10 @@ junk@^3.1.0:
resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
-keytar@^7.3.0:
- version "7.3.0"
- resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.3.0.tgz#2f833d54d9cf2bca14abca7b1d6f172315951eac"
- integrity sha512-t8YD0ETO5AeRxCaaN4N/hzj3JusIH0ugjVooE724+ozaVG9+l16Mau62T+U8tEhCv7SozY/g69BWF1U+o47qJg==
+keytar@^7.4.0:
+ version "7.4.0"
+ resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.4.0.tgz#0a508d64850ca05aa3ba4127818037d13ca3219f"
+ integrity sha512-nELmc35YjSE4ZNSFaID/743CgDt/MdV4JLX7rRewAh9mKvU72RtF3uJMY0MdMpwdDYZhmD8FSdRCD1J97lEyVg==
dependencies:
node-addon-api "^3.0.0"
prebuild-install "^6.0.0"