-
Notifications
You must be signed in to change notification settings - Fork 980
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.
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
Removes large pypi image in Slack link unfurling #17282
Open
rmasters
wants to merge
4
commits into
pypi:main
Choose a base branch
from
rmasters:alternate-opengraph-images
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+57
−0
Open
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
b66bcc3
Test out removing the og:image if the UA is the Slack link expander
rmasters ec31087
Extract to function, add tests, add pypi twitter handle
rmasters 52bf053
fix: Handle some edge-cases for user-agents
rmasters e2333a2
Refactored to use a jinja filter
rmasters File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from warehouse.utils.user_agents import should_show_share_image | ||
|
||
|
||
def test_shows_share_image_for_social_networks() -> None: | ||
# https://developer.x.com/en/docs/x-for-websites/cards/guides/troubleshooting-cards#validate_twitterbot | ||
assert should_show_share_image("Twitterbot/1.0") is True | ||
# https://developers.facebook.com/docs/sharing/webmasters/web-crawlers | ||
assert ( | ||
should_show_share_image( | ||
"facebookexternalhit/1.1 (+http://www.facebook.com/externalhit_uatext.php)" | ||
) | ||
is True | ||
) | ||
assert should_show_share_image("facebookexternalhit/1.1") is True | ||
assert should_show_share_image("facebookcatalog/1.0") is True | ||
# https://www.linkedin.com/robots.txt | ||
assert should_show_share_image("LinkedInBot") is True | ||
|
||
|
||
def test_doesnt_show_share_image_for_slackbot() -> None: | ||
# https://api.slack.com/robots | ||
assert ( | ||
should_show_share_image( | ||
"Slackbot-LinkExpanding 1.0 (+https://api.slack.com/robots)" | ||
) | ||
is False | ||
) |
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,21 @@ | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from pyramid.request import Request | ||
|
||
|
||
def should_show_share_image(request: Request) -> bool: | ||
if user_agent := request.user_agent: | ||
if user_agent.strip().startswith("Slackbot-LinkExpanding"): | ||
return False | ||
|
||
return True |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it probably makes more sense to pass the user agent here...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks - I used the request that's already in the template (lmk if that's not always present). I also added some handling for
Request.user_agent is None
in case the user-agent isn't supplied.