From 63c342d87afbf4a8362f8a41b598de86cb3e4fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= Date: Wed, 15 Jan 2020 14:59:09 +0100 Subject: [PATCH] comment all --- configuration.go | 31 +++++++++++++++++++-------- facebook.go | 54 ++++++++++++++++++++++++------------------------ fb_dataft.go | 7 +++++++ main_test.go | 4 ---- urlexpander.go | 1 + webhook.go | 8 +++++++ 6 files changed, 65 insertions(+), 40 deletions(-) diff --git a/configuration.go b/configuration.go index 331640c..974346d 100644 --- a/configuration.go +++ b/configuration.go @@ -31,17 +31,30 @@ const ( fbGameURL string = "apps.facebook.com/mobaheroes" ) +// Constants for title of the Postings +const ( + TitleFreeTitanArtifact string = "FREE Titan Artifact" + TitleFreeSilverCaskets string = "FREE Silver Caskets" + TitleFreeSoulStones string = "FREE Soul Stones" + TitleFreeSkinStones string = "FREE Skin Stones" + TitleActionKeepTheAmount string = "Keep the amount" + TitleFreeWinterfestBaubles string = "Winterfest Baubles" + TitleFreeTopFanPackage string = "Top Fan Gift" + TitleFreeEnergyForFee string = "ENERGY FOR FREE" + TitleWinterfestRankingRewards string = "Winterfest ranking rewards" +) + // Constants for all search for title of the Postings const ( - FreeTitanArtifact string = "FREE Titan Artifact" - FreeSilverCaskets string = "FREE Silver Caskets" - FreeSoulStones string = "Soul Stones" - FreeSkinStones string = "Skin Stones" - ActionKeepTheAmount string = "Keep the amount" - FreeWinterfestBaubles string = "Winterfest Baubles" - FreeTopFanPackage string = "Top Fan" - FreeEnergyForFee string = "ENERGY FOR FREE" - WinterfestRankingRewards string = "Winterfest ranking rewards" + SearchFreeTitanArtifact string = "FREE Titan Artifact" + SearchFreeSilverCaskets string = "FREE Silver Caskets" + SearchFreeSoulStones string = "Soul Stones" + SearchFreeSkinStones string = "Skin Stones" + SearchActionKeepTheAmount string = "Keep the amount" + SearchFreeWinterfestBaubles string = "Winterfest Baubles" + SearchFreeTopFanPackage string = "Top Fan" + SearchFreeEnergyForFee string = "ENERGY FOR FREE" + SearchWinterfestRankingRewards string = "Winterfest ranking rewards" ) var ( diff --git a/facebook.go b/facebook.go index 40b7f14..5543607 100644 --- a/facebook.go +++ b/facebook.go @@ -79,76 +79,76 @@ func ParsePost(s, PostURL string) (*FBPostData, error) { return &fb, err } - if strings.Contains(fb.Content, FreeSilverCaskets) { + if strings.Contains(fb.Content, SearchFreeSilverCaskets) { if len(fb.Title) == 0 { - fb.Title = FreeSilverCaskets + fb.Title = TitleFreeSilverCaskets } else { - fb.Title = FreeSilverCaskets + "+" + fb.Title + fb.Title = TitleFreeSilverCaskets + "+" + fb.Title } } - if strings.Contains(fb.Content, FreeTitanArtifact) { + if strings.Contains(fb.Content, SearchFreeTitanArtifact) { if len(fb.Title) == 0 { - fb.Title = FreeTitanArtifact + fb.Title = TitleFreeTitanArtifact } else { - fb.Title = FreeTitanArtifact + "+" + fb.Title + fb.Title = TitleFreeTitanArtifact + "+" + fb.Title } } - if strings.Contains(fb.Content, FreeSoulStones) { + if strings.Contains(fb.Content, SearchFreeSoulStones) { if len(fb.Title) == 0 { - fb.Title = FreeSoulStones + fb.Title = TitleFreeSoulStones } else { - fb.Title = FreeSoulStones + "+" + fb.Title + fb.Title = TitleFreeSoulStones + "+" + fb.Title } } - if strings.Contains(fb.Content, FreeSkinStones) { + if strings.Contains(fb.Content, SearchFreeSkinStones) { if len(fb.Title) == 0 { - fb.Title = FreeSkinStones + fb.Title = TitleFreeSkinStones } else { - fb.Title = FreeSkinStones + "+" + fb.Title + fb.Title = TitleFreeSkinStones + "+" + fb.Title } } - if strings.Contains(fb.Content, ActionKeepTheAmount) { + if strings.Contains(fb.Content, SearchActionKeepTheAmount) { if len(fb.Title) == 0 { - fb.Title = ActionKeepTheAmount + fb.Title = TitleActionKeepTheAmount } else { - fb.Title = ActionKeepTheAmount + "+" + fb.Title + fb.Title = TitleActionKeepTheAmount + "+" + fb.Title } fb.GiftURL = fb.PostURL } - if strings.Contains(fb.Content, FreeWinterfestBaubles) { + if strings.Contains(fb.Content, SearchFreeWinterfestBaubles) { if len(fb.Title) == 0 { - fb.Title = FreeWinterfestBaubles + fb.Title = TitleFreeWinterfestBaubles } else { - fb.Title = FreeWinterfestBaubles + "+" + fb.Title + fb.Title = TitleFreeWinterfestBaubles + "+" + fb.Title } } - if strings.Contains(fb.Content, FreeTopFanPackage) { + if strings.Contains(fb.Content, SearchFreeTopFanPackage) { if len(fb.Title) == 0 { - fb.Title = FreeTopFanPackage + fb.Title = TitleFreeTopFanPackage } else { - fb.Title = FreeTopFanPackage + "+" + fb.Title + fb.Title = TitleFreeTopFanPackage + "+" + fb.Title } } - if strings.Contains(fb.Content, FreeEnergyForFee) { + if strings.Contains(fb.Content, SearchFreeEnergyForFee) { if len(fb.Title) == 0 { - fb.Title = FreeEnergyForFee + fb.Title = TitleFreeEnergyForFee } else { - fb.Title = FreeEnergyForFee + "+" + fb.Title + fb.Title = TitleFreeEnergyForFee + "+" + fb.Title } } - if strings.Contains(fb.Content, WinterfestRankingRewards) { + if strings.Contains(fb.Content, SearchWinterfestRankingRewards) { if len(fb.Title) == 0 { - fb.Title = WinterfestRankingRewards + fb.Title = TitleWinterfestRankingRewards } else { - fb.Title = WinterfestRankingRewards + "+" + fb.Title + fb.Title = TitleWinterfestRankingRewards + "+" + fb.Title } } diff --git a/fb_dataft.go b/fb_dataft.go index 52250d4..5955d64 100644 --- a/fb_dataft.go +++ b/fb_dataft.go @@ -8,16 +8,19 @@ package main import "encoding/json" +// UnmarshalDataFT UnmarshalDataFT func UnmarshalDataFT(data []byte) (DataFT, error) { var r DataFT err := json.Unmarshal(data, &r) return r, err } +// Marshal Marshal func (r *DataFT) Marshal() ([]byte, error) { return json.Marshal(r) } +//DataFT DataFT type DataFT struct { MFStoryKey string `json:"mf_story_key"` TopLevelPostID string `json:"top_level_post_id"` @@ -32,6 +35,7 @@ type DataFT struct { Tn string `json:"tn"` } +//PageInsight PageInsight type PageInsight struct { PageID string `json:"page_id"` ActorID string `json:"actor_id"` @@ -43,11 +47,13 @@ type PageInsight struct { Targets []Target `json:"targets"` } +// Dm Dm type Dm struct { IsShare int64 `json:"isShare"` OriginalPostOwnerID int64 `json:"originalPostOwnerID"` } +// PostContext PostContext type PostContext struct { ObjectFbtype int64 `json:"object_fbtype"` PublishTime int64 `json:"publish_time"` @@ -55,6 +61,7 @@ type PostContext struct { StoryFbid []string `json:"story_fbid"` } +// Target Target type Target struct { ActorID string `json:"actor_id"` PageID string `json:"page_id"` diff --git a/main_test.go b/main_test.go index f9acccc..4844c90 100644 --- a/main_test.go +++ b/main_test.go @@ -25,10 +25,6 @@ func TestCronTask(t *testing.T) { fmt.Printf("%#v", cronTask()) } -func TestStartTask(t *testing.T) { - fmt.Printf("%#v", startTask()) -} - func Test_moop(t *testing.T) { genURL, err := url.Parse(html.UnescapeString(testMoopURL)) diff --git a/urlexpander.go b/urlexpander.go index 19e0ab3..0d8ccf3 100644 --- a/urlexpander.go +++ b/urlexpander.go @@ -31,6 +31,7 @@ func ExpandURL(url string) (string, error) { return expandedURL, nil } +// ExpandURL2 ExpandURL2 func ExpandURL2(myURL, searchURL string) (string, error) { nextURL := myURL var i int diff --git a/webhook.go b/webhook.go index 1116ca2..1d4767c 100644 --- a/webhook.go +++ b/webhook.go @@ -2,16 +2,19 @@ package main import "encoding/json" +// UnmarshalWebhook UnmarshalWebhook func UnmarshalWebhook(data []byte) (Webhook, error) { var r Webhook err := json.Unmarshal(data, &r) return r, err } +// Marshal Marshal func (r *Webhook) Marshal() ([]byte, error) { return json.Marshal(r) } +// Webhook Webhook type Webhook struct { Username string `json:"username,omitempty"` AvatarURL string `json:"avatar_url,omitempty"` @@ -20,6 +23,7 @@ type Webhook struct { Embeds []*Embed `json:"embeds,omitempty"` } +// Embed Embed type Embed struct { Author Author `json:"author,omitempty"` Title string `json:"title,omitempty"` @@ -32,23 +36,27 @@ type Embed struct { Footer Footer `json:"footer,omitempty"` } +// Author Author type Author struct { Name string `json:"name"` URL string `json:"url"` IconURL string `json:"icon_url"` } +// Field Field type Field struct { Name string `json:"name"` Value string `json:"value"` Inline *bool `json:"inline,omitempty"` } +// Footer Footer type Footer struct { Text string `json:"text"` IconURL string `json:"icon_url"` } +// Image Image type Image struct { URL string `json:"url"` }