feat
This commit is contained in:
parent
95465e82f6
commit
6e3b6c2d6f
17
vk.ipynb
17
vk.ipynb
@ -214,20 +214,19 @@
|
||||
" \n",
|
||||
" sign_avatar = data['sign_avatar']\n",
|
||||
" db_name = item.get('db')\n",
|
||||
" # if db_name == 'competitions':\n",
|
||||
" # social = await social_collection.find_one({'service': True, 'type':'vk'})\n",
|
||||
" # else:\n",
|
||||
" social = doc\n",
|
||||
" if db_name in ['competitions', 'exhibition']:\n",
|
||||
" social = await social_collection.find_one({'service': True, 'type':'vk'})\n",
|
||||
" else:\n",
|
||||
" social = doc\n",
|
||||
" logging.info(doc)\n",
|
||||
" logging.info(social)\n",
|
||||
" images = await get_images(db_name, file_ids, sign_avatar)\n",
|
||||
" async with httpx.AsyncClient(http2=True, verify=ctx) as client:\n",
|
||||
" attachments = []\n",
|
||||
" for _id, img in images.items():\n",
|
||||
" # doc_photo = await mongo_client['vk']['photos'].find_one({'id':f\"{_id}:{social.get('_id')}\"})\n",
|
||||
" # if doc_photo:\n",
|
||||
" # attachments.append(doc_photo['attachment'])\n",
|
||||
" # continue\n",
|
||||
" if (doc_photo:=await mongo_client['vk']['photos'].find_one({'id':f\"{_id}:{social.get('_id')}\"},{'attachment': 1})):\n",
|
||||
" attachments.append(doc_photo['attachment'])\n",
|
||||
" continue\n",
|
||||
" payload = {\"v\": \"5.199\"}\n",
|
||||
" if 'group' in social:\n",
|
||||
" payload['group_id'] = social['id']\n",
|
||||
@ -243,7 +242,7 @@
|
||||
" attachment = ','.join([f'photo{i['owner_id']}_{i['id']}' for i in resp.json()['response']])\n",
|
||||
" if not attachment:\n",
|
||||
" return {'ok': False}\n",
|
||||
" # await mongo_client['vk']['photos'].insert_one({'attachment':attachment,'id':f\"{_id}:{social.get('_id')}\"})\n",
|
||||
" await mongo_client['vk']['photos'].insert_one({'attachment':attachment,'id':f\"{_id}:{social.get('_id')}\"})\n",
|
||||
" attachments.append(attachment)\n",
|
||||
" logging.info(attachments)\n",
|
||||
" \n",
|
||||
|
||||
17
vk.py
17
vk.py
@ -138,20 +138,19 @@ async def send_vk(data:dict, request: Request):
|
||||
|
||||
sign_avatar = data['sign_avatar']
|
||||
db_name = item.get('db')
|
||||
# if db_name == 'competitions':
|
||||
# social = await social_collection.find_one({'service': True, 'type':'vk'})
|
||||
# else:
|
||||
social = doc
|
||||
if db_name in ['competitions', 'exhibition']:
|
||||
social = await social_collection.find_one({'service': True, 'type':'vk'})
|
||||
else:
|
||||
social = doc
|
||||
logging.info(doc)
|
||||
logging.info(social)
|
||||
images = await get_images(db_name, file_ids, sign_avatar)
|
||||
async with httpx.AsyncClient(http2=True, verify=ctx) as client:
|
||||
attachments = []
|
||||
for _id, img in images.items():
|
||||
# doc_photo = await mongo_client['vk']['photos'].find_one({'id':f"{_id}:{social.get('_id')}"})
|
||||
# if doc_photo:
|
||||
# attachments.append(doc_photo['attachment'])
|
||||
# continue
|
||||
if (doc_photo:=await mongo_client['vk']['photos'].find_one({'id':f"{_id}:{social.get('_id')}"},{'attachment': 1})):
|
||||
attachments.append(doc_photo['attachment'])
|
||||
continue
|
||||
payload = {"v": "5.199"}
|
||||
if 'group' in social:
|
||||
payload['group_id'] = social['id']
|
||||
@ -167,7 +166,7 @@ async def send_vk(data:dict, request: Request):
|
||||
attachment = ','.join([f'photo{i['owner_id']}_{i['id']}' for i in resp.json()['response']])
|
||||
if not attachment:
|
||||
return {'ok': False}
|
||||
# await mongo_client['vk']['photos'].insert_one({'attachment':attachment,'id':f"{_id}:{social.get('_id')}"})
|
||||
await mongo_client['vk']['photos'].insert_one({'attachment':attachment,'id':f"{_id}:{social.get('_id')}"})
|
||||
attachments.append(attachment)
|
||||
logging.info(attachments)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user