Browse Source

好友拉黑发消息提醒修改,查看不是好友朋友圈权限修改

master
wanghongjun 5 months ago
parent
commit
e5f9d41a0d
  1. 2
      app/enterprise/controller/Posts.php
  2. 4
      app/enterprise/model/Message.php
  3. 3
      app/lang/en_us.php
  4. 3
      app/lang/zh_cn.php

2
app/enterprise/controller/Posts.php

@ -122,7 +122,7 @@ class Posts extends BaseController
}
$friendIds = Friend::getFriendIds($this->uid);
if (!in_array($friendUserId, $friendIds)) {
return warning(lang('system.error'));
return warning(lang('system.forbidden'));
}
$user_id = $friendUserId;

4
app/enterprise/model/Message.php

@ -106,11 +106,11 @@ class Message extends BaseModel
return false;
}
if ($friend['is_blacklist'] == 1) {
$this->error=lang('im.blacklist');
$this->error=lang('im.youBlacklist');
return false;
}
if ($otherFriend['is_blacklist'] == 1) {
$this->error=lang('im.blacklist');
$this->error=lang('im.meBlacklist');
return false;
}
}

3
app/lang/en_us.php

@ -116,7 +116,8 @@ return [
'msgContentLimit' => "Message content too long",
'sendTimeLimit'=>'The message sending interval is {:time} seconds!',
'forbidMsg'=>'[The message is suspected of violation and has been blocked]',
'blacklist'=>'You have been blacklisted by him',
'youBlacklist'=>'You have been blacklisted by him',
'meBlacklist'=>'You have added him to the blacklist',
],
'webRtc' => [
'cancel' => 'Call has been canceled',

3
app/lang/zh_cn.php

@ -115,7 +115,8 @@ return [
'msgContentLimit'=>'你发送的消息长度太长了!',
'sendTimeLimit'=>'消息发送时间间隔为 {:time} 秒!',
'forbidMsg'=>'[该消息涉嫌违规,已被屏蔽]',
'blacklist'=>'您已被TA加入黑名单',
'youBlacklist'=>'您已被TA加入黑名单',
'meBlacklist'=>'您已将TA加入黑名单',
],
'webRtc'=>[
'cancel'=>'已取消通话',

Loading…
Cancel
Save