friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1061 from annando/issue-9692 

Twitter Issue 9692: Only append Twitter profile links as mentions
pull/1062/head
Hypolite Petovan 2020-12-24 12:02:26 -05:00 committed by GitHub
parent 5a7acbc184 e1bbec52bf
commit 7ce00592a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
twitter/twitter.php
View File

@ -557,7 +557,7 @@ function twitter_post_hook(App $a, array &$b)
} }
$condition = ['uri' => $b["thr-parent"], 'uid' => $b["uid"]]; $condition = ['uri' => $b["thr-parent"], 'uid' => $b["uid"]];
$orig_post = Item::selectFirst([], $condition); $orig_post = Item::selectFirst(['author-nick', 'author-network'], $condition);
if (!DBA::isResult($orig_post)) { if (!DBA::isResult($orig_post)) {
Logger::warning('No parent found', ['thr-parent' => $b["thr-parent"]]); Logger::warning('No parent found', ['thr-parent' => $b["thr-parent"]]);
return; return;
@ -565,14 +565,14 @@ function twitter_post_hook(App $a, array &$b)
$iscomment = true; $iscomment = true;
} }
if ($orig_post['author-network'] == Protocol::TWITTER) {
$nickname = "@[url=" . $orig_post["author-link"] . "]" . $orig_post["author-nick"] . "[/url]";
$nicknameplain = "@" . $orig_post["author-nick"];
$nicknameplain = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]); Logger::info('Comparing', ['nickname' => $nickname, 'nicknameplain' => $nicknameplain, 'body' => $b["body"]]);
$nickname = "@[url=" . $orig_post["author-link"] . "]" . $nicknameplain . "[/url]"; if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false)) {
$nicknameplain = "@" . $nicknameplain; $b["body"] = $nickname . " " . $b["body"];
}
Logger::info('Comparing', ['nickname' => $nickname, 'nicknameplain' => $nicknameplain, 'body' => $b["body"]]);
if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false)) {
$b["body"] = $nickname . " " . $b["body"];
} }
Logger::debug('Parent found', ['parent' => $orig_post]); Logger::debug('Parent found', ['parent' => $orig_post]);