Rooba
/
stash
mirror of https://github.com/stashapp/stash.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix List filter styles, fix freeones spam (#1853) 

* Fix List filter styles, fix freeones spam
This commit is contained in:
kermieisinthehouse 2021-10-15 03:02:49 +00:00 committed by GitHub
parent 39fdde273d
commit 5ec70ac3e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/scraper/freeones.go
View File

@ -46,7 +46,7 @@ xPathScrapers:
- regex: \sBio\s*$ - regex: \sBio\s*$
with: "" with: ""
URL: //link[@rel="alternate" and @hreflang="x-default"]/@href URL: //link[@rel="alternate" and @hreflang="x-default"]/@href
Twitter: //a[contains(@href,'twitter.com/')]/@href Twitter: //a[not(starts-with(@href,'https://twitter.com/FreeOnes'))][contains(@href,'twitter.com/')]/@href
Instagram: //a[contains(@href,'instagram.com/')]/@href Instagram: //a[contains(@href,'instagram.com/')]/@href
Birthdate: Birthdate:
selector: //span[contains(text(),'Born On')] selector: //span[contains(text(),'Born On')]

1
ui/v2.5/src/components/Changelog/versions/v0110.md
View File

@ -7,6 +7,7 @@
* Optimised scanning process. ([#1816](https://github.com/stashapp/stash/pull/1816)) * Optimised scanning process. ([#1816](https://github.com/stashapp/stash/pull/1816))
### 🐛 Bug fixes ### 🐛 Bug fixes
* Fix Twitter value defaulting to freeones in built-in Freeones scraper. ([#1853](https://github.com/stashapp/stash/pull/1853))
* Fix colour codes not outputting correctly when logging to file on Windows. ([#1846](https://github.com/stashapp/stash/pull/1846)) * Fix colour codes not outputting correctly when logging to file on Windows. ([#1846](https://github.com/stashapp/stash/pull/1846))
* Sort directory listings using case sensitive collation. ([#1823](https://github.com/stashapp/stash/pull/1823)) * Sort directory listings using case sensitive collation. ([#1823](https://github.com/stashapp/stash/pull/1823))
* Fix auto-tag logic for names which have single-letter words. ([#1817](https://github.com/stashapp/stash/pull/1817)) * Fix auto-tag logic for names which have single-letter words. ([#1817](https://github.com/stashapp/stash/pull/1817))

12
ui/v2.5/src/components/List/ListFilter.tsx
View File

@ -240,11 +240,13 @@ export const ListFilter: React.FC<IListFilterProps> = ({
</div> </div>
<Dropdown as={ButtonGroup} className="mr-2 mb-1"> <Dropdown as={ButtonGroup} className="mr-2 mb-1">
<Dropdown.Toggle variant="secondary"> <InputGroup.Prepend>
{currentSortBy <Dropdown.Toggle variant="secondary">
? intl.formatMessage({ id: currentSortBy.messageID }) {currentSortBy
: ""} ? intl.formatMessage({ id: currentSortBy.messageID })
</Dropdown.Toggle> : ""}
</Dropdown.Toggle>
</InputGroup.Prepend>
<Dropdown.Menu className="bg-secondary text-white"> <Dropdown.Menu className="bg-secondary text-white">
{renderSortByOptions()} {renderSortByOptions()}
</Dropdown.Menu> </Dropdown.Menu>

7
ui/v2.5/src/components/Shared/styles.scss
View File

@ -208,3 +208,10 @@ button.collapse-button.btn-primary:not(:disabled):not(.disabled):active {
} }
} }
} }
.input-group-prepend {
.btn {
border-bottom-right-radius: 0;
border-top-right-radius: 0;
}
}