Skip to content

Use Twitter OG tags if no Twitter credentials are configured #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pajlada merged 6 commits into from
Sep 9, 2023
Merged

Use Twitter OG tags if no Twitter credentials are configured #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c085b76
Adjust User-Agent to fetch twitter opengraph tags
M4tthewDE Sep 8, 2023
789e552
Add changelog entry
M4tthewDE Sep 8, 2023
142bf63
Only send adjusted User-Agent for twitter requests
M4tthewDE Sep 8, 2023
e5207a3
Reword changelog entry
pajlada Sep 9, 2023
c4151e0
Move changelog entry
pajlada Sep 9, 2023
d18bc5b
Merge branch 'master' into feature/twitter-opengraph-default
pajlada Sep 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Unreleased

- Breaking: Remove the `/twitchemotes/` endpoints. See [issue 332](https://github.com/Chatterino/api/issues/332) for more information. (#465)
- Minor: Use Twitter OG tags if no Twitter credentials are configured. (#522)
- Fix: We do some more YouTube video ID parsing to ensure broken links (such as `youtube.com/watch?v=foobar?feature=share`) still return the actual video ID, since this is how the browser operates. (#488)
- Dev: Document the `log-development` setting. (#491)
- Dev: Document the `log-level` setting. (#490)
Expand Down
10 changes: 9 additions & 1 deletion internal/resolvers/default/link_loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ import (
"time"

"github.com/Chatterino/api/internal/logger"
"github.com/Chatterino/api/internal/resolvers/twitter"
"github.com/Chatterino/api/internal/staticresponse"
"github.com/Chatterino/api/internal/version"
"github.com/Chatterino/api/pkg/cache"
"github.com/Chatterino/api/pkg/resolver"
"github.com/Chatterino/api/pkg/thumbnail"
Expand Down Expand Up @@ -48,7 +50,13 @@ func (l *LinkLoader) Load(ctx context.Context, urlString string, r *http.Request
return resolver.ReturnInvalidURL()
}

resp, err := resolver.RequestGET(ctx, requestUrl.String())
extraHeaders := make(map[string]string)
ctx, isTwitterRequest := twitter.Check(ctx, requestUrl)
if isTwitterRequest {
extraHeaders["User-Agent"] = fmt.Sprintf("chatterino-api-cache/%s link-resolver (bot)", version.Version)
}

resp, err := resolver.RequestGETWithHeaders(requestUrl.String(), extraHeaders)
if err != nil {
if strings.HasSuffix(err.Error(), "no such host") {
return staticresponse.SNoLinkInfoFound.
Expand Down
6 changes: 5 additions & 1 deletion internal/resolvers/twitter/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ type TwitterResolver struct {
userCache cache.Cache
}

func (r *TwitterResolver) Check(ctx context.Context, url *url.URL) (context.Context, bool) {
func Check(ctx context.Context, url *url.URL) (context.Context, bool) {
if !utils.IsSubdomainOf(url, "twitter.com") {
return ctx, false
}
Expand All @@ -45,6 +45,10 @@ func (r *TwitterResolver) Check(ctx context.Context, url *url.URL) (context.Cont
return ctx, isTwitterUser
}

func (r *TwitterResolver) Check(ctx context.Context, url *url.URL) (context.Context, bool) {
return Check(ctx, url)
}

func (r *TwitterResolver) Run(ctx context.Context, url *url.URL, req *http.Request) (*cache.Response, error) {
tweetMatch := tweetRegexp.FindStringSubmatch(url.Path)
if len(tweetMatch) == 2 && len(tweetMatch[1]) > 0 {
Expand Down