mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-11 18:42:54 +00:00
no message
This commit is contained in:
parent
07c5f586b0
commit
829e3982d2
@ -1183,7 +1183,7 @@ class UsersController extends AbstractController
|
||||
$meeting->save();
|
||||
} elseif ($type === 'create') {
|
||||
$meetingid = strtoupper(Base::generatePassword(11, 1));
|
||||
$name = $name ?: "{$user?->nickname} 发起的会议";
|
||||
$name = $name ?: Doo::translate("{$user?->nickname} 发起的会议");
|
||||
$channel = "DooTask:" . substr(md5($meetingid . env("APP_KEY")), 16);
|
||||
$meeting = Meeting::createInstance([
|
||||
'meetingid' => $meetingid,
|
||||
|
||||
@ -95,7 +95,13 @@ class User extends AbstractModel
|
||||
*/
|
||||
public function getNicknameAttribute($value)
|
||||
{
|
||||
return $value ?: Base::cardFormat($this->email);
|
||||
if ($value) {
|
||||
if (UserBot::isSystemBot($this->email)) {
|
||||
return Doo::translate($value);
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
return Base::formatName($this->email);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -44,6 +44,16 @@ use Carbon\Carbon;
|
||||
class UserBot extends AbstractModel
|
||||
{
|
||||
|
||||
/**
|
||||
* 判断是否系统机器人
|
||||
* @param $email
|
||||
* @return bool
|
||||
*/
|
||||
public static function isSystemBot($email)
|
||||
{
|
||||
return str_ends_with($email, '@bot.system') && self::systemBotName($email);
|
||||
}
|
||||
|
||||
/**
|
||||
* 系统机器人名称
|
||||
* @param $name string 邮箱 或 邮箱前缀
|
||||
|
||||
@ -48,7 +48,7 @@ class UserDelete extends AbstractModel
|
||||
$value = Base::json2array($value);
|
||||
// 昵称
|
||||
if (!$value['nickname']) {
|
||||
$value['nickname'] = Base::cardFormat($value['email']);
|
||||
$value['nickname'] = Base::formatName($value['email']);
|
||||
}
|
||||
// 头像
|
||||
$value['userimg'] = User::getAvatar($value['userid'], $value['userimg'], $value['email'], $value['nickname']);
|
||||
|
||||
@ -1710,9 +1710,9 @@ class Base
|
||||
* @param $str
|
||||
* @return string
|
||||
*/
|
||||
public static function cardFormat($str)
|
||||
public static function formatName($str)
|
||||
{
|
||||
if (strpos($str, '@')) {
|
||||
if (str_contains($str, "@")) {
|
||||
$email_array = explode("@", $str);
|
||||
$prevfix = substr($str, 0, strlen($email_array[0]) < 4 ? 1 : 3); //邮箱前缀
|
||||
$count = 0;
|
||||
|
||||
@ -334,6 +334,7 @@ LDAP 用户禁止修改邮箱
|
||||
删除子任务负责人
|
||||
同步修改子任务时间
|
||||
修改子任务时间
|
||||
修改子任务时间(备注:(*))
|
||||
修改子任务下个周期
|
||||
修改子任务重复周期
|
||||
修改子任务协助人员
|
||||
@ -494,9 +495,7 @@ webhook地址最长仅支持255个字符。
|
||||
审批通知
|
||||
待你审批
|
||||
未知的消息
|
||||
修改子任务时间(*)
|
||||
移动子任务
|
||||
修改任务时间(*)
|
||||
移动任务
|
||||
项目
|
||||
任务
|
||||
@ -538,6 +537,7 @@ webhook地址最长仅支持255个字符。
|
||||
今日已下班打卡,无需重复打卡。
|
||||
上班时间到了,你还没有打卡哦~
|
||||
快到上班时间了,别忘了打卡哦~
|
||||
不在有效时间内,有效时间为:(*)
|
||||
匿名消息使用说明
|
||||
使用说明:打开你想要发匿名消息的个人对话,点击输入框右边的 ⊕ 号,选择「匿名消息」即可输入你想要发送的匿名消息内容。
|
||||
匿名消息隐私说明
|
||||
@ -596,3 +596,4 @@ webhook地址最长仅支持255个字符。
|
||||
不是你的机器人
|
||||
置顶成功
|
||||
上传成功
|
||||
(*)发起的会议
|
||||
|
||||
@ -1638,6 +1638,7 @@ Token
|
||||
上班时间到了,你还没有打卡哦~
|
||||
打卡提醒
|
||||
快到上班时间了,别忘了打卡哦~
|
||||
不在有效时间内,有效时间为:(*)
|
||||
文件下载打包已完成
|
||||
匿名消息使用说明
|
||||
使用说明:打开你想要发匿名消息的个人对话,点击输入框右边的 ⊕ 号,选择「匿名消息」即可输入你想要发送的匿名消息内容。
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
||||
["","","","","","","","开启语音转文字功能需要在应用中开启 ChatGPT AI 机器人。","","","","","","","","","","","一次最多只能下载100个文件或文件夹","","","","","","","","","","","","","保存任务详情至文件失败,请重试","","文件总大小已超过1GB,请分批下载","","","","","","","","","","","","","","","","开始时间不能大于结束时间","","请选择下载的文件或文件夹","","","","开始时间 无效的时间格式","","结束时间 无效的时间格式","","","保存任务详情至文件失败","","","","","找不到符合条件的子节点","","","","","","","","","","","","","","","","","","","","文件下载打包已完成。","","","","","语音转文字功能未开启","","","","","","","","","","日期范围限制最大35天","","","","","","","","","","","","创建签到机器人失败","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","创建压缩文件失败","","","","","","","","","","","","","","","","","","","","系统机器人不存在","置顶会话无法隐藏","","","","","","","","","","","","","","仅支持语音消息","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","语音文件不存在","语音转文字失败","","","","","","","","","","","","","","","","","","","","不能重复投票","个人会话禁言","个人群组禁言","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","撤回失败","","","","","","","","","","注册失败","","","","","点击下载","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]
|
||||
["","","","","","","","开启语音转文字功能需要在应用中开启 ChatGPT AI 机器人。","","","","","","","","","","一次最多只能下载100个文件或文件夹","","","","","","","","","","","","","","保存任务详情至文件失败,请重试","","文件总大小已超过1GB,请分批下载","","","","","","","","","","","","","","","","开始时间不能大于结束时间","","请选择下载的文件或文件夹","","","","开始时间 无效的时间格式","","结束时间 无效的时间格式","","","保存任务详情至文件失败","","","","","找不到符合条件的子节点","","","","","","","","","","","","","","","","","","","","文件下载打包已完成。","","","","","语音转文字功能未开启","","","","","","","","","","日期范围限制最大35天","","","","","","","","","","","","创建签到机器人失败","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","创建压缩文件失败","","","","","","","","","","","","","","","","","","","","","系统机器人不存在","置顶会话无法隐藏","","","","","","","","","","","","","","仅支持语音消息","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","语音文件不存在","语音转文字失败","","","","","","","","","","","","","","","","","","","","不能重复投票","个人会话禁言","个人群组禁言","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","撤回失败","","","","","","","","","","注册失败","","","","","点击下载","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]
|
||||
2
public/language/web/de.js
vendored
2
public/language/web/de.js
vendored
File diff suppressed because one or more lines are too long
2
public/language/web/en.js
vendored
2
public/language/web/en.js
vendored
File diff suppressed because one or more lines are too long
2
public/language/web/fr.js
vendored
2
public/language/web/fr.js
vendored
File diff suppressed because one or more lines are too long
2
public/language/web/id.js
vendored
2
public/language/web/id.js
vendored
File diff suppressed because one or more lines are too long
2
public/language/web/ja.js
vendored
2
public/language/web/ja.js
vendored
File diff suppressed because one or more lines are too long
2
public/language/web/key.js
vendored
2
public/language/web/key.js
vendored
File diff suppressed because one or more lines are too long
2
public/language/web/ko.js
vendored
2
public/language/web/ko.js
vendored
File diff suppressed because one or more lines are too long
2
public/language/web/ru.js
vendored
2
public/language/web/ru.js
vendored
File diff suppressed because one or more lines are too long
2
public/language/web/zh-CHT.js
vendored
2
public/language/web/zh-CHT.js
vendored
File diff suppressed because one or more lines are too long
2
public/language/web/zh.js
vendored
2
public/language/web/zh.js
vendored
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user