mirror of
https://github.com/friendica/friendica
synced 2025-04-24 10:30:11 +00:00
We now set the protocol in "gserver" on receiving as well
This commit is contained in:
parent
5e98a38ac9
commit
9e87dcb25b
6 changed files with 65 additions and 3 deletions
|
@ -34,6 +34,7 @@ use Friendica\Model\Contact;
|
|||
use Friendica\Model\Conversation;
|
||||
use Friendica\Model\Event;
|
||||
use Friendica\Model\FContact;
|
||||
use Friendica\Model\GServer;
|
||||
use Friendica\Model\Item;
|
||||
use Friendica\Model\ItemURI;
|
||||
use Friendica\Model\Mail;
|
||||
|
@ -2604,6 +2605,14 @@ class DFRN
|
|||
|
||||
Logger::log("Import DFRN message for user " . $importer["importer_uid"] . " from contact " . $importer["id"], Logger::DEBUG);
|
||||
|
||||
if (!empty($importer['gsid'])) {
|
||||
if ($protocol == Conversation::PARCEL_DIASPORA_DFRN) {
|
||||
GServer::setProtocol($importer['gsid'], Post\DeliveryData::DFRN);
|
||||
} elseif ($protocol == Conversation::PARCEL_LEGACY_DFRN) {
|
||||
GServer::setProtocol($importer['gsid'], Post\DeliveryData::LEGACY_DFRN);
|
||||
}
|
||||
}
|
||||
|
||||
// is it a public forum? Private forums aren't exposed with this method
|
||||
$forum = intval(XML::getFirstNodeValue($xpath, "/atom:feed/dfrn:community/text()"));
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue