AkkomaGang/akkoma
AkkomaGang/akkoma
15
66
Fork 94
Code Issues 180 Pull requests 28 Projects 2 Releases 14 Packages Wiki Activity

[#58] pre-link MFM content #59

Merged
floatingghost merged 5 commits from prelink-mfm into develop 2022-07-10 17:06:26 +00:00
Conversation 7 Commits 5 Files changed 9 +175 -18
floatingghost commented 2022-07-10 16:23:28 +00:00
Owner
Copy link

when misskey sends us a message, it gives us two different representations - the "federatable mfm" that misskey itself generates, this is a basic markdown-parsed HTML string which shows mfm formatting as italics

the other is either in the _misskey_content (deprecated) or source fields, and is the raw MFM source

this PR pre-parses the raw content and links mentions/hashtags/etc

when misskey sends us a message, it gives us two different representations - the "federatable mfm" that misskey itself generates, this is a basic markdown-parsed HTML string which shows mfm formatting as italics the other is either in the `_misskey_content` (deprecated) or `source` fields, and is the raw MFM source this PR pre-parses the raw content and links mentions/hashtags/etc
floatingghost added 4 commits 2022-07-10 16:23:28 +00:00
pre-link MFM content
Some checks failed
ci/woodpecker/push/release Pipeline was successful
Details
ci/woodpecker/push/lint Pipeline was successful
Details
ci/woodpecker/push/test Pipeline failed
Details
705a8a1fe9
fix typo
Some checks failed
ci/woodpecker/push/release Pipeline was successful
Details
ci/woodpecker/push/lint Pipeline was successful
Details
ci/woodpecker/pr/release Pipeline was successful
Details
ci/woodpecker/pr/lint Pipeline was successful
Details
ci/woodpecker/push/test Pipeline failed
Details
ci/woodpecker/pr/test Pipeline failed
Details
838b025337
Ghost commented 2022-07-10 16:27:27 +00:00
First-time contributor
Copy link

dumb question, this is also going to do the same for MFM messages sent by akkoma, right?

dumb question, this is also going to do the same for MFM messages sent by akkoma, right?
floatingghost commented 2022-07-10 16:35:43 +00:00
Author
Owner
Copy link

hm we probably should, shouldn't we

also seeing how that interacts with stuf

hm we probably should, shouldn't we also seeing how that interacts with stuf
floatingghost commented 2022-07-10 16:39:27 +00:00
Author
Owner
Copy link

ok change of plan

{
  "account": "...",
  "content": "<processed by linker mfm>",
  "akkoma": {
    "source": {
      "content": "raw $[mfm] unlinked",
      "mediaType": "text/x.misskeymarkdown"
    }
  }
}

apparently source shouldn't contain anything like html, so we're going to throw out the silly html misskey generates and use our own, which i think was the initial suggestion

ok change of plan ```json { "account": "...", "content": "<processed by linker mfm>", "akkoma": { "source": { "content": "raw $[mfm] unlinked", "mediaType": "text/x.misskeymarkdown" } } } ``` apparently source shouldn't contain anything like html, so we're going to throw out the silly html misskey generates and use our own, which i think was the initial suggestion
floatingghost commented 2022-07-10 16:47:08 +00:00
Author
Owner
Copy link

final AP format:

 {
  "actor": "https://akkoma.local.live/users/akkoma_user",
  "attachment": [],
  "attributedTo": "https://akkoma.local.live/users/akkoma_user",
  "cc": [
    "https://akkoma.local.live/users/akkoma_user/followers"
  ],
  "content": "<span class=\"h-card\"><a class=\"u-url mention\" data-user=\"ALKPkorAW5uljzcsMK\" href=\"https://misskey.local.live/@mmm_user\" rel=\"ugc\">@<span>mmm_user</span></a></span> $[mfm here] LINK",
  "context": "https://akkoma.local.live/contexts/d048e2c0-b900-46c0-8d12-e6df5c93844d",
  "conversation": "https://akkoma.local.live/contexts/d048e2c0-b900-46c0-8d12-e6df5c93844d",
  "id": "https://akkoma.local.live/objects/00d168db-4878-465f-836d-e5fbdc75e8c3",
  "published": "2022-07-10T16:45:24.395222Z",
  "sensitive": null,
  "source": {
    "content": "@mmm_user@misskey.local.live $[mfm here] LINK",
    "mediaType": "text/x.misskeymarkdown"
  },
  "summary": "",
  "tag": [
    {
      "href": "https://misskey.local.live/users/92hzkskwgy",
      "name": "@mmm_user@misskey.local.live",
      "type": "Mention"
    }
  ],
  "to": [
    "https://www.w3.org/ns/activitystreams#Public",
    "https://misskey.local.live/users/92hzkskwgy"
  ],
  "type": "Note"
}

this is converted to

{
  "account": {
    ...
  },
  "akkoma": {
    "source": {
      "content": "@mmm_user@misskey.local.live $[mfm here] LINK",
      "mediaType": "text/x.misskeymarkdown"
    }
  },
  "application": {
    "name": "PleromaFE_36309ebe\r\n_2022-06-30T13:34:19.062Z",
    "website": null
  },
  "bookmarked": false,
  "card": null,
  "content": "<span class=\"h-card\"><a class=\"u-url mention\" data-user=\"ALKPkorAW5uljzcsMK\" href=\"https://misskey.local.live/@mmm_user\" rel=\"ugc\">@<span>mmm_user</span></a></span> $[mfm here] LINK"

}

on the mastoAPI call

final AP format: ```json { "actor": "https://akkoma.local.live/users/akkoma_user", "attachment": [], "attributedTo": "https://akkoma.local.live/users/akkoma_user", "cc": [ "https://akkoma.local.live/users/akkoma_user/followers" ], "content": "<span class=\"h-card\"><a class=\"u-url mention\" data-user=\"ALKPkorAW5uljzcsMK\" href=\"https://misskey.local.live/@mmm_user\" rel=\"ugc\">@<span>mmm_user</span></a></span> $[mfm here] LINK", "context": "https://akkoma.local.live/contexts/d048e2c0-b900-46c0-8d12-e6df5c93844d", "conversation": "https://akkoma.local.live/contexts/d048e2c0-b900-46c0-8d12-e6df5c93844d", "id": "https://akkoma.local.live/objects/00d168db-4878-465f-836d-e5fbdc75e8c3", "published": "2022-07-10T16:45:24.395222Z", "sensitive": null, "source": { "content": "@mmm_user@misskey.local.live $[mfm here] LINK", "mediaType": "text/x.misskeymarkdown" }, "summary": "", "tag": [ { "href": "https://misskey.local.live/users/92hzkskwgy", "name": "@mmm_user@misskey.local.live", "type": "Mention" } ], "to": [ "https://www.w3.org/ns/activitystreams#Public", "https://misskey.local.live/users/92hzkskwgy" ], "type": "Note" } ``` this is converted to ```json { "account": { ... }, "akkoma": { "source": { "content": "@mmm_user@misskey.local.live $[mfm here] LINK", "mediaType": "text/x.misskeymarkdown" } }, "application": { "name": "PleromaFE_36309ebe\r\n_2022-06-30T13:34:19.062Z", "website": null }, "bookmarked": false, "card": null, "content": "<span class=\"h-card\"><a class=\"u-url mention\" data-user=\"ALKPkorAW5uljzcsMK\" href=\"https://misskey.local.live/@mmm_user\" rel=\"ugc\">@<span>mmm_user</span></a></span> $[mfm here] LINK" } ``` on the mastoAPI call
floatingghost added 1 commit 2022-07-10 16:47:36 +00:00
only link in content field
Some checks failed
ci/woodpecker/push/release Pipeline was successful
Details
ci/woodpecker/pr/release Pipeline was successful
Details
ci/woodpecker/pr/lint Pipeline was successful
Details
ci/woodpecker/push/lint Pipeline was successful
Details
ci/woodpecker/push/test Pipeline failed
Details
ci/woodpecker/pr/test Pipeline was successful
Details
e71a7893ec
floatingghost merged commit 5ad256f170 into develop 2022-07-10 17:06:26 +00:00
floatingghost deleted branch prelink-mfm 2022-07-10 17:06:26 +00:00
Ghost commented 2022-07-11 08:04:48 +00:00
First-time contributor
Copy link

o, noticed a bug
when a misskey user tags a user on the same instance it doesn't tag it
because this searches for that mention on our instance

o, noticed a bug when a misskey user tags a user on the same instance it doesn't tag it because this searches for that mention on our instance
floatingghost commented 2022-07-11 09:56:25 +00:00
Author
Owner
Copy link

interdasting, i'll see if i can replicate
suffering :angery:

interdasting, i'll see if i can replicate suffering :angery:
floatingghost commented 2022-07-11 10:55:28 +00:00
Author
Owner
Copy link

well fixing THAT was a pain in the bum let me tell you

well fixing _THAT_ was a pain in the bum let me tell you
rat referenced this pull request from a commit 2024-02-25 20:33:28 +00:00
[#58] pre-link MFM content (#59)
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
approved, awaiting change

   
bug

Something is not working

  
configuration

This requires config changes

  
documentation

This is about human-readable docs

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
extremely low priority

   
feature request

Something new?

  
Fix it yourself

Support has been attempted

  
help wanted

Need some help

  
invalid

Something is wrong

  
mastodon_api

   
needs docs

   
needs tests

   
not a bug

   
planned

   
pleroma_api

   
privacy

   
question

More information is needed

  
static_fe

   
triage

   
wontfix

This won't be fixed

No labels
approved, awaiting change
bug
configuration
documentation
duplicate
enhancement
extremely low priority
feature request
Fix it yourself
help wanted
invalid
mastodon_api
needs docs
needs tests
not a bug
planned
pleroma_api
privacy
question
static_fe
triage
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
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/akkoma#59
No description provided.
Delete branch "prelink-mfm"

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?