FreakU
/
takahe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc lemmy compat (#635)

This commit is contained in:
Osma Ahvenlampi 2023-08-21 05:25:48 +03:00 committed by GitHub
parent 2a50928f27
commit 671807beb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activities/models/emoji.py
View File

@ -281,7 +281,7 @@ class Emoji(StatorModel):
# Name could be a direct property, or in a language'd value # Name could be a direct property, or in a language'd value
if "name" in data: if "name" in data:
name = data["name"] name = data["name"]
elif "nameMap" in data: elif "nameMap" in data and "und" in data["nameMap"]:
name = data["nameMap"]["und"] name = data["nameMap"]["und"]
else: else:
raise ValueError("No name on emoji JSON") raise ValueError("No name on emoji JSON")

4
api/views/search.py
View File

@ -13,7 +13,7 @@ from api.decorators import scope_required
def search( def search(
request, request,
q: str, q: str,
type: Literal["accounts", "hashtags", "statuses"] | None = None, type: Literal["accounts", "hashtags", "statuses", ""] | None = None,
fetch_identities: bool = Field(False, alias="resolve"), fetch_identities: bool = Field(False, alias="resolve"),
following: bool = False, following: bool = False,
exclude_unreviewed: bool = False, exclude_unreviewed: bool = False,
@ -33,6 +33,8 @@ def search(
# Run search # Run search
searcher = SearchService(q, request.identity) searcher = SearchService(q, request.identity)
search_result = searcher.search_all() search_result = searcher.search_all()
if type == "":
type = None
if type is None or type == "accounts": if type is None or type == "accounts":
result["accounts"] = [ result["accounts"] = [
schemas.Account.from_identity(i, include_counts=False) schemas.Account.from_identity(i, include_counts=False)