dirk/honk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix mastodon import to work with new format.

Browse source 
from Peter Sanchez
This commit is contained in:
Ted Unangst 2021-01-17 19:01:54 -05:00
parent 9766f208e8
commit 07ae68eae0
2 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog.txt
View file

@ -2,6 +2,8 @@ changelog
=== next === next
+ Fix mastodon import.
+ Better regex for filters. + Better regex for filters.
+ Fix hoot to work with Twitter's latest crap. + Fix hoot to work with Twitter's latest crap.

22
import.go
View file

@ -49,6 +49,7 @@ func importMastodon(username, source string) {
Type string Type string
To []string To []string
Cc []string Cc []string
Object struct {
Summary string Summary string
Content string Content string
InReplyTo string InReplyTo string
@ -65,10 +66,9 @@ func importMastodon(username, source string) {
Name string Name string
} }
} }
var outbox struct {
OrderedItems []struct {
Object Toot
} }
var outbox struct {
OrderedItems []Toot
} }
fd, err := os.Open(source + "/outbox.json") fd, err := os.Open(source + "/outbox.json")
if err != nil { if err != nil {
@ -93,7 +93,7 @@ func importMastodon(username, source string) {
re_tootid := regexp.MustCompile("[^/]+$") re_tootid := regexp.MustCompile("[^/]+$")
for _, item := range outbox.OrderedItems { for _, item := range outbox.OrderedItems {
toot := item.Object toot := item
tootid := re_tootid.FindString(toot.Id) tootid := re_tootid.FindString(toot.Id)
xid := fmt.Sprintf("%s/%s/%s", user.URL, honkSep, tootid) xid := fmt.Sprintf("%s/%s/%s", user.URL, honkSep, tootid)
if havetoot(xid) { if havetoot(xid) {
@ -104,15 +104,15 @@ func importMastodon(username, source string) {
What: "honk", What: "honk",
Honker: user.URL, Honker: user.URL,
XID: xid, XID: xid,
RID: toot.InReplyTo, RID: toot.Object.InReplyTo,
Date: toot.Published, Date: toot.Object.Published,
URL: xid, URL: xid,
Audience: append(toot.To, toot.Cc...), Audience: append(toot.To, toot.Cc...),
Noise: toot.Content, Noise: toot.Object.Content,
Convoy: toot.Conversation, Convoy: toot.Object.Conversation,
Whofore: 2, Whofore: 2,
Format: "html", Format: "html",
Precis: toot.Summary, Precis: toot.Object.Summary,
} }
if honk.RID != "" { if honk.RID != "" {
honk.What = "tonk" honk.What = "tonk"
@ -120,7 +120,7 @@ func importMastodon(username, source string) {
if !loudandproud(honk.Audience) { if !loudandproud(honk.Audience) {
honk.Whofore = 3 honk.Whofore = 3
} }
for _, att := range toot.Attachment { for _, att := range toot.Object.Attachment {
switch att.Type { switch att.Type {
case "Document": case "Document":
fname := fmt.Sprintf("%s/%s", source, att.Url) fname := fmt.Sprintf("%s/%s", source, att.Url)
@ -144,7 +144,7 @@ func importMastodon(username, source string) {
honk.Donks = append(honk.Donks, donk) honk.Donks = append(honk.Donks, donk)
} }
} }
for _, t := range toot.Tag { for _, t := range toot.Object.Tag {
switch t.Type { switch t.Type {
case "Hashtag": case "Hashtag":
honk.Onts = append(honk.Onts, t.Name) honk.Onts = append(honk.Onts, t.Name)