]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into private
authorMichael <heluecht@pirati.ca>
Mon, 2 Mar 2020 15:05:00 +0000 (15:05 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 2 Mar 2020 15:05:00 +0000 (15:05 +0000)
1  2 
include/api.php
mod/settings.php
src/Content/Text/BBCode.php
src/Model/Item.php
src/Model/Term.php
src/Object/Post.php
src/Protocol/ActivityPub/Processor.php
src/Protocol/ActivityPub/Receiver.php
src/Protocol/ActivityPub/Transmitter.php
src/Protocol/Diaspora.php
view/theme/frio/templates/settings/settings.tpl

diff --cc include/api.php
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 75dcf3dbd11fc105ef472c63108d2067d0d3e877,724ac3092d209c8b7ad8a6d2ddd66f25cd193fbf..2e3264e09193f8c09745f141c5ebe4db395342bb
@@@ -447,14 -449,13 +448,21 @@@ class Processo
                $item['owner-link'] = $activity['actor'];
                $item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true);
  
 +              if (in_array(0, $activity['receiver']) && !empty($activity['unlisted'])) {
 +                      $item['private'] = Item::UNLISTED;
 +              } elseif (in_array(0, $activity['receiver'])) {
 +                      $item['private'] = Item::PUBLIC;
 +              } else {
 +                      $item['private'] = Item::PRIVATE;
 +              }
 +
+               if (!empty($activity['raw'])) {
+                       $item['source'] = $activity['raw'];
+                       $item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
+                       $item['conversation-href'] = $activity['context'] ?? '';
+                       $item['conversation-uri'] = $activity['conversation'] ?? '';
+               }
                $isForum = false;
  
                if (!empty($activity['thread-completion'])) {
Simple merge
Simple merge