mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 11:02:25 -05:00 
			
		
		
		
	[chore]: Bump github.com/gorilla/feeds from 1.1.1 to 1.1.2 (#2414)
Bumps [github.com/gorilla/feeds](https://github.com/gorilla/feeds) from 1.1.1 to 1.1.2. - [Release notes](https://github.com/gorilla/feeds/releases) - [Commits](https://github.com/gorilla/feeds/compare/v1.1.1...v1.1.2) --- updated-dependencies: - dependency-name: github.com/gorilla/feeds dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
		
					parent
					
						
							
								5556767ff7
							
						
					
				
			
			
				commit
				
					
						bffc67d764
					
				
			
		
					 13 changed files with 154 additions and 103 deletions
				
			
		
							
								
								
									
										31
									
								
								vendor/github.com/gorilla/feeds/atom.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										31
									
								
								vendor/github.com/gorilla/feeds/atom.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -89,15 +89,16 @@ type Atom struct { | |||
| 
 | ||||
| func newAtomEntry(i *Item) *AtomEntry { | ||||
| 	id := i.Id | ||||
| 	// assume the description is html | ||||
| 	s := &AtomSummary{Content: i.Description, Type: "html"} | ||||
| 
 | ||||
| 	link := i.Link | ||||
| 	if link == nil { | ||||
| 		link = &Link{} | ||||
| 	} | ||||
| 	if len(id) == 0 { | ||||
| 		// if there's no id set, try to create one, either from data or just a uuid | ||||
| 		if len(i.Link.Href) > 0 && (!i.Created.IsZero() || !i.Updated.IsZero()) { | ||||
| 		if len(link.Href) > 0 && (!i.Created.IsZero() || !i.Updated.IsZero()) { | ||||
| 			dateStr := anyTimeFormat("2006-01-02", i.Updated, i.Created) | ||||
| 			host, path := i.Link.Href, "/invalid.html" | ||||
| 			if url, err := url.Parse(i.Link.Href); err == nil { | ||||
| 			host, path := link.Href, "/invalid.html" | ||||
| 			if url, err := url.Parse(link.Href); err == nil { | ||||
| 				host, path = url.Host, url.Path | ||||
| 			} | ||||
| 			id = fmt.Sprintf("tag:%s,%s:%s", host, dateStr, path) | ||||
|  | @ -110,16 +111,20 @@ func newAtomEntry(i *Item) *AtomEntry { | |||
| 		name, email = i.Author.Name, i.Author.Email | ||||
| 	} | ||||
| 
 | ||||
| 	link_rel := i.Link.Rel | ||||
| 	link_rel := link.Rel | ||||
| 	if link_rel == "" { | ||||
| 		link_rel = "alternate" | ||||
| 	} | ||||
| 	x := &AtomEntry{ | ||||
| 		Title:   i.Title, | ||||
| 		Links:   []AtomLink{{Href: i.Link.Href, Rel: link_rel, Type: i.Link.Type}}, | ||||
| 		Links:   []AtomLink{{Href: link.Href, Rel: link_rel, Type: link.Type}}, | ||||
| 		Id:      id, | ||||
| 		Updated: anyTimeFormat(time.RFC3339, i.Updated, i.Created), | ||||
| 		Summary: s, | ||||
| 	} | ||||
| 
 | ||||
| 	// if there's a description, assume it's html | ||||
| 	if len(i.Description) > 0 { | ||||
| 		x.Summary = &AtomSummary{Content: i.Description, Type: "html"} | ||||
| 	} | ||||
| 
 | ||||
| 	// if there's a content, assume it's html | ||||
|  | @ -140,12 +145,16 @@ func newAtomEntry(i *Item) *AtomEntry { | |||
| // create a new AtomFeed with a generic Feed struct's data | ||||
| func (a *Atom) AtomFeed() *AtomFeed { | ||||
| 	updated := anyTimeFormat(time.RFC3339, a.Updated, a.Created) | ||||
| 	link := a.Link | ||||
| 	if link == nil { | ||||
| 		link = &Link{} | ||||
| 	} | ||||
| 	feed := &AtomFeed{ | ||||
| 		Xmlns:    ns, | ||||
| 		Title:    a.Title, | ||||
| 		Link:     &AtomLink{Href: a.Link.Href, Rel: a.Link.Rel}, | ||||
| 		Link:     &AtomLink{Href: link.Href, Rel: link.Rel}, | ||||
| 		Subtitle: a.Description, | ||||
| 		Id:       a.Link.Href, | ||||
| 		Id:       link.Href, | ||||
| 		Updated:  updated, | ||||
| 		Rights:   a.Copyright, | ||||
| 	} | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue