forked from cybrespace/mastodon
		
	Fix default assumed object type (note->activity), make stream entry threaded? check aware of orphaned replies
This commit is contained in:
		
							parent
							
								
									0634e8dee5
								
							
						
					
					
						commit
						5f737c7228
					
				
					 2 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
					@ -39,7 +39,7 @@ class StreamEntry < ApplicationRecord
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def threaded?
 | 
					  def threaded?
 | 
				
			||||||
    verb == :favorite || object_type == :comment
 | 
					    (verb == :favorite || object_type == :comment) && !thread.nil?
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def thread
 | 
					  def thread
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -214,7 +214,7 @@ class ProcessFeedService < BaseService
 | 
				
			||||||
  def object_type(xml)
 | 
					  def object_type(xml)
 | 
				
			||||||
    xml.at_xpath('./activity:object-type').content.gsub('http://activitystrea.ms/schema/1.0/', '').to_sym
 | 
					    xml.at_xpath('./activity:object-type').content.gsub('http://activitystrea.ms/schema/1.0/', '').to_sym
 | 
				
			||||||
  rescue
 | 
					  rescue
 | 
				
			||||||
    :note
 | 
					    :activity
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def verb(xml)
 | 
					  def verb(xml)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue