pch_xyz/relay
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/relay.git synced 2024-09-19 15:01:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

use right algorithm for inbox pushes

Browse source 
* return instance rows from distill_inboxes
* pass the row of the instance being POSTed to the instance parameter of HttpClient.post
This commit is contained in:
Izalia Mae 2024-03-27 12:48:22 -04:00
parent 938d3f419e
commit e700f9baa2
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
relay/database/connection.py
View file

@ -42,15 +42,15 @@ class Connection(SqlConnection):
return get_app() return get_app()
def distill_inboxes(self, message: Message) -> Iterator[str]: def distill_inboxes(self, message: Message) -> Iterator[Row]:
src_domains = { src_domains = {
message.domain, message.domain,
urlparse(message.object_id).netloc urlparse(message.object_id).netloc
} }
for inbox in self.get_inboxes(): for instance in self.get_inboxes():
if inbox['domain'] not in src_domains: if instance['domain'] not in src_domains:
yield inbox['inbox'] yield instance
def get_config(self, key: str) -> Any: def get_config(self, key: str) -> Any:

8
relay/processors.py
View file

@ -35,8 +35,8 @@ async def handle_relay(view: ActorView, conn: Connection) -> None:
message = Message.new_announce(view.config.domain, view.message.object_id) message = Message.new_announce(view.config.domain, view.message.object_id)
logging.debug('>> relay: %s', message) logging.debug('>> relay: %s', message)
for inbox in conn.distill_inboxes(view.message): for instance in conn.distill_inboxes(view.message):
view.app.push_message(inbox, message, view.instance) view.app.push_message(instance["inbox"], message, instance)
view.cache.set('handle-relay', view.message.object_id, message.id, 'str') view.cache.set('handle-relay', view.message.object_id, message.id, 'str')
@ -53,8 +53,8 @@ async def handle_forward(view: ActorView, conn: Connection) -> None:
message = Message.new_announce(view.config.domain, view.message) message = Message.new_announce(view.config.domain, view.message)
logging.debug('>> forward: %s', message) logging.debug('>> forward: %s', message)
for inbox in conn.distill_inboxes(view.message): for instance in conn.distill_inboxes(view.message):
view.app.push_message(inbox, message, view.instance) view.app.push_message(instance["inbox"], await view.request.read(), instance)
view.cache.set('handle-relay', view.message.id, message.id, 'str') view.cache.set('handle-relay', view.message.id, message.id, 'str')