parent
							
								
									12567f6891
								
							
						
					
					
						commit
						770f6728f6
					
				@ -211,7 +211,6 @@ class Emoji(StatorModel):
 | 
			
		||||
    def to_ap_tag(self):
 | 
			
		||||
        """
 | 
			
		||||
        Return this Emoji as an ActivityPub Tag
 | 
			
		||||
        http://joinmastodon.org/ns#Emoji
 | 
			
		||||
        """
 | 
			
		||||
        return {
 | 
			
		||||
            "id": self.object_uri or f"https://{settings.MAIN_DOMAIN}/emoji/{self.pk}/",
 | 
			
		||||
 | 
			
		||||
@ -672,7 +672,7 @@ class Post(StatorModel):
 | 
			
		||||
                    post.mentions.add(mention_identity)
 | 
			
		||||
                elif tag["type"].lower() == "hashtag":
 | 
			
		||||
                    post.hashtags.append(tag["name"].lower().lstrip("#"))
 | 
			
		||||
                elif tag["type"].lower() == "http://joinmastodon.org/ns#emoji":
 | 
			
		||||
                elif tag["type"].lower() == "toot:emoji":
 | 
			
		||||
                    emoji = Emoji.by_ap_tag(post.author.domain, tag, create=True)
 | 
			
		||||
                    post.emojis.add(emoji)
 | 
			
		||||
                else:
 | 
			
		||||
@ -689,10 +689,8 @@ class Post(StatorModel):
 | 
			
		||||
            # These have no IDs, so we have to wipe them each time
 | 
			
		||||
            post.attachments.all().delete()
 | 
			
		||||
            for attachment in get_list(data, "attachment"):
 | 
			
		||||
                if "http://joinmastodon.org/ns#focalPoint" in attachment:
 | 
			
		||||
                    focal_x, focal_y = attachment[
 | 
			
		||||
                        "http://joinmastodon.org/ns#focalPoint"
 | 
			
		||||
                    ]["@list"]
 | 
			
		||||
                if "toot:focalPoint" in attachment:
 | 
			
		||||
                    focal_x, focal_y = attachment["toot:focalPoint"]["@list"]
 | 
			
		||||
                else:
 | 
			
		||||
                    focal_x, focal_y = None, None
 | 
			
		||||
                post.attachments.create(
 | 
			
		||||
@ -701,7 +699,7 @@ class Post(StatorModel):
 | 
			
		||||
                    name=attachment.get("name"),
 | 
			
		||||
                    width=attachment.get("width"),
 | 
			
		||||
                    height=attachment.get("height"),
 | 
			
		||||
                    blurhash=attachment.get("http://joinmastodon.org/ns#blurhash"),
 | 
			
		||||
                    blurhash=attachment.get("toot:blurhash"),
 | 
			
		||||
                    focal_x=focal_x,
 | 
			
		||||
                    focal_y=focal_y,
 | 
			
		||||
                )
 | 
			
		||||
 | 
			
		||||
@ -96,7 +96,7 @@ class PostAttachment(StatorModel):
 | 
			
		||||
            "width": self.width,
 | 
			
		||||
            "height": self.height,
 | 
			
		||||
            "mediaType": self.mimetype,
 | 
			
		||||
            "http://joinmastodon.org/ns#focalPoint": [0, 0],
 | 
			
		||||
            "toot:focalPoint": [0, 0],
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
    ### Mastodon Client API ###
 | 
			
		||||
 | 
			
		||||
@ -321,7 +321,7 @@ class Identity(StatorModel):
 | 
			
		||||
            },
 | 
			
		||||
            "published": self.created.strftime("%Y-%m-%dT%H:%M:%SZ"),
 | 
			
		||||
            "url": self.absolute_profile_uri(),
 | 
			
		||||
            "http://joinmastodon.org/ns#discoverable": self.discoverable,
 | 
			
		||||
            "toot:discoverable": self.discoverable,
 | 
			
		||||
        }
 | 
			
		||||
        if self.name:
 | 
			
		||||
            response["name"] = self.name
 | 
			
		||||
@ -348,7 +348,6 @@ class Identity(StatorModel):
 | 
			
		||||
    def to_ap_tag(self):
 | 
			
		||||
        """
 | 
			
		||||
        Return this Identity as an ActivityPub Tag
 | 
			
		||||
        http://joinmastodon.org/ns#Mention
 | 
			
		||||
        """
 | 
			
		||||
        return {
 | 
			
		||||
            "href": self.actor_uri,
 | 
			
		||||
@ -472,9 +471,7 @@ class Identity(StatorModel):
 | 
			
		||||
        self.public_key_id = document.get("publicKey", {}).get("id")
 | 
			
		||||
        self.icon_uri = document.get("icon", {}).get("url")
 | 
			
		||||
        self.image_uri = document.get("image", {}).get("url")
 | 
			
		||||
        self.discoverable = document.get(
 | 
			
		||||
            "http://joinmastodon.org/ns#discoverable", True
 | 
			
		||||
        )
 | 
			
		||||
        self.discoverable = document.get("toot:discoverable", True)
 | 
			
		||||
        # Profile links/metadata
 | 
			
		||||
        self.metadata = []
 | 
			
		||||
        for attachment in get_list(document, "attachment"):
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user