fix media description render for orgmode #26895
Merged
Conversation
This file contains hidden or 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
GiteaBot
added
the
lgtm/need 2
delvh
reviewed
Sep 4, 2023
Comment on lines
+162
to
+165
| description := strings.TrimPrefix(org.String(l.Description...), "file:") | ||
| imageSrc := getMediaURL([]byte(description)) | ||
| fmt.Fprintf(r, `<a href="%s"><img src="%s" alt="%s" /></a>`, link, imageSrc, imageSrc) |
There was a problem hiding this comment.
I am thoroughly confused by these changes.
I'd interpret description as alt or title attribute or something like that (which is already present).
But not as an external link that wraps the image.
There was a problem hiding this comment.
They are from the "official" org package. org/html_writer.go#L406-L427
I would prefer to leave a comment there to tell readers why the code is written as this, where they are copied from.
earl-warren
force-pushed
the
wip-gitea-org-mode
branch
from
aff2753 to
65dd90c
Compare
- In org mode you can specify an description for media via the following syntax `[[description][media link]]`. The description is then used as title or alt. - This patch fixes the rendering of the description by seperating the description and non-description cases and using `org.String()`. - Added unit tests. - Inspired by https://github.com/niklasfasching/go-org/blob/6eb20dbda93cb88c3503f7508dc78cbbc639378f/org/html_writer.go#L406-L427 - Resolves https://codeberg.org/Codeberg/Community/issues/848 (cherry picked from commit 8b8aab83113b34bade61964e2097ed497abc39e9)
earl-warren
force-pushed
the
wip-gitea-org-mode
branch
from
65dd90c to
516318a
Compare
lunny
approved these changes
Sep 11, 2023
GiteaBot
added
lgtm/need 1
wxiaoguang
approved these changes
Sep 13, 2023
GiteaBot
added
lgtm/done
lunny
added
the
reviewed/wait-merge
GiteaBot
removed
the
reviewed/wait-merge
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Sep 13, 2023
* giteaofficial/main: fix media description render for orgmode (go-gitea#26895) Show OpenID Connect and OAuth on signup page (go-gitea#20242) Update status and code index after changing the default branch (go-gitea#27018) add sparse url in cargo package guide (go-gitea#26937) Add missing 404 response to Swagger (go-gitea#27038) Fix object storage path handling (go-gitea#27024) [skip ci] Updated translations via Crowdin bump rootful to 16gb setup go in the nightly release pipeline Speed up nightly builds (go-gitea#27045) Improve repo/user/org search (go-gitea#27030) Use Actuated.dev runner for nightly builds update snap package (go-gitea#27021) resolve issue with sort icons on admin/users and admin/runners (go-gitea#24360)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
[[description][media link]]. The description is then used as title or alt.org.String().(cherry picked from commit 8b8aab83113b34bade61964e2097ed497abc39e9)