interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix query string parsing

This commit is contained in:
Chocobozzz 2020-06-26 16:01:04 +02:00
parent d8b382912e
commit cc0e0d32ea
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html
View File

@ -17,7 +17,7 @@
<span class="text-muted">{{ videoAbuse.reporterAccount.nameWithHost }}</span> <span class="text-muted">{{ videoAbuse.reporterAccount.nameWithHost }}</span>
</div> </div>
</a> </a>
<a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'reportee:&quot;' + videoAbuse.reporterAccount.displayName + '&quot;' }" class="ml-auto text-muted video-details-links" i18n> <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'reporter:&quot;' + videoAbuse.reporterAccount.displayName + '&quot;' }" class="ml-auto text-muted video-details-links" i18n>
{videoAbuse.countReportsForReporter, plural, =1 {1 report} other {{{ videoAbuse.countReportsForReporter }} reports}}<span class="ml-1 glyphicon glyphicon-flag"></span> {videoAbuse.countReportsForReporter, plural, =1 {1 report} other {{{ videoAbuse.countReportsForReporter }} reports}}<span class="ml-1 glyphicon glyphicon-flag"></span>
</a> </a>
</span> </span>
@ -90,4 +90,4 @@
<div *ngIf="!videoAbuse.video.deleted && !videoAbuse.video.blacklisted" [innerHTML]="videoAbuse.embedHtml"></div> <div *ngIf="!videoAbuse.video.deleted && !videoAbuse.video.blacklisted" [innerHTML]="videoAbuse.embedHtml"></div>
</div> </div>
</div> </div>
</div> </div>

6
client/src/app/core/rest/rest.service.ts
View File

@ -68,8 +68,9 @@ export class RestService {
parseQueryStringFilter (q: string, prefixes: QueryStringFilterPrefixes): ParseQueryStringFilterResult { parseQueryStringFilter (q: string, prefixes: QueryStringFilterPrefixes): ParseQueryStringFilterResult {
if (!q) return {} if (!q) return {}
// Tokenize the strings using spaces // Tokenize the strings using spaces that are not in quotes
const tokens = q.split(' ').filter(token => !!token) const tokens = q.match(/(?:[^\s"]+|"[^"]*")+/g)
.filter(token => !!token)
// Build prefix array // Build prefix array
const prefixeStrings = Object.values(prefixes) const prefixeStrings = Object.values(prefixes)
@ -88,6 +89,7 @@ export class RestService {
const matchedTokens = tokens.filter(t => t.startsWith(prefix)) const matchedTokens = tokens.filter(t => t.startsWith(prefix))
.map(t => t.slice(prefix.length)) // Keep the value filter .map(t => t.slice(prefix.length)) // Keep the value filter
.map(t => t.replace(/^"|"$/g, ''))
.map(t => { .map(t => {
if (prefixObj.handler) return prefixObj.handler(t) if (prefixObj.handler) return prefixObj.handler(t)