clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated addons for new tag handling

This commit is contained in:
Michael 2020-05-05 22:47:43 +00:00
parent 9b57f661b0
commit 471bcc1b63
4 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
advancedcontentfilter/advancedcontentfilter.php
View File

@ -43,7 +43,7 @@ use Friendica\Database\DBA;
use Friendica\Database\DBStructure; use Friendica\Database\DBStructure;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\Term; use Friendica\Model\Tag;
use Friendica\Module\Security\Login; use Friendica\Module\Security\Login;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;
use Friendica\Util\DateTimeFormat; 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'])); 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['tags'] = $tags['tags'];
$item['hashtags'] = $tags['hashtags']; $item['hashtags'] = $tags['hashtags'];

14
diaspora/diaspora.php
View File

@ -262,20 +262,6 @@ function diaspora_send(App $a, array &$b)
if ($handle && $password) { if ($handle && $password) {
Logger::log('diaspora_send: all values seem to be okay', Logger::DEBUG); 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']; $title = $b['title'];
$body = $b['body']; $body = $b['body'];
// Insert a newline before and after a quote // Insert a newline before and after a quote

12
libertree/libertree.php
View File

@ -211,18 +211,6 @@ function libertree_send(&$a,&$b) {
$ltree_source .= " (".$b['app'].")"; $ltree_source .= " (".$b['app'].")";
if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) { 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']; $title = $b['title'];
$body = $b['body']; $body = $b['body'];
// Insert a newline before and after a quote // Insert a newline before and after a quote

13
tumblr/tumblr.php
View File

@ -16,6 +16,7 @@ use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Tag;
use Friendica\Util\Strings; use Friendica\Util\Strings;
function tumblr_install() function tumblr_install()
@ -383,14 +384,12 @@ function tumblr_send(App $a, array &$b) {
$tmbl_blog = 'blog/' . $page . '/post'; $tmbl_blog = 'blog/' . $page . '/post';
if ($oauth_token && $oauth_token_secret && $tmbl_blog) { if ($oauth_token && $oauth_token_secret && $tmbl_blog) {
$tag_arr = []; $tags = Tag::getByURIId($b['uri-id']);
$tags = '';
preg_match_all('/\#\[(.*?)\](.*?)\[/', $b['tag'], $matches, PREG_SET_ORDER);
if (!empty($matches)) { $tag_arr = [];
foreach($matches as $mtch) {
$tag_arr[] = $mtch[2]; foreach($tags as $tag) {
} $tag_arr[] = $tag['name'];
} }
if (count($tag_arr)) { if (count($tag_arr)) {