kopia lustrzana https://git.sr.ht/~tsileo/microblog.pub
				
				
				
			Improve/fix non-media attachment display
							rodzic
							
								
									58b383ba4e
								
							
						
					
					
						commit
						cf6a891349
					
				| 
						 | 
				
			
			@ -1,4 +1,5 @@
 | 
			
		|||
import hashlib
 | 
			
		||||
import mimetypes
 | 
			
		||||
from datetime import datetime
 | 
			
		||||
from functools import cached_property
 | 
			
		||||
from typing import Any
 | 
			
		||||
| 
						 | 
				
			
			@ -276,6 +277,17 @@ class Attachment(BaseModel):
 | 
			
		|||
    proxied_url: str | None = None
 | 
			
		||||
    resized_url: str | None = None
 | 
			
		||||
 | 
			
		||||
    @property
 | 
			
		||||
    def mimetype(self) -> str:
 | 
			
		||||
        mimetype = self.media_type
 | 
			
		||||
        if not mimetype:
 | 
			
		||||
            mimetype, _ = mimetypes.guess_type(self.url)
 | 
			
		||||
 | 
			
		||||
        if not mimetype:
 | 
			
		||||
            return "unknown"
 | 
			
		||||
 | 
			
		||||
        return mimetype.split("/")[-1]
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class RemoteObject(Object):
 | 
			
		||||
    def __init__(self, raw_object: ap.RawObject, actor: Actor):
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -343,11 +343,13 @@
 | 
			
		|||
    {% elif attachment.type == "Audio" or (attachment | has_media_type("audio")) %}
 | 
			
		||||
    <audio controls preload="metadata"  src="{{ attachment.url | media_proxy_url }}"{% if attachment.name%} title="{{ attachment.name }}"{% endif %} class="attachment"></audio>
 | 
			
		||||
    {% elif attachment.type == "Link" %}
 | 
			
		||||
        <a href="{{ attachment.url }}" class="attachment">{{ attachment.url }}</a>
 | 
			
		||||
    <a href="{{ attachment.url }}" class="attachment">{{ attachment.url | truncate(64, True) }}</a> ({{ attachment.mimetype}})
 | 
			
		||||
    {% else %}
 | 
			
		||||
    <a href="{{ attachment.url | media_proxy_url }}"{% if attachment.name %} title="{{ attachment.name }}"{% endif %} class="attachment">{{ attachment.url }}</a>
 | 
			
		||||
    <a href="{{ attachment.url | media_proxy_url }}"{% if attachment.name %} title="{{ attachment.url }}"{% endif %} class="attachment">
 | 
			
		||||
        {% if attachment.name %}{{ attachment.name }}{% else %}{{ attachment.url | truncate(64, True) }}{% endif %}
 | 
			
		||||
    </a> ({{ attachment.mimetype }})
 | 
			
		||||
    {% endif %}
 | 
			
		||||
    {% if object.sensitive %}
 | 
			
		||||
    {% if object.sensitive and (attachment.type == "Image" or (attachment | has_media_type("image")) or attachment.type == "Video" or (attachment | has_media_type("video"))) %}
 | 
			
		||||
            </div>
 | 
			
		||||
        </div>
 | 
			
		||||
        </div>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Ładowanie…
	
		Reference in New Issue