From 471bcc1b6372841856882427bea9b76aed367533 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 5 May 2020 22:47:43 +0000
Subject: [PATCH] Updated addons for new tag handling

---
 advancedcontentfilter/advancedcontentfilter.php |  4 ++--
 diaspora/diaspora.php                           | 14 --------------
 libertree/libertree.php                         | 12 ------------
 tumblr/tumblr.php                               | 13 ++++++-------
 4 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 7ecfda4e..62b18d15 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -43,7 +43,7 @@ use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
 use Friendica\Model\Item;
-use Friendica\Model\Term;
+use Friendica\Model\Tag;
 use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException;
 use Friendica\Util\DateTimeFormat;
@@ -417,7 +417,7 @@ function advancedcontentfilter_get_variables_guid(ServerRequestInterface $reques
 		throw new HTTPException\NotFoundException(DI::l10n()->t('Unknown post with guid: %s', $args['guid']));
 	}
 
-	$tags = Term::populateTagsFromItem($item);
+	$tags = Tag::populateTagsFromItem($item);
 
 	$item['tags'] = $tags['tags'];
 	$item['hashtags'] = $tags['hashtags'];
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 96314d88..380a4df8 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -262,20 +262,6 @@ function diaspora_send(App $a, array &$b)
 	if ($handle && $password) {
 		Logger::log('diaspora_send: all values seem to be okay', Logger::DEBUG);
 
-		$tag_arr = [];
-		$tags = '';
-		$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
-
-		if ($x) {
-			foreach ($matches as $mtch) {
-				$tag_arr[] = $mtch[2];
-			}
-		}
-
-		if (count($tag_arr)) {
-			$tags = implode(',',$tag_arr);
-		}
-
 		$title = $b['title'];
 		$body = $b['body'];
 		// Insert a newline before and after a quote
diff --git a/libertree/libertree.php b/libertree/libertree.php
index 7dfd8a36..01a9d942 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -211,18 +211,6 @@ function libertree_send(&$a,&$b) {
 		$ltree_source .= " (".$b['app'].")";
 
 	if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
-		$tag_arr = [];
-		$tags = '';
-		$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
-
-		if($x) {
-			foreach($matches as $mtch) {
-				$tag_arr[] = $mtch[2];
-			}
-		}
-		if(count($tag_arr))
-			$tags = implode(',',$tag_arr);
-
 		$title = $b['title'];
 		$body = $b['body'];
 		// Insert a newline before and after a quote
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index c0db116e..77a9a99f 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -16,6 +16,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Tag;
 use Friendica\Util\Strings;
 
 function tumblr_install()
@@ -383,14 +384,12 @@ function tumblr_send(App $a, array &$b) {
 	$tmbl_blog = 'blog/' . $page . '/post';
 
 	if ($oauth_token && $oauth_token_secret && $tmbl_blog) {
-		$tag_arr = [];
-		$tags = '';
-		preg_match_all('/\#\[(.*?)\](.*?)\[/', $b['tag'], $matches, PREG_SET_ORDER);
+		$tags = Tag::getByURIId($b['uri-id']);
 
-		if (!empty($matches)) {
-			foreach($matches as $mtch) {
-				$tag_arr[] = $mtch[2];
-			}
+		$tag_arr = [];
+
+		foreach($tags as $tag) {
+			$tag_arr[] = $tag['name'];
 		}
 
 		if (count($tag_arr)) {