indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Update valueflows for changes to fep-0837

main
Bob Mottram 2024-01-30 10:19:33 +00:00
parent bb43d669ba
commit 83fb8754a5
2 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
shares.py
View File

@ -2078,10 +2078,7 @@ def _vf_share_id(share_id: str) -> str:
return share_id.replace('--', '/')
def vf_proposal_from_share(shared_item: {},
share_type: str,
publishes_direction: str,
reciprocal_direction: str) -> {}:
def vf_proposal_from_share(shared_item: {}, share_type: str) -> {}:
"""Returns a ValueFlows proposal from a shared item
"""
if not shared_item.get('shareId'):
@ -2096,12 +2093,11 @@ def vf_proposal_from_share(shared_item: {},
"https://www.w3.org/ns/activitystreams",
{
"om2": om2_link,
"vf": "https://w3id.org/valueflows/ont/vf/",
"vf": "https://w3id.org/valueflows/ont/vf#",
"Proposal": "vf:Proposal",
"Intent": "vf:Intent",
"receiver": "vf:receiver",
"provider": "vf:provider",
"action": "vf:action",
"purpose": "vf:purpose",
"unitBased": "vf:unitBased",
"publishes": "vf:publishes",
"reciprocal": "vf:reciprocal",
@ -2111,7 +2107,8 @@ def vf_proposal_from_share(shared_item: {},
"hasNumericalValue": "om2:hasNumericalValue"
}
],
"type": share_type,
"type": "Proposal",
"purpose": share_type,
"id": share_id,
"attributedTo": actor_url,
"name": shared_item['displayName'],
@ -2125,7 +2122,6 @@ def vf_proposal_from_share(shared_item: {},
"hasUnit": "one",
"hasNumericalValue": str(shared_item['itemQty'])
},
publishes_direction: actor_url
},
"attachment": [],
"unitBased": False,
@ -2177,8 +2173,7 @@ def vf_proposal_from_share(shared_item: {},
"resourceQuantity": {
"hasUnit": "one",
"hasNumericalValue": str(shared_item['itemPrice'])
},
reciprocal_direction: actor_url
}
}
return offer_item
@ -2221,19 +2216,13 @@ def vf_proposal_from_id(base_dir: str, nickname: str, domain: str,
print('DEBUG: vf_proposal_from_id does not contain id ' + share_id)
return {}
if shares_file_type == 'shares':
share_type = 'Proposal'
publishes_direction = "provider"
reciprocal_direction = "receiver"
share_type = 'offer'
else:
share_type = 'Want'
publishes_direction = "receiver"
reciprocal_direction = "provider"
share_type = 'request'
shares_json[share_id]['shareId'] = share_id
shares_json[share_id]['actor'] = actor
return vf_proposal_from_share(shares_json[share_id],
share_type,
publishes_direction,
reciprocal_direction)
share_type)
def _is_valueflows_attachment(attach_item: {}) -> bool:

13
webapp_utils.py
View File

@ -587,23 +587,16 @@ def get_shares_collection(actor: str, page_number: int, items_per_page: int,
shared_items_federated_domains, shares_file_type)
if shares_file_type == 'shares':
share_type = 'Proposal'
publishes_direction = "provider"
reciprocal_direction = "receiver"
share_type = 'offer'
collection_name = nickname + "'s Shared Items"
else:
share_type = 'Want'
publishes_direction = "receiver"
reciprocal_direction = "provider"
share_type = 'request'
collection_name = nickname + "'s Wanted Items"
for share_id, shared_item in shares_json.items():
shared_item['shareId'] = share_id
shared_item['actor'] = actor
offer_item = vf_proposal_from_share(shared_item,
share_type,
publishes_direction,
reciprocal_direction)
offer_item = vf_proposal_from_share(shared_item, share_type)
if offer_item:
shares_collection.append(offer_item)