Merge pull request #26 from revanced/dev

Integrate data changes
This commit is contained in:
Alexandre Teles 2023-01-14 22:11:50 -03:00 committed by GitHub
commit 9e15b86e60
6 changed files with 831 additions and 232 deletions

182
app/data/placeholder.json Normal file
View File

@ -0,0 +1,182 @@
{
"ech0#8933": {
"id": "1BZXXTEJD_dKyw91X1mgGPDiFGEDQvDqg",
"filename": "trans.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"NaokoShoto#9083": {
"id": "163fy1gikw6Dc_tnzwUATHQ2eOjSQxZdP",
"filename": "BVariant 1.svg",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"rmgnvn#6655": {
"id": "1IRXBSJphILHitrF-h_zEuNRalYxPMEzw",
"filename": "revanced_logo.svg",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"Leech (ಥ ͜ʖಥ) ia #9195": {
"id": "17YlvGXQYgXruPmoQehWfsi-0j94hqVjk",
"filename": "LOGO3-White.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"Nightcrawler#6054": {
"id": "1sIprGws2fTja95wvH2yBrg6FZT9b8Eo6",
"filename": "revanced_logo.svg",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"SpeedX [AFK],#6988": {
"id": "1cvEi0UaoNJ2j50SrV6dMcBiS_WBtgwYA",
"filename": "ReVanced 2 icon.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"Joker#3692": {
"id": "1tZC-6CzsxFVjmIMuHJCzHhdw7ySJSke0",
"filename": "icon_b.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"D34DC3N73R#1325": {
"id": "1AEjrqNM82vWz_aaNpSCotXP_m5m8J4CR",
"filename": "revanced_logos_red-circle-sans-rounded.svg",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"JhCo(미응)#5446": {
"id": "17sOv7fxurXqkHFSZFAHDlkFKsZhk4t3K",
"filename": "revanced.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"GreenMan36#0633": {
"id": "1c7Mk7qcrP2DZ9BVsr4ASf-EKeWQfVneT",
"filename": "Shrimp Rewind.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"noah#0459": {
"id": "1wnTX1CuMdf7ocjBFsCYFk7QGoyEj7zYq",
"filename": "revanced_icon.svg",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"GlitchyPSI#5904": {
"id": "1dhMSb6_KdNGrYhjD33bb8QnoetLdslEZ",
"filename": "revanced_logos.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"Stazor#6633": {
"id": "1aHOUKpi8x2SkctQXFITgH9CEjf-J9Fib",
"filename": "Dark@4x.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"jalaybeewala#2298": {
"id": "14wAcERy9EXpasjt5AxNAxDGHIXz6S27d",
"filename": "revanced.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"Johnny#3665": {
"id": "1U5I9ELj9NB62jyzN6SZQEbwl_B4OVCKI",
"filename": "REVANCED SVG LOGO (FOR PREVIEW).svg",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"Grabstertv#3720": {
"id": "1IMAVNVqeLTucTDtMdk7bzXkMSZhtMwmj",
"filename": "Revanced SVG.svg",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"afn#3842": {
"id": "1KcwbEaXgpefRteX5NjpyD35bQQfS0ZHL",
"filename": "reVancedLogoFinal.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"I DON'T USE HAY OTHER": {
"id": "1wgFzQ9bVCn2d9wRmOyZZwTHQmIMsdvUI",
"filename": "REVANCED LOGOS.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"vlu_hp#3415": {
"id": "1pD_o0a9q6nit3fxQxqfUnUaVgKMVixQB",
"filename": "Logos.zip",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"PickleNik#0864": {
"id": "1ryzI3Mq3w130-L2-MmClwAoZx9j7ENot",
"filename": "_.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"BrandgrandReal#3131": {
"id": "1NOeknbToIDHnyDe_ZCLiAfygqAcOE6l_",
"filename": "ReVancedFuturisticLogo1.svg",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"Exon#9423 or telegram @exonxo": {
"id": "1tHcir0R_MecIlRJrXCJMN86SNW4BM-CP",
"filename": "revanced.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"Jublingo#9431": {
"id": "10F_kY0v85U2qsAWXxhC9miv5lM_QMI9M",
"filename": "revanced_logo_black_bg.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"afn#7153": {
"id": "1-71UcCVUTjKCYEdRBNICwXsh6C4_GBfj",
"filename": "Group 24.svg",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"Discord: Conobi#0952": {
"id": "1vdILKxfqQpm9G_FeopQphcZZLqFavIGg",
"filename": "Revanced logo.svg",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"ArdeeAsher": {
"id": "1TLXIhJcsM6GjvIr3-uxttUOqjqVSzrp6",
"filename": "Page 6.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"itsmeali#1350": {
"id": "1a02uMqBe6NrQzGmtmfV-QqNHegN1vaJD",
"filename": "Frame 3.svg",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"deciphershie#8809": {
"id": "1EQf003FGbdcw4SqZuNENUeizwL6f1WSp",
"filename": "YT Revanced.svg",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"vision#2313": {
"id": "1diS_3XNjS-UAbc6G8rcFfxk0QKBiVRi2",
"filename": "Icon__Revanced.svg",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"junior Feuerwolf#0941": {
"id": "1fMwOLDee7ZHZKxyENeqpzx9giNDMxoMy",
"filename": "ReVancedConcept.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"cyriotic3#6194": {
"id": "1ILpPM2zpNLRGQqmXf-rtFEnFDFEnpb1H",
"filename": "ReVancedWithBG.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"StaticNebula26#4141": {
"id": "196-WtYfmMmsjHwb3KCs8UZN-zDR0zSkp",
"filename": "ReVancedColorsLogo.svg",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"emsigo#6193": {
"id": "1jQbn_9nobk-LhxCJGwSaYZWGGKqjMLTt",
"filename": "logo.svg",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"artmark@airmail.cc": {
"id": "1DF4gfHbyRNkQWydwvkU2nZv4faNK09vI",
"filename": "revanced_wordmark_dark.svg",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"deepwaters#3598": {
"id": "1PWtBZdhpG4X6bNUASwimid1h3ag7CKa0",
"filename": "D307D9CC-4AE1-4946-A567-208A6653A3C9.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
},
"afn#0128": {
"id": "1iT-iee3jcnJtz-v6BSLEcqJNK8p-E45n",
"filename": "Group 241.png",
"gdrive_direct_url": "https://media.tenor.com/gQV5VzHLWQIAAAAC/among-us-sus.gif"
}
}

View File

@ -11,3 +11,11 @@ class LogoFields(BaseModel):
filename: str
gdrive_direct_url: str
class LogoRoot(BaseModel):
"""Implements the root for the logos.
Args:
BaseModel (pydantic.BaseModel): BaseModel from pydantic
"""
logos: list[LogoFields]

View File

@ -1,5 +1,5 @@
from pydantic import BaseModel
from app.models.ItemFields import LogoFields
from app.models.ItemFields import LogoRoot
class ItemModel(BaseModel):
"""Implements the model for the items.
@ -8,5 +8,5 @@ class ItemModel(BaseModel):
BaseModel (pydantic.BaseModel): BaseModel from pydantic
"""
__root__: dict[str, LogoFields]
__root__: dict[str, LogoRoot]

View File

@ -17,9 +17,14 @@ async def logos(request: Request, response: Response) -> dict:
Returns:
json: list of logos
=> username: {
id,
filename,
gdrive_direct_url
logos: [
{
id,
filename,
gdrive_direct_url
},
...
]
}
"""

830
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,25 +1,29 @@
aiofiles==22.1.0 ; python_version >= "3.10" and python_version < "4.0"
aiohttp==3.8.3 ; python_version >= "3.11" and python_version < "4.0"
aiorwlock==1.3.0 ; python_version >= "3.10" and python_version < "4.0"
aiosignal==1.3.1 ; python_version >= "3.11" and python_version < "4.0"
anyio==3.6.2 ; python_version >= "3.10" and python_version < "4.0"
argon2-cffi-bindings==21.2.0 ; python_version >= "3.10" and python_version < "4.0"
argon2-cffi==21.3.0 ; python_version >= "3.10" and python_version < "4.0"
async-timeout==4.0.2 ; python_version >= "3.10" and python_version < "4.0"
attrs==22.2.0 ; python_version >= "3.10" and python_version < "4.0"
async-timeout==4.0.2 ; python_version < "4.0" and python_version >= "3.10"
attrs==22.2.0 ; python_version < "4.0" and python_version >= "3.10"
certifi==2022.12.7 ; python_version >= "3.10" and python_version < "4.0"
cffi==1.15.1 ; python_version >= "3.10" and python_version < "4.0"
charset-normalizer==2.1.1 ; python_version >= "3.11" and python_version < "4.0"
click==8.1.3 ; python_version >= "3.10" and python_version < "4.0"
colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32" or python_version >= "3.10" and python_version < "4.0" and platform_system == "Windows"
cryptography==37.0.4 ; python_version >= "3.10" and python_version < "4.0"
cytoolz==0.12.1 ; python_version >= "3.10" and python_version < "4.0"
deprecated==1.2.13 ; python_version >= "3.10" and python_version < "4.0"
fastapi-cache2==0.1.9 ; python_version >= "3.10" and python_version < "4.0"
fastapi-cache2==0.2.0 ; python_version >= "3.10" and python_version < "4.0"
fastapi-paseto-auth==0.6.0 ; python_version >= "3.10" and python_version < "4.0"
fastapi==0.85.0 ; python_version >= "3.10" and python_version < "4.0"
fasteners==0.17.3 ; python_version >= "3.10" and python_version < "4.0"
frozenlist==1.3.3 ; python_version >= "3.11" and python_version < "4.0"
gunicorn==20.1.0 ; python_version >= "3.10" and python_version < "4.0"
h11==0.14.0 ; python_version >= "3.10" and python_version < "4.0"
h2==4.1.0 ; python_version >= "3.10" and python_version < "4.0"
hiredis==2.1.0 ; python_version >= "3.10" and python_version < "4.0"
hiredis==2.1.1 ; python_version >= "3.10" and python_version < "4.0"
hpack==4.0.0 ; python_version >= "3.10" and python_version < "4.0"
httpcore==0.16.3 ; python_version >= "3.10" and python_version < "4.0"
httpx-cache==0.7.0 ; python_version >= "3.10" and python_version < "4.0"
@ -27,12 +31,13 @@ httpx==0.23.3 ; python_version >= "3.10" and python_version < "4.0"
httpx[http2]==0.23.3 ; python_version >= "3.10" and python_version < "4.0"
hypercorn[uvloop]==0.14.3 ; python_version >= "3.10" and python_version < "4.0"
hyperframe==6.0.1 ; python_version >= "3.10" and python_version < "4.0"
idna==3.4 ; python_version >= "3.10" and python_version < "4.0"
idna==3.4 ; python_version < "4.0" and python_version >= "3.10"
iso8601==1.1.0 ; python_version >= "3.10" and python_version < "4.0"
limits==2.8.0 ; python_version >= "3.10" and python_version < "4.0"
loguru==0.6.0 ; python_version >= "3.10" and python_version < "4.0"
msgpack==1.0.4 ; python_version >= "3.10" and python_version < "4.0"
orjson==3.8.4 ; python_version >= "3.10" and python_version < "4.0"
multidict==6.0.4 ; python_version >= "3.11" and python_version < "4.0"
orjson==3.8.5 ; python_version >= "3.10" and python_version < "4.0"
packaging==22.0 ; python_version >= "3.10" and python_version < "4.0"
passlib[argon2]==1.7.4 ; python_version >= "3.10" and python_version < "4.0"
pendulum==2.1.2 ; python_version >= "3.10" and python_version < "4.0"
@ -43,10 +48,10 @@ pydantic==1.10.2 ; python_version >= "3.10" and python_version < "4.0"
pyseto==1.6.10 ; python_version >= "3.10" and python_version < "4.0"
python-dateutil==2.8.2 ; python_version >= "3.10" and python_version < "4.0"
pytzdata==2020.1 ; python_version >= "3.10" and python_version < "4.0"
redis==4.4.0 ; python_version >= "3.10" and python_version < "4.0"
redis==4.4.2 ; python_version >= "3.10" and python_version < "4.0"
rfc3986[idna2008]==1.5.0 ; python_version >= "3.10" and python_version < "4.0"
sentry-sdk==1.12.1 ; python_version >= "3.10" and python_version < "4.0"
setuptools==65.6.3 ; python_version >= "3.10" and python_version < "4.0"
sentry-sdk==1.13.0 ; python_version >= "3.10" and python_version < "4.0"
setuptools==65.7.0 ; python_version >= "3.10" and python_version < "4.0"
six==1.16.0 ; python_version >= "3.10" and python_version < "4.0"
slowapi==0.1.7 ; python_version >= "3.10" and python_version < "4.0"
sniffio==1.3.0 ; python_version >= "3.10" and python_version < "4.0"
@ -54,10 +59,11 @@ starlette==0.20.4 ; python_version >= "3.10" and python_version < "4.0"
toml==0.10.2 ; python_version >= "3.10" and python_version < "4.0"
toolz==0.12.0 ; python_version >= "3.10" and python_version < "4.0"
typing-extensions==4.4.0 ; python_version >= "3.10" and python_version < "4.0"
ujson==5.6.0 ; python_version >= "3.10" and python_version < "4.0"
urllib3==1.26.13 ; python_version >= "3.10" and python_version < "4.0"
ujson==5.7.0 ; python_version >= "3.10" and python_version < "4.0"
urllib3==1.26.14 ; python_version >= "3.10" and python_version < "4.0"
uvicorn==0.20.0 ; python_version >= "3.10" and python_version < "4.0"
uvloop==0.17.0 ; platform_system != "Windows" and python_version >= "3.10" and python_version < "4.0"
win32-setctime==1.1.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"
wrapt==1.14.1 ; python_version >= "3.10" and python_version < "4.0"
wsproto==1.2.0 ; python_version >= "3.10" and python_version < "4.0"
yarl==1.8.2 ; python_version >= "3.11" and python_version < "4.0"