forked from mastodon/mastodon
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix mastodon#1491 - Fix broken notifications, broken Link header pars…
…ing for exclude_types
- Loading branch information
Showing
9 changed files
with
60 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
import Link from 'http-link-header'; | ||
import querystring from 'querystring'; | ||
|
||
Link.parseAttrs = (link, parts) => { | ||
let match = null | ||
let attr = '' | ||
let value = '' | ||
let attrs = '' | ||
|
||
let uriAttrs = /<(.*)>;\s*(.*)/gi.exec(parts) | ||
|
||
if(uriAttrs) { | ||
attrs = uriAttrs[2] | ||
link = Link.parseParams(link, uriAttrs[1]) | ||
} | ||
|
||
while(match = Link.attrPattern.exec(attrs)) { | ||
attr = match[1].toLowerCase() | ||
value = match[4] || match[3] || match[2] | ||
|
||
if( /\*$/.test(attr)) { | ||
Link.setAttr(link, attr, Link.parseExtendedValue(value)) | ||
} else if(/%/.test(value)) { | ||
Link.setAttr(link, attr, querystring.decode(value)) | ||
} else { | ||
Link.setAttr(link, attr, value) | ||
} | ||
} | ||
|
||
return link | ||
}; | ||
|
||
export default Link; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters