mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-29 04:22:24 -05:00 
			
		
		
		
	[chore] local instance count query caching, improved status context endpoint logging, don't log ErrHideStatus when timelining (#3330)
* ensure that errors checking status visibility / converting aren't dropped * add some more context to error messages * include calling function name in log entries * don't error on timelining hidden status * further code to ignore statusfilter.ErrHideStatus type errors * remove unused error type * add local instance status / domain / user counts * add checks for localhost * rename from InstanceCounts to LocalInstance * improved code comment
This commit is contained in:
		
					parent
					
						
							
								964262b169
							
						
					
				
			
			
				commit
				
					
						4592e29087
					
				
			
		
					 9 changed files with 214 additions and 91 deletions
				
			
		|  | @ -384,8 +384,9 @@ func (s *Surface) timelineStatus( | |||
| ) (bool, error) { | ||||
| 
 | ||||
| 	// Ingest status into given timeline using provided function. | ||||
| 	if inserted, err := ingest(ctx, timelineID, status); err != nil { | ||||
| 		err = gtserror.Newf("error ingesting status %s: %w", status.ID, err) | ||||
| 	if inserted, err := ingest(ctx, timelineID, status); err != nil && | ||||
| 		!errors.Is(err, statusfilter.ErrHideStatus) { | ||||
| 		err := gtserror.Newf("error ingesting status %s: %w", status.ID, err) | ||||
| 		return false, err | ||||
| 	} else if !inserted { | ||||
| 		// Nothing more to do. | ||||
|  | @ -400,15 +401,19 @@ func (s *Surface) timelineStatus( | |||
| 		filters, | ||||
| 		mutes, | ||||
| 	) | ||||
| 	if err != nil { | ||||
| 		err = gtserror.Newf("error converting status %s to frontend representation: %w", status.ID, err) | ||||
| 	if err != nil && !errors.Is(err, statusfilter.ErrHideStatus) { | ||||
| 		err := gtserror.Newf("error converting status %s to frontend representation: %w", status.ID, err) | ||||
| 		return true, err | ||||
| 	} | ||||
| 
 | ||||
| 	// The status was inserted so stream it to the user. | ||||
| 	s.Stream.Update(ctx, account, apiStatus, streamType) | ||||
| 	if apiStatus != nil { | ||||
| 		// The status was inserted so stream it to the user. | ||||
| 		s.Stream.Update(ctx, account, apiStatus, streamType) | ||||
| 		return true, nil | ||||
| 	} | ||||
| 
 | ||||
| 	return true, nil | ||||
| 	// Status was hidden. | ||||
| 	return false, nil | ||||
| } | ||||
| 
 | ||||
| // timelineAndNotifyStatusForTagFollowers inserts the status into the | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue