AkkomaGang/mfm-parser
1
1
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity

Use FEP-c16b: Formatting MFM functions #2

Open
ilja wants to merge 9 commits from ilja/mfm-parser:akkoma_use_fep-c16b_formatting_mfm_functions into akkoma
pull from: ilja/mfm-parser:akkoma_use_fep-c16b_formatting_mfm_functions
merge into: AkkomaGang:akkoma
Conversation 0 Commits 9 Files changed 11 +363 -1398
ilja commented 2024-08-10 18:06:46 +00:00
First-time contributor
Copy link

See AkkomaGang/akkoma#823

In order to properly get the HTML through the parser, we express the HTML version of the MFM functions using custom classes and data-* attributes. This required big changes in the parser, completely breaking what it did before. I did the changes in my own repo. This PR does the changes here by reverting the commits unique to this fork, and then applying the code changes for the new (FEP-c16b compliant) way of doing the formatting.

Another option is to use https://codeberg.org/ilja/mfm_parser/src/branch/main with commit be09e20e7a2fad2e9964ec4c563201d3fd1c4391 directly. But it makes sense to me to keep using the repo under the Akkoma namespace, which is why I make this PR.

See https://akkoma.dev/AkkomaGang/akkoma/pulls/823 In order to properly get the HTML through the parser, we express the HTML version of the MFM functions using custom classes and data-* attributes. This required big changes in the parser, completely breaking what it did before. I did the changes in my own repo. This PR does the changes here by reverting the commits unique to this fork, and then applying the code changes for the new (FEP-c16b compliant) way of doing the formatting. Another option is to use https://codeberg.org/ilja/mfm_parser/src/branch/main with commit be09e20e7a2fad2e9964ec4c563201d3fd1c4391 directly. But it makes sense to me to keep using the repo under the Akkoma namespace, which is why I make this PR.
ilja added 8 commits 2024-08-10 18:06:46 +00:00 
This reverts commit b21ab77540.
This reverts commit f124e2812e.
This reverts commit 912fba8115.
This reverts commit 51282dd6a7.
This reverts commit 48d0da81e0.
This reverts commit 5054e0ba1e.
This reverts commit 03901025b0.
This reverts commit 5e8723e54b.
ilja changed title from Use FEP-c16b: Formatting MFM functions to WIP: Use FEP-c16b: Formatting MFM functions 2024-08-10 18:07:37 +00:00
ilja force-pushed akkoma_use_fep-c16b_formatting_mfm_functions from d0db44ff70 to 418068793f 2024-08-10 18:14:22 +00:00 Compare
ilja changed title from WIP: Use FEP-c16b: Formatting MFM functions to Use FEP-c16b: Formatting MFM functions 2024-08-10 18:15:00 +00:00
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u akkoma_use_fep-c16b_formatting_mfm_functions:ilja-akkoma_use_fep-c16b_formatting_mfm_functions
git checkout ilja-akkoma_use_fep-c16b_formatting_mfm_functions

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout akkoma
git merge --no-ff ilja-akkoma_use_fep-c16b_formatting_mfm_functions
git checkout ilja-akkoma_use_fep-c16b_formatting_mfm_functions
git rebase akkoma
git checkout akkoma
git merge --ff-only ilja-akkoma_use_fep-c16b_formatting_mfm_functions
git checkout ilja-akkoma_use_fep-c16b_formatting_mfm_functions
git rebase akkoma
git checkout akkoma
git merge --no-ff ilja-akkoma_use_fep-c16b_formatting_mfm_functions
git checkout akkoma
git merge --squash ilja-akkoma_use_fep-c16b_formatting_mfm_functions
git checkout akkoma
git merge --ff-only ilja-akkoma_use_fep-c16b_formatting_mfm_functions
git checkout akkoma
git merge ilja-akkoma_use_fep-c16b_formatting_mfm_functions
git push origin akkoma
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: AkkomaGang/mfm-parser#2
No description provided.
Delete branch "ilja/mfm-parser:akkoma_use_fep-c16b_formatting_mfm_functions"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?