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

Merge branch 'develop' into show_image_upload_limit

This commit is contained in:
Marek Bachmann 2022-11-30 02:28:15 +01:00
parent bbd1c34292 6c2f42ed03
commit ca7af7a64b
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Module/Api/Mastodon/FollowedTags.php
View File

@ -65,9 +65,8 @@ class FollowedTags extends BaseApi
$saved_searches = DBA::select('search', ['id', 'term'], $condition); $saved_searches = DBA::select('search', ['id', 'term'], $condition);
while ($saved_search = DBA::fetch($saved_searches)) { while ($saved_search = DBA::fetch($saved_searches)) {
self::setBoundaries($saved_search['id']); self::setBoundaries($saved_search['id']);
$tag = ['name' => ltrim($saved_search['term'], '#')];
$hashtag = new \Friendica\Object\Api\Mastodon\Tag($this->baseUrl, $tag, [], true); $hashtag = new \Friendica\Object\Api\Mastodon\Tag($this->baseUrl, ['name' => ltrim($saved_search['term'], '#')], [], true);
$return[] = $hashtag->toArray(); $return[] = $hashtag->toArray();
} }

3
src/Module/Api/Mastodon/Tags.php
View File

@ -45,9 +45,8 @@ class Tags extends BaseApi
$tag = ltrim($this->parameters['hashtag'], '#'); $tag = ltrim($this->parameters['hashtag'], '#');
$following = DBA::exists('search', ['uid' => $uid, 'term' => '#' . $tag]); $following = DBA::exists('search', ['uid' => $uid, 'term' => '#' . $tag]);
$term = ['term' => $tag];
$hashtag = new \Friendica\Object\Api\Mastodon\Tag($this->baseUrl, $term, [], $following); $hashtag = new \Friendica\Object\Api\Mastodon\Tag($this->baseUrl, ['name' => $tag], [], $following);
System::jsonExit($hashtag->toArray()); System::jsonExit($hashtag->toArray());
} }
} }

2
src/Module/Api/Mastodon/Tags/Follow.php
View File

@ -45,7 +45,7 @@ class Follow extends BaseApi
DBA::insert('search', $fields); DBA::insert('search', $fields);
} }
$hashtag = new \Friendica\Object\Api\Mastodon\Tag($this->baseUrl, $fields, [], true); $hashtag = new \Friendica\Object\Api\Mastodon\Tag($this->baseUrl, ['name' => ltrim($this->parameters['hashtag'])], [], true);
System::jsonExit($hashtag->toArray()); System::jsonExit($hashtag->toArray());
} }
} }

2
src/Module/Api/Mastodon/Tags/Unfollow.php
View File

@ -44,7 +44,7 @@ class Unfollow extends BaseApi
DBA::delete('search', $term); DBA::delete('search', $term);
$hashtag = new \Friendica\Object\Api\Mastodon\Tag($this->baseUrl, $term, [], false); $hashtag = new \Friendica\Object\Api\Mastodon\Tag($this->baseUrl, ['name' => ltrim($this->parameters['hashtag'])], [], false);
System::jsonExit($hashtag->toArray()); System::jsonExit($hashtag->toArray());
} }
} }