mirror of
https://github.com/friendica/friendica
synced 2024-12-23 11:20:15 +00:00
Merge pull request #12935 from HankG/fix-sending-dms-with-oauth-user
Fix sending dms with oauth user
This commit is contained in:
commit
6394bd91c0
3 changed files with 16 additions and 12 deletions
|
@ -69,12 +69,13 @@ function message_post(App $a)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$sender_id = DI::userSession()->getLocalUserId();
|
||||||
$replyto = !empty($_REQUEST['replyto']) ? trim($_REQUEST['replyto']) : '';
|
$replyto = !empty($_REQUEST['replyto']) ? trim($_REQUEST['replyto']) : '';
|
||||||
$subject = !empty($_REQUEST['subject']) ? trim($_REQUEST['subject']) : '';
|
$subject = !empty($_REQUEST['subject']) ? trim($_REQUEST['subject']) : '';
|
||||||
$body = !empty($_REQUEST['body']) ? Strings::escapeHtml(trim($_REQUEST['body'])) : '';
|
$body = !empty($_REQUEST['body']) ? Strings::escapeHtml(trim($_REQUEST['body'])) : '';
|
||||||
$recipient = !empty($_REQUEST['recipient']) ? intval($_REQUEST['recipient']) : 0;
|
$recipient = !empty($_REQUEST['recipient']) ? intval($_REQUEST['recipient']) : 0;
|
||||||
|
|
||||||
$ret = Mail::send($recipient, $body, $subject, $replyto);
|
$ret = Mail::send($sender_id, $recipient, $body, $subject, $replyto);
|
||||||
$norecip = false;
|
$norecip = false;
|
||||||
|
|
||||||
switch ($ret) {
|
switch ($ret) {
|
||||||
|
|
|
@ -117,6 +117,7 @@ class Mail
|
||||||
/**
|
/**
|
||||||
* Send private message
|
* Send private message
|
||||||
*
|
*
|
||||||
|
* @param integer $sender_uid the user id of the sender
|
||||||
* @param integer $recipient recipient id, default 0
|
* @param integer $recipient recipient id, default 0
|
||||||
* @param string $body message body, default empty
|
* @param string $body message body, default empty
|
||||||
* @param string $subject message subject, default empty
|
* @param string $subject message subject, default empty
|
||||||
|
@ -124,7 +125,7 @@ class Mail
|
||||||
* @return int
|
* @return int
|
||||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||||
*/
|
*/
|
||||||
public static function send(int $recipient = 0, string $body = '', string $subject = '', string $replyto = ''): int
|
public static function send(int $sender_uid, int $recipient = 0, string $body = '', string $subject = '', string $replyto = ''): int
|
||||||
{
|
{
|
||||||
$a = DI::app();
|
$a = DI::app();
|
||||||
|
|
||||||
|
@ -136,12 +137,12 @@ class Mail
|
||||||
$subject = DI::l10n()->t('[no subject]');
|
$subject = DI::l10n()->t('[no subject]');
|
||||||
}
|
}
|
||||||
|
|
||||||
$me = DBA::selectFirst('contact', [], ['uid' => DI::userSession()->getLocalUserId(), 'self' => true]);
|
$me = DBA::selectFirst('contact', [], ['uid' => $sender_uid, 'self' => true]);
|
||||||
if (!DBA::isResult($me)) {
|
if (!DBA::isResult($me)) {
|
||||||
return -2;
|
return -2;
|
||||||
}
|
}
|
||||||
|
|
||||||
$contacts = ACL::getValidMessageRecipientsForUser(DI::userSession()->getLocalUserId());
|
$contacts = ACL::getValidMessageRecipientsForUser($sender_uid);
|
||||||
|
|
||||||
$contactIndex = array_search($recipient, array_column($contacts, 'id'));
|
$contactIndex = array_search($recipient, array_column($contacts, 'id'));
|
||||||
if ($contactIndex === false) {
|
if ($contactIndex === false) {
|
||||||
|
@ -150,7 +151,7 @@ class Mail
|
||||||
|
|
||||||
$contact = $contacts[$contactIndex];
|
$contact = $contacts[$contactIndex];
|
||||||
|
|
||||||
Photo::setPermissionFromBody($body, DI::userSession()->getLocalUserId(), $me['id'], '<' . $contact['id'] . '>', '', '', '');
|
Photo::setPermissionFromBody($body, $sender_uid, $me['id'], '<' . $contact['id'] . '>', '', '', '');
|
||||||
|
|
||||||
$guid = System::createUUID();
|
$guid = System::createUUID();
|
||||||
$uri = Item::newURI($guid);
|
$uri = Item::newURI($guid);
|
||||||
|
@ -163,7 +164,7 @@ class Mail
|
||||||
if (strlen($replyto)) {
|
if (strlen($replyto)) {
|
||||||
$reply = true;
|
$reply = true;
|
||||||
$condition = ["`uid` = ? AND (`uri` = ? OR `parent-uri` = ?)",
|
$condition = ["`uid` = ? AND (`uri` = ? OR `parent-uri` = ?)",
|
||||||
DI::userSession()->getLocalUserId(), $replyto, $replyto];
|
$sender_uid, $replyto, $replyto];
|
||||||
$mail = DBA::selectFirst('mail', ['convid'], $condition);
|
$mail = DBA::selectFirst('mail', ['convid'], $condition);
|
||||||
if (DBA::isResult($mail)) {
|
if (DBA::isResult($mail)) {
|
||||||
$convid = $mail['convid'];
|
$convid = $mail['convid'];
|
||||||
|
@ -176,7 +177,7 @@ class Mail
|
||||||
$conv_guid = System::createUUID();
|
$conv_guid = System::createUUID();
|
||||||
$convuri = $contact['addr'] . ':' . $conv_guid;
|
$convuri = $contact['addr'] . ':' . $conv_guid;
|
||||||
|
|
||||||
$fields = ['uid' => DI::userSession()->getLocalUserId(), 'guid' => $conv_guid, 'creator' => $me['addr'],
|
$fields = ['uid' => $sender_uid, 'guid' => $conv_guid, 'creator' => $me['addr'],
|
||||||
'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(),
|
'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(),
|
||||||
'subject' => $subject, 'recips' => $contact['addr'] . ';' . $me['addr']];
|
'subject' => $subject, 'recips' => $contact['addr'] . ';' . $me['addr']];
|
||||||
if (DBA::insert('conv', $fields)) {
|
if (DBA::insert('conv', $fields)) {
|
||||||
|
@ -195,7 +196,7 @@ class Mail
|
||||||
|
|
||||||
$post_id = self::insert(
|
$post_id = self::insert(
|
||||||
[
|
[
|
||||||
'uid' => DI::userSession()->getLocalUserId(),
|
'uid' => $sender_uid,
|
||||||
'guid' => $guid,
|
'guid' => $guid,
|
||||||
'convid' => $convid,
|
'convid' => $convid,
|
||||||
'from-name' => $me['name'],
|
'from-name' => $me['name'],
|
||||||
|
@ -210,7 +211,8 @@ class Mail
|
||||||
'uri' => $uri,
|
'uri' => $uri,
|
||||||
'parent-uri' => $replyto,
|
'parent-uri' => $replyto,
|
||||||
'created' => DateTimeFormat::utcNow()
|
'created' => DateTimeFormat::utcNow()
|
||||||
], false
|
],
|
||||||
|
false
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -231,7 +233,7 @@ class Mail
|
||||||
foreach ($images as $image) {
|
foreach ($images as $image) {
|
||||||
$image_rid = Photo::ridFromURI($image);
|
$image_rid = Photo::ridFromURI($image);
|
||||||
if (!empty($image_rid)) {
|
if (!empty($image_rid)) {
|
||||||
Photo::update(['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_rid, 'album' => 'Wall Photos', 'uid' => DI::userSession()->getLocalUserId()]);
|
Photo::update(['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_rid, 'album' => 'Wall Photos', 'uid' => $sender_uid]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -311,7 +313,8 @@ class Mail
|
||||||
'parent-uri' => $me['url'],
|
'parent-uri' => $me['url'],
|
||||||
'created' => DateTimeFormat::utcNow(),
|
'created' => DateTimeFormat::utcNow(),
|
||||||
'unknown' => 1
|
'unknown' => 1
|
||||||
], false
|
],
|
||||||
|
false
|
||||||
);
|
);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -83,7 +83,7 @@ class NewDM extends BaseApi
|
||||||
|
|
||||||
$cdata = Contact::getPublicAndUserContactID($cid, $uid);
|
$cdata = Contact::getPublicAndUserContactID($cid, $uid);
|
||||||
|
|
||||||
$id = Mail::send($cdata['user'], $request['text'], $sub, $replyto);
|
$id = Mail::send($uid, $cdata['user'], $request['text'], $sub, $replyto);
|
||||||
|
|
||||||
if ($id > -1) {
|
if ($id > -1) {
|
||||||
$ret = $this->directMessage->createFromMailId($id, $uid, $this->getRequestValue($request, 'getText', ''));
|
$ret = $this->directMessage->createFromMailId($id, $uid, $this->getRequestValue($request, 'getText', ''));
|
||||||
|
|
Loading…
Reference in a new issue