jonny/microblog.pub
1
0
Fork 0
forked from forks/microblog.pub
Code Pull requests Activity

Fix emoji loading

Browse source
This commit is contained in:
Thomas Sileo 2019-08-24 11:08:19 +02:00
parent 681cfe5e54
commit 40c847f1bd
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
utils/emojis.py
View file

@ -11,8 +11,8 @@ from little_boxes import activitypub as ap
EMOJI_REGEX = re.compile(r"(:[\d\w]+:)") EMOJI_REGEX = re.compile(r"(:[\d\w]+:)")
EMOJIS: Dict[str, ap.Emoji] = {} EMOJIS: Dict[str, Dict[str, Any]] = {}
EMOJIS_BY_NAME: Dict[str, ap.Emoji] = {} EMOJIS_BY_NAME: Dict[str, Dict[str, Any]] = {}
def _load_emojis(root_dir: Path, base_url: str) -> None: def _load_emojis(root_dir: Path, base_url: str) -> None:
@ -22,7 +22,8 @@ def _load_emojis(root_dir: Path, base_url: str) -> None:
mt = mimetypes.guess_type(emoji.name)[0] mt = mimetypes.guess_type(emoji.name)[0]
if mt and mt.startswith("image/"): if mt and mt.startswith("image/"):
name = emoji.name.split(".")[0] name = emoji.name.split(".")[0]
ap_emoji = ap.Emoji( ap_emoji = dict(
type=ap.ActivityType.EMOJI.value,
name=f":{name}:", name=f":{name}:",
updated=ap.format_datetime(datetime.fromtimestamp(0.0).astimezone()), updated=ap.format_datetime(datetime.fromtimestamp(0.0).astimezone()),
id=f"{base_url}/emoji/{name}", id=f"{base_url}/emoji/{name}",
@ -33,7 +34,7 @@ def _load_emojis(root_dir: Path, base_url: str) -> None:
}, },
) )
EMOJIS[emoji.name] = ap_emoji EMOJIS[emoji.name] = ap_emoji
EMOJIS_BY_NAME[ap_emoji.name] = ap_emoji EMOJIS_BY_NAME[ap_emoji["name"]] = ap_emoji
def tags(content: str) -> List[Dict[str, Any]]: def tags(content: str) -> List[Dict[str, Any]]:
@ -41,7 +42,7 @@ def tags(content: str) -> List[Dict[str, Any]]:
added: Set[str] = set() added: Set[str] = set()
for e in re.findall(EMOJI_REGEX, content): for e in re.findall(EMOJI_REGEX, content):
if e not in added and e in EMOJIS_BY_NAME: if e not in added and e in EMOJIS_BY_NAME:
tags.append(EMOJIS_BY_NAME[e].to_dict()) tags.append(EMOJIS_BY_NAME[e])
added.add(e) added.add(e)
return tags return tags